diff --git a/.idea/misc.xml b/.idea/misc.xml index 2266f6b..45fe8ed 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/java/net/silentclient/client/Client.java b/src/main/java/net/silentclient/client/Client.java index b26ce66..dbc247d 100644 --- a/src/main/java/net/silentclient/client/Client.java +++ b/src/main/java/net/silentclient/client/Client.java @@ -25,8 +25,10 @@ import net.silentclient.client.gui.util.BackgroundPanorama; import net.silentclient.client.keybinds.KeyBindManager; import net.silentclient.client.mixin.SilentClientTweaker; import net.silentclient.client.mixin.accessors.MinecraftAccessor; +import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.mods.ModInstances; import net.silentclient.client.mods.SettingsManager; +import net.silentclient.client.mods.settings.CosmeticsMod; import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.mods.util.PingSource; @@ -35,6 +37,8 @@ import net.silentclient.client.mods.util.Utils; import net.silentclient.client.premium.PremiumCosmeticsGui; import net.silentclient.client.premium.PremiumUtils; import net.silentclient.client.utils.*; +import net.silentclient.client.utils.animations.AnimationHandler; +import net.silentclient.client.utils.animations.SneakHandler; import net.silentclient.client.utils.culling.EntityCulling; import net.silentclient.client.utils.types.*; import org.apache.logging.log4j.LogManager; @@ -47,7 +51,6 @@ import javax.net.ssl.HttpsURLConnection; import java.io.*; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; -import java.net.URISyntaxException; import java.net.URL; import java.net.UnknownHostException; import java.util.ArrayList; @@ -85,7 +88,6 @@ public class Client { private FriendsResponse friends; public int playersCount = 0; private CPSTracker cpsTracker; - private SilentSocket silentSocket; public static BackgroundPanorama backgroundPanorama; private KeyBindManager keyBindManager; private IMetadataSerializer iMetadataSerializer; @@ -179,13 +181,8 @@ public class Client { } logger.info("INITIALISING > event-manager"); EventManager.register(this); - logger.info("INITIALISING > silent-socket"); - try { - silentSocket = new SilentSocket("https://socket.silentclient.net"); - } catch (URISyntaxException e) { - Client.logger.catching(e); - } - silentSocket.Connect(Client.getInstance().getUserData().getAccessToken()); + EventManager.register(SneakHandler.getInstance()); + EventManager.register(AnimationHandler.getInstance()); memoryDebug("CLIENT_POST_INIT"); } @@ -193,6 +190,8 @@ public class Client { memoryDebug("CLIENT_PRE_START"); logger.info("---------[ Silent Client Starting ]--------------"); try { + logger.info("STARTING > registering-player"); + Players.register(); logger.info("STARTING > sc-account"); PlayerResponse acc = updateAccount(); @@ -309,13 +308,13 @@ public class Client { Client.logger.info("STARTING > launching-detector"); Requests.post("https://api.silentclient.net/_next/launch_v2", new JSONObject().put("branch", getBuildData().getBranch()).toString()); - logger.info("STARTING > news"); - String content = Requests.get("https://api.silentclient.net/_next/news/latest"); - if(content != null) { + logger.info("STARTING > promo"); + String panelContent = Requests.get("https://assets.silentclient.net/client/promo.json"); + if(panelContent != null) { try { - NewsResponse newsResponse = getGson().fromJson(content, NewsResponse.class); + PromoController.PromoResponse promoResponse = getGson().fromJson(panelContent, PromoController.PromoResponse.class); - GuiNews.news = newsResponse; + PromoController.setResponse(promoResponse); } catch (Exception err) { logger.catching(err); } @@ -339,6 +338,9 @@ public class Client { } } + Client.logger.info("STARTING > config-manager-post-init"); + configManager.postInit(); + if(!globalSettings.displayedTutorial) { Minecraft.getMinecraft().displayGuiScreen(new UserTutorial()); } @@ -356,7 +358,7 @@ public class Client { public void shutdown() { logger.info("---------[ Silent Client Stopping ]--------------"); logger.info("STOPPING > silent-socket"); - silentSocket.Disconnect(); + Players.unregister(); logger.info("-------------------------------------------------"); } @@ -367,7 +369,30 @@ public class Client { } public void updateUserInformation() { - silentSocket.getSocket().emit("refresh", Minecraft.getMinecraft().getSession().getUsername().toLowerCase()); + if(Client.getInstance().getAccount() != null) { + (new Thread("updateUserInformation") { + public void run() { + PlayerResponse cosmetics = updateAccount(); + + if(cosmetics != null) { + Client.getInstance().setAccount(cosmetics.getAccount()); + + Client.getInstance().getCosmetics().setMyCapes(cosmetics.getAccount().getCosmetics().getCapes()); + Client.getInstance().getCosmetics().setMyWings(cosmetics.getAccount().getCosmetics().getWings()); + Client.getInstance().getCosmetics().setMyIcons(cosmetics.getAccount().getCosmetics().getIcons()); + Client.getInstance().getCosmetics().setMyBandanas(cosmetics.getAccount().getCosmetics().getBandanas()); + Client.getInstance().getCosmetics().setMyHats(cosmetics.getAccount().getCosmetics().getHats()); + Client.getInstance().getCosmetics().setMyShields(cosmetics.getAccount().getCosmetics().getShields()); + Client.getInstance().getSettingsManager().getSettingByClass(CosmeticsMod.class, "Cape Shoulders").setValBoolean(cosmetics.getAccount().getCapeShoulders()); + Client.getInstance().getSettingsManager().getSettingByClass(CosmeticsMod.class, "Cape Type").setValString(cosmetics.getAccount().getCapeType().equals("dynamic_curved") ? "Dynamic Curved" : cosmetics.getAccount().getCapeType().equals("curved_rectangle") ? "Curved Rectangle" : "Rectangle"); + if(Minecraft.getMinecraft().thePlayer != null) { + ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$setCapeType(cosmetics.getAccount().getCapeType()); + ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$setShoulders(cosmetics.getAccount().getCapeShoulders()); + } + } + } + }).start(); + } } public void updateFriendsList() { @@ -414,26 +439,13 @@ public class Client { public PlayerResponse updateAccount() { try { - URL url = new URL("https://api.silentclient.net/account"); - HttpsURLConnection con = (HttpsURLConnection) url.openConnection(); - con.setRequestMethod("GET"); - con.setRequestProperty("User-Agent", "SilentClient"); - con.setRequestProperty("Authorization", "Bearer " + Client.getInstance().getUserData().getAccessToken()); + String content = Requests.post("https://api.silentclient.net/account/update", new JSONObject().put("server", Minecraft.getMinecraft().getCurrentServerData() != null ? Minecraft.getMinecraft().getCurrentServerData().serverIP : null).toString()); - BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); - String inputLine; - StringBuffer content = new StringBuffer(); - while ((inputLine = in.readLine()) != null) { - content.append(inputLine); - } - in.close(); - con.disconnect(); GsonBuilder builder = new GsonBuilder(); Gson gson = builder.create(); - PlayerResponse response = gson.fromJson(content.toString(), PlayerResponse.class); - return response; - } catch (IOException e) { + return gson.fromJson(content, PlayerResponse.class); + } catch (Exception e) { e.printStackTrace(); return null; } @@ -448,7 +460,7 @@ public class Client { if(getSettingsManager() != null && getSettingsManager().getSettingByClass(FPSBoostMod.class, "Do memory debug").getValBoolean()) { memoryDebug("Interval: " + l); } - silentSocket.getSocket().emit("update_information", (Minecraft.getMinecraft().getCurrentServerData() != null ? Minecraft.getMinecraft().getCurrentServerData().serverIP : "null")); + this.updateUserInformation(); } if(Client.getInstance().getAccount() != null) { if(Client.getInstance().getAccount().isBanned() && banerror == false) { @@ -512,7 +524,6 @@ public class Client { nextPing = 10; this.updateUserInformation(); Client.logger.info("Update Connection Server: " + event.getServerData().serverIP); - silentSocket.getSocket().emit("update_information", event.getServerData().serverIP); Server.setHypixel(Server.checkIsHypixel()); Server.setRuHypixel(Server.checkIsRuHypixel()); } @@ -524,7 +535,6 @@ public class Client { nextPing = 10; this.updateUserInformation(); Client.logger.info("Update Connection Server: null"); - silentSocket.getSocket().emit("update_information", ""); Server.setHypixel(Server.checkIsHypixel()); Server.setRuHypixel(Server.checkIsRuHypixel()); } @@ -536,7 +546,6 @@ public class Client { nextPing = 10; this.updateUserInformation(); Client.logger.info("Update Connection Server: null"); - silentSocket.getSocket().emit("update_information", ""); Server.setHypixel(Server.checkIsHypixel()); Server.setRuHypixel(Server.checkIsRuHypixel()); } @@ -574,10 +583,6 @@ public class Client { return "v" + version + "-" + getBuildData().getCommit() + "-" + getBuildData().getBranch(); } - public SilentSocket getSilentSocket() { - return silentSocket; - } - public Cosmetics getCosmetics() { return cosmetics; } diff --git a/src/main/java/net/silentclient/client/config/ConfigManager.java b/src/main/java/net/silentclient/client/config/ConfigManager.java index 2cdb5cb..6b66a6d 100644 --- a/src/main/java/net/silentclient/client/config/ConfigManager.java +++ b/src/main/java/net/silentclient/client/config/ConfigManager.java @@ -8,6 +8,7 @@ import net.silentclient.client.mods.Mod; import net.silentclient.client.mods.ModDraggable; import net.silentclient.client.mods.Setting; import net.silentclient.client.mods.player.AutoTextMod.AutoTextCommand; +import net.silentclient.client.utils.FileUtils; import net.silentclient.client.utils.MenuBlurUtils; import java.awt.*; @@ -20,6 +21,7 @@ public final class ConfigManager { public File configFile; private Set configs; + private boolean creatingDefaultConfigNeeded; public ConfigManager() { updateConfigs(); @@ -29,16 +31,19 @@ public final class ConfigManager { if(!configFile.exists()) { - try { - configFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } + creatingDefaultConfigNeeded = true; } this.load(); } + public void postInit() { + if(creatingDefaultConfigNeeded) { + configFile.delete(); + newConfig("Default.txt", false); + } + } + public Set getConfigFiles() { return this.configs; } @@ -90,11 +95,13 @@ public final class ConfigManager { Client.logger.info("Creating Config Error: Config already exists."); return "Config already exists."; } else { - try { - testConfig.createNewFile(); - } catch (IOException e) { - Client.logger.catching(e); - return "Error: " + e.getMessage(); + if(clone) { + try { + testConfig.createNewFile(); + } catch (IOException e) { + Client.logger.catching(e); + return "Error: " + e.getMessage(); + } } } Client.getInstance().getGlobalSettings().setConfig(name); @@ -102,8 +109,14 @@ public final class ConfigManager { configFile = testConfig; if(!clone) { Client.getInstance().getModInstances().getMods().forEach(mod -> mod.reset(true)); + try { + FileUtils.exportResource("/assets/minecraft/silentclient/configs/Default.txt", String.format(Client.getInstance().configDir.toString() + "/%s", name)); + } catch (Exception e) { + Client.logger.catching(e); + } + } else { + this.save(); } - this.save(); this.load(); if(clone) { for(Mod m : Client.getInstance().getModInstances().getMods()) { 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 dc17181..e36218d 100644 --- a/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java +++ b/src/main/java/net/silentclient/client/cosmetics/gui/CosmeticsGui.java @@ -11,20 +11,19 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.silentclient.client.Client; import net.silentclient.client.gui.SilentScreen; -import net.silentclient.client.gui.animation.SimpleAnimation; -import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; -import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils.Scroll; import net.silentclient.client.gui.elements.Button; import net.silentclient.client.gui.elements.Input; 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.theme.button.DefaultButtonTheme; +import net.silentclient.client.gui.theme.button.SelectedButtonTheme; import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.client.mods.settings.CosmeticsMod; import net.silentclient.client.mods.settings.GeneralMod; -import net.silentclient.client.gui.theme.button.DefaultButtonTheme; -import net.silentclient.client.gui.theme.button.SelectedButtonTheme; import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.client.utils.MouseCursorHandler; +import net.silentclient.client.utils.ScrollHelper; import net.silentclient.client.utils.Sounds; import net.silentclient.client.utils.types.PlayerResponse.Account.Cosmetics.CosmeticItem; import org.lwjgl.input.Mouse; @@ -36,10 +35,9 @@ import java.net.URI; import java.util.ArrayList; public class CosmeticsGui extends SilentScreen { - public static double scrollY; - public static SimpleAnimation scrollAnimation = new SimpleAnimation(0.0F); public static String selectedCategory = "capes"; private int rotate = 0; + private ScrollHelper scrollHelper = new ScrollHelper(); @Override public void initGui() { @@ -51,7 +49,6 @@ public class CosmeticsGui extends SilentScreen { MenuBlurUtils.loadBlur(); } this.silentInputs.add(new Input("Search")); - CosmeticsGui.scrollY = 0; CosmeticsGui.selectedCategory = "capes"; Client.getInstance().updateUserInformation(); int categoryOffsetY = 25; @@ -113,6 +110,7 @@ public class CosmeticsGui extends SilentScreen { ((Button) button).setTheme(new SelectedButtonTheme()); selectedCategory = "capes"; rotate = 144; + scrollHelper.resetScroll(); break; case 2: this.buttonList.forEach(oldButton -> { @@ -123,6 +121,7 @@ public class CosmeticsGui extends SilentScreen { ((Button) button).setTheme(new SelectedButtonTheme()); selectedCategory = "wings"; rotate = 144; + scrollHelper.resetScroll(); break; case 3: this.buttonList.forEach(oldButton -> { @@ -133,6 +132,7 @@ public class CosmeticsGui extends SilentScreen { ((Button) button).setTheme(new SelectedButtonTheme()); selectedCategory = "bandanas"; rotate = 340; + scrollHelper.resetScroll(); break; case 4: this.buttonList.forEach(oldButton -> { @@ -143,6 +143,7 @@ public class CosmeticsGui extends SilentScreen { ((Button) button).setTheme(new SelectedButtonTheme()); selectedCategory = "hats"; rotate = 340; + scrollHelper.resetScroll(); break; case 5: this.buttonList.forEach(oldButton -> { @@ -153,6 +154,7 @@ public class CosmeticsGui extends SilentScreen { ((Button) button).setTheme(new SelectedButtonTheme()); selectedCategory = "shields"; rotate = 340; + scrollHelper.resetScroll(); break; case 6: this.buttonList.forEach(oldButton -> { @@ -162,11 +164,11 @@ public class CosmeticsGui extends SilentScreen { }); ((Button) button).setTheme(new SelectedButtonTheme()); selectedCategory = "icons"; + scrollHelper.resetScroll(); break; } this.silentInputs.get(0).setValue(""); - scrollY = 0; } if(button.id == 7) { @@ -300,6 +302,10 @@ public class CosmeticsGui extends SilentScreen { } if(can_show) { + scrollHelper.setStep(5); + scrollHelper.setElementsHeight((items != null ? items.size() : 0) * 35); + scrollHelper.setMaxScroll(height - 25); + scrollHelper.setSpeed(100); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_SCISSOR_TEST); ScaledResolution r = new ScaledResolution(mc); @@ -308,8 +314,8 @@ public class CosmeticsGui extends SilentScreen { GL11.glScissor(x * s, translatedY * s, width * s, (height - 25) * s); if(items != null) { for(CosmeticItem m : items) { - RenderUtil.drawRoundedOutline(x + 100, y + modOffsetY + scrollAnimation.getValue(), 135, 28, 10, 2, selected_item.contains(m.getId()) ? new Color(32, 252, 3).getRGB() : new Color(252, 3, 3).getRGB()); - if(MouseUtils.isInside(mouseX, mouseY, x + 100, y + modOffsetY + scrollAnimation.getValue(), 135, 28)) { + RenderUtil.drawRoundedOutline(x + 100, y + modOffsetY + scrollHelper.getScroll(), 135, 28, 10, 2, selected_item.contains(m.getId()) ? new Color(32, 252, 3).getRGB() : new Color(252, 3, 3).getRGB()); + if(MouseUtils.isInside(mouseX, mouseY, x + 100, y + modOffsetY + scrollHelper.getScroll(), 135, 28)) { cursorType = MouseCursorHandler.CursorType.POINTER; } GL11.glDisable((int) 2929); @@ -320,14 +326,14 @@ public class CosmeticsGui extends SilentScreen { GL11.glDepthMask((boolean) true); GL11.glDisable((int) 3042); GL11.glEnable((int) 2929); - Client.getInstance().getSilentFontRenderer().drawString(m.getName(), x + 110, y + modOffsetY + 10 + (int) scrollAnimation.getValue() - 3, 14, SilentFontRenderer.FontType.TITLE, 100); + Client.getInstance().getSilentFontRenderer().drawString(m.getName(), x + 110, y + modOffsetY + 10 + scrollHelper.getScroll() - 3, 14, SilentFontRenderer.FontType.TITLE, 100); boolean favorite = false; for(Number i : getFavoriteItems()) { if(i.intValue() == m.getId()) { favorite = true; } } - RenderUtil.drawImage(favorite ? new ResourceLocation("silentclient/icons/star.png") : new ResourceLocation("silentclient/icons/star_outline.png"), x + 100 + 120, y + modOffsetY + scrollAnimation.getValue() + 8, 12, 12, false); + RenderUtil.drawImage(favorite ? new ResourceLocation("silentclient/icons/star.png") : new ResourceLocation("silentclient/icons/star_outline.png"), x + 100 + 120, y + modOffsetY + scrollHelper.getScroll() + 8, 12, 12, false); modOffsetY+= 35; modIndex += 1; @@ -364,39 +370,10 @@ public class CosmeticsGui extends SilentScreen { } Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); - - final Scroll scroll = MouseUtils.scroll(); - - if(scroll != null) { - switch (scroll) { - case DOWN: - if(scrollY > -((modIndex - 5.5) * 38)) { - scrollY -=20; - } - - if(modIndex > 5) { - if(scrollY < -((modIndex - 7) * 38)) { - scrollY = -((modIndex - 6.1) * 38); - } - } - break; - case UP: - if(scrollY < -10) { - scrollY +=20; - }else { - if(modIndex > 5) { - scrollY = 0; - } - } - break; - } - } if(can_show) { this.silentInputs.get(0).render(mouseX, mouseY, x + width - 140, y + 2, 135); } - - scrollAnimation.setAnimation((float) scrollY, 16); } public void updateScreen() @@ -478,9 +455,9 @@ public class CosmeticsGui extends SilentScreen { if(items != null && can_show) { this.silentInputs.get(0).onClick(mouseX, mouseY, x + width - 140, y + 2, 135); for(CosmeticItem m : items) { - if(MouseUtils.isInside(mouseX, mouseY, x + 100 + 120, y + modOffsetY + scrollAnimation.getValue() + 8, 12, 12)) { + if(MouseUtils.isInside(mouseX, mouseY, x + 100 + 120, y + modOffsetY + scrollHelper.getScroll() + 8, 12, 12)) { Client.getInstance().getAccount().updateFavorite(m.getId(), selectedCategory); - } else if(MouseUtils.isInside(mouseX, mouseY,x + 100, y + modOffsetY + scrollAnimation.getValue(), 135, 28) && mouseButton == 0) { + } else if(MouseUtils.isInside(mouseX, mouseY,x + 100, y + modOffsetY + scrollHelper.getScroll(), 135, 28) && mouseButton == 0) { Sounds.playButtonSound(); if(selectedCategory == "capes") { Client.getInstance().getAccount().setSelectedCape(m.getId()); @@ -521,6 +498,9 @@ public class CosmeticsGui extends SilentScreen { } if(can_show) { this.silentInputs.get(0).onKeyTyped(typedChar, keyCode); + if(this.silentInputs.get(0).isFocused()) { + this.scrollHelper.resetScroll(); + } } } 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 1727401..a565639 100644 --- a/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java +++ b/src/main/java/net/silentclient/client/cosmetics/gui/OutfitsGui.java @@ -9,7 +9,6 @@ import net.minecraft.util.ResourceLocation; import net.silentclient.client.Client; import net.silentclient.client.cosmetics.Outfits; import net.silentclient.client.gui.SilentScreen; -import net.silentclient.client.gui.animation.SimpleAnimation; import net.silentclient.client.gui.elements.IconButton; import net.silentclient.client.gui.font.SilentFontRenderer; import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; @@ -17,9 +16,9 @@ import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.client.utils.MenuBlurUtils; import net.silentclient.client.utils.MouseCursorHandler; +import net.silentclient.client.utils.ScrollHelper; import net.silentclient.client.utils.types.PlayerResponse; import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import java.awt.*; @@ -27,9 +26,8 @@ import java.io.IOException; public class OutfitsGui extends SilentScreen { private final GuiScreen parentScreen; - private SimpleAnimation scrollAnimation = new SimpleAnimation(0.0F); - private float scrollY = 0; private int outfitIndex = 0; + private ScrollHelper scrollHelper = new ScrollHelper(); public OutfitsGui(GuiScreen parentScreen) { this.parentScreen = parentScreen; @@ -40,7 +38,6 @@ public class OutfitsGui extends SilentScreen { public void initGui() { super.initGui(); defaultCursor = false; - this.scrollY = 0; if(mc.thePlayer == null) { Client.backgroundPanorama.updateWidthHeight(this.width, this.height); } else { @@ -72,6 +69,12 @@ public class OutfitsGui extends SilentScreen { int height = 200; int x = this.width / 2 - (width / 2); int y = this.height / 2 - (height / 2); + scrollHelper.setStep(5); + scrollHelper.setElementsHeight((float) Math.ceil((Outfits.getOutfits().size() + 3) / 3) * 85); + scrollHelper.setMaxScroll(height - 20); + scrollHelper.setSpeed(100); + scrollHelper.setFlag(true); + float scrollY = scrollHelper.getScroll(); RenderUtil.drawRoundedRect(x, y, width, height, 4, Theme.backgroundColor().getRGB()); Client.getInstance().getSilentFontRenderer().drawString(x + 3, y + 3, "Outfits", 14, SilentFontRenderer.FontType.TITLE); super.drawScreen(mouseX, mouseY, partialTicks); @@ -83,7 +86,7 @@ public class OutfitsGui extends SilentScreen { int translatedY = r.getScaledHeight() - y - 20 - listHeight; GL11.glScissor(0 * s, translatedY * s, this.width * s, listHeight * s); int outfitX = x + 3; - float outfitY = (int) (y + 20 - scrollAnimation.getValue()); + float outfitY = y + 20 + scrollY; int outfitIndex = 0; boolean isCreateHovered = MouseUtils.isInside(mouseX, mouseY, outfitX, outfitY, 80, 80); if(isCreateHovered) { @@ -178,34 +181,6 @@ public class OutfitsGui extends SilentScreen { GL11.glDisable(GL11.GL_SCISSOR_TEST); GL11.glPopMatrix(); - - scrollAnimation.setAnimation(scrollY, 12); - } - - @Override - public void handleMouseInput() throws IOException { - super.handleMouseInput(); - int dw = Mouse.getEventDWheel(); - double newScrollY = this.scrollY; - int height = 200; - if(dw != 0) { - if (dw > 0) { - dw = -1; - } else { - dw = 1; - } - float amountScrolled = (float) (dw * 10); - if (newScrollY + amountScrolled > 0) - newScrollY += amountScrolled; - else - newScrollY = 0; - if((newScrollY < (this.outfitIndex * 26) && (this.outfitIndex * 26) > height - 20) || amountScrolled < 0) { - this.scrollY = (float) newScrollY; - if(this.scrollY < 0) { - this.scrollY = 0; - } - } - } } @Override @@ -224,7 +199,7 @@ public class OutfitsGui extends SilentScreen { int x = this.width / 2 - (width / 2); int y = this.height / 2 - (height / 2); int outfitX = x + 3; - float outfitY = (int) (y + 20 - scrollAnimation.getValue()); + float outfitY = (int) (y + 20 + scrollHelper.getScroll()); int outfitIndex = 0; if(MouseUtils.isInside(mouseX, mouseY, outfitX, outfitY, 80, 80)) { mc.displayGuiScreen(new NewOutfitModal(this)); diff --git a/src/main/java/net/silentclient/client/gui/UserTutorial.java b/src/main/java/net/silentclient/client/gui/UserTutorial.java index e853abf..a0192c7 100644 --- a/src/main/java/net/silentclient/client/gui/UserTutorial.java +++ b/src/main/java/net/silentclient/client/gui/UserTutorial.java @@ -36,7 +36,7 @@ public class UserTutorial extends SilentScreen { blockY = 40; } this.buttonList.add(new Button(1, blockX + (350 / 2) - 50, blockY + 180 - 35, 100, 20, "Get Started")); - this.configs.add("Bedwars"); + this.configs.add("BedWars"); this.configs.add("Minigames"); this.configs.add("PvP"); this.configs.add("Survival"); diff --git a/src/main/java/net/silentclient/client/gui/lite/GuiNews.java b/src/main/java/net/silentclient/client/gui/lite/GuiNews.java index fa9c126..2a29b8f 100644 --- a/src/main/java/net/silentclient/client/gui/lite/GuiNews.java +++ b/src/main/java/net/silentclient/client/gui/lite/GuiNews.java @@ -5,7 +5,6 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.util.ResourceLocation; import net.silentclient.client.Client; import net.silentclient.client.gui.SilentScreen; @@ -13,25 +12,17 @@ import net.silentclient.client.gui.elements.Button; import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.client.utils.MouseCursorHandler; -import net.silentclient.client.utils.SCTextureManager; +import net.silentclient.client.utils.PromoController; import net.silentclient.client.utils.TimerUtils; -import net.silentclient.client.utils.types.NewsResponse; import java.awt.*; -import java.awt.image.BufferedImage; import java.io.IOException; import java.net.URI; -import java.util.Random; public class GuiNews extends SilentScreen { - public static ResourceLocation imageLocation = null; - public static BufferedImage image = null; - public static boolean loading = false; - public static boolean initPanel = false; private TimerUtils logoTimer = new TimerUtils(); private int logoY = 0; private final boolean firstTime; - public static NewsResponse news; public GuiNews() { this.firstTime = false; @@ -41,25 +32,9 @@ public class GuiNews extends SilentScreen { this.firstTime = firstTime; } - public static void loadPanel() { - if(image == null && !loading && news != null) { - loading = true; - (new Thread("NewsThread") { - public void run() { - GuiNews.image = SCTextureManager.getImage(news.getItem().getCover()); - GuiNews.loading = false; - } - }).start(); - } - if(image != null && !initPanel) { - imageLocation = Minecraft.getMinecraft().getTextureManager().getDynamicTextureLocation("image_panel_" + new Random().nextLong(), new DynamicTexture(image)); - initPanel = true; - } - } - @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { - loadPanel(); + PromoController.getResponse().update(); MouseCursorHandler.CursorType cursorType = getCursor(silentInputs, buttonList); GlStateManager.disableAlpha(); Client.backgroundPanorama.renderSkybox(mouseX, mouseY, partialTicks); @@ -71,11 +46,23 @@ public class GuiNews extends SilentScreen { } GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - if(imageLocation != null) { - RenderUtil.drawImage(imageLocation, (this.width / 2) - (300 / 2), (this.height / 2) - (168 / 2) - 10, 300, 168, false); - if(MouseUtils.isInside(mouseX, mouseY, (this.width / 2) - (300 / 2), (this.height / 2) - (168 / 2) - 10, 300, 168)) { + if(PromoController.getResponse().getPanels().size() > 1) { + if(MouseUtils.isInside(mouseX, mouseY, 40, this.height / 2 - 10, 20, 20) || MouseUtils.isInside(mouseX, mouseY, this.width - 40 - 20, this.height / 2 - 10, 20, 20)) { cursorType = MouseCursorHandler.CursorType.POINTER; } + RenderUtil.drawImage(new ResourceLocation("silentclient/icons/back.png"), 40, this.height / 2 - 10, 20, 20); + RenderUtil.drawImage(new ResourceLocation("silentclient/icons/next.png"), this.width - 40 - 20, this.height / 2 - 10, 20, 20); + } + + if(PromoController.getResponse().getCurrentPanel() != null) { + if(PromoController.getResponse().getCurrentPanel().getImageLocation() != null) { + RenderUtil.drawImage(PromoController.getResponse().getCurrentPanel().getImageLocation(), (this.width / 2) - (300 / 2), (this.height / 2) - (168 / 2) - 10, 300, 168, false); + if(MouseUtils.isInside(mouseX, mouseY, (this.width / 2) - (300 / 2), (this.height / 2) - (168 / 2) - 10, 300, 168)) { + cursorType = MouseCursorHandler.CursorType.POINTER; + } + } else { + PromoController.getResponse().getCurrentPanel().loadImage(); + } } super.drawScreen(mouseX, mouseY, partialTicks); @@ -100,6 +87,7 @@ public class GuiNews extends SilentScreen { Client.backgroundPanorama.updateWidthHeight(this.width, this.height); this.buttonList.add(new Button(1, (this.width / 2) - (98 / 2), this.height - 30, 98, 20, "Exit")); super.initGui(); + PromoController.getResponse().setPanelIndex(0); } @Override @@ -112,11 +100,22 @@ public class GuiNews extends SilentScreen { @Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { super.mouseClicked(mouseX, mouseY, mouseButton); - if(MouseUtils.isInside(mouseX, mouseY, (this.width / 2) - (300 / 2), (this.height / 2) - (168 / 2) - 10, 300, 168) && news != null) { - try { + if(PromoController.getResponse().getPanels().size() > 1) { + if(MouseUtils.isInside(mouseX, mouseY, 40, this.height / 2 - 10, 20, 20)) { + PromoController.getResponse().prevPanel(); + return; + } + + if(MouseUtils.isInside(mouseX, mouseY, this.width - 40 - 20, this.height / 2 - 10, 20, 20)) { + PromoController.getResponse().nextPanel(); + return; + } + } + if(MouseUtils.isInside(mouseX, mouseY, (this.width / 2) - (300 / 2), (this.height / 2) - (168 / 2) - 10, 300, 168) && PromoController.getResponse().getCurrentPanel() != null && PromoController.getResponse().getCurrentPanel().getImageLocation() != null) { + try { Class oclass = Class.forName("java.awt.Desktop"); - Object object = oclass.getMethod("getDesktop", new Class[0]).invoke((Object)null, new Object[0]); - oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, new Object[] {new URI("https://silentclient.net/news/" + GuiNews.news.getItem().id)}); + Object object = oclass.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]); + oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, new Object[] {new URI(PromoController.getResponse().getCurrentPanel().getRedirectUrl())}); } catch (Throwable err) { err.printStackTrace(); } diff --git a/src/main/java/net/silentclient/client/gui/lite/LiteMainMenu.java b/src/main/java/net/silentclient/client/gui/lite/LiteMainMenu.java index 1f8b1bf..4dece1a 100644 --- a/src/main/java/net/silentclient/client/gui/lite/LiteMainMenu.java +++ b/src/main/java/net/silentclient/client/gui/lite/LiteMainMenu.java @@ -16,6 +16,7 @@ import net.silentclient.client.gui.silentmainmenu.components.AccountPicker; import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.client.utils.ColorUtils; import net.silentclient.client.utils.MouseCursorHandler; +import net.silentclient.client.utils.PromoController; import java.awt.*; import java.io.IOException; @@ -56,7 +57,7 @@ public class LiteMainMenu extends SilentScreen @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { - GuiNews.loadPanel(); + PromoController.getResponse().update(); MouseCursorHandler.CursorType cursorType = getCursor(silentInputs, buttonList); GlStateManager.disableAlpha(); Client.backgroundPanorama.renderSkybox(mouseX, mouseY, partialTicks); @@ -74,14 +75,18 @@ public class LiteMainMenu extends SilentScreen ColorUtils.setColor(-1); Client.getInstance().getSilentFontRenderer().drawString(3, height - 14, "SLC Lite 1.8.9", 12, SilentFontRenderer.FontType.TITLE); - if(GuiNews.imageLocation != null) { - if(MouseUtils.isInside(mouseX, mouseY, this.width - 74, this.height - 42, 71, 40)) { - cursorType = MouseCursorHandler.CursorType.POINTER; - this.bannerAnimation.setAnimation(4, 20); + if(PromoController.getResponse().getCurrentPanel() != null) { + if(PromoController.getResponse().getCurrentPanel().getImageLocation() != null) { + if(MouseUtils.isInside(mouseX, mouseY, this.width - 74, this.height - 42, 71, 40)) { + cursorType = MouseCursorHandler.CursorType.POINTER; + this.bannerAnimation.setAnimation(4, 20); + } else { + this.bannerAnimation.setAnimation(0, 30); + } + RenderUtil.drawImage(PromoController.getResponse().getCurrentPanel().getImageLocation(), this.width - 74 + (-this.bannerAnimation.getValue()), this.height - 42 + (-this.bannerAnimation.getValue()), 71, 40, false); } else { - this.bannerAnimation.setAnimation(0, 30); + PromoController.getResponse().getCurrentPanel().loadImage(); } - RenderUtil.drawImage(GuiNews.imageLocation, this.width - 74 + (-this.bannerAnimation.getValue()), this.height - 42 + (-this.bannerAnimation.getValue()), 71, 40, false); } MouseCursorHandler.CursorType accountCursor = accountPicker.draw(mc, mouseX, mouseY); @@ -140,11 +145,11 @@ public class LiteMainMenu extends SilentScreen @Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { super.mouseClicked(mouseX, mouseY, mouseButton); - if(MouseUtils.isInside(mouseX, mouseY, this.width - 74, this.height - 42, 71, 40)) { + if(MouseUtils.isInside(mouseX, mouseY, this.width - 74, this.height - 42, 71, 40) && PromoController.getResponse().getCurrentPanel() != null && PromoController.getResponse().getCurrentPanel().getImageLocation() != null) { try { Class oclass = Class.forName("java.awt.Desktop"); - Object object = oclass.getMethod("getDesktop", new Class[0]).invoke((Object)null, new Object[0]); - oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, new Object[] {new URI("https://silentclient.net/news/" + GuiNews.news.getItem().id)}); + Object object = oclass.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]); + oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, new Object[] {new URI(PromoController.getResponse().getCurrentPanel().getRedirectUrl())}); } catch (Throwable err) { err.printStackTrace(); } 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 71f59a9..ae1964c 100644 --- a/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java +++ b/src/main/java/net/silentclient/client/gui/multiplayer/SilentMultiplayerGui.java @@ -11,7 +11,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.silentclient.client.Client; import net.silentclient.client.ServerDataFeature; import net.silentclient.client.gui.SilentScreen; -import net.silentclient.client.gui.animation.SimpleAnimation; import net.silentclient.client.gui.elements.Button; import net.silentclient.client.gui.elements.Input; import net.silentclient.client.gui.font.SilentFontRenderer; @@ -22,7 +21,7 @@ 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.utils.MouseCursorHandler; -import org.lwjgl.input.Mouse; +import net.silentclient.client.utils.ScrollHelper; import org.lwjgl.opengl.GL11; import java.awt.*; @@ -42,9 +41,8 @@ public class SilentMultiplayerGui extends SilentScreen { private Button btnDeleteServer; private boolean initialized; private ArrayList servers = new ArrayList<>(); - private SimpleAnimation scrollAnimation = new SimpleAnimation(0.0F); - private float scrollY = 0; private int selectedServer = -1; + private ScrollHelper scrollHelper = new ScrollHelper(); public SilentMultiplayerGui(GuiScreen parentScreen) { this.parentScreen = parentScreen; @@ -140,8 +138,11 @@ public class SilentMultiplayerGui extends SilentScreen { Client.getInstance().getSilentFontRenderer().drawCenteredString("Play Multiplayer", blockX + blockWidth / 2, blockY + 3, 16, SilentFontRenderer.FontType.TITLE); this.silentInputs.get(0).render(mouseX, mouseY, blockX + 5, blockY + 3 + 16 + 5, blockWidth - 10, true); - - float serverY = blockY + 43 - scrollAnimation.getValue(); + scrollHelper.setStep(5); + scrollHelper.setElementsHeight(servers.size() * 38); + scrollHelper.setMaxScroll(blockHeight - 43 - 41); + scrollHelper.setSpeed(100); + float serverY = blockY + 43 + scrollHelper.getScroll(); trimContentStart(); int serverIndex = -1; for (ServerComponent serverComponent : servers) @@ -163,8 +164,6 @@ public class SilentMultiplayerGui extends SilentScreen { super.drawScreen(mouseX, mouseY, partialTicks); Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); - - scrollAnimation.setAnimation(scrollY, 12); } public void connectToSelected() { @@ -293,7 +292,7 @@ public class SilentMultiplayerGui extends SilentScreen { } } this.silentInputs.get(0).onClick(mouseX, mouseY, blockX + 5, blockY + 3 + 16 + 5, blockWidth - 10, true); - float serverY = blockY + 43 - scrollAnimation.getValue(); + float serverY = blockY + 43 + scrollHelper.getScroll(); int serverIndex = -1; boolean isReset = true; for (ServerComponent serverComponent : servers) @@ -320,6 +319,9 @@ public class SilentMultiplayerGui extends SilentScreen { protected void keyTyped(char typedChar, int keyCode) throws IOException { super.keyTyped(typedChar, keyCode); this.silentInputs.get(0).onKeyTyped(typedChar, keyCode); + if(this.silentInputs.get(0).isFocused()) { + scrollHelper.resetScroll(); + } } @Override @@ -343,31 +345,6 @@ public class SilentMultiplayerGui extends SilentScreen { GL11.glPopMatrix(); } - @Override - public void handleMouseInput() throws IOException { - super.handleMouseInput(); - int dw = Mouse.getEventDWheel(); - double newScrollY = this.scrollY; - if(dw != 0) { - if (dw > 0) { - dw = -1; - } else { - dw = 1; - } - float amountScrolled = (float) (dw * 10); - if (newScrollY + amountScrolled > 0) - newScrollY += amountScrolled; - else - newScrollY = 0; - if((newScrollY < blockHeight && ((servers.size() + 1) * 38) > blockHeight - 43 - 41) || amountScrolled < 0) { - this.scrollY = (float) newScrollY; - if(this.scrollY < 0) { - this.scrollY = 0; - } - } - } - } - public void refreshServerList() { this.mc.displayGuiScreen(new SilentMultiplayerGui(this.parentScreen)); 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 d8d7ec3..7b54050 100644 --- a/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java +++ b/src/main/java/net/silentclient/client/gui/resourcepacks/SilentResourcePacksGui.java @@ -1,21 +1,446 @@ package net.silentclient.client.gui.resourcepacks; +import com.google.common.collect.Lists; +import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.ResourcePackListEntry; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.ResourcePackRepository; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Util; +import net.silentclient.client.Client; import net.silentclient.client.gui.SilentScreen; +import net.silentclient.client.gui.elements.Button; +import net.silentclient.client.gui.elements.IconButton; +import net.silentclient.client.gui.elements.Input; +import net.silentclient.client.gui.elements.TooltipIconButton; +import net.silentclient.client.gui.font.SilentFontRenderer; +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.utils.*; +import org.apache.commons.io.FilenameUtils; +import org.lwjgl.Sys; +import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.util.Collections; import java.util.List; public class SilentResourcePacksGui extends SilentScreen { private final GuiScreen parentScreen; - private List availableResourcePacks; - private List selectedResourcePacks; + private List availableResourcePacks; + private List selectedResourcePacks; private boolean changed = false; + private int blockX = 0; + private int blockY = 0; + private int blockWidth = 0; + private int blockHeight = 0; + private ScrollHelper scrollHelper = new ScrollHelper(); + private ScrollHelper scrollHelper2 = new ScrollHelper(); public SilentResourcePacksGui(GuiScreen parentScreenIn) { this.parentScreen = parentScreenIn; } + @Override + public void initGui() { + super.initGui(); + this.defaultCursor = false; + Client.backgroundPanorama.updateWidthHeight(this.width, this.height); + this.buttonList.clear(); + this.silentInputs.clear(); + blockWidth = 400; + blockHeight = height - 20; + blockX = (width / 2) - (blockWidth / 2); + blockY = 10; + this.buttonList.add(new IconButton(1, blockX + blockWidth - 14 - 5, blockY + 5, 14, 14, 8, 8, new ResourceLocation("silentclient/icons/exit.png"))); + if(mc.thePlayer != null) { + this.buttonList.add(new TooltipIconButton(2, blockX + blockWidth - 14 - 5, blockY + blockHeight - 5 - 14, 14, 14, 8, 8, new ResourceLocation("silentclient/icons/lightoverlay.png"), "Toggle Background Panorama")); + } + this.buttonList.add(new Button(3, blockX + 40, blockY + blockHeight - 5 - 14, 100, 14, "Open Pack Folder")); + this.buttonList.add(new Button(4, blockX + 40 + 100 + 5, blockY + blockHeight - 5 - 14, 100, 14, "Apply")); + this.buttonList.add(new Button(5, blockX + 40 + 100 + 5 + 100 + 5, blockY + blockHeight - 5 - 14, 100, 14, "Done")); + this.silentInputs.add(new Input("Search")); + if(!this.changed) { + this.availableResourcePacks = Lists.newArrayList(); + this.selectedResourcePacks = Lists.newArrayList(); + ResourcePackRepository resourcepackrepository = this.mc.getResourcePackRepository(); + resourcepackrepository.updateRepositoryEntriesAll(); + List list = Lists.newArrayList(resourcepackrepository.getRepositoryEntriesAll()); + list.removeAll(resourcepackrepository.getRepositoryEntries()); + for (ResourcePackRepository.Entry resourcepackrepository$entry : list) + { + this.availableResourcePacks.add(resourcepackrepository$entry); + } + for (ResourcePackRepository.Entry resourcepackrepository$entry1 : Lists.reverse(resourcepackrepository.getRepositoryEntries())) + { + this.selectedResourcePacks.add(resourcepackrepository$entry1); + } + } + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + MouseCursorHandler.CursorType cursorType = getCursor(silentInputs, buttonList); + if(mc.thePlayer == null || Client.getInstance().getGlobalSettings().isPacksPanoramaEnabled()) { + GlStateManager.disableAlpha(); + Client.backgroundPanorama.renderSkybox(mouseX, mouseY, partialTicks); + GlStateManager.enableAlpha(); + if(Client.getInstance().getGlobalSettings().isLite()) { + this.drawGradientRect(0, 0, this.width, this.height, new Color(0, 0, 0, 127).getRGB(), new Color(0, 0, 0, 200).getRGB()); + } else { + this.drawGradientRect(0, 0, this.width, this.height, 0, Integer.MIN_VALUE); + } + } else { + MenuBlurUtils.renderBackground(this); + } + RenderUtils.drawRect(blockX, blockY, blockWidth, blockHeight, Theme.backgroundColor().getRGB()); + Client.getInstance().getSilentFontRenderer().drawString("Resource Packs", blockX + 5, blockY + 5, 14, SilentFontRenderer.FontType.TITLE); + + MouseCursorHandler.CursorType cursorType1 = this.drawAvailableResourcePacks(blockX + 5, blockY + 14 + 5 + 2, mouseX, mouseY); + if(cursorType1 != null) { + cursorType = cursorType1; + } + MouseCursorHandler.CursorType cursorType2 = this.drawActiveResourcePacks(blockX + blockWidth - 193 - 5, blockY + 14 + 5 + 2, mouseX, mouseY); + if(cursorType2 != null) { + cursorType = cursorType2; + } + + super.drawScreen(mouseX, mouseY, partialTicks); + + Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); + } + + private MouseCursorHandler.CursorType drawAvailableResourcePacks(float x, float y, int mouseX, int mouseY) { + MouseCursorHandler.CursorType cursorType = null; + RenderUtil.drawRoundedOutline(x, y, 193, blockHeight - 45, 3, 1, Theme.borderColor().getRGB()); + scrollHelper.setStep(5); + scrollHelper.setElementsHeight(availableResourcePacks.size() * 37 + 19); + scrollHelper.setMaxScroll(blockHeight - 45); + scrollHelper.setSpeed(100); + + if(MouseUtils.isInside(mouseX, mouseY, x, y, 193, blockHeight - 45)) { + scrollHelper.setFlag(true); + } else { + scrollHelper.setFlag(false); + } + + float scrollY = scrollHelper.getScroll(); + + float itemY = y + 19 + scrollY; + + Scissor.start((int) x, (int) y, 193, blockHeight - 45); + Client.getInstance().getSilentFontRenderer().drawString("Available", x + 3, y + 3 + scrollY, 14, SilentFontRenderer.FontType.TITLE); + this.silentInputs.get(0).render(mouseX, mouseY, x + 193 - 3 - 100, y + 2 + scrollY, 100, true); + + for(ResourcePackRepository.Entry entry : availableResourcePacks) { + if((!this.silentInputs.get(0).getValue().trim().equals("") && !entry.getResourcePackName().toLowerCase().contains(this.silentInputs.get(0).getValue().trim().toLowerCase()))) { + continue; + } + if(GuiUtils.blockInOtherBlock(x + 3, itemY, 187, 35, x, y, 193, blockHeight - 45)) { + int i = entry.func_183027_f(); + boolean isHovered = MouseUtils.isInside(mouseX, mouseY, x, itemY, 187, 35); + RenderUtil.drawRoundedOutline(x + 3, itemY, 187, 35, 3, 1, i != 1 ? Color.RED.getRGB() : Theme.borderColor().getRGB()); + if(isHovered) { + RenderUtil.drawRoundedRect(x + 3, itemY, 187, 35, 3, new Color(255, 255, 255, 30).getRGB()); + cursorType = MouseCursorHandler.CursorType.POINTER; + } + entry.bindTexturePackIcon(mc.getTextureManager()); + RenderUtil.drawImage(null, x + 5, itemY + 2, 31, 31, false); + String s = FilenameUtils.getBaseName(entry.getResourcePackName()); + int i1 = this.mc.fontRendererObj.getStringWidth(s); + + if (i1 > 153) + { + s = this.mc.fontRendererObj.trimStringToWidth(s, 153 - this.mc.fontRendererObj.getStringWidth("...")) + "..."; + } + + this.mc.fontRendererObj.drawStringWithShadow(s, x + 5 + 31 + 3, itemY + 3, 16777215); + List list = this.mc.fontRendererObj.listFormattedStringToWidth(entry.getTexturePackDescription(), 153); + + for (int l = 0; l < 2 && l < list.size(); ++l) + { + this.mc.fontRendererObj.drawStringWithShadow(list.get(l), x + 5 + 31 + 3, itemY + 3 + 12 + 10 * l, 8421504); + } + } + itemY += 37; + } + Scissor.end(); + + return cursorType; + } + + private void availableResourcePacksClick(float x, float y, int mouseX, int mouseY) { + float itemY = y + 19 + scrollHelper.getScroll(); + + for(ResourcePackRepository.Entry entry : availableResourcePacks) { + if((!this.silentInputs.get(0).getValue().trim().equals("") && !entry.getResourcePackName().toLowerCase().contains(this.silentInputs.get(0).getValue().trim().toLowerCase()))) { + continue; + } + if(GuiUtils.blockInOtherBlock(x + 3, itemY, 187, 35, x, y, 193, blockHeight - 45)) { + boolean isHovered = MouseUtils.isInside(mouseX, mouseY, x, itemY, 187, 35); + if(isHovered) { + availableResourcePacks.remove(entry); + selectedResourcePacks.add(0, entry); + this.markChanged(); + break; + } + } + itemY += 37; + } + } + + private MouseCursorHandler.CursorType drawActiveResourcePacks(float x, float y, int mouseX, int mouseY) { + MouseCursorHandler.CursorType cursorType = null; + RenderUtil.drawRoundedOutline(x, y, 193, blockHeight - 45, 3, 1, Theme.borderColor().getRGB()); + scrollHelper2.setStep(5); + scrollHelper2.setElementsHeight(selectedResourcePacks.size() * 37 + 19); + scrollHelper2.setMaxScroll(blockHeight - 45); + scrollHelper2.setSpeed(100); + if(MouseUtils.isInside(mouseX, mouseY, x, y, 193, blockHeight - 45)) { + scrollHelper2.setFlag(true); + } else { + scrollHelper2.setFlag(false); + } + float scrollY = scrollHelper2.getScroll(); + Scissor.start((int) x, (int) y, 193, blockHeight - 45); + Client.getInstance().getSilentFontRenderer().drawString("Active", x + 3, y + 3 + scrollY, 14, SilentFontRenderer.FontType.TITLE); + + float itemY = y + 19 + scrollY; + int packIndex = 0; + + for(ResourcePackRepository.Entry entry : selectedResourcePacks) { + if(GuiUtils.blockInOtherBlock(x + 3, itemY, 187, 35, x, y, 193, blockHeight - 45)) { + int i = entry.func_183027_f(); + RenderUtil.drawRoundedOutline(x + 3, itemY, 187, 35, 3, 1, i != 1 ? Color.RED.getRGB() : Theme.borderColor().getRGB()); + boolean isHovered = MouseUtils.isInside(mouseX, mouseY, x, itemY, 187, 35); + if(isHovered) { + RenderUtil.drawRoundedRect(x + 3, itemY, 187, 35, 3, new Color(255, 255, 255, 30).getRGB()); + cursorType = MouseCursorHandler.CursorType.POINTER; + } + entry.bindTexturePackIcon(mc.getTextureManager()); + RenderUtil.drawImage(null, x + 5, itemY + 2, 31, 31, false); + if(MouseUtils.isInside(mouseX, mouseY, x + 5, itemY + 2, 31, 31)) { + if(this.canUpSwap(packIndex)) { + RenderUtil.drawImage(new ResourceLocation("silentclient/icons/page-up.png"), x + 5 + (31 / 2) - (15 / 2), itemY + 2, 15, 15, true, MouseUtils.isInside(mouseX, mouseY, x + 5 + (31 / 2) - (15 / 2), itemY + 2, 15, 15) ? new Color(255, 255, 255).getRGB() : Theme.borderColor().getRGB()); + } + + if(this.canDownSwap(packIndex)) { + RenderUtil.drawImage(new ResourceLocation("silentclient/icons/page-down.png"), x + 5 + (31 / 2) - (15 / 2), itemY + 2 + 31 - 16, 15, 15, true, MouseUtils.isInside(mouseX, mouseY, x + 5 + (31 / 2) - (15 / 2), itemY + 2 + 31 - 16, 15, 15) ? new Color(255, 255, 255).getRGB() : Theme.borderColor().getRGB()); + } + } + String s = FilenameUtils.getBaseName(entry.getResourcePackName()); + int i1 = this.mc.fontRendererObj.getStringWidth(s); + + if (i1 > 153) + { + s = this.mc.fontRendererObj.trimStringToWidth(s, 153 - this.mc.fontRendererObj.getStringWidth("...")) + "..."; + } + + this.mc.fontRendererObj.drawStringWithShadow(s, x + 5 + 31 + 3, itemY + 3, 16777215); + List list = this.mc.fontRendererObj.listFormattedStringToWidth(entry.getTexturePackDescription(), 153); + + for (int l = 0; l < 2 && l < list.size(); ++l) + { + this.mc.fontRendererObj.drawStringWithShadow(list.get(l), x + 5 + 31 + 3, itemY + 3 + 12 + 10 * l, 8421504); + } + } + itemY += 37; + packIndex++; + } + + Scissor.end(); + return cursorType; + } + + public void activeResourcePacksClick(float x, float y, int mouseX, int mouseY) { + float itemY = y + 19 + scrollHelper2.getScroll(); + int packIndex = 0; + + for(ResourcePackRepository.Entry entry : selectedResourcePacks) { + if(GuiUtils.blockInOtherBlock(x + 3, itemY, 187, 35, x, y, 193, blockHeight - 45)) { + int i = entry.func_183027_f(); + RenderUtil.drawRoundedOutline(x + 3, itemY, 187, 35, 3, 1, i != 1 ? Color.RED.getRGB() : Theme.borderColor().getRGB()); + boolean isHovered = MouseUtils.isInside(mouseX, mouseY, x, itemY, 187, 35); + if(isHovered) { + if(MouseUtils.isInside(mouseX, mouseY, x + 5, itemY + 2, 31, 31)) { + if(this.canUpSwap(packIndex) && MouseUtils.isInside(mouseX, mouseY, x + 5 + (31 / 2) - (15 / 2), itemY + 2, 15, 15)) { + List list1 = this.selectedResourcePacks; + int k = list1.indexOf(entry); + list1.remove(entry); + list1.add(k - 1, entry); + this.markChanged(); + break; + } + + if(this.canDownSwap(packIndex) && MouseUtils.isInside(mouseX, mouseY, x + 5 + (31 / 2) - (15 / 2), itemY + 2 + 31 - 16, 15, 15)) { + List list = this.selectedResourcePacks; + int i2 = list.indexOf(entry); + list.remove(entry); + list.add(i2 + 1, entry); + this.markChanged(); + break; + } + } + selectedResourcePacks.remove(entry); + availableResourcePacks.add(0, entry); + this.markChanged(); + break; + } + } + itemY += 37; + packIndex++; + } + } + + public void apply() { + if (this.changed) + { + this.scrollHelper2.resetScroll(); + this.scrollHelper.resetScroll(); + List list = Lists.newArrayList(); + + for (ResourcePackRepository.Entry resourcepacklistentry : this.selectedResourcePacks) + { + list.add(resourcepacklistentry); + } + + Collections.reverse(list); + this.mc.getResourcePackRepository().setRepositories(list); + this.mc.gameSettings.resourcePacks.clear(); + this.mc.gameSettings.incompatibleResourcePacks.clear(); + + for (ResourcePackRepository.Entry resourcepackrepository$entry : list) + { + this.mc.gameSettings.resourcePacks.add(resourcepackrepository$entry.getResourcePackName()); + + if (resourcepackrepository$entry.func_183027_f() != 1) + { + this.mc.gameSettings.incompatibleResourcePacks.add(resourcepackrepository$entry.getResourcePackName()); + } + } + + this.mc.gameSettings.saveOptions(); + this.mc.refreshResources(); + this.initGui(); + this.scrollHelper2.resetScroll(); + this.scrollHelper.resetScroll(); + } + } + + @Override + protected void actionPerformed(GuiButton button) throws IOException { + super.actionPerformed(button); + switch (button.id) { + case 1: + mc.displayGuiScreen(parentScreen); + break; + case 2: + Client.getInstance().getGlobalSettings().setPacksPanoramaEnabled(!Client.getInstance().getGlobalSettings().isPacksPanoramaEnabled()); + Client.getInstance().getGlobalSettings().save(); + break; + case 3: + File file1 = this.mc.getResourcePackRepository().getDirResourcepacks(); + String s = file1.getAbsolutePath(); + + if (Util.getOSType() == Util.EnumOS.OSX) + { + try + { + Client.logger.info(s); + Runtime.getRuntime().exec(new String[] {"/usr/bin/open", s}); + return; + } + catch (IOException ioexception1) + { + Client.logger.error("Couldn't open file", ioexception1); + } + } + else if (Util.getOSType() == Util.EnumOS.WINDOWS) + { + String s1 = String.format("cmd.exe /C start \"Open file\" \"%s\"", s); + + try + { + Runtime.getRuntime().exec(s1); + return; + } + catch (IOException ioexception) + { + Client.logger.error("Couldn't open file", ioexception); + } + } + + boolean flag = false; + + try + { + Class oclass = Class.forName("java.awt.Desktop"); + Object object = oclass.getMethod("getDesktop", new Class[0]).invoke(null); + oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, file1.toURI()); + } + catch (Throwable throwable) + { + Client.logger.error("Couldn't open link", throwable); + flag = true; + } + + if (flag) + { + Client.logger.info("Opening via system class!"); + Sys.openURL("file://" + s); + } + break; + case 4: + this.apply(); + break; + case 5: + this.apply(); + mc.displayGuiScreen(parentScreen); + break; + } + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + super.mouseClicked(mouseX, mouseY, mouseButton); + this.silentInputs.get(0).onClick(mouseX, mouseY, blockX + 5 + 193 - 3 - 100, blockY + 14 + 5 + 2 + 2, 100, true); + this.availableResourcePacksClick(blockX + 5, blockY + 14 + 5 + 2, mouseX, mouseY); + this.activeResourcePacksClick(blockX + blockWidth - 193 - 5, blockY + 14 + 5 + 2, mouseX, mouseY); + } + + @Override + public void updateScreen() { + super.updateScreen(); + Client.backgroundPanorama.tickPanorama(); + } + + @Override + protected void keyTyped(char typedChar, int keyCode) throws IOException { + super.keyTyped(typedChar, keyCode); + this.silentInputs.get(0).onKeyTyped(typedChar, keyCode); + if(this.silentInputs.get(0).isFocused()) { + this.scrollHelper.resetScroll(); + } + } + + public void markChanged() + { + this.changed = true; + } + + public boolean canUpSwap(int index) + { + return index > 0; + } + + public boolean canDownSwap(int index) + { + return index < this.selectedResourcePacks.size() - 1; + } } diff --git a/src/main/java/net/silentclient/client/gui/silentmainmenu/MainMenuConcept.java b/src/main/java/net/silentclient/client/gui/silentmainmenu/MainMenuConcept.java index 5b2bdba..9111640 100644 --- a/src/main/java/net/silentclient/client/gui/silentmainmenu/MainMenuConcept.java +++ b/src/main/java/net/silentclient/client/gui/silentmainmenu/MainMenuConcept.java @@ -13,7 +13,6 @@ import net.silentclient.client.cosmetics.gui.CosmeticsGui; import net.silentclient.client.gui.SilentScreen; import net.silentclient.client.gui.elements.IconButton; import net.silentclient.client.gui.font.SilentFontRenderer; -import net.silentclient.client.gui.lite.GuiNews; import net.silentclient.client.gui.lite.LiteMainMenu; import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.lite.clickgui.utils.RenderUtils; @@ -22,6 +21,7 @@ import net.silentclient.client.gui.silentmainmenu.components.MenuOption; import net.silentclient.client.gui.theme.button.IButtonTheme; import net.silentclient.client.gui.util.RenderUtil; import net.silentclient.client.utils.MouseCursorHandler; +import net.silentclient.client.utils.PromoController; import net.silentclient.client.utils.SCTextureManager; import java.awt.*; @@ -79,7 +79,6 @@ public class MainMenuConcept extends SilentScreen { @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { - GuiNews.loadPanel(); MouseCursorHandler.CursorType cursorType = getCursor(silentInputs, buttonList); this.loadSkin(); GlStateManager.disableAlpha(); @@ -93,12 +92,18 @@ public class MainMenuConcept extends SilentScreen { RenderUtil.drawImage(new ResourceLocation("silentclient/images/steve.png"), width - 120, height / 2 - (75), 62, 150, false); } - if(GuiNews.imageLocation != null) { - if(MouseUtils.isInside(mouseX, mouseY, 10, 10, 109, 63)) { - cursorType = MouseCursorHandler.CursorType.POINTER; + PromoController.getResponse().update(); + + if(PromoController.getResponse().getCurrentPanel() != null) { + if(PromoController.getResponse().getCurrentPanel().getImageLocation() != null) { + if(MouseUtils.isInside(mouseX, mouseY, 10, 10, 109, 63)) { + cursorType = MouseCursorHandler.CursorType.POINTER; + } + RenderUtils.drawRect(10, 10, 109, 63, -1); + RenderUtil.drawImage(PromoController.getResponse().getCurrentPanel().getImageLocation(), 12, 12, 105, 59, false); + } else { + PromoController.getResponse().getCurrentPanel().loadImage(); } - RenderUtils.drawRect(10, 10, 109, 63, -1); - RenderUtil.drawImage(GuiNews.imageLocation, 12, 12, 105, 59, false); } Client.getInstance().getSilentFontRenderer().drawString(3, height - 14, "Silent Client 1.8.9", 12, SilentFontRenderer.FontType.TITLE); @@ -153,11 +158,11 @@ public class MainMenuConcept extends SilentScreen { @Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { super.mouseClicked(mouseX, mouseY, mouseButton); - if(MouseUtils.isInside(mouseX, mouseY, 10, 10, 109, 63)) { + if(MouseUtils.isInside(mouseX, mouseY, 10, 10, 109, 63) && PromoController.getResponse().getCurrentPanel() != null) { try { Class oclass = Class.forName("java.awt.Desktop"); - Object object = oclass.getMethod("getDesktop", new Class[0]).invoke((Object)null, new Object[0]); - oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, new Object[] {new URI("https://silentclient.net/news/" + GuiNews.news.getItem().id)}); + Object object = oclass.getMethod("getDesktop", new Class[0]).invoke(null, new Object[0]); + oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, new Object[] {new URI(PromoController.getResponse().getCurrentPanel().getRedirectUrl())}); } catch (Throwable err) { err.printStackTrace(); } diff --git a/src/main/java/net/silentclient/client/gui/silentmainmenu/SilentMainMenu.java b/src/main/java/net/silentclient/client/gui/silentmainmenu/SilentMainMenu.java index 2c1ae1e..6661a78 100644 --- a/src/main/java/net/silentclient/client/gui/silentmainmenu/SilentMainMenu.java +++ b/src/main/java/net/silentclient/client/gui/silentmainmenu/SilentMainMenu.java @@ -7,11 +7,11 @@ import net.silentclient.client.Client; import net.silentclient.client.cosmetics.gui.CosmeticsGui; import net.silentclient.client.gui.SilentScreen; import net.silentclient.client.gui.font.SilentFontRenderer; -import net.silentclient.client.gui.lite.GuiNews; import net.silentclient.client.gui.lite.LiteMainMenu; import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.lite.clickgui.utils.RenderUtils; import net.silentclient.client.gui.util.RenderUtil; +import net.silentclient.client.utils.PromoController; import java.awt.*; import java.io.IOException; @@ -31,7 +31,7 @@ public class SilentMainMenu extends SilentScreen { @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { - GuiNews.loadPanel(); + PromoController.getResponse().update(); GlStateManager.disableAlpha(); Client.backgroundPanorama.renderSkybox(mouseX, mouseY, partialTicks); GlStateManager.enableAlpha(); @@ -51,8 +51,12 @@ public class SilentMainMenu extends SilentScreen { blockY = 70; } RenderUtils.drawRect(blockX, blockY, 320, 150, new Color(20, 20, 20).getRGB()); - if(GuiNews.imageLocation != null) { - RenderUtil.drawImage(GuiNews.imageLocation, blockX + 78, blockY + 10, 231, 130, false); + if(PromoController.getResponse().getCurrentPanel() != null) { + if(PromoController.getResponse().getCurrentPanel().getImageLocation() != null) { + RenderUtil.drawImage(PromoController.getResponse().getCurrentPanel().getImageLocation(), blockX + 78, blockY + 10, 231, 130, false); + } else { + PromoController.getResponse().getCurrentPanel().loadImage(); + } } int optionY = blockY + 10; @@ -121,12 +125,11 @@ public class SilentMainMenu extends SilentScreen { if(blockY < 70) { blockY = 70; } - - if(MouseUtils.isInside(mouseX, mouseY, blockX + 78, blockY + 10, 231, 130)) { + if(MouseUtils.isInside(mouseX, mouseY, blockX + 78, blockY + 10, 231, 130) && PromoController.getResponse().getCurrentPanel() != null) { try { Class oclass = Class.forName("java.awt.Desktop"); Object object = oclass.getMethod("getDesktop", new Class[0]).invoke((Object)null, new Object[0]); - oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, new Object[] {new URI("https://silentclient.net/news/" + GuiNews.news.getItem().id)}); + oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, new Object[] {new URI(PromoController.getResponse().getCurrentPanel().getRedirectUrl())}); } catch (Throwable err) { err.printStackTrace(); } diff --git a/src/main/java/net/silentclient/client/gui/util/RenderUtil.java b/src/main/java/net/silentclient/client/gui/util/RenderUtil.java index 3606e0c..8bcd615 100644 --- a/src/main/java/net/silentclient/client/gui/util/RenderUtil.java +++ b/src/main/java/net/silentclient/client/gui/util/RenderUtil.java @@ -183,10 +183,12 @@ public class RenderUtil { OpenGlHelper.glBlendFunc((int) 770, (int) 771, (int) 1, (int) 0); GL11.glColor4f((float) 1.0f, (float) 1.0f, (float) 1.0f, 1f); ColorUtils.setColor(color); - if(mip) { - Client.getInstance().getTextureManager().bindTextureMipmapped(image); - } else { - Minecraft.getMinecraft().getTextureManager().bindTexture(image); + if(image != null) { + if(mip) { + Client.getInstance().getTextureManager().bindTextureMipmapped(image); + } else { + Minecraft.getMinecraft().getTextureManager().bindTexture(image); + } } drawModalRectWithCustomSizedTexture(x, y, 0.0f, 0.0f, width, height, width, height); GL11.glDepthMask((boolean) true); @@ -221,10 +223,12 @@ public class RenderUtil { GL11.glDepthMask((boolean) false); OpenGlHelper.glBlendFunc((int) 770, (int) 771, (int) 1, (int) 0); GL11.glColor4f((float) 1.0f, (float) 1.0f, (float) 1.0f, 1f); - if(mip) { - Client.getInstance().getTextureManager().bindTextureMipmapped(image); - } else { - ((TextureManagerExt) Minecraft.getMinecraft().getTextureManager()).waitBindTexture(new StaticResourceLocation(image), new StaticResourceLocation("silentclient/transparent.png")); + if(image != null) { + if(mip) { + Client.getInstance().getTextureManager().bindTextureMipmapped(image); + } else { + ((TextureManagerExt) Minecraft.getMinecraft().getTextureManager()).waitBindTexture(new StaticResourceLocation(image), new StaticResourceLocation("silentclient/transparent.png")); + } } Gui.drawModalRectWithCustomSizedTexture((int) x, (int) y, (float) 0.0f, (float) 0.0f, (int) width, (int) height, (float) width, (float) height); GL11.glDepthMask((boolean) true); diff --git a/src/main/java/net/silentclient/client/hooks/NameTagRenderingHooks.java b/src/main/java/net/silentclient/client/hooks/NameTagRenderingHooks.java index 512e8d1..306b187 100644 --- a/src/main/java/net/silentclient/client/hooks/NameTagRenderingHooks.java +++ b/src/main/java/net/silentclient/client/hooks/NameTagRenderingHooks.java @@ -48,7 +48,7 @@ public class NameTagRenderingHooks { if (d0 <= (double)(maxDistance * maxDistance)) { boolean fontShadow = Client.getInstance().getModInstances().getModByClass(NametagsMod.class).isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(NametagsMod.class, "Font Shadow").getValBoolean(); - boolean icons = Client.getInstance().getModInstances().getModByClass(NametagsMod.class).isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(NametagsMod.class, "Show Nametag Icons").getValBoolean(); + boolean icons = !Client.getInstance().getModInstances().getModByClass(NametagsMod.class).isEnabled() || Client.getInstance().getSettingsManager().getSettingByClass(NametagsMod.class, "Show Nametag Icons").getValBoolean(); boolean background = !Client.getInstance().getModInstances().getModByClass(NametagsMod.class).isEnabled() || Client.getInstance().getModInstances().getModByClass(NametagsMod.class).isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(NametagsMod.class, "Background").getValBoolean(); FontRenderer fontrenderer = render.getFontRendererFromRenderManager(); float f = 1.6F; diff --git a/src/main/java/net/silentclient/client/mixin/mixins/EntityRendererMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/EntityRendererMixin.java index 13e681b..a796b3f 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/EntityRendererMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/EntityRendererMixin.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.culling.Frustum; import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.client.shader.ShaderGroup; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.silentclient.client.Client; import net.silentclient.client.cosmetics.StaticResourceLocation; @@ -26,10 +24,12 @@ import net.silentclient.client.mods.settings.RenderMod; import net.silentclient.client.utils.CloudRenderer; import net.silentclient.client.utils.HUDCaching; import net.silentclient.client.utils.OptifinePatch; +import net.silentclient.client.utils.animations.SneakHandler; import net.silentclient.client.utils.culling.EntityCulling; import net.silentclient.client.utils.shader.MotionBlurUtils; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; @@ -46,10 +46,12 @@ public abstract class EntityRendererMixin implements EntityRendererExt { private float prevRotationYaw; private float rotationPitch; private float prevRotationPitch; + @Unique + private float partialTicks; @Inject(method = "orientCamera", at = @At("HEAD")) public void orientCamera(float partialTicks, CallbackInfo ci) { - + this.partialTicks = partialTicks; rotationYaw = mc.getRenderViewEntity().rotationYaw; prevRotationYaw = mc.getRenderViewEntity().prevRotationYaw; rotationPitch = mc.getRenderViewEntity().rotationPitch; @@ -68,35 +70,10 @@ public abstract class EntityRendererMixin implements EntityRendererExt { GlStateManager.rotate(event.getRoll(), 0, 0, 1); } - private float eyeHeightSubtractor; - private long lastEyeHeightUpdate; - @Redirect(method = "orientCamera", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getEyeHeight()F")) public float orientCamera(Entity entity) { - if(Client.getInstance().getModInstances().getModByClass(AnimationsMod.class).isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "Smooth Sneaking").getValBoolean() && entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; - float height = player.getEyeHeight(); - if(player.isSneaking()) { - height += 0.08F; - } - float actualEyeHeightSubtractor = player.isSneaking() ? 0.08F : 0; - long sinceLastUpdate = System.currentTimeMillis() - lastEyeHeightUpdate; - lastEyeHeightUpdate = System.currentTimeMillis(); - if(actualEyeHeightSubtractor > eyeHeightSubtractor) { - eyeHeightSubtractor += sinceLastUpdate / 500f; - if(actualEyeHeightSubtractor < eyeHeightSubtractor) { - eyeHeightSubtractor = actualEyeHeightSubtractor; - } - } - else if(actualEyeHeightSubtractor < eyeHeightSubtractor) { - eyeHeightSubtractor -= sinceLastUpdate / 500f; - if(actualEyeHeightSubtractor > eyeHeightSubtractor) { - eyeHeightSubtractor = actualEyeHeightSubtractor; - } - } - return height - eyeHeightSubtractor; - } - return entity.getEyeHeight(); + if (mc.getRenderViewEntity() != mc.thePlayer) return entity.getEyeHeight(); + return SneakHandler.getInstance().getEyeHeight(partialTicks); } @Redirect(method = "orientCamera", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/Entity;rotationYaw:F")) @@ -226,20 +203,6 @@ public abstract class EntityRendererMixin implements EntityRendererExt { NotificationManager.render(); } - @Inject(method = "renderHand", at = @At("HEAD")) - public void swingProgress(float partialTicks, int xOffset, CallbackInfo ci) { - if(mc.thePlayer != null && Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Punching Animation").getValBoolean() - && mc.objectMouseOver != null - && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK - && mc.thePlayer != null - && mc.gameSettings.keyBindAttack.isKeyDown() && mc.gameSettings.keyBindUseItem.isKeyDown() - && mc.thePlayer.getItemInUseCount() > 0 && (!mc.thePlayer.isSwingInProgress - || mc.thePlayer.swingProgressInt < 0)) { - mc.thePlayer.swingProgressInt = -1; - mc.thePlayer.isSwingInProgress = true; - } - } - @Redirect(method = "updateCameraAndRender", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiIngame;renderGameOverlay(F)V")) public void renderCachedHUD(GuiIngame guiIngame, float partialTicks) { HUDCaching.renderCachedHud((EntityRenderer) (Object) this, guiIngame, partialTicks); diff --git a/src/main/java/net/silentclient/client/mixin/mixins/GuiInGameMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/GuiInGameMixin.java index 6a7b172..d70a6c3 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/GuiInGameMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/GuiInGameMixin.java @@ -36,7 +36,7 @@ public abstract class GuiInGameMixin extends Gui { @Redirect(method = "renderPlayerStats", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiIngame;drawTexturedModalRect(IIIIII)V", ordinal = 4)) public void oldHealth(GuiIngame instance, int i1, int i2, int i3, int i4, int i5, int i6) { - if(!Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() || !Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Health Animation").getValBoolean()) { + if(!Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() || !AnimationsMod.getSettingBoolean("Remove Health Bar Flashing")) { instance.drawTexturedModalRect(i1, i2, i3, i4, i5, i6); } } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/GuiPlayerTabOverlayMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/GuiPlayerTabOverlayMixin.java index 5252114..7b6e2a9 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/GuiPlayerTabOverlayMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/GuiPlayerTabOverlayMixin.java @@ -78,7 +78,7 @@ public abstract class GuiPlayerTabOverlayMixin { } catch (Exception err) { } - int k = this.mc.fontRendererObj.getStringWidth(this.getPlayerName(networkplayerinfo)) + (isSilent && Client.getInstance().getSettingsManager().getSettingByClass(TabMod.class, "Show Nametag Icons").getValBoolean() ? 9 : 0); + int k = this.mc.fontRendererObj.getStringWidth(this.getPlayerName(networkplayerinfo)) + (isSilent && (!Client.getInstance().getModInstances().getModByClass(TabMod.class).isEnabled() || Client.getInstance().getSettingsManager().getSettingByClass(TabMod.class, "Show Nametag Icons").getValBoolean()) ? 9 : 0); i = Math.max(i, k); if (scoreObjectiveIn != null && scoreObjectiveIn.getRenderType() != IScoreObjectiveCriteria.EnumRenderType.HEARTS) { k = this.mc.fontRendererObj.getStringWidth(" " + scoreboardIn.getValueFromObjective(networkplayerinfo.getGameProfile().getName(), scoreObjectiveIn).getScorePoints()); @@ -190,7 +190,7 @@ public abstract class GuiPlayerTabOverlayMixin { if(entityplayer != null) { isSilent = Boolean.parseBoolean(Players.getPlayerStatus(gameprofile.getName().equalsIgnoreCase(Client.getInstance().getAccount().getUsername()), gameprofile.getName(), entityplayer.getUniqueID(), (AbstractClientPlayer) entityplayer)); } - if(isSilent && entityplayer != null && Client.getInstance().getModInstances().getModByClass(TabMod.class).isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(TabMod.class, "Show Nametag Icons").getValBoolean()) { + if(isSilent && entityplayer != null && (!Client.getInstance().getModInstances().getModByClass(TabMod.class).isEnabled() || Client.getInstance().getSettingsManager().getSettingByClass(TabMod.class, "Show Nametag Icons").getValBoolean())) { ColorUtils.setColor(-1); this.mc.getTextureManager().bindTexture(((AbstractClientPlayerExt) entityplayer).silent$getPlayerIcon().getLocation()); Gui.drawModalRectWithCustomSizedTexture(j2, k2, 8, 8, 8, 8, 8, 8); @@ -230,7 +230,7 @@ public abstract class GuiPlayerTabOverlayMixin { if (scoreObjectiveIn != null && networkplayerinfo1.getGameType() != WorldSettings.GameType.SPECTATOR) { - int k5 = (j2 - (isSilent && Client.getInstance().getModInstances().getModByClass(TabMod.class).isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(TabMod.class, "Show Nametag Icons").getValBoolean() ? 9 : 0)) + i + 1; + int k5 = (j2 - (isSilent && (!Client.getInstance().getModInstances().getModByClass(TabMod.class).isEnabled() || Client.getInstance().getSettingsManager().getSettingByClass(TabMod.class, "Show Nametag Icons").getValBoolean()) ? 9 : 0)) + i + 1; int l5 = k5 + l; if (l5 - k5 > 5) @@ -239,7 +239,7 @@ public abstract class GuiPlayerTabOverlayMixin { } } - this.drawPing(i1, j2 - (flag ? 9 : 0) - (isSilent && Client.getInstance().getModInstances().getModByClass(TabMod.class).isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(TabMod.class, "Show Nametag Icons").getValBoolean() ? 9 : 0), k2, networkplayerinfo1); + this.drawPing(i1, j2 - (flag ? 9 : 0) - (isSilent && (!Client.getInstance().getModInstances().getModByClass(TabMod.class).isEnabled() || Client.getInstance().getSettingsManager().getSettingByClass(TabMod.class, "Show Nametag Icons").getValBoolean()) ? 9 : 0), k2, networkplayerinfo1); } } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/ItemRendererMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/ItemRendererMixin.java index 5d1adfa..f1e272e 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/ItemRendererMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/ItemRendererMixin.java @@ -3,9 +3,11 @@ package net.silentclient.client.mixin.mixins; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.silentclient.client.Client; import net.silentclient.client.event.impl.EventTransformFirstPersonItem; +import net.silentclient.client.mods.render.AnimationsMod; import net.silentclient.client.mods.render.PackTweaksMod; import net.silentclient.client.utils.animations.AnimationHandler; import org.spongepowered.asm.mixin.Final; @@ -13,6 +15,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ItemRenderer.class) @@ -25,6 +28,8 @@ public class ItemRendererMixin { @Shadow @Final private Minecraft mc; + @Shadow private int equippedItemSlot; + @Inject(method = "transformFirstPersonItem", at = @At("HEAD")) public void transformFirstPersonItem(float equipProgress, float swingProgress, CallbackInfo ci) { EventTransformFirstPersonItem event = new EventTransformFirstPersonItem(itemToRender, equipProgress, swingProgress); @@ -42,6 +47,16 @@ public class ItemRendererMixin { } } + @ModifyArg(method = "updateEquippedItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/MathHelper;clamp_float(FFF)F"), index = 0) + private float handleItemSwitch(float original) { + EntityPlayer entityplayer = Minecraft.getMinecraft().thePlayer; + ItemStack itemstack = entityplayer.inventory.getCurrentItem(); + if (AnimationsMod.getSettingBoolean("Item Switching Animation") && this.equippedItemSlot == entityplayer.inventory.currentItem && ItemStack.areItemsEqual(this.itemToRender, itemstack)) { + return 1.0f - this.equippedProgress; + } + return original; + } + @Inject(method = "renderWaterOverlayTexture", at = @At("HEAD"), cancellable = true) public void cancelWaterOverlay(float partialTicks, CallbackInfo ci) { if (Client.getInstance().getModInstances().getModByClass(PackTweaksMod.class).isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(PackTweaksMod.class, "Water Fog").getValBoolean() == false) { diff --git a/src/main/java/net/silentclient/client/mixin/mixins/LayerArmorBaseMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/LayerArmorBaseMixin.java index 92001d2..41a5275 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/LayerArmorBaseMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/LayerArmorBaseMixin.java @@ -1,7 +1,7 @@ package net.silentclient.client.mixin.mixins; import net.minecraft.client.renderer.entity.layers.LayerArmorBase; -import net.silentclient.client.Client; +import net.silentclient.client.mods.render.AnimationsMod; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -11,9 +11,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public class LayerArmorBaseMixin { @Inject(method = "shouldCombineTextures", at = @At("HEAD"), cancellable = true) private void shouldCombineTextures(CallbackInfoReturnable cir) { - if(Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled()) { - cir.setReturnValue(true); - cir.cancel(); - } + if (AnimationsMod.getSettingBoolean("Red Armor")) cir.setReturnValue(true); } } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/MinecraftMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/MinecraftMixin.java index 944774b..0c9340e 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/MinecraftMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/MinecraftMixin.java @@ -23,6 +23,7 @@ import net.silentclient.client.event.impl.*; import net.silentclient.client.gui.SilentScreen; import net.silentclient.client.gui.lite.LiteMainMenu; import net.silentclient.client.gui.multiplayer.SilentMultiplayerGui; +import net.silentclient.client.gui.resourcepacks.SilentResourcePacksGui; import net.silentclient.client.gui.silentmainmenu.MainMenuConcept; import net.silentclient.client.gui.util.BackgroundPanorama; import net.silentclient.client.hooks.MinecraftHook; @@ -65,9 +66,6 @@ public abstract class MinecraftMixin implements MinecraftExt { if(Client.backgroundPanorama == null) { Client.backgroundPanorama = new BackgroundPanorama(Minecraft.getMinecraft()); } -// if(Client.getInstance().getGlobalSettings() != null) { -// displayGuiScreen(Client.getInstance().getGlobalSettings().isLite() ? new GuiNews() : new MainMenuConcept()); -// } } @Override @@ -90,7 +88,7 @@ public abstract class MinecraftMixin implements MinecraftExt { } - @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/profiler/Profiler;endSection()V", shift = At.Shift.BEFORE)) + @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/profiler/Profiler;endSection()V", ordinal = 1, shift = At.Shift.BEFORE)) public void tickEvent(CallbackInfo callbackInfo) { new ClientTickEvent().call(); } @@ -134,27 +132,34 @@ public abstract class MinecraftMixin implements MinecraftExt { @Shadow private Timer timer; - @Inject(method = "displayGuiScreen", at = @At("RETURN"), cancellable = true) + @Inject(method = "displayGuiScreen", at = @At("HEAD"), cancellable = true) public void displayGuiScreenInject(GuiScreen guiScreenIn, CallbackInfo ci) { + if(guiScreenIn instanceof SilentScreen) { + Client.logger.info("Opening menu: " + guiScreenIn.getClass().toString()); + } if(Client.backgroundPanorama == null) { Client.backgroundPanorama = new BackgroundPanorama(Minecraft.getMinecraft()); } - if(guiScreenIn instanceof GuiMainMenu) { - if(Client.getInstance().getGlobalSettings() != null) { - displayGuiScreen(Client.getInstance().getGlobalSettings().isLite() ? new LiteMainMenu() : new MainMenuConcept()); - } + if((guiScreenIn instanceof GuiMainMenu || (guiScreenIn == null && this.theWorld == null)) && Client.getInstance().getGlobalSettings() != null) { + displayGuiScreen(Client.getInstance().getGlobalSettings().isLite() ? new LiteMainMenu() : new MainMenuConcept()); + ci.cancel(); + return; + } + if(guiScreenIn instanceof GuiScreenResourcePacks) { + displayGuiScreen(new SilentResourcePacksGui(this.currentScreen)); + ci.cancel(); return; } if(guiScreenIn instanceof GuiMultiplayer) { displayGuiScreen(new SilentMultiplayerGui((GuiScreen) ((GuiMultiplayerExt) guiScreenIn).silent$getParentScreen())); + ci.cancel(); + return; } if(guiScreenIn instanceof GuiIngameMenu) { displayGuiScreen(new net.silentclient.client.gui.minecraft.GuiIngameMenu()); + ci.cancel(); return; } - if(guiScreenIn != null && guiScreenIn instanceof SilentScreen) { - Client.logger.info("Opening menu: " + guiScreenIn.getClass().toString()); - } } /** @@ -195,11 +200,15 @@ public abstract class MinecraftMixin implements MinecraftExt { @Inject(method = "rightClickMouse", at = @At("HEAD")) public void rightClickMouse(CallbackInfo ci) { - if (Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Punching Animation").getValBoolean() && + if (AnimationsMod.getSettingBoolean("Punching During Usage") && Minecraft.getMinecraft().playerController.getIsHittingBlock() && Minecraft.getMinecraft().thePlayer.getHeldItem() != null && (Minecraft.getMinecraft().thePlayer.getHeldItem().getItemUseAction() != EnumAction.NONE || Minecraft.getMinecraft().thePlayer.getHeldItem().getItem() instanceof ItemBlock)) { + // This sends packets to the server saying we stopped breaking. + // Simply making getIsHittingBlock return false will make the server + // think we are still breaking the block while right clicking. + // Which is bad. Obviously. Minecraft.getMinecraft().playerController.resetBlockRemoving(); } } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/ModelBipedMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/ModelBipedMixin.java index cc48746..ebae735 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/ModelBipedMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/ModelBipedMixin.java @@ -1,7 +1,6 @@ package net.silentclient.client.mixin.mixins; import net.minecraft.client.model.ModelBiped; -import net.silentclient.client.Client; import net.silentclient.client.mods.render.AnimationsMod; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; @@ -11,6 +10,6 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant; public class ModelBipedMixin { @ModifyConstant(method = "setRotationAngles", constant = @Constant(floatValue = -0.5235988F)) private float cancelRotation(float original) { - return Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Block Animation").getValBoolean() ? 0 : original; + return AnimationsMod.getSettingBoolean("1.7 3rd Person Block Animation") ? 0 : original; } } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/RenderFishMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/RenderFishMixin.java new file mode 100644 index 0000000..b68df82 --- /dev/null +++ b/src/main/java/net/silentclient/client/mixin/mixins/RenderFishMixin.java @@ -0,0 +1,17 @@ +package net.silentclient.client.mixin.mixins; + +import net.minecraft.client.renderer.entity.RenderFish; +import net.minecraft.util.Vec3; +import net.silentclient.client.mods.render.AnimationsMod; +import net.silentclient.client.utils.animations.FishingLineHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(value = RenderFish.class, priority = 1001) +public class RenderFishMixin { + @Redirect(method = "doRender", at = @At(value = "NEW", target = "net/minecraft/util/Vec3", ordinal = 0)) + private Vec3 oldFishingLine(double x, double y, double z) { + return !AnimationsMod.getSettingBoolean("1.7 Rod Position") ? new Vec3(x, y, z) : FishingLineHandler.getInstance().getOffset(); + } +} \ No newline at end of file diff --git a/src/main/java/net/silentclient/client/mixin/mixins/RenderItemMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/RenderItemMixin.java index b79d29d..9f46c3b 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/RenderItemMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/RenderItemMixin.java @@ -34,6 +34,24 @@ public abstract class RenderItemMixin { lastEntityToRenderFor = entityToRenderFor; } + @Inject(method = "renderItemModelTransform", at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderItem(" + + "Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V") + ) + public void renderItemModelForEntity_renderItem(ItemStack stack, IBakedModel model, + ItemCameraTransforms.TransformType cameraTransformType, CallbackInfo ci) { + if (cameraTransformType == ItemCameraTransforms.TransformType.THIRD_PERSON && + lastEntityToRenderFor instanceof EntityPlayer) { + EntityPlayer p = (EntityPlayer) lastEntityToRenderFor; + ItemStack heldStack = p.getHeldItem(); + if (heldStack != null && p.getItemInUseCount() > 0 && + heldStack.getItemUseAction() == EnumAction.BLOCK) { + AnimationHandler.getInstance().doSwordBlock3rdPersonTransform(); + } + } + } + @Shadow protected abstract void renderEffect(IBakedModel model); @Shadow protected abstract void renderModel(IBakedModel model, int color); @@ -76,22 +94,4 @@ public abstract class RenderItemMixin { renderEffect(model); } } - - @Inject(method = "renderItemModelTransform", at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderItem(" + - "Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V") - ) - public void renderItemModelForEntity_renderItem(ItemStack stack, IBakedModel model, - ItemCameraTransforms.TransformType cameraTransformType, CallbackInfo ci) { - if (cameraTransformType == ItemCameraTransforms.TransformType.THIRD_PERSON && - lastEntityToRenderFor instanceof EntityPlayer) { - EntityPlayer p = (EntityPlayer) lastEntityToRenderFor; - ItemStack heldStack = p.getHeldItem(); - if (heldStack != null && p.getItemInUseCount() > 0 && - heldStack.getItemUseAction() == EnumAction.BLOCK) { - AnimationHandler.getInstance().doSwordBlock3rdPersonTransform(); - } - } - } } diff --git a/src/main/java/net/silentclient/client/mods/Mod.java b/src/main/java/net/silentclient/client/mods/Mod.java index 3b225b6..684238f 100644 --- a/src/main/java/net/silentclient/client/mods/Mod.java +++ b/src/main/java/net/silentclient/client/mods/Mod.java @@ -61,7 +61,7 @@ public class Mod implements IMod { } public void reset(boolean resetEnabled) { - if(resetEnabled && (defaultEnabled && !isEnabled || !defaultEnabled && isEnabled)) { + if(resetEnabled && isEnabled != defaultEnabled) { this.toggle(); } Client.getInstance().getSettingsManager().getSettingByMod(this).forEach(setting -> { @@ -231,7 +231,6 @@ public class Mod implements IMod { public void setEnabled(boolean isEnabled) { this.isEnabled = isEnabled; - if(isEnabled) { try { onEnable(); diff --git a/src/main/java/net/silentclient/client/mods/ModDraggable.java b/src/main/java/net/silentclient/client/mods/ModDraggable.java index 9a269fa..9f105c3 100644 --- a/src/main/java/net/silentclient/client/mods/ModDraggable.java +++ b/src/main/java/net/silentclient/client/mods/ModDraggable.java @@ -157,9 +157,9 @@ public abstract class ModDraggable extends Mod implements IRenderer { ColorUtils.setColor(-1); Client.getInstance().getSilentFontRenderer().drawString(debugX, debugY + 12, "y: " + y, 6, SilentFontRenderer.FontType.TITLE); ColorUtils.setColor(-1); - Client.getInstance().getSilentFontRenderer().drawString(debugX, debugY + 18, "width: " + (int) this.getScaledWidth(), 6, SilentFontRenderer.FontType.TITLE); + Client.getInstance().getSilentFontRenderer().drawString(debugX, debugY + 18, "width: " + this.getScaledWidth(), 6, SilentFontRenderer.FontType.TITLE); ColorUtils.setColor(-1); - Client.getInstance().getSilentFontRenderer().drawString(debugX, debugY + 24, "height: " + (int) this.getScaledHeight(), 6, SilentFontRenderer.FontType.TITLE); + Client.getInstance().getSilentFontRenderer().drawString(debugX, debugY + 24, "height: " + this.getScaledHeight(), 6, SilentFontRenderer.FontType.TITLE); ColorUtils.setColor(-1); Client.getInstance().getSilentFontRenderer().drawString(debugX, debugY + 30, "dragging: " + this.isDragging(), 6, SilentFontRenderer.FontType.TITLE); ColorUtils.setColor(-1); diff --git a/src/main/java/net/silentclient/client/mods/ModInstances.java b/src/main/java/net/silentclient/client/mods/ModInstances.java index b063610..981fc44 100644 --- a/src/main/java/net/silentclient/client/mods/ModInstances.java +++ b/src/main/java/net/silentclient/client/mods/ModInstances.java @@ -184,9 +184,7 @@ public class ModInstances { mods.add(new FPSSpoofer()); } mods.add(new NewMotionBlurMod()); - if(Client.getInstance().getBuildData().getBranch().equals("fushka")) { - mods.add(new DonationsAlertsMod()); - } + mods.add(new DonationsAlertsMod()); mods.add(new QuickPlayMod()); } diff --git a/src/main/java/net/silentclient/client/mods/hud/KeystrokesMod.java b/src/main/java/net/silentclient/client/mods/hud/KeystrokesMod.java index d32a159..c1500a0 100644 --- a/src/main/java/net/silentclient/client/mods/hud/KeystrokesMod.java +++ b/src/main/java/net/silentclient/client/mods/hud/KeystrokesMod.java @@ -28,7 +28,7 @@ public class KeystrokesMod extends ModDraggable { @Override public void setup() { - this.addSliderSetting("Scale", this, 2.23F, 1.0F, 5.0F, false); + this.addSliderSetting("Scale", this, 2.20F, 1.0F, 5.0F, false); setUpdated(true); ArrayList cpsModes = new ArrayList<>(); cpsModes.add("None"); @@ -48,7 +48,7 @@ public class KeystrokesMod extends ModDraggable { this.addBooleanSetting("Replace Names With Arrow", this, false); } - public static enum KeystrokesMode { + public enum KeystrokesMode { WASD(Key.W, Key.A, Key.S, Key.D), WASD_MOUSE(Key.W, Key.A, Key.S, Key.D, Key.LMB, Key.RMB); @@ -57,7 +57,7 @@ public class KeystrokesMod extends ModDraggable { private int width; private int height; - private KeystrokesMode(Key... keysIn) { + KeystrokesMode(Key... keysIn) { this.keys = keysIn; for(Key key : keys) { @@ -111,14 +111,18 @@ public class KeystrokesMod extends ModDraggable { } public boolean isDown() { - if(Minecraft.getMinecraft().currentScreen != null) { - return false; + try { + if(Minecraft.getMinecraft().currentScreen != null) { + return false; + } + + if(this == Key.LMB || this == Key.RMB) { + return Mouse.isButtonDown(this == Key.LMB ? 0 : 1); + } + return Keyboard.isKeyDown(keyBind.getKeyCode()); + } catch (Exception err) { + return keyBind.isKeyDown(); } - - if(this == Key.LMB || this == Key.RMB) { - return Mouse.isButtonDown(this == Key.LMB ? 0 : 1); - } - return Keyboard.isKeyDown(keyBind.getKeyCode()); } public int getHeight() { @@ -147,7 +151,7 @@ public class KeystrokesMod extends ModDraggable { @Override public int getWidth() { - return (Client.getInstance().getSettingsManager().getSettingByName(this, "Show LMB/RMB").getValBoolean() ? KeystrokesMode.WASD_MOUSE.getWidth() : KeystrokesMode.WASD.getWidth()) - 1; + return Client.getInstance().getSettingsManager().getSettingByName(this, "Show LMB/RMB").getValBoolean() ? KeystrokesMode.WASD_MOUSE.getWidth() : KeystrokesMode.WASD.getWidth(); } @Override diff --git a/src/main/java/net/silentclient/client/mods/player/DonationsAlertsMod.java b/src/main/java/net/silentclient/client/mods/player/DonationsAlertsMod.java index 67ca7df..30ab5fb 100644 --- a/src/main/java/net/silentclient/client/mods/player/DonationsAlertsMod.java +++ b/src/main/java/net/silentclient/client/mods/player/DonationsAlertsMod.java @@ -1,23 +1,32 @@ package net.silentclient.client.mods.player; -import java.net.URISyntaxException; -import java.util.ArrayList; - +import com.google.common.collect.Lists; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.ResourcePackRepository; import net.silentclient.client.Client; -import net.silentclient.client.gui.lite.clickgui.utils.GlUtils; -import net.silentclient.client.gui.hud.ScreenPosition; +import net.silentclient.client.mods.Mod; import net.silentclient.client.mods.ModCategory; -import net.silentclient.client.mods.ModDraggable; +import net.silentclient.client.utils.HttpPostMultipart; import net.silentclient.donationalerts.DonationAlerts; import net.silentclient.donationalerts.DonationAlertsEvent; -public class DonationsAlertsMod extends ModDraggable { +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class DonationsAlertsMod extends Mod { public static DonationAlerts da; public static final String DASERVER = "https://socket.donationalerts.ru:443"; public static final Minecraft mc = Minecraft.getMinecraft(); public static ArrayList donates; private int height; + private static float goal = 0; + private static final float goalMax = 100; + private static ArrayList sendedResourcePacks = new ArrayList<>(); public DonationsAlertsMod() { super("Donation Alerts", ModCategory.MODS, null); @@ -27,6 +36,7 @@ public class DonationsAlertsMod extends ModDraggable { public void setup() { super.setup(); this.addInputSetting("Token", this, ""); + this.addInputSetting("Bot Token", this, ""); donates = new ArrayList(); try { da = new DonationAlerts(DASERVER); @@ -61,25 +71,40 @@ public class DonationsAlertsMod extends ModDraggable { DonationAlertsInformation(event.getAmount() + " " + event.currency + " from " + event.getUsername() + ", message: " + event.getMessage()); event.setShow(true); event.getTimer().reset(); - donates.add(event); +// donates.add(event); - switch(event.getAmount()) { - case "100.00": - mc.thePlayer.sendChatMessage("Test!"); - break; - case "200.00": - disableKeyboard(10000); - break; + if(event.currency.equalsIgnoreCase("rub")) { + if(Float.parseFloat(event.getAmount()) == 500) { + sendCurrentPackToTelegram(event); + } } } } - - public static void disableKeyboard(int timeout) { - (new Thread() { - public void run() { - + + public static void sendCurrentPackToTelegram(DonationAlertsEvent event) { + new Thread(() -> { + Client.logger.info("Sending Resource Pack to Telegram"); + String url = String.format("https://api.telegram.org/bot%s/sendDocument", Client.getInstance().getSettingsManager().getSettingByClass(DonationsAlertsMod.class, "Bot Token").getValString()); + Map headers = new HashMap<>(); + List rps = Lists.reverse(Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntries()); + if(!rps.isEmpty() && !sendedResourcePacks.contains(rps.get(0).getResourcePackName())) { + headers.put("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36"); + HttpPostMultipart multipart; + try { + multipart = new HttpPostMultipart(url, "utf-8", headers); + multipart.addFilePart("document", new File(Minecraft.getMinecraft().getResourcePackRepository().getDirResourcepacks(), rps.get(0).getResourcePackName())); + multipart.addFormField("chat_id", "-1001627884112"); + multipart.addFormField("caption", String.format("%s ОПЛАТИЛ РЕСУРСПАК НА СТРИМЕ!\nБольшое спасибо и приятной игры!", event.getUsername())); + multipart.addFormField("parse_mode", "HTML"); + sendedResourcePacks.add(rps.get(0).getResourcePackName()); + multipart.finish(); + } catch (IOException e) { + Client.logger.catching(e); + } + } else { + Client.logger.error("Resource Pack not found"); } - }).start(); + }).start(); } public static void DonationAlertsInformation(String message) @@ -87,39 +112,4 @@ public class DonationsAlertsMod extends ModDraggable { Client.logger.info("[DonationsAlerts]: " + message); } - @Override - public int getWidth() { - return 100; - } - - @Override - public int getHeight() { - return height; - } - - @Override - public boolean render(ScreenPosition pos) { - int y = 0; - height = 0; - - for(DonationAlertsEvent donate : donates) { - if(donate.getTimer().delay(5000)) { - donate.setShow(false); - } - if(donate.isShow()) { - String header = donate.getUsername() + " – " + donate.getAmount() + " " + donate.getCurrency(); - GlUtils.startScale(0, y, 1.3F); - font.drawString(header, 0, y, -1, true); - GlUtils.stopScale(); - if(!donate.getMessage().trim().equals("")) { - y += font.FONT_HEIGHT * 1.3F + 4; - font.drawString(donate.getMessage(), (font.getStringWidth(header) * 1.3F) / 2, y, -1, true); - } - y += 20; - height += (font.FONT_HEIGHT * 1.3F) + (!donate.getMessage().trim().equals("") ? font.FONT_HEIGHT : 0) + 20; - } - }; - - return true; - } } diff --git a/src/main/java/net/silentclient/client/mods/render/AnimationsMod.java b/src/main/java/net/silentclient/client/mods/render/AnimationsMod.java index 6c398d5..b843cd3 100644 --- a/src/main/java/net/silentclient/client/mods/render/AnimationsMod.java +++ b/src/main/java/net/silentclient/client/mods/render/AnimationsMod.java @@ -1,5 +1,6 @@ package net.silentclient.client.mods.render; +import net.silentclient.client.Client; import net.silentclient.client.mods.Mod; import net.silentclient.client.mods.ModCategory; @@ -11,19 +12,26 @@ public class AnimationsMod extends Mod { @Override public void setup() { + setUpdated(true); this.addBooleanSetting("1.7 Item Positions", this, true); this.addBooleanSetting("1.7 Bow Pullback", this, true); this.addBooleanSetting("1.7 Block Animation", this, true); this.addBooleanSetting("1.7 Rod Position", this, true); - this.addBooleanSetting("1.7 Punching Animation", this, true); - this.addBooleanSetting("1.7 Health Animation", this, true); - this.addBooleanSetting("1.7 Eating & Drinking Animation", this, true); - this.addBooleanSetting("1.7 Block-Hitting Animation", this, true); - this.addBooleanSetting("1.7 Item Switching Animation", this, true); + this.addBooleanSetting("1.7 3rd Person Block Animation", this, true); this.addBooleanSetting("1.7 Throwing", this, true); this.addBooleanSetting("1.7 Enchant Glint", this, true); this.addBooleanSetting("1.7 Skins", this, false); this.addBooleanSetting("Smooth Sneaking", this, true); this.addBooleanSetting("No Shaking", this, true); + this.addBooleanSetting("Consume Animation", this, true); + this.addBooleanSetting("Block-Hitting Animation", this, true); + this.addBooleanSetting("Red Armor", this, true); + this.addBooleanSetting("Punching During Usage", this, true); + this.addBooleanSetting("Item Switching Animation", this, true); + this.addBooleanSetting("Remove Health Bar Flashing", this, true); + } + + public static boolean getSettingBoolean(String name) { + return Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, name).getValBoolean(); } } diff --git a/src/main/java/net/silentclient/client/utils/AccountManager.java b/src/main/java/net/silentclient/client/utils/AccountManager.java index 97d75a8..ca32e75 100644 --- a/src/main/java/net/silentclient/client/utils/AccountManager.java +++ b/src/main/java/net/silentclient/client/utils/AccountManager.java @@ -55,8 +55,8 @@ public class AccountManager { Session session = new Session(account.username, nameToUuid(account.username), account.mc_access_token != null ? account.mc_access_token : "0", account.mc_access_token != null ? "msa" : "legacy"); ((MinecraftExt) Minecraft.getMinecraft()).setSession(session); Client.getInstance().getUserData().setAccessToken(selected.access_token); - Client.getInstance().getSilentSocket().Disconnect(); - Client.getInstance().getSilentSocket().Connect(selected.access_token); + Players.unregister(); + Players.register(); } PlayerResponse acc = Client.getInstance().updateAccount(); if(acc != null) { diff --git a/src/main/java/net/silentclient/client/utils/GuiUtils.java b/src/main/java/net/silentclient/client/utils/GuiUtils.java new file mode 100644 index 0000000..dd04fb9 --- /dev/null +++ b/src/main/java/net/silentclient/client/utils/GuiUtils.java @@ -0,0 +1,9 @@ +package net.silentclient.client.utils; + +import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; + +public class GuiUtils { + public static boolean blockInOtherBlock(float blockX, float blockY, int blockWidth, int blockHeight, float parentX, float parentY, int parentWidth, int parentHeight) { + return MouseUtils.isInside((int) blockX, (int) blockY, parentX, parentY, parentWidth, parentHeight) || MouseUtils.isInside((int) blockX, (int) blockY + blockHeight, parentX, parentY, parentWidth, parentHeight); + } +} diff --git a/src/main/java/net/silentclient/client/utils/Players.java b/src/main/java/net/silentclient/client/utils/Players.java index b53dc83..2dfb54e 100644 --- a/src/main/java/net/silentclient/client/utils/Players.java +++ b/src/main/java/net/silentclient/client/utils/Players.java @@ -2,14 +2,12 @@ package net.silentclient.client.utils; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.entity.player.EntityPlayer; import net.silentclient.client.Client; import net.silentclient.client.cosmetics.HatData; import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; -import net.silentclient.client.mods.settings.CosmeticsMod; import net.silentclient.client.utils.types.PlayerResponse; +import org.json.JSONObject; import java.util.Map; import java.util.UUID; @@ -17,6 +15,7 @@ import java.util.WeakHashMap; public class Players { public static final Map playersCache = new WeakHashMap<>(); + public static boolean isLoading = false; public static void reload() { playersCache.clear(); @@ -92,53 +91,32 @@ public class Players { return result.isOnline() ? "true" : "false"; } else { + if(isLoading) { + return "false"; + } + Players.isLoading = true; Client.logger.info("Loading Account of " + name.toLowerCase()); playersCache.put(name.toLowerCase(), null); - Client.getInstance().getSilentSocket().getSocket().emit("account", name.toLowerCase()); + (new Thread("loadingAccountOf"+name) { + public void run() { + PlayerResponse response = getAccount(name.toLowerCase()); + if(response != null && response.getAccount() != null) { + playersCache.put(response.getAccount().getUsername(), response.getAccount()); + } + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + Client.logger.catching(e); + } + Players.isLoading = false; + } + }).start(); } return "false"; } public static void handleAccount(PlayerResponse.Account account) { - if(account.getUsername().toLowerCase().equals(Minecraft.getMinecraft().getSession().getUsername().toLowerCase().toString())) { - Client.getInstance().setAccount(account); - Client.getInstance().getCosmetics().setMyCapes(account.getCosmetics().getCapes()); - Client.getInstance().getCosmetics().setMyWings(account.getCosmetics().getWings()); - Client.getInstance().getCosmetics().setMyIcons(account.getCosmetics().getIcons()); - Client.getInstance().getCosmetics().setMyBandanas(account.getCosmetics().getBandanas()); - Client.getInstance().getCosmetics().setMyHats(account.getCosmetics().getHats()); - Client.getInstance().getCosmetics().setMyShields(account.getCosmetics().getShields()); - Client.getInstance().getSettingsManager().getSettingByClass(CosmeticsMod.class, "Cape Shoulders").setValBoolean(account.getCapeShoulders()); - Client.getInstance().getSettingsManager().getSettingByClass(CosmeticsMod.class, "Cape Type").setValString(account.getCapeType().equals("dynamic_curved") ? "Dynamic Curved" : account.getCapeType().equals("curved_rectangle") ? "Curved Rectangle" : "Rectangle"); - if(Minecraft.getMinecraft().thePlayer != null) { - ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$setCapeType(account.getCapeType()); - ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$setShoulders(account.getCapeShoulders()); - Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); - } - } - if(Minecraft.getMinecraft().theWorld != null && getPlayerEntityByName(account.original_username) != null) { - Client.logger.info("Account processing: " + account.getUsername()); - if(playersCache.containsKey(account.getUsername())) { - playersCache.remove(account.getUsername()); - } - playersCache.put(account.getUsername(), account); - } - } - - public static EntityPlayer getPlayerEntityByName(String name) - { - for (int i = 0; i < Minecraft.getMinecraft().theWorld.playerEntities.size(); ++i) - { - EntityPlayer entityplayer = (EntityPlayer)Minecraft.getMinecraft().theWorld.playerEntities.get(i); - - if (name.equalsIgnoreCase(entityplayer.getName())) - { - return entityplayer; - } - } - - return null; } public static PlayerResponse getAccount(String name) { @@ -154,4 +132,26 @@ public class Players { return null; } } + + public static void register() { + try { + String content = Requests.post("https://api.silentclient.net/account/set_online", new JSONObject().put("online", true).toString()); + + Client.logger.info("STARTING > registering-player > response: " + content); + } catch (Exception e) { + Client.logger.catching(e); + Client.logger.info("STARTING > registering-player > ERROR: " + e.getMessage()); + } + } + + public static void unregister() { + try { + String content = Requests.post("https://api.silentclient.net/account/set_online", new JSONObject().put("online", true).toString()); + + Client.logger.info("STOPPING > unregistering-player > response: " + content.toString()); + } catch (Exception e) { + Client.logger.catching(e); + Client.logger.error("STOPPING > unregistering-player > ERROR: " + e.getMessage()); + } + } } \ No newline at end of file diff --git a/src/main/java/net/silentclient/client/utils/PromoController.java b/src/main/java/net/silentclient/client/utils/PromoController.java new file mode 100644 index 0000000..fa246f8 --- /dev/null +++ b/src/main/java/net/silentclient/client/utils/PromoController.java @@ -0,0 +1,128 @@ +package net.silentclient.client.utils; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.util.ResourceLocation; +import net.silentclient.client.Client; + +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.Random; + +public class PromoController { + public static PromoResponse promo; + public static boolean loading = false; + + public static PromoResponse getResponse() { + return promo; + } + + public static void setResponse(PromoResponse promo) { + PromoController.promo = promo; + } + + public class PromoResponse { + public ArrayList panels; + private int panelIndex = 0; + private TimerUtils timer; + + public int getPanelIndex() { + return panelIndex; + } + + public void update() { + if(timer == null) { + timer = new TimerUtils(); + } + if(timer.delay(6000)) { + nextPanel(); + } + } + + public void setPanelIndex(int panelIndex) { + if(timer == null) { + timer = new TimerUtils(); + } + timer.reset(); + this.panelIndex = panelIndex; + } + + public void prevPanel() { + if(timer == null) { + timer = new TimerUtils(); + } + timer.reset(); + if(panelIndex == 0) { + this.panelIndex = PromoController.getResponse().getPanels().size() - 1; + } else { + this.panelIndex -= 1; + } + } + + public void nextPanel() { + if(timer == null) { + timer = new TimerUtils(); + } + timer.reset(); + if(panelIndex == PromoController.getResponse().getPanels().size() - 1) { + this.panelIndex = 0; + } else { + this.panelIndex += 1; + } + } + + public Panel getCurrentPanel() { + return panels.get(panelIndex) != null ? panels.get(panelIndex) : null; + } + + public ArrayList getPanels() { + return panels; + } + } + + public class Panel { + public String imageUrl; + public String redirectUrl; + + public ResourceLocation imageLocation; + public BufferedImage image = null; + public boolean initImage = false; + + public void loadImage() { + if(image == null && !PromoController.loading && !initImage) { + PromoController.loading = true; + (new Thread("PromoImageThread") { + public void run() { + Client.logger.info(String.format("Downloading promo image %s...", imageUrl)); + BufferedImage avatar = SCTextureManager.getImage(imageUrl); + if(avatar != null) { + Client.logger.info(String.format("Promo image %s successfully downloaded!", imageUrl)); + image = avatar; + } else { + Client.logger.info(String.format("Promo image %s downloading failed!", imageUrl)); + initImage = true; + } + PromoController.loading = false; + } + }).start(); + } + if(image != null && !initImage) { + Client.logger.info(String.format("Crating ResourceLocation of promo image %s...", imageUrl)); + imageLocation = Minecraft.getMinecraft().getTextureManager().getDynamicTextureLocation("promo_image_" + new Random().nextLong(), new DynamicTexture(image)); + initImage = true; + } + } + + public ResourceLocation getImageLocation() { + return imageLocation; + } + + public String getImageUrl() { + return imageUrl; + } + + public String getRedirectUrl() { + return redirectUrl; + } + } +} diff --git a/src/main/java/net/silentclient/client/utils/Scissor.java b/src/main/java/net/silentclient/client/utils/Scissor.java new file mode 100644 index 0000000..a64f3ce --- /dev/null +++ b/src/main/java/net/silentclient/client/utils/Scissor.java @@ -0,0 +1,22 @@ +package net.silentclient.client.utils; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import org.lwjgl.opengl.GL11; + +public class Scissor { + public static void start(int x, int y, int width, int height) { + ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft()); + GL11.glEnable(GL11.GL_SCISSOR_TEST); + GL11.glScissor( + x * sr.getScaleFactor(), + (sr.getScaledHeight() - y) * sr.getScaleFactor() - height * sr.getScaleFactor(), + width * sr.getScaleFactor(), + height * sr.getScaleFactor() + ); + } + + public static void end() { + GL11.glDisable(GL11.GL_SCISSOR_TEST); + } +} diff --git a/src/main/java/net/silentclient/client/utils/ScrollHelper.java b/src/main/java/net/silentclient/client/utils/ScrollHelper.java new file mode 100644 index 0000000..d8d67be --- /dev/null +++ b/src/main/java/net/silentclient/client/utils/ScrollHelper.java @@ -0,0 +1,74 @@ +package net.silentclient.client.utils; + +import net.minecraft.util.MathHelper; +import org.lwjgl.input.Mouse; +import net.minecraft.client.Minecraft; + +public class ScrollHelper { + private float step = 0,real = 0,scroll = 0,elementsHeight = 0,maxScroll = 0,speed = 300F; + private boolean flag = true; + + /** + Returns the smoothed scroll value, only call this once after you set all the setters + */ + public float getScroll() { + if(!flag) { + return -scroll; + } + int wheel = Mouse.getDWheel(); + float delta = 1f / Minecraft.getDebugFPS(); + if(flag) + real -= wheel / 120f * step; + float divider = delta*2*Math.min(speed, elementsHeight); + if(scroll > real) { + scroll -= ((scroll - real) / 50) * divider; + } + if(scroll < real) { + scroll += ((real - scroll) / 50) * divider; + } + + real = MathHelper.clamp_float(real, 0, elementsHeight > maxScroll ? elementsHeight - maxScroll : 0); + real = ((int)(real*100))/100f; + return -scroll; + } + + public void resetScroll() { + this.scroll = 0; + this.real = 0; + } + + /** + How much to increment each scroll + */ + public void setStep(float step) { + this.step = step; + } + + /** + Height and gaps of all elements to be scrolled combined + */ + public void setElementsHeight(float elementsHeight) { + this.elementsHeight = elementsHeight; + } + + /** + Maximum scroll, for example height of your scrollable panel + */ + public void setMaxScroll(float maxScroll) { + this.maxScroll = maxScroll; + } + + /** + Speed of the scrolling + */ + public void setSpeed(float speed) { + this.speed = speed; + } + + /** + Scrolling will only happen when this flag is true (be default its always true) + */ + public void setFlag(boolean flag) { + this.flag = flag; + } +} \ No newline at end of file diff --git a/src/main/java/net/silentclient/client/utils/SilentSocket.java b/src/main/java/net/silentclient/client/utils/SilentSocket.java deleted file mode 100644 index 5c9023d..0000000 --- a/src/main/java/net/silentclient/client/utils/SilentSocket.java +++ /dev/null @@ -1,94 +0,0 @@ -package net.silentclient.client.utils; - -import java.net.URI; -import java.net.URISyntaxException; - -import org.json.JSONException; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import io.socket.client.IO; -import io.socket.client.Socket; -import io.socket.emitter.Emitter.Listener; -import net.minecraft.client.Minecraft; -import net.silentclient.client.Client; -import net.silentclient.client.utils.types.NotificationResponse; -import net.silentclient.client.utils.types.PlayerResponse; - -public class SilentSocket { - private Socket sock; - private URI _url; - private String _token; - - private Listener connectListener; - private Listener disconectListener; - private Listener accountListener; - private Listener notificationListener; - private Listener errorListener; - - public SilentSocket(String server) throws URISyntaxException { - _url = new URI(server); - sock = IO.socket(_url); - connectListener = arg0 -> { - Client.logger.info("Connected to Silent Socket!"); - sock.emit("set_token", _token); - }; - - disconectListener = arg0 -> Client.logger.info("Disconnected from Silent Socket!"); - - notificationListener = arg0 -> { - try { - GsonBuilder builder = new GsonBuilder(); - Gson gson = builder.create(); - NotificationResponse response = gson.fromJson(arg0[0].toString(), NotificationResponse.class); - Client.logger.info("Received notification via API: " + arg0[0].toString()); - NotificationUtils.showNotification(response.getStatus(), response.getMessage()); - } catch (Exception err) { - Client.logger.catching(err); - } - }; - - accountListener = arg0 -> { - try { - GsonBuilder builder = new GsonBuilder(); - Gson gson = builder.create(); - PlayerResponse response = gson.fromJson(arg0[0].toString(), PlayerResponse.class); - if(response.getAccount() != null) { - Client.logger.info("Received account via Websocket: " + response.getAccount().getUsername()); - Players.handleAccount(response.getAccount()); - } - } catch (Exception err) { - Client.logger.catching(err); - } - }; - - errorListener = arg0 -> Client.logger.error("Silent Socket Error!"); - - sock.on(Socket.EVENT_CONNECT, connectListener) - .on(Socket.EVENT_DISCONNECT, disconectListener) - .on(Socket.EVENT_ERROR, errorListener) - .on("account", accountListener) - .on("notification", notificationListener) - .on("update_information", arg0 -> Client.logger.info("User information updated: " + arg0[0].toString())); - } - - public Socket getSocket() { - return sock; - } - - - public void Connect(String token) throws JSONException { - _token = token; - - sock.connect(); - } - - public void Disconnect() { - sock.disconnect(); - } - - public boolean getConnected() { - return sock.connected(); - } -} diff --git a/src/main/java/net/silentclient/client/utils/animations/AnimationHandler.java b/src/main/java/net/silentclient/client/utils/animations/AnimationHandler.java index f7092aa..05b8159 100644 --- a/src/main/java/net/silentclient/client/utils/animations/AnimationHandler.java +++ b/src/main/java/net/silentclient/client/utils/animations/AnimationHandler.java @@ -8,26 +8,20 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.init.Items; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemCloth; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.potion.Potion; import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; -import net.silentclient.client.Client; import net.silentclient.client.event.EventTarget; import net.silentclient.client.event.impl.ClientTickEvent; import net.silentclient.client.mixin.accessors.ItemFoodAccessor; import net.silentclient.client.mods.render.AnimationsMod; - import org.lwjgl.opengl.GL11; public class AnimationHandler { - private static final AnimationHandler INSTANCE = new AnimationHandler(); + private static final AnimationHandler INSTANCE = new AnimationHandler(); private final Minecraft mc = Minecraft.getMinecraft(); public static AnimationHandler getInstance() { @@ -62,13 +56,14 @@ public class AnimationHandler { */ private int getArmSwingAnimationEnd(EntityPlayerSP player) { return player.isPotionActive(Potion.digSpeed) ? 5 - player.getActivePotionEffect(Potion.digSpeed).getAmplifier() : - (player.isPotionActive(Potion.digSlowdown) ? 8 + player.getActivePotionEffect(Potion.digSlowdown).getAmplifier() * 2 : 6); + (player.isPotionActive(Potion.digSlowdown) ? 8 + player.getActivePotionEffect(Potion.digSlowdown).getAmplifier() * 2 : 6); } /** * Updates the swing progress, also enables swing if hitting a block */ - private void updateSwingProgress() { + @EventTarget + public void updateSwingProgress(ClientTickEvent event) { final EntityPlayerSP player = mc.thePlayer; if (player == null) { return; @@ -78,9 +73,9 @@ public class AnimationHandler { int max = getArmSwingAnimationEnd(player); - if (Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Punching Animation").getValBoolean() && mc.gameSettings.keyBindAttack.isKeyDown() && - mc.objectMouseOver != null && - mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if (AnimationsMod.getSettingBoolean("Punching During Usage") && mc.gameSettings.keyBindAttack.isKeyDown() && + mc.objectMouseOver != null && + mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { if (!this.isSwingInProgress || this.swingProgressInt >= max >> 1 || this.swingProgressInt < 0) { isSwingInProgress = true; swingProgressInt = -1; @@ -101,11 +96,6 @@ public class AnimationHandler { this.swingProgress = (float) this.swingProgressInt / (float) max; } - @EventTarget - public void onClientTick(ClientTickEvent event) { - updateSwingProgress(); - } - /** * Renders an item from the first person perspective * The following code has been taken from 1.7 and heavily modified to be readable @@ -124,23 +114,12 @@ public class AnimationHandler { } final EnumAction action = stack.getItemUseAction(); - if ((item == Items.fishing_rod && !(Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Rod Position").getValBoolean())) - || (action == EnumAction.NONE && !(Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Item Positions").getValBoolean())) - || (action == EnumAction.BLOCK && !(Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Block Animation").getValBoolean())) - || (action == EnumAction.BOW && !(Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Bow Pullback").getValBoolean()))) { + if ((item == Items.fishing_rod && !AnimationsMod.getSettingBoolean("1.7 Rod Position")) + || (action == EnumAction.NONE && !AnimationsMod.getSettingBoolean("1.7 Item Positions")) + || (action == EnumAction.BLOCK && !AnimationsMod.getSettingBoolean("1.7 Block Animation")) + || (action == EnumAction.BOW && !AnimationsMod.getSettingBoolean("1.7 Bow Pullback"))) { return false; } - - if(mc.thePlayer != null && Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Punching Animation").getValBoolean() - && mc.objectMouseOver != null - && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK - && mc.thePlayer != null - && mc.gameSettings.keyBindAttack.isKeyDown() && mc.gameSettings.keyBindUseItem.isKeyDown() - && mc.thePlayer.getItemInUseCount() > 0 && (!mc.thePlayer.isSwingInProgress - || mc.thePlayer.swingProgressInt < 0)) { - mc.thePlayer.swingProgressInt = -1; - mc.thePlayer.isSwingInProgress = true; - } final EntityPlayerSP player = mc.thePlayer; @@ -180,7 +159,7 @@ public class AnimationHandler { final float swingProgress = getSwingProgress(partialTicks); boolean blockHitOverride = false; - if (Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Punching Animation").getValBoolean() && useCount <= 0 && mc.gameSettings.keyBindUseItem.isKeyDown()) { + if (AnimationsMod.getSettingBoolean("Punching During Usage") && useCount <= 0 && mc.gameSettings.keyBindUseItem.isKeyDown()) { boolean block = action == EnumAction.BLOCK; boolean consume = false; if (item instanceof ItemFood) { @@ -200,17 +179,15 @@ public class AnimationHandler { case EAT: case DRINK: doConsumeAnimation(stack, useCount, partialTicks); - doEquipAndSwingTransform(equipProgress, Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Block-Hitting Animation").getValBoolean() ? swingProgress : 0); + doEquipAndSwingTransform(equipProgress, AnimationsMod.getSettingBoolean("Block-Hitting Animation") ? swingProgress : 0); break; case BLOCK: - doEquipAndSwingTransform(equipProgress, Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Block-Hitting Animation").getValBoolean() ? swingProgress : 0); + doEquipAndSwingTransform(equipProgress, AnimationsMod.getSettingBoolean("Block-Hitting Animation") ? swingProgress : 0); doSwordBlockAnimation(); break; case BOW: - doEquipAndSwingTransform(equipProgress, Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Block-Hitting Animation").getValBoolean() ? swingProgress : 0); + doEquipAndSwingTransform(equipProgress, AnimationsMod.getSettingBoolean("Block-Hitting Animation") ? swingProgress : 0); doBowAnimation(stack, useCount, partialTicks); - default: - break; } } else { doSwingTranslation(swingProgress); @@ -240,7 +217,7 @@ public class AnimationHandler { } public void doSwordBlock3rdPersonTransform() { - if (Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Block Animation").getValBoolean()) { + if (AnimationsMod.getSettingBoolean("1.7 3rd Person Block Animation")) { GlStateManager.translate(-0.15f, -0.2f, 0); GlStateManager.rotate(70, 1, 0, 0); GlStateManager.translate(0.119f, 0.2f, -0.024f); @@ -257,17 +234,17 @@ public class AnimationHandler { private boolean doFirstPersonTransform(ItemStack stack) { switch (stack.getItemUseAction()) { case BOW: - if (!(Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Bow Pullback").getValBoolean())) return true; + if (!AnimationsMod.getSettingBoolean("1.7 Bow Pullback")) return true; break; case EAT: case DRINK: - if (!(Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Eating & Drinking Animation").getValBoolean())) return true; + if (!AnimationsMod.getSettingBoolean("Consume Animation")) return true; break; case BLOCK: - if (!(Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Block Animation").getValBoolean())) return true; + if (!AnimationsMod.getSettingBoolean("1.7 Block Animation")) return true; break; case NONE: - if (!(Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Item Positions").getValBoolean())) return true; + if (!AnimationsMod.getSettingBoolean("1.7 Item Positions")) return true; } GlStateManager.translate(0.58800083f, 0.36999986f, -0.77000016f); @@ -294,7 +271,7 @@ public class AnimationHandler { } private void doConsumeAnimation(ItemStack stack, int useCount, float partialTicks) { - if (Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Eating & Drinking Animation").getValBoolean()) { + if (AnimationsMod.getSettingBoolean("Consume Animation")) { float useAmount = (float) useCount - partialTicks + 1.0F; float useAmountNorm = 1.0F - useAmount / (float) stack.getMaxItemUseDuration(); float useAmountPow = 1.0F - useAmountNorm; @@ -303,7 +280,7 @@ public class AnimationHandler { useAmountPow = useAmountPow * useAmountPow * useAmountPow; float useAmountFinal = 1.0F - useAmountPow; GlStateManager.translate(0.0F, MathHelper.abs(MathHelper.cos(useAmount / 4.0F * - (float) Math.PI) * 0.1F) * (float) ((double) useAmountNorm > 0.2D ? 1 : 0), 0.0F); + (float) Math.PI) * 0.1F) * (float) ((double) useAmountNorm > 0.2D ? 1 : 0), 0.0F); GlStateManager.translate(useAmountFinal * 0.6F, -useAmountFinal * 0.5F, 0.0F); GlStateManager.rotate(useAmountFinal * 90.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(useAmountFinal * 10.0F, 1.0F, 0.0F, 0.0F); @@ -330,8 +307,8 @@ public class AnimationHandler { float swingProgress2 = MathHelper.sin(swingProgress * (float) Math.PI); float swingProgress3 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float) Math.PI); GlStateManager.translate(-swingProgress3 * 0.4F, - MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float) Math.PI * 2.0F) * 0.2F, - -swingProgress2 * 0.2F); + MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float) Math.PI * 2.0F) * 0.2F, + -swingProgress2 * 0.2F); } private void doEquipAndSwingTransform(float equipProgress, float swingProgress) { @@ -367,12 +344,12 @@ public class AnimationHandler { if (pullbackNorm > 0.1F) { GlStateManager.translate(0.0F, MathHelper.sin((totalPullback - 0.1F) * 1.3F) * 0.01F - * (pullbackNorm - 0.1F), 0.0F); + * (pullbackNorm - 0.1F), 0.0F); } GlStateManager.translate(0.0F, 0.0F, pullbackNorm * 0.1F); - if (Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Bow Pullback").getValBoolean()) { + if (AnimationsMod.getSettingBoolean("1.7 Bow Pullback")) { GlStateManager.rotate(-335.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(-50.0F, 0.0F, 1.0F, 0.0F); GlStateManager.translate(0.0F, 0.5F, 0.0F); @@ -381,10 +358,10 @@ public class AnimationHandler { float zScale = 1.0F + pullbackNorm * 0.2F; GlStateManager.scale(1.0F, 1.0F, zScale); - if (Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() && Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Bow Pullback").getValBoolean()) { + if (AnimationsMod.getSettingBoolean("1.7 Bow Pullback")) { GlStateManager.translate(0.0F, -0.5F, 0.0F); GlStateManager.rotate(50.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(335.0F, 0.0F, 0.0F, 1.0F); } } -} +} \ No newline at end of file diff --git a/src/main/java/net/silentclient/client/utils/animations/FishingLineHandler.java b/src/main/java/net/silentclient/client/utils/animations/FishingLineHandler.java index 243c807..3ffe6dd 100644 --- a/src/main/java/net/silentclient/client/utils/animations/FishingLineHandler.java +++ b/src/main/java/net/silentclient/client/utils/animations/FishingLineHandler.java @@ -4,15 +4,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.util.Vec3; public class FishingLineHandler { - private static final FishingLineHandler INSTANCE = new FishingLineHandler(); + private static final FishingLineHandler INSTANCE = new FishingLineHandler(); - public static FishingLineHandler getInstance() { - return INSTANCE; - } + public static FishingLineHandler getInstance() { + return INSTANCE; + } - public Vec3 getOffset() { - double fov = Minecraft.getMinecraft().gameSettings.fovSetting; - double decimalFov = fov / 110; - return new Vec3(((-decimalFov + (decimalFov / 2.5)) - (decimalFov / 8)) + 0.16, 0, 0.4D); - } + public Vec3 getOffset() { + double fov = Minecraft.getMinecraft().gameSettings.fovSetting; + double decimalFov = fov / 110; + return new Vec3(((-decimalFov + (decimalFov / 2.5)) - (decimalFov / 8)) + 0.16, 0, 0.4D); + } } diff --git a/src/main/java/net/silentclient/client/utils/animations/OldSneaking.java b/src/main/java/net/silentclient/client/utils/animations/OldSneaking.java deleted file mode 100644 index d3d78c9..0000000 --- a/src/main/java/net/silentclient/client/utils/animations/OldSneaking.java +++ /dev/null @@ -1,59 +0,0 @@ -package net.silentclient.client.utils.animations; - -import net.minecraft.entity.Entity; - -public class OldSneaking { - private static long sneak = 0L; - private static boolean is = false; - - public static float getCustomEyeHeight(Entity entity) - { - if (is != entity.isSneaking() || sneak <= 0L) - { - sneak = System.currentTimeMillis(); - } - - is = entity.isSneaking(); - float f = 1.62F; - - if (entity.isSneaking()) - { - int i = (int) (sneak + 8L - System.currentTimeMillis()); - - if (i > -50) - { - f = (float) (f + i * 0.0017D); - - if (f < 0.0F || f > 10.0F) - { - f = 1.54F; - } - } - else - { - f = (float) (f - 0.08D); - } - } - else - { - int j = (int) (sneak + 8L - System.currentTimeMillis()); - - if (j > -50) - { - f = (float) (f - j * 0.0017D); - f = (float) (f - 0.08D); - - if (f < 0.0F) - { - f = 1.62F; - } - } - else - { - f = f - 0.0F; - } - } - - return f; - } -} diff --git a/src/main/java/net/silentclient/client/utils/animations/SneakHandler.java b/src/main/java/net/silentclient/client/utils/animations/SneakHandler.java new file mode 100644 index 0000000..60ba0a0 --- /dev/null +++ b/src/main/java/net/silentclient/client/utils/animations/SneakHandler.java @@ -0,0 +1,50 @@ +package net.silentclient.client.utils.animations; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityPlayerSP; +import net.silentclient.client.event.EventTarget; +import net.silentclient.client.event.impl.ClientTickEvent; +import net.silentclient.client.mods.render.AnimationsMod; + +public class SneakHandler { + private static final float START_HEIGHT = 1.62f; + private static final float END_HEIGHT = 1.54f; + + private static final SneakHandler INSTANCE = new SneakHandler(); + + private float eyeHeight; + private float lastEyeHeight; + + public static SneakHandler getInstance() { + return INSTANCE; + } + + public float getEyeHeight(float partialTicks) { + if (!AnimationsMod.getSettingBoolean("Smooth Sneaking")) { + return eyeHeight; + } + + return lastEyeHeight + (eyeHeight - lastEyeHeight) * partialTicks; + } + + @EventTarget + public void onTick(ClientTickEvent event) { + lastEyeHeight = eyeHeight; + + final EntityPlayerSP player = Minecraft.getMinecraft().thePlayer; + if (player == null) { + eyeHeight = START_HEIGHT; + return; + } + + if (player.isSneaking()) { + eyeHeight = END_HEIGHT; + } else if (!AnimationsMod.getSettingBoolean("Smooth Sneaking")) { + eyeHeight = START_HEIGHT; + } else if (eyeHeight < START_HEIGHT) { + float delta = START_HEIGHT - eyeHeight; + delta *= 0.4; + eyeHeight = START_HEIGHT - delta; + } + } +} diff --git a/src/main/java/net/silentclient/client/utils/types/GlobalSettings.java b/src/main/java/net/silentclient/client/utils/types/GlobalSettings.java index b7a32dc..d8dbe15 100644 --- a/src/main/java/net/silentclient/client/utils/types/GlobalSettings.java +++ b/src/main/java/net/silentclient/client/utils/types/GlobalSettings.java @@ -9,11 +9,13 @@ public class GlobalSettings { public boolean lite; public boolean displayedTutorial; public boolean configsMigrated; + public boolean packsPanoramaEnabled; public GlobalSettings() { - this.config = "config.txt"; + this.config = "Default.txt"; this.lite = false; this.displayedTutorial = false; + this.packsPanoramaEnabled = true; } public String getConfig() { @@ -45,6 +47,14 @@ public class GlobalSettings { this.configsMigrated = configsMigrated; } + public boolean isPacksPanoramaEnabled() { + return packsPanoramaEnabled; + } + + public void setPacksPanoramaEnabled(boolean packsPanoramaEnabled) { + this.packsPanoramaEnabled = packsPanoramaEnabled; + } + public void save() { try { FileOutputStream outputStream = new FileOutputStream(Client.getInstance().getGlobalSettingsFile()); diff --git a/src/main/java/net/silentclient/client/utils/types/PlayerResponse.java b/src/main/java/net/silentclient/client/utils/types/PlayerResponse.java index 4e4035e..0efb4f6 100644 --- a/src/main/java/net/silentclient/client/utils/types/PlayerResponse.java +++ b/src/main/java/net/silentclient/client/utils/types/PlayerResponse.java @@ -1,6 +1,9 @@ package net.silentclient.client.utils.types; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; import net.silentclient.client.Client; +import net.silentclient.client.mixin.ducks.AbstractClientPlayerExt; import net.silentclient.client.utils.NotificationUtils; import net.silentclient.client.utils.Players; import net.silentclient.client.utils.Requests; @@ -99,7 +102,10 @@ public class PlayerResponse extends AbstractReply { } public void updateFavorite(int id, String type) { - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("updateFavorite") { public void run() { Requests.post("https://api.silentclient.net/account/update_favorite_cosmetics", new JSONObject().put("id", id).put("type", type).toString()); @@ -110,7 +116,10 @@ public class PlayerResponse extends AbstractReply { public void setBandanaColor(int color) { this.bandana_color = color; - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread() { public void run() { Requests.post("https://api.silentclient.net/plus/set_bandana_color", new JSONObject().put("color", color).toString()); @@ -154,7 +163,10 @@ public class PlayerResponse extends AbstractReply { public void setShowNametagMessage(boolean show) { this.show_nametag_message = show ? 1 : 0; Players.reload(); - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("setShowNametagMessage") { public void run() { Requests.post("https://api.silentclient.net/plus/set_nametag_message", new JSONObject().put("enabled", show).toString()); @@ -166,7 +178,10 @@ public class PlayerResponse extends AbstractReply { public void setNametagMessage(String message) { this.nametag_message = message; Players.reload(); - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } String response = Requests.post("https://api.silentclient.net/plus/set_nametag_message", new JSONObject().put("message", message).toString()); if(response != null) { NotificationUtils.showNotification("success", "Nametag Message updated successfully!"); @@ -182,7 +197,10 @@ public class PlayerResponse extends AbstractReply { public void setCapeShoulders(boolean shoulders) { this.cape_shoulders = shoulders ? 1 : 0; - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("setShoulders") { public void run() { Requests.post("https://api.silentclient.net/account/set_cape_shoulders", new JSONObject().put("enabled", shoulders).toString()); @@ -195,7 +213,10 @@ public class PlayerResponse extends AbstractReply { public void setCapeType(String type) { this.cape_type = type; - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("setCapeType") { public void run() { Requests.post("https://api.silentclient.net/account/set_cape_type", new JSONObject().put("type", type).toString()); @@ -287,7 +308,10 @@ public class PlayerResponse extends AbstractReply { public void setSelectedBandana(int id) { final int bandanaId = id == this.selected_bandana ? 0 : id; this.selected_bandana = bandanaId; - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("setBandana") { public void run() { Requests.post("https://api.silentclient.net/account/select_bandana", new JSONObject().put("id", bandanaId).toString()); @@ -314,7 +338,10 @@ public class PlayerResponse extends AbstractReply { break; } final int cid = hatId; - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("setHat") { public void run() { Requests.post("https://api.silentclient.net/account/select_hat", new JSONObject().put("id", cid).put("type", type).toString()); @@ -327,7 +354,10 @@ public class PlayerResponse extends AbstractReply { public void setSelectedShield(int id) { final int hatId = id == this.selected_shield ? 0 : id; this.selected_shield = hatId; - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("setShield") { public void run() { Requests.post("https://api.silentclient.net/account/select_shield", new JSONObject().put("id", hatId).toString()); @@ -344,7 +374,10 @@ public class PlayerResponse extends AbstractReply { public void setSelectedCape(int id) { final int capeId = id == this.selected_cape ? 0 : id; this.selected_cape = capeId; - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("setCapeRequest") { public void run() { Requests.post("https://api.silentclient.net/account/select_cape", new JSONObject().put("id", capeId).toString()); @@ -361,7 +394,10 @@ public class PlayerResponse extends AbstractReply { public void setSelectedWings(int id) { final int wingsId = id == this.selected_wings ? 0 : id; this.selected_wings = wingsId; - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("setWingsRequest") { public void run() { Requests.post("https://api.silentclient.net/account/select_wings", new JSONObject().put("id", wingsId).toString()); @@ -378,7 +414,10 @@ public class PlayerResponse extends AbstractReply { public void setSelectedIcon(int id) { final int iconId = id == this.selected_icon ? 0 : id; this.selected_icon = iconId; - Players.handleAccount(this); + Players.reload(); + if(Minecraft.getMinecraft().thePlayer != null) { + Players.getPlayerStatus(false, ((AbstractClientPlayerExt) Minecraft.getMinecraft().thePlayer).silent$getNameClear(), EntityPlayer.getUUID(Minecraft.getMinecraft().thePlayer.getGameProfile()), Minecraft.getMinecraft().thePlayer); + } (new Thread("setIconRequest") { public void run() { Requests.post("https://api.silentclient.net/account/select_icon", new JSONObject().put("id", iconId).toString()); diff --git a/src/main/resources/assets/minecraft/silentclient/configs/BedWars.txt b/src/main/resources/assets/minecraft/silentclient/configs/BedWars.txt index 34121cf..ccc5df2 100644 --- a/src/main/resources/assets/minecraft/silentclient/configs/BedWars.txt +++ b/src/main/resources/assets/minecraft/silentclient/configs/BedWars.txt @@ -1,11 +1,11 @@ MOD:FPS:true -POS:FPS:0.9078125:0.2 +POS:FPS:0.93125:0.15 MOD:CPS:true -POS:CPS:0.9078125:0.24166666666666667 +POS:CPS:0.93125:0.17777777777777778 MOD:Toggle Sprint:false POS:Toggle Sprint:0.0:0.0 MOD:Keystrokes:true -POS:Keystrokes:0.9078125:0.0 +POS:Keystrokes:0.93125:0.002777777777777778 MOD:Perspective:false MOD:Animations:true MOD:Armor Status:false @@ -20,7 +20,7 @@ POS:Ping:0.0:0.0 MOD:Item Physics:false MOD:Pack Display:false POS:Pack Display:0.0:0.0 -MOD:FullBright:false +MOD:FullBright:true MOD:Clock:false POS:Clock:0.0:0.0 MOD:Speedometer:false @@ -50,9 +50,9 @@ MOD:Render:false MOD:Weather:false MOD:Tab:true MOD:Chat:true -MOD:Inventory Blur:false +MOD:Inventory Blur:true MOD:Coordinates:true -POS:Coordinates:0.0015625:0.002777777777777778 +POS:Coordinates:0.003125:0.005555555555555556 MOD:Chunk Borders:false MOD:Hitboxes:false MOD:Nametags:true @@ -71,7 +71,8 @@ POS:Player Counter:0.0:0.0 MOD:BlockInfo:false POS:BlockInfo:0.0:0.0 MOD:Motion Blur:false -SET:Scale:FPS:3.0 +MOD:Quickplay:false +SET:Scale:FPS:2.0 SET:Background:FPS:true SET:Background Color:FPS:-16777216:false:127 SET:Color:FPS:-1:false:255 @@ -79,7 +80,7 @@ SET:Font Shadow:FPS:true SET:Brackets:FPS:false SET:Fancy Font:FPS:false SET:Text After Value:FPS:FPS -SET:Scale:CPS:3.0 +SET:Scale:CPS:2.0 SET:Background:CPS:true SET:Background Color:CPS:-16777216:false:127 SET:Color:CPS:-1:false:255 @@ -99,39 +100,43 @@ SET:Fancy Font:Toggle Sprint:false SET:Sprint Mode:Toggle Sprint:Toggle SET:Sprinting Text:Toggle Sprint:Sprinting SET:Show HUD Text:Toggle Sprint:true -SET:Scale:Keystrokes:3.0 +SET:Scale:Keystrokes:2.20 SET:Font Shadow:Keystrokes:true SET:Fancy Font:Keystrokes:false SET:Background:Keystrokes:true +SET:CPS Mode:Keystrokes:None SET:Color:Keystrokes:-1:false:255 SET:Background Color:Keystrokes:-16777216:false:127 SET:Clicked Color:Keystrokes:-16777216:false:255 SET:Clicked Background Color:Keystrokes:-1:false:127 SET:Fade Delay:Keystrokes:100.0 SET:Show LMB/RMB:Keystrokes:true -SET:Show CPS:Keystrokes:false SET:Show Space:Keystrokes:true SET:Replace Names With Arrow:Keystrokes:false +SET:Keybind:Perspective:56 SET:1.7 Item Positions:Animations:true SET:1.7 Bow Pullback:Animations:true SET:1.7 Block Animation:Animations:true SET:1.7 Rod Position:Animations:true -SET:1.7 Punching Animation:Animations:true -SET:1.7 Eating & Drinking Animation:Animations:true -SET:1.7 Block-Hitting Animation:Animations:true -SET:1.7 Item Switching Animation:Animations:true +SET:1.7 3rd Person Block Animation:Animations:true SET:1.7 Throwing:Animations:true SET:1.7 Enchant Glint:Animations:true SET:1.7 Skins:Animations:false SET:Smooth Sneaking:Animations:true SET:No Shaking:Animations:true -SET:Scale:Armor Status:3.0 +SET:Consume Animation:Animations:true +SET:Block-Hitting Animation:Animations:true +SET:Red Armor:Animations:true +SET:Punching During Usage:Animations:true +SET:Item Switching Animation:Animations:true +SET:Remove Health Bar Flashing:Animations:true +SET:Scale:Armor Status:2.0 SET:Orientation:Armor Status:Vertical SET:Font Shadow:Armor Status:true SET:Show Percentage:Armor Status:true SET:Percentage Color:Armor Status:-1:false:255 SET:Fancy Font:Armor Status:false -SET:Scale:Memory:3.0 +SET:Scale:Memory:2.0 SET:Background:Memory:true SET:Background Color:Memory:-16777216:false:127 SET:Color:Memory:-1:false:255 @@ -140,7 +145,7 @@ SET:Brackets:Memory:false SET:Fancy Font:Memory:false SET:Text After Value:Memory:Mem SET:Phrase:Auto GG:gg -SET:Scale:Potion Hud:3.0 +SET:Scale:Potion Hud:2.0 SET:Font Shadow:Potion Hud:true SET:Fancy Font:Potion Hud:false SET:Show Potion Name:Potion Hud:true @@ -148,7 +153,7 @@ SET:Potion Name Color:Potion Hud:-1:false:255 SET:Show Duration:Potion Hud:true SET:Duration Color:Potion Hud:-6513257:false:255 SET:Potions In Inventory:Potion Hud:true -SET:Scale:Ping:3.0 +SET:Scale:Ping:2.0 SET:Background:Ping:true SET:Background Color:Ping:-16777216:false:127 SET:Color:Ping:-1:false:255 @@ -157,27 +162,25 @@ SET:Brackets:Ping:false SET:Fancy Font:Ping:false SET:Text After Value:Ping:ms SET:Speed:Item Physics:1.0 -SET:Scale:Pack Display:3.0 +SET:Scale:Pack Display:2.0 SET:Background:Pack Display:true SET:Background Color:Pack Display:-16777216:false:127 SET:Color:Pack Display:-1:false:255 SET:Font Shadow:Pack Display:true SET:Brackets:Pack Display:false SET:Fancy Font:Pack Display:false -SET:Text After Value:Pack Display: SET:Pack Icon:Pack Display:true SET:Pack Order:Pack Display:First Pack SET:Pack Title Replacement:Pack Display:White Text Only -SET:Scale:Clock:3.0 +SET:Scale:Clock:2.0 SET:Background:Clock:true SET:Background Color:Clock:-16777216:false:127 SET:Color:Clock:-1:false:255 SET:Font Shadow:Clock:true SET:Brackets:Clock:false SET:Fancy Font:Clock:false -SET:Text After Value:Clock: SET:24 Hour Format:Clock:false -SET:Scale:Speedometer:3.0 +SET:Scale:Speedometer:2.0 SET:Background:Speedometer:true SET:Background Color:Speedometer:-16777216:false:127 SET:Color:Speedometer:-1:false:255 @@ -185,7 +188,7 @@ SET:Font Shadow:Speedometer:true SET:Brackets:Speedometer:false SET:Fancy Font:Speedometer:false SET:Text After Value:Speedometer:m/s -SET:Scale:Reach Display:3.0 +SET:Scale:Reach Display:2.0 SET:Background:Reach Display:true SET:Background Color:Reach Display:-16777216:false:127 SET:Color:Reach Display:-1:false:255 @@ -193,7 +196,7 @@ SET:Font Shadow:Reach Display:true SET:Brackets:Reach Display:false SET:Fancy Font:Reach Display:false SET:Text After Value:Reach Display:blocks -SET:Scale:Day Counter:3.0 +SET:Scale:Day Counter:2.0 SET:Background:Day Counter:true SET:Background Color:Day Counter:-16777216:false:127 SET:Color:Day Counter:-1:false:255 @@ -201,7 +204,7 @@ SET:Font Shadow:Day Counter:true SET:Brackets:Day Counter:false SET:Fancy Font:Day Counter:false SET:Text After Value:Day Counter:Days -SET:Scale:Server Address:3.0 +SET:Scale:Server Address:2.0 SET:Background:Server Address:true SET:Background Color:Server Address:-16777216:false:127 SET:Color:Server Address:-1:false:255 @@ -215,12 +218,13 @@ SET:Use Own Skin For All:Nick Hider:false SET:Use Real Skin For Self:Nick Hider:true SET:Custom Name:Nick Hider:You SET:Time:Time Changer:0.0 +SET:Keybind:Zoom:46 SET:Scroll:Zoom:false SET:Smooth Zoom:Zoom:true SET:Zoom Speed:Zoom:14.0 SET:Factor:Zoom:4.0 SET:Smooth Camera:Zoom:true -SET:Scale:Combo Counter:3.0 +SET:Scale:Combo Counter:2.0 SET:Background:Combo Counter:true SET:Background Color:Combo Counter:-16777216:false:127 SET:Color:Combo Counter:-1:false:255 @@ -293,6 +297,7 @@ SET:Gui Debug:General:false SET:Hide mods in F3:General:true SET:Vanilla ESC Menu Layout:General:false SET:Menu Background Blur:General:true +SET:Mod Menu Keybind:General:54 SET:Silent Logo Location:General:Bottom Right Corner SET:Silent Button Sounds:General:false SET:Menu Animations:General:true @@ -316,7 +321,7 @@ SET:Smooth Speed:Chat:4.0 SET:Disable Background:Chat:true SET:Anti-Spam:Chat:false SET:Dark Background:Inventory Blur:false -SET:Scale:Coordinates:3.0 +SET:Scale:Coordinates:2.0 SET:Background:Coordinates:true SET:Background Color:Coordinates:-16777216:false:127 SET:Color:Coordinates:-1:false:255 @@ -357,7 +362,7 @@ SET:Outline:Block Overlay:true SET:Outline Color:Block Overlay:-1:false:255 SET:Outline Width:Block Overlay:3.0 SET:Fill:Block Overlay:true -SET:Fill Color:Block Overlay:-1:false:56 +SET:Fill Color:Block Overlay:-1:false:127 SET:Show Sharpness:Particles:true SET:Always Sharpness Particles:Particles:false SET:Sharpness Multiplier:Particles:1.0 @@ -386,7 +391,7 @@ SET:Fire Height:Pack Tweaks:0.0 SET:Fire Opacity:Pack Tweaks:0.8999999761581421 SET:Hide Pumpkin Overlay:Pack Tweaks:false SET:Water Fog:Pack Tweaks:true -SET:Scale:Player Counter:3.0 +SET:Scale:Player Counter:2.0 SET:Background:Player Counter:true SET:Background Color:Player Counter:-16777216:false:127 SET:Color:Player Counter:-1:false:255 @@ -394,7 +399,7 @@ SET:Font Shadow:Player Counter:true SET:Brackets:Player Counter:false SET:Fancy Font:Player Counter:false SET:Text After Value:Player Counter:Players Online -SET:Scale:BlockInfo:3.0 +SET:Scale:BlockInfo:2.0 SET:Block Coords:BlockInfo:true SET:Correct Tool:BlockInfo:true SET:Break Time:BlockInfo:true @@ -404,4 +409,161 @@ SET:Color:BlockInfo:-1:false:255 SET:Font Shadow:BlockInfo:true SET:Fancy Font:BlockInfo:false SET:Amount:Motion Blur:0.5 -ATC:/play solo_insane:13 +SET:Open Menu:Quickplay:12 +SET:Quickplay Mode&Hypixel&/lobby main:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/stuck:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby arcade:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_day_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_bounty_hunters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pvp_ctw:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_creeper_attack:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_dragon_wars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_ender_spleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_farm_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_soccer:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_starwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_party_pooper:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_prop_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hole_in_the_wall:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_simon_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_santa_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_mini_walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_party_games_1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pixel_painters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_throw_out:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_dead_end:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_bad_blood:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_alien_arcadium:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby bedwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_three:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_two_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_castle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby blitz:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby buildbattle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_pro:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_guess_the_build:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play vampirez:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_solo:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_teams:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play paintball:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_1v1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tkr:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby cops:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby duels:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_blitz_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bow_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bowspleef_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_boxing_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_2v2v2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_capture_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_classic_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_combo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_potion_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_parkour_eight:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sumo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_meetup:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby murder:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_assassins:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_infection:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_double_up:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby skywars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_hunters_vs_beasts:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_2v2_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_friends_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_1v1_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby tnt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntrun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_pvprun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_bowspleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntag:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby warlords:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_ctf_mini:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_domination:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_team_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby woolwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play wool_wool_wars_two_four:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BLOCK_PARTY:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DROPPER:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play MURDERMYSTERY_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_SOLO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_TEAM:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_4v4v4v4:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_THE_BRIDGE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_BOXING:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_COMBO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_NODEBUFF:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_OP:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_PEARL_FIGHT:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_STICK_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_SUMO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_UHC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_SOLO_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_TEAM_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_RANKED:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_RUN:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_TAG:Quickplay:-1 +ATC:/ce fushka:40 diff --git a/src/main/resources/assets/minecraft/silentclient/configs/Default.txt b/src/main/resources/assets/minecraft/silentclient/configs/Default.txt new file mode 100644 index 0000000..1173461 --- /dev/null +++ b/src/main/resources/assets/minecraft/silentclient/configs/Default.txt @@ -0,0 +1,579 @@ +MOD:FPS:false +POS:FPS:0.0:0.0 +MOD:CPS:false +POS:CPS:0.0:0.0 +MOD:Toggle Sprint:false +POS:Toggle Sprint:0.0:0.0 +MOD:Keystrokes:false +POS:Keystrokes:0.0:0.0 +MOD:Perspective:false +MOD:Animations:true +MOD:Armor Status:false +POS:Armor Status:0.0:0.0 +MOD:Memory:false +POS:Memory:0.0:0.0 +MOD:Auto GG:false +MOD:Potion Hud:false +POS:Potion Hud:0.0:0.0 +MOD:Ping:false +POS:Ping:0.0:0.0 +MOD:Item Physics:false +MOD:Pack Display:false +POS:Pack Display:0.0:0.0 +MOD:FullBright:false +MOD:Clock:false +POS:Clock:0.0:0.0 +MOD:Speedometer:false +POS:Speedometer:0.0:0.0 +MOD:Reach Display:false +POS:Reach Display:0.0:0.0 +MOD:Day Counter:false +POS:Day Counter:0.0:0.0 +MOD:Server Address:false +POS:Server Address:0.0:0.0 +MOD:TNT Timer:false +MOD:Auto Tip:false +MOD:Level Head:false +MOD:Nick Hider:false +MOD:Time Changer:false +MOD:Zoom:true +MOD:Combo Counter:false +POS:Combo Counter:0.0:0.0 +MOD:Hit Color:false +MOD:UHC Overlay:false +MOD:FPS Boost:false +MOD:Clear Glass:false +MOD:Crosshair:false +MOD:Cosmetics:false +MOD:General:false +MOD:Render:false +MOD:Weather:false +MOD:Tab:true +MOD:Chat:true +MOD:Inventory Blur:false +MOD:Coordinates:false +POS:Coordinates:0.0:0.0 +MOD:Chunk Borders:false +MOD:Hitboxes:false +MOD:Nametags:true +MOD:Scoreboard:true +MOD:Block Overlay:false +MOD:Particles:false +MOD:Damage Tint:false +MOD:Titles:true +MOD:Color Saturation:false +MOD:Auto Text:false +MOD:Boss Bar:true +MOD:ToggleChat:false +MOD:Pack Tweaks:false +MOD:Player Counter:false +POS:Player Counter:0.0:0.0 +MOD:BlockInfo:false +POS:BlockInfo:0.0:0.0 +MOD:Test:false +MOD:Debug NPC:false +MOD:Hit Delay Fix:false +MOD:FPS Spoofer:false +MOD:Motion Blur:false +MOD:Quickplay:false +SET:Scale:FPS:2.0 +SET:Background:FPS:true +SET:Background Color:FPS:-16777216:false:127 +SET:Color:FPS:-1:false:255 +SET:Font Shadow:FPS:true +SET:Brackets:FPS:false +SET:Fancy Font:FPS:false +SET:Text After Value:FPS:FPS +SET:Scale:CPS:2.0 +SET:Background:CPS:true +SET:Background Color:CPS:-16777216:false:127 +SET:Color:CPS:-1:false:255 +SET:Font Shadow:CPS:true +SET:Brackets:CPS:false +SET:Fancy Font:CPS:false +SET:Text After Value:CPS:CPS +SET:CPS Type:CPS:LMB +SET:Remove CPS Text:CPS:false +SET:Scale:Toggle Sprint:2.0 +SET:Background:Toggle Sprint:false +SET:Background Color:Toggle Sprint:-16777216:false:127 +SET:Color:Toggle Sprint:-1:false:255 +SET:Font Shadow:Toggle Sprint:true +SET:Brackets:Toggle Sprint:true +SET:Fancy Font:Toggle Sprint:false +SET:Sprint Mode:Toggle Sprint:Toggle +SET:Sprinting Text:Toggle Sprint:Sprinting +SET:Show HUD Text:Toggle Sprint:true +SET:Scale:Keystrokes:2.200000047683716 +SET:Font Shadow:Keystrokes:true +SET:Fancy Font:Keystrokes:false +SET:Background:Keystrokes:true +SET:CPS Mode:Keystrokes:Small +SET:Color:Keystrokes:-1:false:255 +SET:Background Color:Keystrokes:-16777216:false:127 +SET:Clicked Color:Keystrokes:-16777216:false:255 +SET:Clicked Background Color:Keystrokes:-1:false:127 +SET:Fade Delay:Keystrokes:100.0 +SET:Show LMB/RMB:Keystrokes:true +SET:Show Space:Keystrokes:true +SET:Replace Names With Arrow:Keystrokes:false +SET:Keybind:Perspective:56 +SET:1.7 Item Positions:Animations:true +SET:1.7 Bow Pullback:Animations:true +SET:1.7 Block Animation:Animations:true +SET:1.7 Rod Position:Animations:true +SET:1.7 3rd Person Block Animation:Animations:true +SET:1.7 Throwing:Animations:true +SET:1.7 Enchant Glint:Animations:true +SET:1.7 Skins:Animations:false +SET:Smooth Sneaking:Animations:true +SET:No Shaking:Animations:true +SET:Consume Animation:Animations:true +SET:Block-Hitting Animation:Animations:true +SET:Red Armor:Animations:true +SET:Punching During Usage:Animations:true +SET:Item Switching Animation:Animations:true +SET:Remove Health Bar Flashing:Animations:true +SET:Scale:Armor Status:2.0 +SET:Orientation:Armor Status:Vertical +SET:Font Shadow:Armor Status:true +SET:Show Percentage:Armor Status:true +SET:Percentage Color:Armor Status:-1:false:255 +SET:Fancy Font:Armor Status:false +SET:Scale:Memory:2.0 +SET:Background:Memory:true +SET:Background Color:Memory:-16777216:false:127 +SET:Color:Memory:-1:false:255 +SET:Font Shadow:Memory:true +SET:Brackets:Memory:false +SET:Fancy Font:Memory:false +SET:Text After Value:Memory:Mem +SET:Phrase:Auto GG:gg +SET:Scale:Potion Hud:2.0 +SET:Font Shadow:Potion Hud:true +SET:Fancy Font:Potion Hud:false +SET:Show Potion Name:Potion Hud:true +SET:Potion Name Color:Potion Hud:-1:false:255 +SET:Show Duration:Potion Hud:true +SET:Duration Color:Potion Hud:-6513257:false:255 +SET:Potions In Inventory:Potion Hud:true +SET:Scale:Ping:2.0 +SET:Background:Ping:true +SET:Background Color:Ping:-16777216:false:127 +SET:Color:Ping:-1:false:255 +SET:Font Shadow:Ping:true +SET:Brackets:Ping:false +SET:Fancy Font:Ping:false +SET:Text After Value:Ping:ms +SET:Speed:Item Physics:1.0 +SET:Scale:Pack Display:2.0 +SET:Background:Pack Display:true +SET:Background Color:Pack Display:-16777216:false:127 +SET:Color:Pack Display:-1:false:255 +SET:Font Shadow:Pack Display:true +SET:Brackets:Pack Display:false +SET:Fancy Font:Pack Display:false +SET:Pack Icon:Pack Display:true +SET:Pack Order:Pack Display:First Pack +SET:Pack Title Replacement:Pack Display:White Text Only +SET:Scale:Clock:2.0 +SET:Background:Clock:true +SET:Background Color:Clock:-16777216:false:127 +SET:Color:Clock:-1:false:255 +SET:Font Shadow:Clock:true +SET:Brackets:Clock:false +SET:Fancy Font:Clock:false +SET:24 Hour Format:Clock:false +SET:Scale:Speedometer:2.0 +SET:Background:Speedometer:true +SET:Background Color:Speedometer:-16777216:false:127 +SET:Color:Speedometer:-1:false:255 +SET:Font Shadow:Speedometer:true +SET:Brackets:Speedometer:false +SET:Fancy Font:Speedometer:false +SET:Text After Value:Speedometer:m/s +SET:Scale:Reach Display:2.0 +SET:Background:Reach Display:true +SET:Background Color:Reach Display:-16777216:false:127 +SET:Color:Reach Display:-1:false:255 +SET:Font Shadow:Reach Display:true +SET:Brackets:Reach Display:false +SET:Fancy Font:Reach Display:false +SET:Text After Value:Reach Display:blocks +SET:Scale:Day Counter:2.0 +SET:Background:Day Counter:true +SET:Background Color:Day Counter:-16777216:false:127 +SET:Color:Day Counter:-1:false:255 +SET:Font Shadow:Day Counter:true +SET:Brackets:Day Counter:false +SET:Fancy Font:Day Counter:false +SET:Text After Value:Day Counter:Days +SET:Scale:Server Address:2.0 +SET:Background:Server Address:true +SET:Background Color:Server Address:-16777216:false:127 +SET:Color:Server Address:-1:false:255 +SET:Font Shadow:Server Address:true +SET:Brackets:Server Address:false +SET:Fancy Font:Server Address:false +SET:Text After Value:Server Address: +SET:Hide Your Name:Nick Hider:true +SET:Hide Skins:Nick Hider:false +SET:Use Own Skin For All:Nick Hider:false +SET:Use Real Skin For Self:Nick Hider:true +SET:Custom Name:Nick Hider:You +SET:Time:Time Changer:0.0 +SET:Keybind:Zoom:46 +SET:Scroll:Zoom:false +SET:Smooth Zoom:Zoom:true +SET:Zoom Speed:Zoom:14.0 +SET:Factor:Zoom:4.0 +SET:Smooth Camera:Zoom:true +SET:Scale:Combo Counter:2.0 +SET:Background:Combo Counter:true +SET:Background Color:Combo Counter:-16777216:false:127 +SET:Color:Combo Counter:-1:false:255 +SET:Font Shadow:Combo Counter:true +SET:Brackets:Combo Counter:false +SET:Fancy Font:Combo Counter:false +SET:Text After Value:Combo Counter:Combo +SET:Alpha:Hit Color:0.8 +SET:Gold Ingot Scale:UHC Overlay:1.5 +SET:Gold Nugget Scale:UHC Overlay:1.5 +SET:Gold Ore Scale:UHC Overlay:1.5 +SET:Gold Apple Scale:UHC Overlay:1.5 +SET:Skull Scale:UHC Overlay:1.5 +SET:FPS Boost:FPS Boost:true +SET:Advanced FPS Boost:FPS Boost:false +SET:Low Graphics Mode:FPS Boost:false +SET:Hud Optimization:FPS Boost:false +SET:Optimized Entity Movement:FPS Boost:true +SET:Lazy Chunk Loading:FPS Boost:Balance +SET:Occlusion Culling:FPS Boost:Balance +SET:Hide Tall Grass:FPS Boost:false +SET:Hide Flowers:FPS Boost:false +SET:Hide Fences:FPS Boost:false +SET:Hide Fence Gates:FPS Boost:false +SET:Hide Armor Stands:FPS Boost:false +SET:Hide Skulls:FPS Boost:false +SET:Hide Item Frames:FPS Boost:false +SET:Hide Maps In Item Frames:FPS Boost:false +SET:Hide Stuck Arrows:FPS Boost:false +SET:Hide Ground Arrows:FPS Boost:false +SET:Hide Lava Particles:FPS Boost:false +SET:Hide Mob in Spawner:FPS Boost:false +SET:Hide Spawner Particles:FPS Boost:false +SET:Player Render Distance:FPS Boost:64.0 +SET:Passive Entity Render Distance:FPS Boost:64.0 +SET:Hostile Entity Render Distance:FPS Boost:64.0 +SET:Misc. Entity Render Distance:FPS Boost:64.0 +SET:Check glError:FPS Boost:false +SET:Do memory debug:FPS Boost:true +SET:Preset Crosshair:Crosshair:false +SET:Preset ID:Crosshair:1 +SET:Type:Crosshair:Cross +SET:Crosshair Color:Crosshair:-1:false:255 +SET:Player Color:Crosshair:-5231066:false:255 +SET:Hostile Color:Crosshair:-16777216:false:255 +SET:Passive Color:Crosshair:-16777216:false:255 +SET:Outline Color:Crosshair:-16777216:false:255 +SET:Dot Color:Crosshair:-16777216:false:255 +SET:Width:Crosshair:3.0 +SET:Height:Crosshair:3.0 +SET:Gap:Crosshair:2.0 +SET:Thickness:Crosshair:1.0 +SET:Scale:Crosshair:1.0 +SET:Highlight Hostile Mobs:Crosshair:false +SET:Highlight Passive Mobs:Crosshair:false +SET:Highlight Players:Crosshair:false +SET:Crosshair Outline:Crosshair:false +SET:Crosshair Dot:Crosshair:false +SET:Vanilla Blendering:Crosshair:true +SET:Capes:Cosmetics:true +SET:Cape Type:Cosmetics:Dynamic Curved +SET:Cape Shoulders:Cosmetics:true +SET:Wings:Cosmetics:true +SET:Wings Scale:Cosmetics:1.0 +SET:Bandanas:Cosmetics:true +SET:Hats:Cosmetics:true +SET:Shields:Cosmetics:true +SET:Custom Skins:Cosmetics:true +SET:Gui Debug:General:false +SET:Hide mods in F3:General:true +SET:Vanilla ESC Menu Layout:General:false +SET:Menu Background Blur:General:true +SET:Mod Menu Keybind:General:54 +SET:Silent Logo Location:General:Bottom Right Corner +SET:Silent Button Sounds:General:false +SET:Menu Animations:General:true +SET:Menu Animations Speed:General:300.0 +SET:Crosshair in F5:Render:false +SET:Centered Potion Inventory:Render:true +SET:Disable Achievements:Render:false +SET:Model Bobbing Only:Render:false +SET:Borderless Fullscreen:Render:false +SET:Weather:Weather:Clear +SET:Play Thunder Sound:Weather:true +SET:Background:Tab:true +SET:Disable Header:Tab:false +SET:Disable Footer:Tab:false +SET:Show Ping Numbers:Tab:true +SET:Show Nametag Icons:Tab:true +SET:Font Shadow:Chat:true +SET:Bar Animation:Chat:false +SET:Smooth:Chat:false +SET:Smooth Speed:Chat:4.0 +SET:Disable Background:Chat:true +SET:Anti-Spam:Chat:false +SET:Dark Background:Inventory Blur:false +SET:Scale:Coordinates:2.0 +SET:Background:Coordinates:true +SET:Background Color:Coordinates:-16777216:false:127 +SET:Color:Coordinates:-1:false:255 +SET:Font Shadow:Coordinates:true +SET:Brackets:Coordinates:false +SET:Fancy Font:Coordinates:false +SET:Show Biome:Coordinates:true +SET:Bounding Box:Hitboxes:true +SET:Bounding Box Color:Hitboxes:-1:false:255 +SET:Eye Height:Hitboxes:false +SET:Eye Height Color:Hitboxes:-5231066:false:255 +SET:Look Vector:Hitboxes:false +SET:Look Vector Color:Hitboxes:-12827479:false:255 +SET:Line Width:Hitboxes:2.0 +SET:Projectile Hitbox:Hitboxes:true +SET:Arrow Hitbox:Hitboxes:true +SET:Players Hitbox:Hitboxes:true +SET:Passive Hitbox:Hitboxes:true +SET:Monsters Hitbox:Hitboxes:true +SET:Fireballs Hitbox:Hitboxes:true +SET:Snowballs Hitbox:Hitboxes:true +SET:Wither Skulls Hitbox:Hitboxes:true +SET:Item Drops Hitbox:Hitboxes:true +SET:Fireworks Hitbox:Hitboxes:true +SET:XP Orbs Hitbox:Hitboxes:true +SET:Item Frames Hitbox:Hitboxes:true +SET:Show in F5:Nametags:true +SET:Show in F1:Nametags:false +SET:Background:Nametags:true +SET:Font Shadow:Nametags:false +SET:Show Nametag Icons:Nametags:true +SET:Show Nametag Messages:Nametags:true +SET:Scale:Scoreboard:1.0 +SET:Background:Scoreboard:true +SET:Font Shadow:Scoreboard:true +SET:Numbers:Scoreboard:false +SET:Outline:Block Overlay:true +SET:Outline Color:Block Overlay:-1:false:255 +SET:Outline Width:Block Overlay:3.0 +SET:Fill:Block Overlay:false +SET:Fill Color:Block Overlay:-1:false:127 +SET:Show Sharpness:Particles:true +SET:Always Sharpness Particles:Particles:false +SET:Sharpness Multiplier:Particles:1.0 +SET:Show Criticals:Particles:true +SET:Criticals Multiplier:Particles:1.0 +SET:Only Players Particles:Particles:false +SET:Cancel Impossible:Particles:false +SET:New Particles For Impossibles:Particles:false +SET:Health:Damage Tint:5.0 +SET:Scale:Titles:1.0 +SET:Amount:Color Saturation:1.0 +SET:Boss Bar:Boss Bar:true +SET:Boss Text:Boss Bar:true +SET:Hide Direct Messages:ToggleChat:false +SET:Hide Shout Messages:ToggleChat:false +SET:Hide In-Game Team Messages:ToggleChat:false +SET:Hide In-Game Messages (Excludes Team Chat):ToggleChat:false +SET:Hide Friend Join/Leave Message:ToggleChat:false +SET:Hide Friend Requests:ToggleChat:false +SET:Hide Guild Messages:ToggleChat:false +SET:Hide Guild Join/Leave Messages:ToggleChat:false +SET:Hide Party Messages:ToggleChat:false +SET:Hide Party Invites:ToggleChat:false +SET:Hide Lobby Join Messages:ToggleChat:false +SET:Fire Height:Pack Tweaks:0.0 +SET:Fire Opacity:Pack Tweaks:0.8999999761581421 +SET:Hide Pumpkin Overlay:Pack Tweaks:false +SET:Water Fog:Pack Tweaks:true +SET:Scale:Player Counter:2.0 +SET:Background:Player Counter:true +SET:Background Color:Player Counter:-16777216:false:127 +SET:Color:Player Counter:-1:false:255 +SET:Font Shadow:Player Counter:true +SET:Brackets:Player Counter:false +SET:Fancy Font:Player Counter:false +SET:Text After Value:Player Counter:Players Online +SET:Scale:BlockInfo:2.0 +SET:Block Coords:BlockInfo:true +SET:Correct Tool:BlockInfo:true +SET:Break Time:BlockInfo:true +SET:Background:BlockInfo:true +SET:Background Color:BlockInfo:-16777216:false:127 +SET:Color:BlockInfo:-1:false:255 +SET:Font Shadow:BlockInfo:true +SET:Fancy Font:BlockInfo:false +SET:Test Boolean:Test:true +SET:Test Slider:Test:10.0 +SET:Test Input:Test:Test Value +SET:Test Color:Test:-1:false:255 +SET:Test Select:Test:Test Value 2 +SET:Username:Debug NPC:Silent_Client +SET:Multiplication:FPS Spoofer:3.0 +SET:Amount:Motion Blur:0.5 +SET:Open Menu:Quickplay:12 +SET:Quickplay Mode&Hypixel&/lobby main:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/stuck:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby arcade:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_day_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_bounty_hunters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pvp_ctw:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_creeper_attack:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_dragon_wars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_ender_spleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_farm_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_soccer:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_starwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_party_pooper:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_prop_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hole_in_the_wall:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_simon_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_santa_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_mini_walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_party_games_1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pixel_painters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_throw_out:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_dead_end:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_bad_blood:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_alien_arcadium:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby bedwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_three:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_two_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_castle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby blitz:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby buildbattle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_pro:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_guess_the_build:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play vampirez:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_solo:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_teams:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play paintball:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_1v1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tkr:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby cops:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby duels:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_blitz_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bow_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bowspleef_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_boxing_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_2v2v2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_capture_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_classic_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_combo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_potion_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_parkour_eight:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sumo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_meetup:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby murder:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_assassins:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_infection:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_double_up:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby skywars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_hunters_vs_beasts:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_2v2_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_friends_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_1v1_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby tnt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntrun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_pvprun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_bowspleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntag:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby warlords:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_ctf_mini:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_domination:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_team_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby woolwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play wool_wool_wars_two_four:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BLOCK_PARTY:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DROPPER:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play MURDERMYSTERY_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_SOLO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_TEAM:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_4v4v4v4:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_THE_BRIDGE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_BOXING:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_COMBO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_NODEBUFF:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_OP:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_PEARL_FIGHT:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_STICK_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_SUMO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_UHC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_SOLO_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_TEAM_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_RANKED:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_RUN:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_TAG:Quickplay:-1 diff --git a/src/main/resources/assets/minecraft/silentclient/configs/Minigames.txt b/src/main/resources/assets/minecraft/silentclient/configs/Minigames.txt index 8805666..23c7180 100644 --- a/src/main/resources/assets/minecraft/silentclient/configs/Minigames.txt +++ b/src/main/resources/assets/minecraft/silentclient/configs/Minigames.txt @@ -1,11 +1,11 @@ MOD:FPS:false -POS:FPS:0.0:0.0 +POS:FPS:0.93125:0.15 MOD:CPS:false -POS:CPS:0.0:0.0 +POS:CPS:0.93125:0.17777777777777778 MOD:Toggle Sprint:false POS:Toggle Sprint:0.0:0.0 MOD:Keystrokes:false -POS:Keystrokes:0.0:0.0 +POS:Keystrokes:0.93125:0.002777777777777778 MOD:Perspective:false MOD:Animations:true MOD:Armor Status:false @@ -20,7 +20,7 @@ POS:Ping:0.0:0.0 MOD:Item Physics:false MOD:Pack Display:false POS:Pack Display:0.0:0.0 -MOD:FullBright:false +MOD:FullBright:true MOD:Clock:false POS:Clock:0.0:0.0 MOD:Speedometer:false @@ -50,14 +50,14 @@ MOD:Render:false MOD:Weather:false MOD:Tab:true MOD:Chat:true -MOD:Inventory Blur:false +MOD:Inventory Blur:true MOD:Coordinates:true -POS:Coordinates:0.0015625:0.002777777777777778 +POS:Coordinates:0.003125:0.005555555555555556 MOD:Chunk Borders:false MOD:Hitboxes:false MOD:Nametags:true MOD:Scoreboard:true -MOD:Block Overlay:false +MOD:Block Overlay:true MOD:Particles:false MOD:Damage Tint:false MOD:Titles:true @@ -71,7 +71,8 @@ POS:Player Counter:0.0:0.0 MOD:BlockInfo:false POS:BlockInfo:0.0:0.0 MOD:Motion Blur:false -SET:Scale:FPS:3.0 +MOD:Quickplay:false +SET:Scale:FPS:2.0 SET:Background:FPS:true SET:Background Color:FPS:-16777216:false:127 SET:Color:FPS:-1:false:255 @@ -79,7 +80,7 @@ SET:Font Shadow:FPS:true SET:Brackets:FPS:false SET:Fancy Font:FPS:false SET:Text After Value:FPS:FPS -SET:Scale:CPS:3.0 +SET:Scale:CPS:2.0 SET:Background:CPS:true SET:Background Color:CPS:-16777216:false:127 SET:Color:CPS:-1:false:255 @@ -99,39 +100,43 @@ SET:Fancy Font:Toggle Sprint:false SET:Sprint Mode:Toggle Sprint:Toggle SET:Sprinting Text:Toggle Sprint:Sprinting SET:Show HUD Text:Toggle Sprint:true -SET:Scale:Keystrokes:3.0 +SET:Scale:Keystrokes:2.20 SET:Font Shadow:Keystrokes:true SET:Fancy Font:Keystrokes:false SET:Background:Keystrokes:true +SET:CPS Mode:Keystrokes:None SET:Color:Keystrokes:-1:false:255 SET:Background Color:Keystrokes:-16777216:false:127 SET:Clicked Color:Keystrokes:-16777216:false:255 SET:Clicked Background Color:Keystrokes:-1:false:127 SET:Fade Delay:Keystrokes:100.0 SET:Show LMB/RMB:Keystrokes:true -SET:Show CPS:Keystrokes:true SET:Show Space:Keystrokes:true SET:Replace Names With Arrow:Keystrokes:false +SET:Keybind:Perspective:56 SET:1.7 Item Positions:Animations:true SET:1.7 Bow Pullback:Animations:true SET:1.7 Block Animation:Animations:true SET:1.7 Rod Position:Animations:true -SET:1.7 Punching Animation:Animations:true -SET:1.7 Eating & Drinking Animation:Animations:true -SET:1.7 Block-Hitting Animation:Animations:true -SET:1.7 Item Switching Animation:Animations:true +SET:1.7 3rd Person Block Animation:Animations:true SET:1.7 Throwing:Animations:true SET:1.7 Enchant Glint:Animations:true SET:1.7 Skins:Animations:false SET:Smooth Sneaking:Animations:true SET:No Shaking:Animations:true -SET:Scale:Armor Status:3.0 +SET:Consume Animation:Animations:true +SET:Block-Hitting Animation:Animations:true +SET:Red Armor:Animations:true +SET:Punching During Usage:Animations:true +SET:Item Switching Animation:Animations:true +SET:Remove Health Bar Flashing:Animations:true +SET:Scale:Armor Status:2.0 SET:Orientation:Armor Status:Vertical SET:Font Shadow:Armor Status:true SET:Show Percentage:Armor Status:true SET:Percentage Color:Armor Status:-1:false:255 SET:Fancy Font:Armor Status:false -SET:Scale:Memory:3.0 +SET:Scale:Memory:2.0 SET:Background:Memory:true SET:Background Color:Memory:-16777216:false:127 SET:Color:Memory:-1:false:255 @@ -140,7 +145,7 @@ SET:Brackets:Memory:false SET:Fancy Font:Memory:false SET:Text After Value:Memory:Mem SET:Phrase:Auto GG:gg -SET:Scale:Potion Hud:3.0 +SET:Scale:Potion Hud:2.0 SET:Font Shadow:Potion Hud:true SET:Fancy Font:Potion Hud:false SET:Show Potion Name:Potion Hud:true @@ -148,7 +153,7 @@ SET:Potion Name Color:Potion Hud:-1:false:255 SET:Show Duration:Potion Hud:true SET:Duration Color:Potion Hud:-6513257:false:255 SET:Potions In Inventory:Potion Hud:true -SET:Scale:Ping:3.0 +SET:Scale:Ping:2.0 SET:Background:Ping:true SET:Background Color:Ping:-16777216:false:127 SET:Color:Ping:-1:false:255 @@ -157,27 +162,25 @@ SET:Brackets:Ping:false SET:Fancy Font:Ping:false SET:Text After Value:Ping:ms SET:Speed:Item Physics:1.0 -SET:Scale:Pack Display:3.0 +SET:Scale:Pack Display:2.0 SET:Background:Pack Display:true SET:Background Color:Pack Display:-16777216:false:127 SET:Color:Pack Display:-1:false:255 SET:Font Shadow:Pack Display:true SET:Brackets:Pack Display:false SET:Fancy Font:Pack Display:false -SET:Text After Value:Pack Display: SET:Pack Icon:Pack Display:true SET:Pack Order:Pack Display:First Pack SET:Pack Title Replacement:Pack Display:White Text Only -SET:Scale:Clock:3.0 +SET:Scale:Clock:2.0 SET:Background:Clock:true SET:Background Color:Clock:-16777216:false:127 SET:Color:Clock:-1:false:255 SET:Font Shadow:Clock:true SET:Brackets:Clock:false SET:Fancy Font:Clock:false -SET:Text After Value:Clock: SET:24 Hour Format:Clock:false -SET:Scale:Speedometer:3.0 +SET:Scale:Speedometer:2.0 SET:Background:Speedometer:true SET:Background Color:Speedometer:-16777216:false:127 SET:Color:Speedometer:-1:false:255 @@ -185,7 +188,7 @@ SET:Font Shadow:Speedometer:true SET:Brackets:Speedometer:false SET:Fancy Font:Speedometer:false SET:Text After Value:Speedometer:m/s -SET:Scale:Reach Display:3.0 +SET:Scale:Reach Display:2.0 SET:Background:Reach Display:true SET:Background Color:Reach Display:-16777216:false:127 SET:Color:Reach Display:-1:false:255 @@ -193,7 +196,7 @@ SET:Font Shadow:Reach Display:true SET:Brackets:Reach Display:false SET:Fancy Font:Reach Display:false SET:Text After Value:Reach Display:blocks -SET:Scale:Day Counter:3.0 +SET:Scale:Day Counter:2.0 SET:Background:Day Counter:true SET:Background Color:Day Counter:-16777216:false:127 SET:Color:Day Counter:-1:false:255 @@ -201,7 +204,7 @@ SET:Font Shadow:Day Counter:true SET:Brackets:Day Counter:false SET:Fancy Font:Day Counter:false SET:Text After Value:Day Counter:Days -SET:Scale:Server Address:3.0 +SET:Scale:Server Address:2.0 SET:Background:Server Address:true SET:Background Color:Server Address:-16777216:false:127 SET:Color:Server Address:-1:false:255 @@ -215,12 +218,13 @@ SET:Use Own Skin For All:Nick Hider:false SET:Use Real Skin For Self:Nick Hider:true SET:Custom Name:Nick Hider:You SET:Time:Time Changer:0.0 +SET:Keybind:Zoom:46 SET:Scroll:Zoom:false SET:Smooth Zoom:Zoom:true SET:Zoom Speed:Zoom:14.0 SET:Factor:Zoom:4.0 SET:Smooth Camera:Zoom:true -SET:Scale:Combo Counter:3.0 +SET:Scale:Combo Counter:2.0 SET:Background:Combo Counter:true SET:Background Color:Combo Counter:-16777216:false:127 SET:Color:Combo Counter:-1:false:255 @@ -293,6 +297,7 @@ SET:Gui Debug:General:false SET:Hide mods in F3:General:true SET:Vanilla ESC Menu Layout:General:false SET:Menu Background Blur:General:true +SET:Mod Menu Keybind:General:54 SET:Silent Logo Location:General:Bottom Right Corner SET:Silent Button Sounds:General:false SET:Menu Animations:General:true @@ -316,7 +321,7 @@ SET:Smooth Speed:Chat:4.0 SET:Disable Background:Chat:true SET:Anti-Spam:Chat:false SET:Dark Background:Inventory Blur:false -SET:Scale:Coordinates:3.0 +SET:Scale:Coordinates:2.0 SET:Background:Coordinates:true SET:Background Color:Coordinates:-16777216:false:127 SET:Color:Coordinates:-1:false:255 @@ -356,7 +361,7 @@ SET:Numbers:Scoreboard:false SET:Outline:Block Overlay:true SET:Outline Color:Block Overlay:-1:false:255 SET:Outline Width:Block Overlay:3.0 -SET:Fill:Block Overlay:false +SET:Fill:Block Overlay:true SET:Fill Color:Block Overlay:-1:false:127 SET:Show Sharpness:Particles:true SET:Always Sharpness Particles:Particles:false @@ -386,7 +391,7 @@ SET:Fire Height:Pack Tweaks:0.0 SET:Fire Opacity:Pack Tweaks:0.8999999761581421 SET:Hide Pumpkin Overlay:Pack Tweaks:false SET:Water Fog:Pack Tweaks:true -SET:Scale:Player Counter:3.0 +SET:Scale:Player Counter:2.0 SET:Background:Player Counter:true SET:Background Color:Player Counter:-16777216:false:127 SET:Color:Player Counter:-1:false:255 @@ -394,7 +399,7 @@ SET:Font Shadow:Player Counter:true SET:Brackets:Player Counter:false SET:Fancy Font:Player Counter:false SET:Text After Value:Player Counter:Players Online -SET:Scale:BlockInfo:3.0 +SET:Scale:BlockInfo:2.0 SET:Block Coords:BlockInfo:true SET:Correct Tool:BlockInfo:true SET:Break Time:BlockInfo:true @@ -404,4 +409,161 @@ SET:Color:BlockInfo:-1:false:255 SET:Font Shadow:BlockInfo:true SET:Fancy Font:BlockInfo:false SET:Amount:Motion Blur:0.5 -ATC:/play solo_insane:13 +SET:Open Menu:Quickplay:12 +SET:Quickplay Mode&Hypixel&/lobby main:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/stuck:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby arcade:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_day_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_bounty_hunters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pvp_ctw:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_creeper_attack:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_dragon_wars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_ender_spleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_farm_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_soccer:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_starwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_party_pooper:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_prop_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hole_in_the_wall:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_simon_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_santa_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_mini_walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_party_games_1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pixel_painters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_throw_out:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_dead_end:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_bad_blood:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_alien_arcadium:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby bedwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_three:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_two_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_castle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby blitz:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby buildbattle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_pro:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_guess_the_build:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play vampirez:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_solo:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_teams:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play paintball:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_1v1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tkr:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby cops:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby duels:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_blitz_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bow_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bowspleef_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_boxing_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_2v2v2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_capture_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_classic_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_combo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_potion_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_parkour_eight:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sumo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_meetup:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby murder:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_assassins:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_infection:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_double_up:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby skywars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_hunters_vs_beasts:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_2v2_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_friends_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_1v1_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby tnt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntrun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_pvprun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_bowspleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntag:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby warlords:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_ctf_mini:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_domination:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_team_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby woolwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play wool_wool_wars_two_four:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BLOCK_PARTY:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DROPPER:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play MURDERMYSTERY_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_SOLO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_TEAM:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_4v4v4v4:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_THE_BRIDGE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_BOXING:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_COMBO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_NODEBUFF:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_OP:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_PEARL_FIGHT:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_STICK_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_SUMO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_UHC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_SOLO_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_TEAM_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_RANKED:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_RUN:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_TAG:Quickplay:-1 +ATC:/ce fushka:40 diff --git a/src/main/resources/assets/minecraft/silentclient/configs/PvP.txt b/src/main/resources/assets/minecraft/silentclient/configs/PvP.txt index 2544e64..e1cacbf 100644 --- a/src/main/resources/assets/minecraft/silentclient/configs/PvP.txt +++ b/src/main/resources/assets/minecraft/silentclient/configs/PvP.txt @@ -1,26 +1,26 @@ MOD:FPS:true -POS:FPS:0.9078125:0.2 +POS:FPS:0.93125:0.15 MOD:CPS:true -POS:CPS:0.9078125:0.24166666666666667 +POS:CPS:0.93125:0.17777777777777778 MOD:Toggle Sprint:true -POS:Toggle Sprint:0.5046875:0.9166666666666666 +POS:Toggle Sprint:0.509375:0.9027777777777778 MOD:Keystrokes:true -POS:Keystrokes:0.9078125:0.0 +POS:Keystrokes:0.93125:0.002777777777777778 MOD:Perspective:false MOD:Animations:true MOD:Armor Status:true -POS:Armor Status:0.0015625:0.3527777777777778 +POS:Armor Status:0.003125:0.40555555555555556 MOD:Memory:false POS:Memory:0.0:0.0 MOD:Auto GG:false MOD:Potion Hud:false POS:Potion Hud:0.0:0.0 MOD:Ping:true -POS:Ping:0.9078125:0.2833333333333333 +POS:Ping:0.93125:0.20555555555555555 MOD:Item Physics:false MOD:Pack Display:false POS:Pack Display:0.0:0.0 -MOD:FullBright:false +MOD:FullBright:true MOD:Clock:false POS:Clock:0.0:0.0 MOD:Speedometer:false @@ -43,21 +43,21 @@ MOD:Hit Color:false MOD:UHC Overlay:false MOD:FPS Boost:false MOD:Clear Glass:false -MOD:Crosshair:true +MOD:Crosshair:false MOD:Cosmetics:false MOD:General:false MOD:Render:false MOD:Weather:false MOD:Tab:true MOD:Chat:true -MOD:Inventory Blur:false +MOD:Inventory Blur:true MOD:Coordinates:false -POS:Coordinates:0.0015625:0.002777777777777778 +POS:Coordinates:0.003125:0.005555555555555556 MOD:Chunk Borders:false MOD:Hitboxes:false MOD:Nametags:true MOD:Scoreboard:true -MOD:Block Overlay:false +MOD:Block Overlay:true MOD:Particles:false MOD:Damage Tint:false MOD:Titles:true @@ -71,7 +71,8 @@ POS:Player Counter:0.0:0.0 MOD:BlockInfo:false POS:BlockInfo:0.0:0.0 MOD:Motion Blur:false -SET:Scale:FPS:3.0 +MOD:Quickplay:false +SET:Scale:FPS:2.0 SET:Background:FPS:true SET:Background Color:FPS:-16777216:false:127 SET:Color:FPS:-1:false:255 @@ -79,7 +80,7 @@ SET:Font Shadow:FPS:true SET:Brackets:FPS:false SET:Fancy Font:FPS:false SET:Text After Value:FPS:FPS -SET:Scale:CPS:3.0 +SET:Scale:CPS:2.0 SET:Background:CPS:true SET:Background Color:CPS:-16777216:false:127 SET:Color:CPS:-1:false:255 @@ -99,39 +100,43 @@ SET:Fancy Font:Toggle Sprint:false SET:Sprint Mode:Toggle Sprint:Toggle SET:Sprinting Text:Toggle Sprint:Sprinting SET:Show HUD Text:Toggle Sprint:true -SET:Scale:Keystrokes:3.0 +SET:Scale:Keystrokes:2.20 SET:Font Shadow:Keystrokes:true SET:Fancy Font:Keystrokes:false SET:Background:Keystrokes:true +SET:CPS Mode:Keystrokes:None SET:Color:Keystrokes:-1:false:255 SET:Background Color:Keystrokes:-16777216:false:127 SET:Clicked Color:Keystrokes:-16777216:false:255 SET:Clicked Background Color:Keystrokes:-1:false:127 SET:Fade Delay:Keystrokes:100.0 SET:Show LMB/RMB:Keystrokes:true -SET:Show CPS:Keystrokes:false SET:Show Space:Keystrokes:true SET:Replace Names With Arrow:Keystrokes:false +SET:Keybind:Perspective:56 SET:1.7 Item Positions:Animations:true SET:1.7 Bow Pullback:Animations:true SET:1.7 Block Animation:Animations:true SET:1.7 Rod Position:Animations:true -SET:1.7 Punching Animation:Animations:true -SET:1.7 Eating & Drinking Animation:Animations:true -SET:1.7 Block-Hitting Animation:Animations:true -SET:1.7 Item Switching Animation:Animations:true +SET:1.7 3rd Person Block Animation:Animations:true SET:1.7 Throwing:Animations:true SET:1.7 Enchant Glint:Animations:true SET:1.7 Skins:Animations:false SET:Smooth Sneaking:Animations:true SET:No Shaking:Animations:true -SET:Scale:Armor Status:3.0 +SET:Consume Animation:Animations:true +SET:Block-Hitting Animation:Animations:true +SET:Red Armor:Animations:true +SET:Punching During Usage:Animations:true +SET:Item Switching Animation:Animations:true +SET:Remove Health Bar Flashing:Animations:true +SET:Scale:Armor Status:3.192730665206909 SET:Orientation:Armor Status:Vertical SET:Font Shadow:Armor Status:true SET:Show Percentage:Armor Status:true SET:Percentage Color:Armor Status:-1:false:255 SET:Fancy Font:Armor Status:false -SET:Scale:Memory:3.0 +SET:Scale:Memory:2.0 SET:Background:Memory:true SET:Background Color:Memory:-16777216:false:127 SET:Color:Memory:-1:false:255 @@ -140,7 +145,7 @@ SET:Brackets:Memory:false SET:Fancy Font:Memory:false SET:Text After Value:Memory:Mem SET:Phrase:Auto GG:gg -SET:Scale:Potion Hud:3.0 +SET:Scale:Potion Hud:2.0 SET:Font Shadow:Potion Hud:true SET:Fancy Font:Potion Hud:false SET:Show Potion Name:Potion Hud:true @@ -148,7 +153,7 @@ SET:Potion Name Color:Potion Hud:-1:false:255 SET:Show Duration:Potion Hud:true SET:Duration Color:Potion Hud:-6513257:false:255 SET:Potions In Inventory:Potion Hud:true -SET:Scale:Ping:3.0 +SET:Scale:Ping:2.0 SET:Background:Ping:true SET:Background Color:Ping:-16777216:false:127 SET:Color:Ping:-1:false:255 @@ -157,27 +162,25 @@ SET:Brackets:Ping:false SET:Fancy Font:Ping:false SET:Text After Value:Ping:ms SET:Speed:Item Physics:1.0 -SET:Scale:Pack Display:3.0 +SET:Scale:Pack Display:2.0 SET:Background:Pack Display:true SET:Background Color:Pack Display:-16777216:false:127 SET:Color:Pack Display:-1:false:255 SET:Font Shadow:Pack Display:true SET:Brackets:Pack Display:false SET:Fancy Font:Pack Display:false -SET:Text After Value:Pack Display: SET:Pack Icon:Pack Display:true SET:Pack Order:Pack Display:First Pack SET:Pack Title Replacement:Pack Display:White Text Only -SET:Scale:Clock:3.0 +SET:Scale:Clock:2.0 SET:Background:Clock:true SET:Background Color:Clock:-16777216:false:127 SET:Color:Clock:-1:false:255 SET:Font Shadow:Clock:true SET:Brackets:Clock:false SET:Fancy Font:Clock:false -SET:Text After Value:Clock: SET:24 Hour Format:Clock:false -SET:Scale:Speedometer:3.0 +SET:Scale:Speedometer:2.0 SET:Background:Speedometer:true SET:Background Color:Speedometer:-16777216:false:127 SET:Color:Speedometer:-1:false:255 @@ -185,7 +188,7 @@ SET:Font Shadow:Speedometer:true SET:Brackets:Speedometer:false SET:Fancy Font:Speedometer:false SET:Text After Value:Speedometer:m/s -SET:Scale:Reach Display:3.0 +SET:Scale:Reach Display:2.0 SET:Background:Reach Display:true SET:Background Color:Reach Display:-16777216:false:127 SET:Color:Reach Display:-1:false:255 @@ -193,7 +196,7 @@ SET:Font Shadow:Reach Display:true SET:Brackets:Reach Display:false SET:Fancy Font:Reach Display:false SET:Text After Value:Reach Display:blocks -SET:Scale:Day Counter:3.0 +SET:Scale:Day Counter:2.0 SET:Background:Day Counter:true SET:Background Color:Day Counter:-16777216:false:127 SET:Color:Day Counter:-1:false:255 @@ -201,7 +204,7 @@ SET:Font Shadow:Day Counter:true SET:Brackets:Day Counter:false SET:Fancy Font:Day Counter:false SET:Text After Value:Day Counter:Days -SET:Scale:Server Address:3.0 +SET:Scale:Server Address:2.0 SET:Background:Server Address:true SET:Background Color:Server Address:-16777216:false:127 SET:Color:Server Address:-1:false:255 @@ -215,12 +218,13 @@ SET:Use Own Skin For All:Nick Hider:false SET:Use Real Skin For Self:Nick Hider:true SET:Custom Name:Nick Hider:You SET:Time:Time Changer:0.0 +SET:Keybind:Zoom:46 SET:Scroll:Zoom:false SET:Smooth Zoom:Zoom:true SET:Zoom Speed:Zoom:14.0 SET:Factor:Zoom:4.0 SET:Smooth Camera:Zoom:true -SET:Scale:Combo Counter:3.0 +SET:Scale:Combo Counter:2.0 SET:Background:Combo Counter:true SET:Background Color:Combo Counter:-16777216:false:127 SET:Color:Combo Counter:-1:false:255 @@ -271,7 +275,7 @@ SET:Outline Color:Crosshair:-16777216:false:255 SET:Dot Color:Crosshair:-16777216:false:255 SET:Width:Crosshair:3.0 SET:Height:Crosshair:3.0 -SET:Gap:Crosshair:1.0 +SET:Gap:Crosshair:2.0 SET:Thickness:Crosshair:1.0 SET:Scale:Crosshair:1.0 SET:Highlight Hostile Mobs:Crosshair:false @@ -293,6 +297,7 @@ SET:Gui Debug:General:false SET:Hide mods in F3:General:true SET:Vanilla ESC Menu Layout:General:false SET:Menu Background Blur:General:true +SET:Mod Menu Keybind:General:54 SET:Silent Logo Location:General:Bottom Right Corner SET:Silent Button Sounds:General:false SET:Menu Animations:General:true @@ -316,7 +321,7 @@ SET:Smooth Speed:Chat:4.0 SET:Disable Background:Chat:true SET:Anti-Spam:Chat:false SET:Dark Background:Inventory Blur:false -SET:Scale:Coordinates:3.0 +SET:Scale:Coordinates:2.0 SET:Background:Coordinates:true SET:Background Color:Coordinates:-16777216:false:127 SET:Color:Coordinates:-1:false:255 @@ -357,7 +362,7 @@ SET:Outline:Block Overlay:true SET:Outline Color:Block Overlay:-1:false:255 SET:Outline Width:Block Overlay:3.0 SET:Fill:Block Overlay:true -SET:Fill Color:Block Overlay:-1:false:56 +SET:Fill Color:Block Overlay:-1:false:127 SET:Show Sharpness:Particles:true SET:Always Sharpness Particles:Particles:false SET:Sharpness Multiplier:Particles:1.0 @@ -386,7 +391,7 @@ SET:Fire Height:Pack Tweaks:0.0 SET:Fire Opacity:Pack Tweaks:0.8999999761581421 SET:Hide Pumpkin Overlay:Pack Tweaks:false SET:Water Fog:Pack Tweaks:true -SET:Scale:Player Counter:3.0 +SET:Scale:Player Counter:2.0 SET:Background:Player Counter:true SET:Background Color:Player Counter:-16777216:false:127 SET:Color:Player Counter:-1:false:255 @@ -394,7 +399,7 @@ SET:Font Shadow:Player Counter:true SET:Brackets:Player Counter:false SET:Fancy Font:Player Counter:false SET:Text After Value:Player Counter:Players Online -SET:Scale:BlockInfo:3.0 +SET:Scale:BlockInfo:2.0 SET:Block Coords:BlockInfo:true SET:Correct Tool:BlockInfo:true SET:Break Time:BlockInfo:true @@ -404,4 +409,161 @@ SET:Color:BlockInfo:-1:false:255 SET:Font Shadow:BlockInfo:true SET:Fancy Font:BlockInfo:false SET:Amount:Motion Blur:0.5 -ATC:/play solo_insane:13 +SET:Open Menu:Quickplay:12 +SET:Quickplay Mode&Hypixel&/lobby main:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/stuck:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby arcade:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_day_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_bounty_hunters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pvp_ctw:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_creeper_attack:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_dragon_wars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_ender_spleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_farm_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_soccer:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_starwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_party_pooper:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_prop_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hole_in_the_wall:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_simon_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_santa_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_mini_walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_party_games_1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pixel_painters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_throw_out:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_dead_end:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_bad_blood:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_alien_arcadium:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby bedwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_three:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_two_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_castle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby blitz:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby buildbattle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_pro:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_guess_the_build:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play vampirez:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_solo:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_teams:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play paintball:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_1v1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tkr:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby cops:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby duels:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_blitz_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bow_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bowspleef_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_boxing_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_2v2v2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_capture_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_classic_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_combo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_potion_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_parkour_eight:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sumo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_meetup:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby murder:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_assassins:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_infection:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_double_up:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby skywars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_hunters_vs_beasts:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_2v2_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_friends_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_1v1_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby tnt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntrun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_pvprun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_bowspleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntag:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby warlords:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_ctf_mini:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_domination:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_team_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby woolwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play wool_wool_wars_two_four:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BLOCK_PARTY:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DROPPER:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play MURDERMYSTERY_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_SOLO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_TEAM:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_4v4v4v4:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_THE_BRIDGE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_BOXING:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_COMBO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_NODEBUFF:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_OP:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_PEARL_FIGHT:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_STICK_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_SUMO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_UHC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_SOLO_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_TEAM_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_RANKED:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_RUN:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_TAG:Quickplay:-1 +ATC:/ce fushka:40 diff --git a/src/main/resources/assets/minecraft/silentclient/configs/Survival.txt b/src/main/resources/assets/minecraft/silentclient/configs/Survival.txt index 9caf5f7..799429f 100644 --- a/src/main/resources/assets/minecraft/silentclient/configs/Survival.txt +++ b/src/main/resources/assets/minecraft/silentclient/configs/Survival.txt @@ -1,26 +1,26 @@ MOD:FPS:true -POS:FPS:0.90625:0.9555555555555556 +POS:FPS:0.9296875:0.9694444444444444 MOD:CPS:false -POS:CPS:0.0:0.0 +POS:CPS:0.93125:0.17777777777777778 MOD:Toggle Sprint:false -POS:Toggle Sprint:0.0:0.0 +POS:Toggle Sprint:0.509375:0.9027777777777778 MOD:Keystrokes:false -POS:Keystrokes:0.0:0.0 +POS:Keystrokes:0.93125:0.002777777777777778 MOD:Perspective:false MOD:Animations:true MOD:Armor Status:true -POS:Armor Status:0.0:0.38055555555555554 +POS:Armor Status:0.003125:0.40555555555555556 MOD:Memory:false POS:Memory:0.0:0.0 MOD:Auto GG:false MOD:Potion Hud:true -POS:Potion Hud:0.8578125:0.3 +POS:Potion Hud:0.9046875:0.39166666666666666 MOD:Ping:false -POS:Ping:0.0:0.0 +POS:Ping:0.93125:0.20555555555555555 MOD:Item Physics:false MOD:Pack Display:false POS:Pack Display:0.0:0.0 -MOD:FullBright:false +MOD:FullBright:true MOD:Clock:false POS:Clock:0.0:0.0 MOD:Speedometer:false @@ -50,14 +50,14 @@ MOD:Render:false MOD:Weather:false MOD:Tab:true MOD:Chat:true -MOD:Inventory Blur:false -MOD:Coordinates:true -POS:Coordinates:0.0015625:0.002777777777777778 +MOD:Inventory Blur:true +MOD:Coordinates:false +POS:Coordinates:0.003125:0.005555555555555556 MOD:Chunk Borders:false MOD:Hitboxes:false MOD:Nametags:true MOD:Scoreboard:true -MOD:Block Overlay:false +MOD:Block Overlay:true MOD:Particles:false MOD:Damage Tint:false MOD:Titles:true @@ -71,7 +71,8 @@ POS:Player Counter:0.0:0.0 MOD:BlockInfo:false POS:BlockInfo:0.0:0.0 MOD:Motion Blur:false -SET:Scale:FPS:3.0 +MOD:Quickplay:false +SET:Scale:FPS:2.0 SET:Background:FPS:true SET:Background Color:FPS:-16777216:false:127 SET:Color:FPS:-1:false:255 @@ -79,7 +80,7 @@ SET:Font Shadow:FPS:true SET:Brackets:FPS:false SET:Fancy Font:FPS:false SET:Text After Value:FPS:FPS -SET:Scale:CPS:3.0 +SET:Scale:CPS:2.0 SET:Background:CPS:true SET:Background Color:CPS:-16777216:false:127 SET:Color:CPS:-1:false:255 @@ -99,39 +100,43 @@ SET:Fancy Font:Toggle Sprint:false SET:Sprint Mode:Toggle Sprint:Toggle SET:Sprinting Text:Toggle Sprint:Sprinting SET:Show HUD Text:Toggle Sprint:true -SET:Scale:Keystrokes:3.0 +SET:Scale:Keystrokes:2.20 SET:Font Shadow:Keystrokes:true SET:Fancy Font:Keystrokes:false SET:Background:Keystrokes:true +SET:CPS Mode:Keystrokes:None SET:Color:Keystrokes:-1:false:255 SET:Background Color:Keystrokes:-16777216:false:127 SET:Clicked Color:Keystrokes:-16777216:false:255 SET:Clicked Background Color:Keystrokes:-1:false:127 SET:Fade Delay:Keystrokes:100.0 SET:Show LMB/RMB:Keystrokes:true -SET:Show CPS:Keystrokes:true SET:Show Space:Keystrokes:true SET:Replace Names With Arrow:Keystrokes:false +SET:Keybind:Perspective:56 SET:1.7 Item Positions:Animations:true SET:1.7 Bow Pullback:Animations:true SET:1.7 Block Animation:Animations:true SET:1.7 Rod Position:Animations:true -SET:1.7 Punching Animation:Animations:true -SET:1.7 Eating & Drinking Animation:Animations:true -SET:1.7 Block-Hitting Animation:Animations:true -SET:1.7 Item Switching Animation:Animations:true +SET:1.7 3rd Person Block Animation:Animations:true SET:1.7 Throwing:Animations:true SET:1.7 Enchant Glint:Animations:true SET:1.7 Skins:Animations:false SET:Smooth Sneaking:Animations:true SET:No Shaking:Animations:true -SET:Scale:Armor Status:3.0 +SET:Consume Animation:Animations:true +SET:Block-Hitting Animation:Animations:true +SET:Red Armor:Animations:true +SET:Punching During Usage:Animations:true +SET:Item Switching Animation:Animations:true +SET:Remove Health Bar Flashing:Animations:true +SET:Scale:Armor Status:3.192730665206909 SET:Orientation:Armor Status:Vertical SET:Font Shadow:Armor Status:true SET:Show Percentage:Armor Status:true SET:Percentage Color:Armor Status:-1:false:255 SET:Fancy Font:Armor Status:false -SET:Scale:Memory:3.0 +SET:Scale:Memory:2.0 SET:Background:Memory:true SET:Background Color:Memory:-16777216:false:127 SET:Color:Memory:-1:false:255 @@ -140,7 +145,7 @@ SET:Brackets:Memory:false SET:Fancy Font:Memory:false SET:Text After Value:Memory:Mem SET:Phrase:Auto GG:gg -SET:Scale:Potion Hud:3.0 +SET:Scale:Potion Hud:2.0 SET:Font Shadow:Potion Hud:true SET:Fancy Font:Potion Hud:false SET:Show Potion Name:Potion Hud:true @@ -148,7 +153,7 @@ SET:Potion Name Color:Potion Hud:-1:false:255 SET:Show Duration:Potion Hud:true SET:Duration Color:Potion Hud:-6513257:false:255 SET:Potions In Inventory:Potion Hud:true -SET:Scale:Ping:3.0 +SET:Scale:Ping:2.0 SET:Background:Ping:true SET:Background Color:Ping:-16777216:false:127 SET:Color:Ping:-1:false:255 @@ -157,27 +162,25 @@ SET:Brackets:Ping:false SET:Fancy Font:Ping:false SET:Text After Value:Ping:ms SET:Speed:Item Physics:1.0 -SET:Scale:Pack Display:3.0 +SET:Scale:Pack Display:2.0 SET:Background:Pack Display:true SET:Background Color:Pack Display:-16777216:false:127 SET:Color:Pack Display:-1:false:255 SET:Font Shadow:Pack Display:true SET:Brackets:Pack Display:false SET:Fancy Font:Pack Display:false -SET:Text After Value:Pack Display: SET:Pack Icon:Pack Display:true SET:Pack Order:Pack Display:First Pack SET:Pack Title Replacement:Pack Display:White Text Only -SET:Scale:Clock:3.0 +SET:Scale:Clock:2.0 SET:Background:Clock:true SET:Background Color:Clock:-16777216:false:127 SET:Color:Clock:-1:false:255 SET:Font Shadow:Clock:true SET:Brackets:Clock:false SET:Fancy Font:Clock:false -SET:Text After Value:Clock: SET:24 Hour Format:Clock:false -SET:Scale:Speedometer:3.0 +SET:Scale:Speedometer:2.0 SET:Background:Speedometer:true SET:Background Color:Speedometer:-16777216:false:127 SET:Color:Speedometer:-1:false:255 @@ -185,7 +188,7 @@ SET:Font Shadow:Speedometer:true SET:Brackets:Speedometer:false SET:Fancy Font:Speedometer:false SET:Text After Value:Speedometer:m/s -SET:Scale:Reach Display:3.0 +SET:Scale:Reach Display:2.0 SET:Background:Reach Display:true SET:Background Color:Reach Display:-16777216:false:127 SET:Color:Reach Display:-1:false:255 @@ -193,7 +196,7 @@ SET:Font Shadow:Reach Display:true SET:Brackets:Reach Display:false SET:Fancy Font:Reach Display:false SET:Text After Value:Reach Display:blocks -SET:Scale:Day Counter:3.0 +SET:Scale:Day Counter:2.0 SET:Background:Day Counter:true SET:Background Color:Day Counter:-16777216:false:127 SET:Color:Day Counter:-1:false:255 @@ -201,7 +204,7 @@ SET:Font Shadow:Day Counter:true SET:Brackets:Day Counter:false SET:Fancy Font:Day Counter:false SET:Text After Value:Day Counter:Days -SET:Scale:Server Address:3.0 +SET:Scale:Server Address:2.0 SET:Background:Server Address:true SET:Background Color:Server Address:-16777216:false:127 SET:Color:Server Address:-1:false:255 @@ -215,12 +218,13 @@ SET:Use Own Skin For All:Nick Hider:false SET:Use Real Skin For Self:Nick Hider:true SET:Custom Name:Nick Hider:You SET:Time:Time Changer:0.0 +SET:Keybind:Zoom:46 SET:Scroll:Zoom:false SET:Smooth Zoom:Zoom:true SET:Zoom Speed:Zoom:14.0 SET:Factor:Zoom:4.0 SET:Smooth Camera:Zoom:true -SET:Scale:Combo Counter:3.0 +SET:Scale:Combo Counter:2.0 SET:Background:Combo Counter:true SET:Background Color:Combo Counter:-16777216:false:127 SET:Color:Combo Counter:-1:false:255 @@ -293,6 +297,7 @@ SET:Gui Debug:General:false SET:Hide mods in F3:General:true SET:Vanilla ESC Menu Layout:General:false SET:Menu Background Blur:General:true +SET:Mod Menu Keybind:General:54 SET:Silent Logo Location:General:Bottom Right Corner SET:Silent Button Sounds:General:false SET:Menu Animations:General:true @@ -316,7 +321,7 @@ SET:Smooth Speed:Chat:4.0 SET:Disable Background:Chat:true SET:Anti-Spam:Chat:false SET:Dark Background:Inventory Blur:false -SET:Scale:Coordinates:3.0 +SET:Scale:Coordinates:2.0 SET:Background:Coordinates:true SET:Background Color:Coordinates:-16777216:false:127 SET:Color:Coordinates:-1:false:255 @@ -356,7 +361,7 @@ SET:Numbers:Scoreboard:false SET:Outline:Block Overlay:true SET:Outline Color:Block Overlay:-1:false:255 SET:Outline Width:Block Overlay:3.0 -SET:Fill:Block Overlay:false +SET:Fill:Block Overlay:true SET:Fill Color:Block Overlay:-1:false:127 SET:Show Sharpness:Particles:true SET:Always Sharpness Particles:Particles:false @@ -386,7 +391,7 @@ SET:Fire Height:Pack Tweaks:0.0 SET:Fire Opacity:Pack Tweaks:0.8999999761581421 SET:Hide Pumpkin Overlay:Pack Tweaks:false SET:Water Fog:Pack Tweaks:true -SET:Scale:Player Counter:3.0 +SET:Scale:Player Counter:2.0 SET:Background:Player Counter:true SET:Background Color:Player Counter:-16777216:false:127 SET:Color:Player Counter:-1:false:255 @@ -394,7 +399,7 @@ SET:Font Shadow:Player Counter:true SET:Brackets:Player Counter:false SET:Fancy Font:Player Counter:false SET:Text After Value:Player Counter:Players Online -SET:Scale:BlockInfo:3.0 +SET:Scale:BlockInfo:2.0 SET:Block Coords:BlockInfo:true SET:Correct Tool:BlockInfo:true SET:Break Time:BlockInfo:true @@ -404,4 +409,161 @@ SET:Color:BlockInfo:-1:false:255 SET:Font Shadow:BlockInfo:true SET:Fancy Font:BlockInfo:false SET:Amount:Motion Blur:0.5 -ATC:/play solo_insane:13 +SET:Open Menu:Quickplay:12 +SET:Quickplay Mode&Hypixel&/lobby main:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/stuck:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby arcade:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_day_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_bounty_hunters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pvp_ctw:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_creeper_attack:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_dragon_wars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_ender_spleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_farm_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_soccer:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_starwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_party_pooper:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hide_and_seek_prop_hunt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_hole_in_the_wall:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_simon_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_santa_says:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_mini_walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_party_games_1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_pixel_painters:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_throw_out:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_dead_end:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_bad_blood:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arcade_zombies_alien_arcadium:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby bedwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_one:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_three:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_two_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_ultimate:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_castle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight_two_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_voidless:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_armed:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_eight two_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play bedwars_four_four_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby blitz:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play blitz_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby buildbattle:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_solo_pro:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play build_battle_guess_the_build:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play vampirez:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_solo:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play quake_teams:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play paintball:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_1v1:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play walls:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tkr:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby cops:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_normal_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mcgo_deathmatch_party:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby duels:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_blitz_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bow_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bowspleef_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_boxing_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_2v2v2v2:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_bridge_four:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_capture_threes:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_classic_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_combo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_mw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_potion_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_op_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_parkour_eight:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sw_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_sumo_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_duel:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play arena_4v4:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play duels_uhc_meetup:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby murder:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_classic:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_assassins:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_infection:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play murder_double_up:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby skywars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play mega_doubles:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_tnt_madness:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_rush:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_slime:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play teams_insane_lucky:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play solo_insane_hunters_vs_beasts:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_solo_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_2v2_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_teams_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_friends_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play super_smash_1v1_normal:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby tnt:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntrun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_pvprun:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_bowspleef:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_tntag:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play tnt_capture:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby warlords:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_ctf_mini:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_domination:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play warlords_team_deathmatch:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/lobby woolwars:Quickplay:-1 +SET:Quickplay Mode&Hypixel&/play wool_wool_wars_two_four:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/lobby:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BLOCK_PARTY:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DROPPER:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play MURDERMYSTERY_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_SOLO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_TEAM:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_3v3v3v3:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_4v4v4v4:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play BEDWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_THE_BRIDGE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_BOXING:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_CLASSIC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_COMBO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_NODEBUFF:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_OP:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_PEARL_FIGHT:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_STICK_DUELS:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_SUMO:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play DUEL_UHC:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_SOLO_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_TEAM_INSANE:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play SKYWARS_RANKED:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_RUN:Quickplay:-1 +SET:Quickplay Mode&RuHypixel&/play TNT_TAG:Quickplay:-1 +ATC:/ce fushka:40 diff --git a/src/main/resources/assets/minecraft/silentclient/configs/screenshots/BedWars.png b/src/main/resources/assets/minecraft/silentclient/configs/screenshots/BedWars.png new file mode 100644 index 0000000..eda1155 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/configs/screenshots/BedWars.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Bedwars.png b/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Bedwars.png deleted file mode 100644 index bce9c72..0000000 Binary files a/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Bedwars.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Minigames.png b/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Minigames.png index fb58093..4c4d8cb 100644 Binary files a/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Minigames.png and b/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Minigames.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/configs/screenshots/PvP.png b/src/main/resources/assets/minecraft/silentclient/configs/screenshots/PvP.png index 749b65e..b37f3be 100644 Binary files a/src/main/resources/assets/minecraft/silentclient/configs/screenshots/PvP.png and b/src/main/resources/assets/minecraft/silentclient/configs/screenshots/PvP.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Survival.png b/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Survival.png index bd62ed8..99d6605 100644 Binary files a/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Survival.png and b/src/main/resources/assets/minecraft/silentclient/configs/screenshots/Survival.png differ diff --git a/src/main/resources/assets/minecraft/silentclient/icons/lightoverlay.png b/src/main/resources/assets/minecraft/silentclient/icons/lightoverlay.png new file mode 100755 index 0000000..0350662 Binary files /dev/null and b/src/main/resources/assets/minecraft/silentclient/icons/lightoverlay.png differ diff --git a/src/main/resources/mixins.SilentClient.json b/src/main/resources/mixins.SilentClient.json index 1bab5a4..fd92d82 100644 --- a/src/main/resources/mixins.SilentClient.json +++ b/src/main/resources/mixins.SilentClient.json @@ -117,6 +117,7 @@ "accessors.NetworkPlayerInfoAccessor", "mixins.MathHelperMixin", "mixins.GuiLanguageMixin", - "mixins.RenderArrowMixin" + "mixins.RenderArrowMixin", + "mixins.RenderFishMixin" ] } \ No newline at end of file