From a6592db2deb66c69b9e8baaeaf0b924e5c143a83 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Fri, 9 Feb 2024 15:17:46 +0600 Subject: [PATCH] (improve) emotes icon --- .../client/cosmetics/gui/CosmeticsGui.java | 2 +- .../client/cosmetics/gui/OutfitsGui.java | 3 +-- .../silentclient/client/emotes/EmotesMod.java | 2 +- .../client/emotes/ui/EmoteMenuGui.java | 3 +-- .../gui/multiplayer/SilentMultiplayerGui.java | 3 +-- .../resourcepacks/SilentResourcePacksGui.java | 6 +++--- .../client/mods/settings/GeneralMod.java | 1 - .../silentclient/icons/settings/emotes.png | Bin 0 -> 1822 bytes 8 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/minecraft/silentclient/icons/settings/emotes.png diff --git a/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java b/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java index db79001..98194e4 100644 --- a/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java +++ b/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java @@ -305,7 +305,7 @@ public class CosmeticsGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight((items != null ? items.size() : 0) * 35); scrollHelper.setMaxScroll(height - 25); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_SCISSOR_TEST); ScaledResolution r = new ScaledResolution(mc); diff --git a/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java b/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java index 0453a2e..42c8f2c 100644 --- a/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java +++ b/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java @@ -14,7 +14,6 @@ import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.util.RenderUtil; -import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.client.utils.ScrollHelper; @@ -73,7 +72,7 @@ public class OutfitsGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight((float) Math.ceil((Outfits.getOutfits().size() + 3) / 3) * 85); scrollHelper.setMaxScroll(height - 20); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); scrollHelper.setFlag(true); float scrollY = scrollHelper.getScroll(); RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB()); diff --git a/src/main/java/net/silentclient/client/emotes/EmotesMod.java b/src/main/java/net/silentclient/client/emotes/EmotesMod.java index d0dd8d4..5779bd0 100644 --- a/src/main/java/net/silentclient/client/emotes/EmotesMod.java +++ b/src/main/java/net/silentclient/client/emotes/EmotesMod.java @@ -11,7 +11,7 @@ import java.util.ArrayList; public class EmotesMod extends Mod { public EmotesMod() { - super("Emotes", ModCategory.SETTINGS, null); + super("Emotes", ModCategory.SETTINGS, "silentclient/icons/settings/emotes.png"); } @Override diff --git a/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java b/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java index 3a104fd..8b0be34 100644 --- a/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java +++ b/src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java @@ -14,7 +14,6 @@ import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.util.RenderUtil; -import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.client.utils.ScrollHelper; @@ -52,7 +51,7 @@ public class EmoteMenuGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight((float) Math.ceil((Client.getInstance().getCosmetics().getMyEmotes().size() + 3) / 3) * 85); scrollHelper.setMaxScroll(height - 20); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); scrollHelper.setFlag(true); float scrollY = scrollHelper.getScroll(); RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB()); diff --git a/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java b/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java index 34e2e93..c62b097 100644 --- a/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java +++ b/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java @@ -20,7 +20,6 @@ import net.silentclient.client.gui.minecraft.GuiConnecting; import net.silentclient.client.gui.multiplayer.components.ServerComponent; import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.mixin.ducks.ServerListExt; -import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.client.utils.ScrollHelper; import org.lwjgl.opengl.GL11; @@ -143,7 +142,7 @@ public class SilentMultiplayerGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight(servers.size() * 38); scrollHelper.setMaxScroll(blockHeight - 43 - 41); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); float serverY = blockY + 43 + scrollHelper.getScroll(); trimContentStart(); int serverIndex = -1; diff --git a/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java b/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java index ac4df4f..6e945a3 100644 --- a/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java +++ b/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java @@ -18,7 +18,6 @@ import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.lite.clickgui.utils.RenderUtils; import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.util.RenderUtil; -import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.utils.*; import org.apache.commons.io.FilenameUtils; import org.lwjgl.Sys; @@ -126,7 +125,7 @@ public class SilentResourcePacksGui extends SilentScreen { scrollHelper.setStep(5); scrollHelper.setElementsHeight(availableResourcePacks.size() * 37 + 19); scrollHelper.setMaxScroll(blockHeight - 45); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); if(MouseUtils.isInside(mouseX, mouseY, x, y, 193, blockHeight - 45)) { scrollHelper.setFlag(true); @@ -208,7 +207,8 @@ public class SilentResourcePacksGui extends SilentScreen { scrollHelper2.setStep(5); scrollHelper2.setElementsHeight(selectedResourcePacks.size() * 37 + 19); scrollHelper2.setMaxScroll(blockHeight - 45); - scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); + scrollHelper.setSpeed(200); + if(MouseUtils.isInside(mouseX, mouseY, x, y, 193, blockHeight - 45)) { scrollHelper2.setFlag(true); } else { diff --git a/src/main/java/net/silentclient/client/mods/settings/GeneralMod.java b/src/main/java/net/silentclient/client/mods/settings/GeneralMod.java index 871f52a..d9a9a88 100644 --- a/src/main/java/net/silentclient/client/mods/settings/GeneralMod.java +++ b/src/main/java/net/silentclient/client/mods/settings/GeneralMod.java @@ -43,7 +43,6 @@ public class GeneralMod extends Mod { this.addBooleanSetting("Menu Animations", this, true); this.addSliderSetting("Menu Animations Speed", this, 300, 100, 500, true); this.addBooleanSetting("Disable Scroll Wheel", this, false); - this.addSliderSetting("Scroll Speed", this, 150, 100, 1000, true); } @Override diff --git a/src/main/resources/assets/minecraft/silentclient/icons/settings/emotes.png b/src/main/resources/assets/minecraft/silentclient/icons/settings/emotes.png new file mode 100644 index 0000000000000000000000000000000000000000..160357ae3af628b587e7298c18d945aa2aaa1404 GIT binary patch literal 1822 zcmV+(2jTdMP)c6~}+87fZ3RfYe0WiYC@l)JjARG1`K(1ufX(4Z(Q9 z#0Py)V$>KDH5yF}CK{t5ULLS2XhT9xu#`Y60THScH7K!7qpeUZMW{j!r&QYW^I^}C z!`E+S_BY=?7k|ll`DU%P*MIiRzRlhT21LC?{jEBpZdcD3G{%fV{i-LjTb-NXd$Rf& zbxY+lsy?88M?HHg^6!__H~I(~XI+c$>(z%F{KwR5)zhX*57pglVoihZD)p%r|8X8s z7f-gBP=C;p$UgPt8vj$&Co=_&^P9;Qw5cV55%qNqF}^&YpmDC43_-KipS2YHFZG<3 zo6__iHLNKR%JL3*b1y~ z$a5cXZbaHWA>V}M)w7ACqm^yph zsNcxD3y+#Q?2o7~>66TB)g7KF?r~E$(%MZ-h&57^!>h*)Lj7D7yd=BTZ>#Io`4bXa zqMoO|$&RCP_3oN7-_vV2$26k;nyD{ndt3(LhAhdbw$y zbEqarR}QK_Rj;(qqnaV=s+zc)2Mx4R{j_?U>7_2o9@FsWo$4tWxzx3Qe*);+Vr2xK z53B|*to~MXiBrQE@CRT!umkvYL_B8{VVX!D=;M1FnAb^EFX~cY9dH@VBa<#11@0yZ z+z#xDh~uV_{PX+RpIJoIIO@f~O(kRY;R)al;9THEeXd_Rr*MH;Blsa%2)v`=`dPCI z7x>D;@w!l4RO3?F6j4r;Y4TXArXB+}1OM*eyS!vgU0N{K4H5A^;Dx{&fiD1ek(%r_ zvgdrQsDCWj8TXyvsV`7BRvq=<`}mEiA1KvNoeBJGS{P8Kyt# zki+90d>YBEsg1yb7MtHkM5%R(p~w}L^XUC}m_$m_DoR~M`>^OZaD9=C3XoG%R{*nH zY_>(jKMUkjgd9=-SC1aFh*DPowVMGuu zs7DW)YibR!sKtL@L`>dB-i|bh%4r}rl}e-}eMPA!kw(~U%(zDn>T7BPa8ir!T?6dW zoKosUHST1tC{;_v55UxkdR~U_mO?pfR@)|$12N1B?Nb>xIdiLp!0lB>UxdValECnj#`bNjuB# z%XE1esm9tyGqp^*D1e9<0WJXU&vaQv64q&t?UaZDh=?bE^U2?Dv4Yep_C3hb#FU8w zh={|a9i4kKT~-1+tT{_9rPMtOU@U^X%hudjq+Cmxhqj`2X1iuOh*mVDhePX_L77h&UD!b zTxZRJ8JGd00IKEc^GQ3IbGQune%-|xAqpTO?k9E7wI@e=_^A5%eivqpD1eB#k2Itj z&2;&q`qJJXXOt*_h}cP5yRSP?Igxp!ote*}PE_kw&rF+6M8uuICBT0&%ukrA)QM{Q z0>8gH9Xe@5#CFmS>b8&Ezsm}!E>oXr_)dHEuu11)+TDDtCXagu4fe^JK>M9=9B(Qx z9rt^%Cy#r~`DXxqf~_|lk M07*qoM6N<$g26j%Gynhq literal 0 HcmV?d00001