refactoring
/
SLC-1.8.9
mirror of https://github.com/refactorinqq/SLC-1.8.9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(improve) emotes icon

This commit is contained in:
kirillsaint 2024-02-09 15:17:46 +06:00
parent cfa15dcd85
commit a6592db2de
8 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java
View File

@ -305,7 +305,7 @@ public class CosmeticsGui extends SilentScreen {
scrollHelper.setStep(5); scrollHelper.setStep(5);
scrollHelper.setElementsHeight((items != null ? items.size() : 0) * 35); scrollHelper.setElementsHeight((items != null ? items.size() : 0) * 35);
scrollHelper.setMaxScroll(height - 25); scrollHelper.setMaxScroll(height - 25);
scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); scrollHelper.setSpeed(200);
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glEnable(GL11.GL_SCISSOR_TEST); GL11.glEnable(GL11.GL_SCISSOR_TEST);
ScaledResolution r = new ScaledResolution(mc); ScaledResolution r = new ScaledResolution(mc);

3
src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java
View File

@ -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.lite.clickgui.utils.MouseUtils;
import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.theme.Theme;
import net.silentclient.client.gui.util.RenderUtil; 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.MenuBlurUtils;
import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.client.utils.MouseCursorHandler;
import net.silentclient.client.utils.ScrollHelper; import net.silentclient.client.utils.ScrollHelper;
@ -73,7 +72,7 @@ public class OutfitsGui extends SilentScreen {
scrollHelper.setStep(5); scrollHelper.setStep(5);
scrollHelper.setElementsHeight((float) Math.ceil((Outfits.getOutfits().size() + 3) / 3) * 85); scrollHelper.setElementsHeight((float) Math.ceil((Outfits.getOutfits().size() + 3) / 3) * 85);
scrollHelper.setMaxScroll(height - 20); scrollHelper.setMaxScroll(height - 20);
scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); scrollHelper.setSpeed(200);
scrollHelper.setFlag(true); scrollHelper.setFlag(true);
float scrollY = scrollHelper.getScroll(); float scrollY = scrollHelper.getScroll();
RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB()); RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB());

2
src/main/java/net/silentclient/client/emotes/EmotesMod.java
View File

@ -11,7 +11,7 @@ import java.util.ArrayList;
public class EmotesMod extends Mod { public class EmotesMod extends Mod {
public EmotesMod() { public EmotesMod() {
super("Emotes", ModCategory.SETTINGS, null); super("Emotes", ModCategory.SETTINGS, "silentclient/icons/settings/emotes.png");
} }
@Override @Override

3
src/main/java/net/silentclient/client/emotes/ui/EmoteMenuGui.java
View File

@ -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.lite.clickgui.utils.MouseUtils;
import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.theme.Theme;
import net.silentclient.client.gui.util.RenderUtil; 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.MenuBlurUtils;
import net.silentclient.client.utils.MouseCursorHandler; import net.silentclient.client.utils.MouseCursorHandler;
import net.silentclient.client.utils.ScrollHelper; import net.silentclient.client.utils.ScrollHelper;
@ -52,7 +51,7 @@ public class EmoteMenuGui extends SilentScreen {
scrollHelper.setStep(5); scrollHelper.setStep(5);
scrollHelper.setElementsHeight((float) Math.ceil((Client.getInstance().getCosmetics().getMyEmotes().size() + 3) / 3) * 85); scrollHelper.setElementsHeight((float) Math.ceil((Client.getInstance().getCosmetics().getMyEmotes().size() + 3) / 3) * 85);
scrollHelper.setMaxScroll(height - 20); scrollHelper.setMaxScroll(height - 20);
scrollHelper.setSpeed(Client.getInstance().getSettingsManager().getSettingByClass(GeneralMod.class, "Scroll Speed").getValInt()); scrollHelper.setSpeed(200);
scrollHelper.setFlag(true); scrollHelper.setFlag(true);
float scrollY = scrollHelper.getScroll(); float scrollY = scrollHelper.getScroll();
RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB()); RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB());

3
src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java
View File

@ -20,7 +20,6 @@ import net.silentclient.client.gui.minecraft.GuiConnecting;
import net.silentclient.client.gui.multiplayer.components.ServerComponent; import net.silentclient.client.gui.multiplayer.components.ServerComponent;
import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.theme.Theme;
import net.silentclient.client.mixin.ducks.ServerListExt; 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.MouseCursorHandler;
import net.silentclient.client.utils.ScrollHelper; import net.silentclient.client.utils.ScrollHelper;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -143,7 +142,7 @@ public class SilentMultiplayerGui extends SilentScreen {
scrollHelper.setStep(5); scrollHelper.setStep(5);
scrollHelper.setElementsHeight(servers.size() * 38); scrollHelper.setElementsHeight(servers.size() * 38);
scrollHelper.setMaxScroll(blockHeight - 43 - 41); 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(); float serverY = blockY + 43 + scrollHelper.getScroll();
trimContentStart(); trimContentStart();
int serverIndex = -1; int serverIndex = -1;

6
src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java
View File

@ -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.lite.clickgui.utils.RenderUtils;
import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.theme.Theme;
import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.client.gui.util.RenderUtil;
import net.silentclient.client.mods.settings.GeneralMod;
import net.silentclient.client.utils.*; import net.silentclient.client.utils.*;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.lwjgl.Sys; import org.lwjgl.Sys;
@ -126,7 +125,7 @@ public class SilentResourcePacksGui extends SilentScreen {
scrollHelper.setStep(5); scrollHelper.setStep(5);
scrollHelper.setElementsHeight(availableResourcePacks.size() * 37 + 19); scrollHelper.setElementsHeight(availableResourcePacks.size() * 37 + 19);
scrollHelper.setMaxScroll(blockHeight - 45); 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)) { if(MouseUtils.isInside(mouseX, mouseY, x, y, 193, blockHeight - 45)) {
scrollHelper.setFlag(true); scrollHelper.setFlag(true);
@ -208,7 +207,8 @@ public class SilentResourcePacksGui extends SilentScreen {
scrollHelper2.setStep(5); scrollHelper2.setStep(5);
scrollHelper2.setElementsHeight(selectedResourcePacks.size() * 37 + 19); scrollHelper2.setElementsHeight(selectedResourcePacks.size() * 37 + 19);
scrollHelper2.setMaxScroll(blockHeight - 45); 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)) { if(MouseUtils.isInside(mouseX, mouseY, x, y, 193, blockHeight - 45)) {
scrollHelper2.setFlag(true); scrollHelper2.setFlag(true);
} else { } else {

1
src/main/java/net/silentclient/client/mods/settings/GeneralMod.java
View File

@ -43,7 +43,6 @@ public class GeneralMod extends Mod {
this.addBooleanSetting("Menu Animations", this, true); this.addBooleanSetting("Menu Animations", this, true);
this.addSliderSetting("Menu Animations Speed", this, 300, 100, 500, true); this.addSliderSetting("Menu Animations Speed", this, 300, 100, 500, true);
this.addBooleanSetting("Disable Scroll Wheel", this, false); this.addBooleanSetting("Disable Scroll Wheel", this, false);
this.addSliderSetting("Scroll Speed", this, 150, 100, 1000, true);
} }
@Override @Override

BIN
src/main/resources/assets/minecraft/silentclient/icons/settings/emotes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB