diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/ModuleCategory.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/ModuleCategory.kt index 34ab310dfd..4fb4e5bbc3 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/ModuleCategory.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/ModuleCategory.kt @@ -5,11 +5,6 @@ */ package net.ccbluex.liquidbounce.features.module -import lombok.Getter -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.normal.Main -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.objects.Drag -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.render.Scroll - enum class ModuleCategory(val displayName: String, val configName: String, val htmlIcon: String) { COMBAT("%module.category.combat%", "Combat", ""), PLAYER("%module.category.player%", "Player", ""), @@ -19,26 +14,4 @@ enum class ModuleCategory(val displayName: String, val configName: String, val h WORLD("%module.category.world%", "World", ""), OTHER("%module.category.other%", "Other", ""), EXPLOIT("%module.category.exploit%", "Exploit", ""); - - var namee: String? = null - var icon: String? = null - var posX = 0 - var expanded = false - - @Getter - val scroll: Scroll = Scroll() - - @Getter - var drag: Drag? = null - var posY = 20 - - open fun ModuleCategory(name: String?) { - namee = name - icon = icon - posX = 40 + Main.categoryCount * 120 - drag = Drag(posX.toFloat(), posY.toFloat()) - expanded = true - Main.categoryCount++ - } - } diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HUD.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HUD.kt index c9def113d7..66fd54285f 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HUD.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HUD.kt @@ -12,9 +12,9 @@ import net.ccbluex.liquidbounce.features.module.ModuleCategory import net.ccbluex.liquidbounce.features.module.ModuleInfo import net.ccbluex.liquidbounce.features.value.* import net.ccbluex.liquidbounce.ui.cape.GuiCapeManager.height -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule.colorBlueValue -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule.colorGreenValue -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule.colorRedValue +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule.colorBlueValue +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule.colorGreenValue +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule.colorRedValue import net.ccbluex.liquidbounce.ui.client.hud.designer.GuiHudDesigner import net.ccbluex.liquidbounce.utils.render.ColorUtils import net.ccbluex.liquidbounce.utils.render.ColorUtils.rainbow diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt index ebb17c79dc..9879cc28ed 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/HotbarSettings.kt @@ -10,7 +10,7 @@ import net.ccbluex.liquidbounce.event.Render2DEvent import net.ccbluex.liquidbounce.features.module.Module import net.ccbluex.liquidbounce.features.module.ModuleCategory import net.ccbluex.liquidbounce.features.module.ModuleInfo -import net.ccbluex.liquidbounce.font.FontLoaders +import net.ccbluex.liquidbounce.ui.font.FontLoaders import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.utils.render.Animation import net.ccbluex.liquidbounce.utils.render.BlurUtils diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/AbstractButtonRenderer.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/AbstractButtonRenderer.kt index 7b29c57ff2..9c9f2e30fb 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/AbstractButtonRenderer.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/AbstractButtonRenderer.kt @@ -5,7 +5,7 @@ */ package net.ccbluex.liquidbounce.features.module.modules.client.button -import net.ccbluex.liquidbounce.font.FontLoaders +import net.ccbluex.liquidbounce.ui.font.FontLoaders import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiButton import java.awt.Color @@ -16,7 +16,8 @@ abstract class AbstractButtonRenderer(protected val button: GuiButton) { open fun drawButtonText(mc: Minecraft) { FontLoaders.F18.DisplayFonts( button.displayString, - button.xPosition + button.width / 2f - FontLoaders.F18.DisplayFontWidths(FontLoaders.F18,button.displayString) / 2f, + button.xPosition + button.width / 2f - FontLoaders.F18.DisplayFontWidths( + FontLoaders.F18,button.displayString) / 2f, button.yPosition + button.height / 2f - FontLoaders.F18.height / 2f, if (button.enabled) Color.WHITE.rgb else Color.GRAY.rgb, FontLoaders.F18 diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/FlatButtonRenderer.java b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/FlatButtonRenderer.java index 8c1c1eb410..bb136ada0e 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/FlatButtonRenderer.java +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/FlatButtonRenderer.java @@ -5,8 +5,8 @@ */ package net.ccbluex.liquidbounce.features.module.modules.client.button; -import net.ccbluex.liquidbounce.font.CFontRenderer; -import net.ccbluex.liquidbounce.font.FontLoaders; +import net.ccbluex.liquidbounce.ui.font.CFontRenderer; +import net.ccbluex.liquidbounce.ui.font.FontLoaders; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import net.ccbluex.liquidbounce.utils.timer.MSTimer; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/WolframButtonRenderer.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/WolframButtonRenderer.kt index 5f5ceb5d32..ed4630b092 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/WolframButtonRenderer.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/button/WolframButtonRenderer.kt @@ -7,8 +7,7 @@ package net.ccbluex.liquidbounce.features.module.modules.client.button import net.ccbluex.liquidbounce.utils.render.EaseUtils.easeInOutQuad import net.ccbluex.liquidbounce.utils.render.RenderUtils -import net.ccbluex.liquidbounce.utils.render.shadowRenderUtils -import net.ccbluex.liquidbounce.font.FontLoaders +import net.ccbluex.liquidbounce.ui.font.FontLoaders import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiButton import java.awt.Color @@ -39,7 +38,8 @@ class WolframButtonRenderer(button: GuiButton) : AbstractButtonRenderer(button) } val percent = easeInOutQuad(animation) if (button.enabled) { - val half = FontLoaders.F18.DisplayFontWidths(FontLoaders.F18,button.displayString) / 2.0 + val half = FontLoaders.F18.DisplayFontWidths( + FontLoaders.F18,button.displayString) / 2.0 val center = button.xPosition + (button.width / 2.0) RenderUtils.drawRect( center - percent * half, diff --git a/src/main/java/net/ccbluex/liquidbounce/handler/combat/CombatManager.kt b/src/main/java/net/ccbluex/liquidbounce/handler/combat/CombatManager.kt index e06f114ffc..e3c97d5d2a 100644 --- a/src/main/java/net/ccbluex/liquidbounce/handler/combat/CombatManager.kt +++ b/src/main/java/net/ccbluex/liquidbounce/handler/combat/CombatManager.kt @@ -1,3 +1,8 @@ +/* + * FDPClient Hacked Client + * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. + * https://github.com/SkidderMC/FDPClient/ + */ package net.ccbluex.liquidbounce.handler.combat import net.ccbluex.liquidbounce.FDPClient diff --git a/src/main/java/net/ccbluex/liquidbounce/handler/macro/Macro.kt b/src/main/java/net/ccbluex/liquidbounce/handler/macro/Macro.kt index f2fe50ee36..c89c758c3f 100644 --- a/src/main/java/net/ccbluex/liquidbounce/handler/macro/Macro.kt +++ b/src/main/java/net/ccbluex/liquidbounce/handler/macro/Macro.kt @@ -1,3 +1,8 @@ +/* + * FDPClient Hacked Client + * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. + * https://github.com/SkidderMC/FDPClient/ + */ package net.ccbluex.liquidbounce.handler.macro import net.ccbluex.liquidbounce.FDPClient diff --git a/src/main/java/net/ccbluex/liquidbounce/handler/macro/MacroManager.kt b/src/main/java/net/ccbluex/liquidbounce/handler/macro/MacroManager.kt index 6eb5544c31..a63f87d1ea 100644 --- a/src/main/java/net/ccbluex/liquidbounce/handler/macro/MacroManager.kt +++ b/src/main/java/net/ccbluex/liquidbounce/handler/macro/MacroManager.kt @@ -1,3 +1,8 @@ +/* + * FDPClient Hacked Client + * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. + * https://github.com/SkidderMC/FDPClient/ + */ package net.ccbluex.liquidbounce.handler.macro import net.ccbluex.liquidbounce.event.EventTarget diff --git a/src/main/java/net/ccbluex/liquidbounce/handler/network/ProxyManager.kt b/src/main/java/net/ccbluex/liquidbounce/handler/network/ProxyManager.kt index 4e30ccab3a..bf7326ae42 100644 --- a/src/main/java/net/ccbluex/liquidbounce/handler/network/ProxyManager.kt +++ b/src/main/java/net/ccbluex/liquidbounce/handler/network/ProxyManager.kt @@ -1,3 +1,8 @@ +/* + * FDPClient Hacked Client + * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. + * https://github.com/SkidderMC/FDPClient/ + */ package net.ccbluex.liquidbounce.handler.network import io.netty.bootstrap.ChannelFactory diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/gui/MixinGuiNewChat.java b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/gui/MixinGuiNewChat.java index 2234247bf8..cddca429ce 100644 --- a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/gui/MixinGuiNewChat.java +++ b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/gui/MixinGuiNewChat.java @@ -9,8 +9,8 @@ import net.ccbluex.liquidbounce.FDPClient; import net.ccbluex.liquidbounce.features.module.modules.client.HUD; import net.ccbluex.liquidbounce.features.module.modules.client.ChatControl; -import net.ccbluex.liquidbounce.font.CFontRenderer; -import net.ccbluex.liquidbounce.font.FontLoaders; +import net.ccbluex.liquidbounce.ui.font.CFontRenderer; +import net.ccbluex.liquidbounce.ui.font.FontLoaders; import net.ccbluex.liquidbounce.injection.access.StaticStorage; import net.ccbluex.liquidbounce.utils.render.EaseUtils; import net.ccbluex.liquidbounce.utils.render.RenderUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/gui/MixinGuiScreen.java b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/gui/MixinGuiScreen.java index d1801818b9..1924b477ba 100644 --- a/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/gui/MixinGuiScreen.java +++ b/src/main/java/net/ccbluex/liquidbounce/injection/forge/mixins/gui/MixinGuiScreen.java @@ -7,7 +7,7 @@ import net.ccbluex.liquidbounce.FDPClient; import net.ccbluex.liquidbounce.features.module.modules.client.HUD; -import net.ccbluex.liquidbounce.font.FontLoaders; +import net.ccbluex.liquidbounce.ui.font.FontLoaders; import net.ccbluex.liquidbounce.ui.client.GuiBackground; import net.ccbluex.liquidbounce.utils.particles.ParticleUtils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/transformers/OptimizeTransformer.java b/src/main/java/net/ccbluex/liquidbounce/injection/transformers/OptimizeTransformer.java index 89746e3c64..940bf32257 100644 --- a/src/main/java/net/ccbluex/liquidbounce/injection/transformers/OptimizeTransformer.java +++ b/src/main/java/net/ccbluex/liquidbounce/injection/transformers/OptimizeTransformer.java @@ -1,3 +1,8 @@ +/* + * FDPClient Hacked Client + * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. + * https://github.com/SkidderMC/FDPClient/ + */ package net.ccbluex.liquidbounce.injection.transformers; import net.ccbluex.liquidbounce.utils.ASMUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/injection/transformers/ViaForgeSupportTransformer.java b/src/main/java/net/ccbluex/liquidbounce/injection/transformers/ViaForgeSupportTransformer.java index 7e797813c0..993bf2e489 100644 --- a/src/main/java/net/ccbluex/liquidbounce/injection/transformers/ViaForgeSupportTransformer.java +++ b/src/main/java/net/ccbluex/liquidbounce/injection/transformers/ViaForgeSupportTransformer.java @@ -1,3 +1,8 @@ +/* + * FDPClient Hacked Client + * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. + * https://github.com/SkidderMC/FDPClient/ + */ package net.ccbluex.liquidbounce.injection.transformers; import net.ccbluex.liquidbounce.utils.ASMUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/ClickGUIModule.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/ClickGUIModule.kt similarity index 84% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/ClickGUIModule.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/ClickGUIModule.kt index 5a375fd853..d66f38f2ba 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/ClickGUIModule.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/ClickGUIModule.kt @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui +package net.ccbluex.liquidbounce.ui.clickgui import net.ccbluex.liquidbounce.event.EventTarget import net.ccbluex.liquidbounce.event.PacketEvent @@ -14,14 +14,13 @@ import net.ccbluex.liquidbounce.features.value.BoolValue import net.ccbluex.liquidbounce.features.value.FloatValue import net.ccbluex.liquidbounce.features.value.IntegerValue import net.ccbluex.liquidbounce.features.value.ListValue -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.ClickGui -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.* -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.Slight.SlightUI -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.dropdown.DropdownGUI -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.light.LightClickGUI -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.NewUi -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.novoline.ClickyUI -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.OtcClickGUi +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.* +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.Slight.SlightUI +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.classic.DropdownGUI +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.light.LightClickGUI +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.NewUi +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.novoline.ClickyUI +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.OtcClickGUi import net.ccbluex.liquidbounce.ui.client.gui.options.modernuiLaunchOption import net.ccbluex.liquidbounce.utils.render.ColorUtils.rainbow import net.minecraft.network.play.server.S2EPacketCloseWindow @@ -32,7 +31,7 @@ import java.util.* @ModuleInfo(name = "ClickGUI", category = ModuleCategory.CLIENT, keyBind = Keyboard.KEY_RSHIFT, canEnable = false) object ClickGUIModule : Module() { - val styleValue: ListValue = object : ListValue( + private val styleValue: ListValue = object : ListValue( "Style", arrayOf( "Classic", @@ -41,7 +40,6 @@ object ClickGUIModule : Module() { "Novoline", "Astolfo", "LB+", - "Jello", "LiquidBounce", "Tenacity5", "Slight", @@ -61,6 +59,9 @@ object ClickGUIModule : Module() { val maxElementsValue = IntegerValue("MaxElements", 20, 1, 35) val backgroundValue = ListValue("Background", arrayOf("Default", "Gradient", "None"), "None") val animationValue = ListValue("Animation", arrayOf("Bread", "Slide", "LiquidBounce", "Zoom", "Ziul", "None"), "Ziul") + val animSpeedValue = FloatValue("AnimSpeed", 1f, 0.01f, 5f) + val gradStartValue = IntegerValue("GradientStartAlpha", 255, 0, 255) + val gradEndValue = IntegerValue("GradientEndAlpha", 0, 0, 255) val colorRainbow = BoolValue("Rainbow", true) val colorRedValue = IntegerValue("R", 0, 0, 255).displayable { !colorRainbow.get() } as IntegerValue val colorGreenValue = IntegerValue("G", 160, 0, 255).displayable { !colorRainbow.get() } as IntegerValue @@ -96,12 +97,12 @@ object ClickGUIModule : Module() { "null" -> modernuiLaunchOption.clickGui.style = NullStyle() "slowly" -> modernuiLaunchOption.clickGui.style = SlowlyStyle() "black", "white" -> modernuiLaunchOption.clickGui.style = if (styleValue.get() == "White") WhiteStyle() else BlackStyle() - "jello" -> modernuiLaunchOption.clickGui.style = JelloStyle() "tenacity5" -> modernuiLaunchOption.clickGui.style = TenacityStyle() "astolfo" -> modernuiLaunchOption.clickGui.style = AstolfoStyle() } } + @JvmStatic fun generateColor(): Color { return if (colorRainbow.get()) { rainbow() diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/ClickGui.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/ClickGui.java similarity index 76% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/ClickGui.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/ClickGui.java index d1352e5718..783a3b4160 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/ClickGui.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/ClickGui.java @@ -3,17 +3,16 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui; +package net.ccbluex.liquidbounce.ui.clickgui; import net.ccbluex.liquidbounce.FDPClient; import net.ccbluex.liquidbounce.features.module.Module; import net.ccbluex.liquidbounce.features.module.ModuleCategory; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.Element; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.Style; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.SlowlyStyle; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ButtonElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.Element; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.Style; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.SlowlyStyle; import net.ccbluex.liquidbounce.ui.client.gui.options.modernuiLaunchOption; import net.ccbluex.liquidbounce.ui.client.hud.designer.GuiHudDesigner; import net.ccbluex.liquidbounce.ui.font.AWTFontRenderer; @@ -37,9 +36,10 @@ public class ClickGui extends GuiScreen { private Panel clickedPanel; private int mouseX; private int mouseY; - private double slide, progress = 0; + public long lastMS = System.currentTimeMillis(); + public ClickGui() { final int width = 100; final int height = 18; @@ -62,19 +62,10 @@ public void setupItems() { @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { - float trueCguiScale; - if (FDPClient.moduleManager.getModule(ClickGUIModule.class).INSTANCE.getStyleValue().get().equals("Jello")) { - trueCguiScale = 1; - } else if(FDPClient.moduleManager.getModule(ClickGUIModule.class).INSTANCE.getStyleValue().get().equals("Glow")) { - trueCguiScale = 1; - } else { - trueCguiScale = FDPClient.moduleManager.getModule(ClickGUIModule.class).INSTANCE.getScaleValue().get(); - } - final double scale = trueCguiScale; - if (progress < 1) progress += 0.1 * (1 - partialTicks); + if (progress < 1) progress = (float)(System.currentTimeMillis() - lastMS) / (500F / Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getAnimSpeedValue().get()); // fully fps async else progress = 1; - switch (Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).INSTANCE.getAnimationValue().get().toLowerCase()) { + switch (ClickGUIModule.INSTANCE.getAnimationValue().get().toLowerCase()) { case "liquidbounce": case "ziul": slide = EaseUtils.easeOutBack(progress); @@ -94,28 +85,31 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { AWTFontRenderer.Companion.setAssumeNonVolatile(true); - mouseX /= scale; - mouseY /= scale; + final double scale = Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getScaleValue().get(); + + mouseX /= (int) scale; + mouseY /= (int) scale; this.mouseX = mouseX; this.mouseY = mouseY; - switch (Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).INSTANCE.getBackgroundValue().get()) { + switch (Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getBackgroundValue().get()) { case "Default": drawDefaultBackground(); break; case "Gradient": - drawGradientRect(0, 0, width, height, ColorUtils.reAlpha(ClickGUIModule.INSTANCE.generateColor(), 40).getRGB(), ClickGUIModule.INSTANCE.generateColor().getRGB()); + drawGradientRect(0, 0, width, height, + ColorUtils.reAlpha(ClickGUIModule.generateColor(), Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getGradEndValue().get()).getRGB(), + ColorUtils.reAlpha(ClickGUIModule.generateColor(), Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getGradStartValue().get()).getRGB()); break; default: break; } - drawDefaultBackground(); - int defaultHeight1 = (this.height); - int defaultWidth1 = (this.width); + GlStateManager.disableAlpha(); + GlStateManager.enableAlpha(); - switch (Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).INSTANCE.getAnimationValue().get().toLowerCase()) { + switch (Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getAnimationValue().get().toLowerCase()) { case "bread": GlStateManager.translate(0, (1.0 - slide) * height * 2.0, 0); GlStateManager.scale(scale, scale + (1.0 - slide) * 2.0, scale); @@ -201,18 +195,13 @@ private void handleScroll(final int wheel) { @Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { - float trueCguiScale; - if (FDPClient.moduleManager.getModule(ClickGUIModule.class).getStyleValue().get().equals("Jello")) { - trueCguiScale = 1; - } else if(FDPClient.moduleManager.getModule(ClickGUIModule.class).getStyleValue().get().equals("Glow")) { - trueCguiScale = 1; - } else { - trueCguiScale = FDPClient.moduleManager.getModule(ClickGUIModule.class).getScaleValue().get(); - } - final double scale = trueCguiScale; + final double scale = Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getScaleValue().get(); - mouseX /= scale; - mouseY /= scale; + mouseX /= (int) scale; + mouseY /= (int) scale; + + mouseX /= (int) scale; + mouseY /= (int) scale; for (final Panel panel : panels) { panel.mouseClicked(mouseX, mouseY, mouseButton); @@ -237,18 +226,10 @@ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOEx @Override protected void mouseReleased(int mouseX, int mouseY, int state) { - float trueCguiScale; - if (FDPClient.moduleManager.getModule(ClickGUIModule.class).getStyleValue().get().equals("Jello")) { - trueCguiScale = 1; - } else if(FDPClient.moduleManager.getModule(ClickGUIModule.class).getStyleValue().get().equals("Glow")) { - trueCguiScale = 1; - } else { - trueCguiScale = FDPClient.moduleManager.getModule(ClickGUIModule.class).getScaleValue().get(); - } - final double scale = trueCguiScale; + final double scale = Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getScaleValue().get(); - mouseX /= scale; - mouseY /= scale; + mouseX /= (int) scale; + mouseY /= (int) scale; for (Panel panel : panels) { panel.mouseReleased(mouseX, mouseY, state); diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/ClickGuiConfig.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/ClickGuiConfig.java similarity index 92% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/ClickGuiConfig.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/ClickGuiConfig.java index c72e44059e..24b2780e44 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/ClickGuiConfig.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/ClickGuiConfig.java @@ -1,4 +1,4 @@ -package net.ccbluex.liquidbounce.ui.client.gui; +package net.ccbluex.liquidbounce.ui.clickgui; import com.google.gson.JsonElement; import com.google.gson.JsonNull; @@ -6,11 +6,11 @@ import com.google.gson.JsonParser; import net.ccbluex.liquidbounce.config.FileConfig; import net.ccbluex.liquidbounce.config.FileManager; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.Element; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.Element; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; import net.ccbluex.liquidbounce.ui.client.gui.options.modernuiLaunchOption; import net.ccbluex.liquidbounce.utils.ClientUtils; +import org.jetbrains.annotations.NotNull; import java.io.File; @@ -21,7 +21,7 @@ public ClickGuiConfig(final File file) { } @Override - public void loadConfig(String config) { + public void loadConfig(@NotNull String config) { final JsonElement jsonElement = new JsonParser().parse(config); if (jsonElement instanceof JsonNull) @@ -64,6 +64,7 @@ public void loadConfig(String config) { } } + @NotNull @Override public String saveConfig() { final JsonObject jsonObject = new JsonObject(); diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/Panel.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/Panel.java similarity index 92% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/Panel.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/Panel.java index 35a138c4bd..649fcd28f8 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/Panel.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/Panel.java @@ -3,12 +3,11 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui; +package net.ccbluex.liquidbounce.ui.clickgui; import net.ccbluex.liquidbounce.FDPClient; import net.ccbluex.liquidbounce.features.module.ModuleCategory; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.Element; +import net.ccbluex.liquidbounce.ui.clickgui.elements.Element; import net.ccbluex.liquidbounce.ui.client.gui.options.modernuiLaunchOption; import net.ccbluex.liquidbounce.utils.MinecraftInstance; import net.minecraft.client.audio.PositionedSoundRecord; @@ -17,6 +16,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; public abstract class Panel extends MinecraftInstance { @@ -61,7 +61,7 @@ public void drawScreen(int mouseX, int mouseY, float button) { if(!visible) return; - final int maxElements = FDPClient.moduleManager.getModule(ClickGUIModule.class).getMaxElementsValue().get(); + final int maxElements = Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getMaxElementsValue().get(); // Drag if(drag) { @@ -126,7 +126,7 @@ public void mouseReleased(int mouseX, int mouseY, int state) { } public boolean handleScroll(int mouseX, int mouseY, int wheel) { - final int maxElements = FDPClient.moduleManager.getModule(ClickGUIModule.class).getMaxElementsValue().get(); + final int maxElements = Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getMaxElementsValue().get(); if(mouseX >= getX() && mouseX <= getX() + 100 && mouseY >= getY() && mouseY <= getY() + 19 + elementsHeight) { if(wheel < 0 && scroll < elements.size() - maxElements) { @@ -229,7 +229,7 @@ private int getElementsHeight() { int height = 0; int count = 0; for(final Element element : elements) { - if (count >= FDPClient.moduleManager.getModule(ClickGUIModule.class).getMaxElementsValue().get()) + if (count >= Objects.requireNonNull(FDPClient.moduleManager.getModule(ClickGUIModule.class)).getMaxElementsValue().get()) continue; height += element.getHeight() + 1; ++count; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/elements/ButtonElement.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/elements/ButtonElement.java similarity index 95% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/elements/ButtonElement.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/elements/ButtonElement.java index 026c73c81d..c9d85248e9 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/elements/ButtonElement.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/elements/ButtonElement.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements; +package net.ccbluex.liquidbounce.ui.clickgui.elements; import net.ccbluex.liquidbounce.ui.client.gui.options.modernuiLaunchOption; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/elements/Element.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/elements/Element.java similarity index 95% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/elements/Element.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/elements/Element.java index 258657d12b..31de87916a 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/elements/Element.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/elements/Element.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements; +package net.ccbluex.liquidbounce.ui.clickgui.elements; import net.ccbluex.liquidbounce.utils.MinecraftInstance; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/elements/ModuleElement.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/elements/ModuleElement.java similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/elements/ModuleElement.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/elements/ModuleElement.java index 1d0b32be75..aa9390c2d6 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/elements/ModuleElement.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/elements/ModuleElement.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements; +package net.ccbluex.liquidbounce.ui.clickgui.elements; import net.ccbluex.liquidbounce.features.module.Module; import net.ccbluex.liquidbounce.ui.client.gui.options.modernuiLaunchOption; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontFamily.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontFamily.java similarity index 80% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontFamily.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontFamily.java index b2c0668fd6..7ce07cbbd8 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontFamily.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontFamily.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.api; public interface FontFamily { diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontManager.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontManager.java similarity index 80% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontManager.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontManager.java index 3d2f2e0865..739d862f41 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontManager.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontManager.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.api; @FunctionalInterface public interface FontManager { FontFamily fontFamily(FontType fontType); diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontRenderer.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontRenderer.java similarity index 94% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontRenderer.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontRenderer.java index 13623c5356..ec2c8d09ea 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontRenderer.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontRenderer.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.api; public interface FontRenderer { float drawString(CharSequence text, float x, float y, int color, boolean dropShadow); diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontType.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontType.java similarity index 91% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontType.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontType.java index 362ee0b27c..0346b745f7 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/api/FontType.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/api/FontType.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.api; @SuppressWarnings("SpellCheckingInspection") public enum FontType { DM("diramight.ttf"), diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/Fonts.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/Fonts.java similarity index 91% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/Fonts.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/Fonts.java index 5975ab1616..7fc4cc11d2 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/Fonts.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/Fonts.java @@ -3,13 +3,13 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.impl; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.impl; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontFamily; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontManager; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontRenderer; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontType; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.logo.info; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontFamily; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontManager; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontRenderer; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontType; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.logo.info; @SuppressWarnings("SpellCheckingInspection") public interface Fonts { diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/SimpleFontFamily.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/SimpleFontFamily.java similarity index 71% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/SimpleFontFamily.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/SimpleFontFamily.java index c1c397c2a3..2ebe66e857 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/SimpleFontFamily.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/SimpleFontFamily.java @@ -3,11 +3,11 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.impl; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.impl; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontFamily; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontRenderer; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontType; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontFamily; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontRenderer; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontType; final class SimpleFontFamily implements FontFamily { private final FontType fontType; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/SimpleFontManager.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/SimpleFontManager.java similarity index 85% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/SimpleFontManager.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/SimpleFontManager.java index 3c2c085da8..650346c8eb 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/SimpleFontManager.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/SimpleFontManager.java @@ -3,12 +3,12 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.impl; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.impl; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontFamily; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontManager; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontType; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.util.SneakyThrowing; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontFamily; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontManager; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontType; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.util.SneakyThrowing; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/SimpleFontRenderer.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/SimpleFontRenderer.java similarity index 99% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/SimpleFontRenderer.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/SimpleFontRenderer.java index 1ec5a2acb8..774ccdfa4a 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/impl/SimpleFontRenderer.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/impl/SimpleFontRenderer.java @@ -3,9 +3,9 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.impl; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.impl; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontRenderer; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.DynamicTexture; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/logo/OutlineUtils.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/logo/OutlineUtils.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/logo/OutlineUtils.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/logo/OutlineUtils.java index c37812b211..7b488b75b9 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/logo/OutlineUtils.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/logo/OutlineUtils.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.logo; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.logo; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/logo/info.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/logo/info.java similarity index 73% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/logo/info.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/logo/info.java index aec65e9ba2..01045b7df0 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/logo/info.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/logo/info.java @@ -3,10 +3,10 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.logo; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.logo; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontManager; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.impl.SimpleFontManager; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontManager; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.impl.SimpleFontManager; public class info { public static String Name = "FDPCLIENT"; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/util/SneakyThrowing.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/util/SneakyThrowing.java similarity index 89% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/util/SneakyThrowing.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/util/SneakyThrowing.java index 2048d10230..bdcefd2c56 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/fonts/util/SneakyThrowing.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/fonts/util/SneakyThrowing.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.util; +package net.ccbluex.liquidbounce.ui.clickgui.fonts.util; public final class SneakyThrowing { diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/Style.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/Style.java similarity index 72% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/Style.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/Style.java index 9c4258cf49..24f29b63a6 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/Style.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/Style.java @@ -3,11 +3,11 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style; +package net.ccbluex.liquidbounce.ui.clickgui.style; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.Panel; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ButtonElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; import net.ccbluex.liquidbounce.utils.MinecraftInstance; public abstract class Style extends MinecraftInstance { diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/AstolfoStyle.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/AstolfoStyle.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/AstolfoStyle.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/AstolfoStyle.java index 3faeddf510..affe64f18c 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/AstolfoStyle.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/AstolfoStyle.java @@ -3,13 +3,13 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.Style; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.Panel; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ButtonElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.Style; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; import net.ccbluex.liquidbounce.ui.i18n.LanguageManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/BlackStyle.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/BlackStyle.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/BlackStyle.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/BlackStyle.java index 32534d1e63..d51b3697f0 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/BlackStyle.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/BlackStyle.java @@ -3,12 +3,12 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.Style; +import net.ccbluex.liquidbounce.ui.clickgui.Panel; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ButtonElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.Style; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; import net.ccbluex.liquidbounce.ui.i18n.LanguageManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/LiquidBounceStyle.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/LiquidBounceStyle.java similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/LiquidBounceStyle.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/LiquidBounceStyle.java index 2984954ea6..8841524fb5 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/LiquidBounceStyle.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/LiquidBounceStyle.java @@ -3,14 +3,14 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles; import net.ccbluex.liquidbounce.FDPClient; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.Style; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.Panel; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ButtonElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.Style; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; import net.ccbluex.liquidbounce.ui.i18n.LanguageManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/NullStyle.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/NullStyle.java similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/NullStyle.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/NullStyle.java index 9379b500e3..72e98689ec 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/NullStyle.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/NullStyle.java @@ -3,13 +3,13 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.Style; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.Panel; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ButtonElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.Style; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; import net.ccbluex.liquidbounce.ui.i18n.LanguageManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/Opacity.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/Opacity.java similarity index 93% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/Opacity.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/Opacity.java index 880ca57b9e..5d3f98a5d6 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/Opacity.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/Opacity.java @@ -1,4 +1,4 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.Slight; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.Slight; import net.ccbluex.liquidbounce.ui.client.gui.AnimationUtil; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/RenderUtil.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/RenderUtil.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/RenderUtil.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/RenderUtil.java index 277514c586..f8837dd7fe 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/RenderUtil.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/RenderUtil.java @@ -1,14 +1,11 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.Slight; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.Slight; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.culling.Frustum; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.shader.Framebuffer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.EXTFramebufferObject; import org.lwjgl.opengl.GL11; import java.awt.*; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/SlightUI.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/SlightUI.java similarity index 99% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/SlightUI.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/SlightUI.java index 8107bfce2e..7d4ddff303 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/SlightUI.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/SlightUI.java @@ -1,4 +1,4 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.Slight; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.Slight; import net.ccbluex.liquidbounce.FDPClient; import net.ccbluex.liquidbounce.features.module.Module; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/UISlider.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/UISlider.java similarity index 99% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/UISlider.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/UISlider.java index 902ed94a38..e3001cd114 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/Slight/UISlider.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/Slight/UISlider.java @@ -1,4 +1,4 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.Slight; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.Slight; import net.ccbluex.liquidbounce.features.value.FloatValue; import net.ccbluex.liquidbounce.features.value.IntegerValue; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/SlowlyStyle.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/SlowlyStyle.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/SlowlyStyle.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/SlowlyStyle.java index 1f045972b0..4f59b5dfe7 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/SlowlyStyle.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/SlowlyStyle.java @@ -3,12 +3,12 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.Style; +import net.ccbluex.liquidbounce.ui.clickgui.Panel; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ButtonElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.Style; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; import net.ccbluex.liquidbounce.ui.i18n.LanguageManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/TenacityStyle.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/TenacityStyle.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/TenacityStyle.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/TenacityStyle.java index 6d689efefa..7fd45847da 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/TenacityStyle.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/TenacityStyle.java @@ -3,12 +3,12 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.Style; +import net.ccbluex.liquidbounce.ui.clickgui.Panel; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ButtonElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.Style; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; import net.ccbluex.liquidbounce.ui.i18n.LanguageManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/WhiteStyle.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/WhiteStyle.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/WhiteStyle.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/WhiteStyle.java index e77d2b84a3..e2cdc0d981 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/WhiteStyle.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/WhiteStyle.java @@ -3,12 +3,12 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.Style; +import net.ccbluex.liquidbounce.ui.clickgui.Panel; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ButtonElement; +import net.ccbluex.liquidbounce.ui.clickgui.elements.ModuleElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.Style; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; import net.ccbluex.liquidbounce.ui.i18n.LanguageManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Client.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Client.java similarity index 88% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Client.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Client.java index 5e876d549b..872b7d58c8 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Client.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Client.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.dropdown; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.classic; import lombok.Getter; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/DropdownGUI.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/DropdownGUI.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/DropdownGUI.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/DropdownGUI.java index f29db7f0f5..d4d001d835 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/DropdownGUI.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/DropdownGUI.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.dropdown; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.classic; import net.ccbluex.liquidbounce.features.module.ModuleCategory; import net.ccbluex.liquidbounce.ui.client.hud.designer.GuiHudDesigner; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Manager.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Manager.java similarity index 88% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Manager.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Manager.java index f247b90238..dd8a3ec750 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Manager.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Manager.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.dropdown; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.classic; import net.ccbluex.liquidbounce.features.value.Value; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Module.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Module.java similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Module.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Module.java index 683ffc99be..79411a1381 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Module.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Module.java @@ -3,14 +3,14 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.dropdown; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.classic; import lombok.Getter; import net.ccbluex.liquidbounce.FDPClient; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; import net.ccbluex.liquidbounce.features.module.modules.client.HUD; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.impl.Fonts; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.impl.Fonts; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import net.ccbluex.liquidbounce.utils.timer.TickTimer; import net.ccbluex.liquidbounce.features.value.TextValue; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/ScaleUtils.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/ScaleUtils.java similarity index 93% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/ScaleUtils.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/ScaleUtils.java index 5efa2f2069..98ac4192d5 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/ScaleUtils.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/ScaleUtils.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.dropdown; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.classic; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Setting.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Setting.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Setting.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Setting.java index 696e2e2af4..5638c78b13 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Setting.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Setting.java @@ -3,12 +3,12 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.dropdown; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.classic; import net.ccbluex.liquidbounce.FDPClient; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; import net.ccbluex.liquidbounce.features.module.modules.client.HUD; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.impl.Fonts; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.impl.Fonts; import net.ccbluex.liquidbounce.utils.MathUtils; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import net.ccbluex.liquidbounce.utils.timer.TickTimer; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Tab.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Tab.java similarity index 96% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Tab.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Tab.java index 7b72a47935..2d95da81c2 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/dropdown/Tab.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/classic/Tab.java @@ -3,11 +3,11 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.dropdown; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.classic; import net.ccbluex.liquidbounce.FDPClient; import net.ccbluex.liquidbounce.features.module.ModuleCategory; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.impl.Fonts; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.impl.Fonts; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import java.awt.*; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/GuiExit.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/GuiExit.java similarity index 96% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/GuiExit.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/GuiExit.java index 8a7f05f2e0..4a84c78471 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/GuiExit.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/GuiExit.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.light; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.light; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.render.RenderUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/LightClickGUI.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/LightClickGUI.java similarity index 99% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/LightClickGUI.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/LightClickGUI.java index f158de045a..549cc9d520 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/LightClickGUI.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/LightClickGUI.java @@ -4,13 +4,13 @@ * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.light; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.light; import net.ccbluex.liquidbounce.FDPClient; import net.ccbluex.liquidbounce.features.module.Module; import net.ccbluex.liquidbounce.features.module.ModuleCategory; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.light.LightSettings.InputBox; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.light.ModuleSettings.Settings; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.light.LightSettings.InputBox; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.light.ModuleSettings.Settings; import net.ccbluex.liquidbounce.ui.client.hud.designer.GuiHudDesigner; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.AnimationHelper; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/LightSettings/InputBox.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/LightSettings/InputBox.java similarity index 99% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/LightSettings/InputBox.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/LightSettings/InputBox.java index 929e1b622d..cf883e5c7a 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/LightSettings/InputBox.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/LightSettings/InputBox.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.light.LightSettings; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.light.LightSettings; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/ModuleSettings/Setting.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/ModuleSettings/Setting.java similarity index 94% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/ModuleSettings/Setting.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/ModuleSettings/Setting.java index 17e870122f..92e506d51c 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/ModuleSettings/Setting.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/ModuleSettings/Setting.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.light.ModuleSettings; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.light.ModuleSettings; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/ModuleSettings/Settings.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/ModuleSettings/Settings.java similarity index 99% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/ModuleSettings/Settings.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/ModuleSettings/Settings.java index cf82f2c758..cfd973a847 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/light/ModuleSettings/Settings.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/light/ModuleSettings/Settings.java @@ -3,7 +3,7 @@ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.light.ModuleSettings; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.light.ModuleSettings; import net.ccbluex.liquidbounce.utils.AnimationHelper; import net.ccbluex.liquidbounce.utils.render.RenderUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/ColorManager.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/ColorManager.kt similarity index 100% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/ColorManager.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/ColorManager.kt diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/IconManager.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/IconManager.kt similarity index 100% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/IconManager.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/IconManager.kt diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/NewUi.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/NewUi.java similarity index 96% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/NewUi.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/NewUi.java index 643bca0acb..87cffba4a5 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/NewUi.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/NewUi.java @@ -1,10 +1,10 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer; import net.ccbluex.liquidbounce.features.module.ModuleCategory; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; import net.ccbluex.liquidbounce.ui.client.gui.newVer.IconManager; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element.CategoryElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element.SearchElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.CategoryElement; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.SearchElement; import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.ModuleElement; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.MouseUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/CategoryElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/CategoryElement.kt similarity index 96% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/CategoryElement.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/CategoryElement.kt index 637e2ba548..ec0d06258b 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/CategoryElement.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/CategoryElement.kt @@ -1,10 +1,10 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element import net.ccbluex.liquidbounce.FDPClient import net.ccbluex.liquidbounce.features.module.ModuleCategory import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.ModuleElement -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.extensions.animSmooth +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animSmooth import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.utils.MinecraftInstance import net.ccbluex.liquidbounce.utils.MouseUtils diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/SearchBox.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchBox.kt similarity index 77% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/SearchBox.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchBox.kt index ba181beef1..9b7c1caf62 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/SearchBox.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchBox.kt @@ -1,4 +1,4 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element import net.ccbluex.liquidbounce.ui.font.Fonts import net.minecraft.client.gui.GuiTextField diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/SearchElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchElement.kt similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/SearchElement.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchElement.kt index 11eb0bdd5c..66deeeb616 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/SearchElement.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchElement.kt @@ -1,8 +1,8 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager import net.ccbluex.liquidbounce.ui.client.gui.newVer.IconManager -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.extensions.animSmooth +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animSmooth import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.utils.MouseUtils import net.ccbluex.liquidbounce.utils.render.RenderUtils diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/components/Checkbox.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Checkbox.kt similarity index 86% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/components/Checkbox.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Checkbox.kt index 3456368d2b..8f91125828 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/components/Checkbox.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Checkbox.kt @@ -1,6 +1,6 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element.components +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.extensions.animLinear +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animLinear import net.ccbluex.liquidbounce.utils.render.BlendUtils import net.ccbluex.liquidbounce.utils.render.RenderUtils import org.lwjgl.opengl.GL11 diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/components/Slider.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Slider.kt similarity index 82% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/components/Slider.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Slider.kt index 096bfcc7ba..06930d3ed3 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/components/Slider.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Slider.kt @@ -1,7 +1,7 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element.components +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.extensions.animSmooth +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animSmooth import net.ccbluex.liquidbounce.utils.render.RenderUtils import java.awt.Color diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/components/ToggleSwitch.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/ToggleSwitch.kt similarity index 86% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/components/ToggleSwitch.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/ToggleSwitch.kt index fc488468ad..5403510458 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/components/ToggleSwitch.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/ToggleSwitch.kt @@ -1,6 +1,6 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element.components +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.extensions.animLinear +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animLinear import net.ccbluex.liquidbounce.utils.render.BlendUtils import net.ccbluex.liquidbounce.utils.render.RenderUtils diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/ModuleElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/ModuleElement.kt similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/ModuleElement.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/ModuleElement.kt index e60f0d03be..a5aabf585e 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/ModuleElement.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/ModuleElement.kt @@ -2,13 +2,13 @@ package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module import net.ccbluex.liquidbounce.features.module.Module import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element.components.ToggleSwitch +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components.ToggleSwitch import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl.BooleanElement import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl.ListElement import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl.IntElement import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl.FloatElement -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.extensions.animSmooth +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animSmooth import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.utils.render.BlendUtils import net.ccbluex.liquidbounce.utils.MinecraftInstance diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/ValueElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/ValueElement.kt similarity index 100% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/ValueElement.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/ValueElement.kt diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt similarity index 91% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt index 1ce1429a90..f13d28dfe2 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt @@ -1,6 +1,6 @@ package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element.components.Checkbox +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components.Checkbox import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.utils.MouseUtils diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt index b95c2f9d94..462bb129ca 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt @@ -1,7 +1,7 @@ package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element.components.Slider +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components.Slider import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.utils.MouseUtils diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt index 742f617023..0c6fe95414 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt @@ -1,7 +1,7 @@ package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.element.components.Slider +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components.Slider import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.utils.MouseUtils diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt index 7eea8d2259..c513e18cb2 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt @@ -2,7 +2,7 @@ package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.extensions.animSmooth +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animSmooth import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.utils.MouseUtils import net.ccbluex.liquidbounce.utils.render.RenderUtils diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/extensions/AnimHelper.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/extensions/AnimHelper.kt similarity index 76% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/extensions/AnimHelper.kt rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/extensions/AnimHelper.kt index 59f8e57ca4..4947d3381f 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/newVer/extensions/AnimHelper.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/extensions/AnimHelper.kt @@ -1,8 +1,8 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.newVer.extensions +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions import net.ccbluex.liquidbounce.utils.AnimationUtils import net.ccbluex.liquidbounce.utils.render.RenderUtils -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule fun Float.animSmooth(target: Float, speed: Float) = if (ClickGUIModule.fastRenderValue.get()) target else AnimationUtils.animate(target, this, speed * RenderUtils.deltaTime * 0.025F) diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/AnimationUtil.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/AnimationUtil.java similarity index 96% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/AnimationUtil.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/AnimationUtil.java index 04fac7efa5..a430e281a5 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/AnimationUtil.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/AnimationUtil.java @@ -1,4 +1,4 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.novoline; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.novoline; public class AnimationUtil { public static float fastmax(float a, float b) { diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/Button.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/Button.java similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/Button.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/Button.java index f205276eb7..92d85571f3 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/Button.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/Button.java @@ -1,7 +1,7 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.novoline; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.novoline; import net.ccbluex.liquidbounce.features.module.Module; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; import net.ccbluex.liquidbounce.utils.render.RenderUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/ClickyUI.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/ClickyUI.java similarity index 96% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/ClickyUI.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/ClickyUI.java index 89f21e14e9..fc044c9772 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/ClickyUI.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/ClickyUI.java @@ -1,7 +1,7 @@ /* * Decompiled with CFR 0.136. */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.novoline; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.novoline; import com.google.common.collect.Lists; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/ColorValueButton.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/ColorValueButton.java similarity index 95% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/ColorValueButton.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/ColorValueButton.java index 2d6aad3561..4a796ef06b 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/ColorValueButton.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/ColorValueButton.java @@ -1,7 +1,7 @@ /* * Decompiled with CFR 0.136. */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.novoline; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.novoline; import net.ccbluex.liquidbounce.utils.render.RenderUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/ValueButton.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/ValueButton.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/ValueButton.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/ValueButton.java index 90cda96264..027b5995c8 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/ValueButton.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/ValueButton.java @@ -1,4 +1,4 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.novoline; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.novoline; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/Window.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/Window.java similarity index 98% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/Window.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/Window.java index 80d8e8c1b5..6cb92fd9ff 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/novoline/Window.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/novoline/Window.java @@ -1,4 +1,4 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.novoline; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.novoline; import com.google.common.collect.Lists; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/CategoryScreen.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/CategoryScreen.java similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/CategoryScreen.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/CategoryScreen.java index 7aa45ada10..9b663a5067 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/CategoryScreen.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/CategoryScreen.java @@ -1,9 +1,9 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap; import net.ccbluex.liquidbounce.FDPClient; import net.ccbluex.liquidbounce.features.module.Module; import net.ccbluex.liquidbounce.features.module.ModuleCategory; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Utils.Position; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Utils.Position; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.MathUtils; import net.ccbluex.liquidbounce.utils.misc.Direction; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Downward.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Downward.java similarity index 91% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Downward.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Downward.java index 8f839fa81e..f4c305349a 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Downward.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Downward.java @@ -1,6 +1,6 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Utils.Position; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Utils.Position; import net.ccbluex.liquidbounce.features.value.Value; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/ModuleRender.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/ModuleRender.java similarity index 96% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/ModuleRender.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/ModuleRender.java index 37b8794637..650a9346a4 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/ModuleRender.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/ModuleRender.java @@ -1,9 +1,9 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap; import net.ccbluex.liquidbounce.features.module.Module; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Settings.*; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Utils.Position; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Settings.*; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Utils.Position; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import net.ccbluex.liquidbounce.utils.render.RoundedUtil; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/OtcClickGUi.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/OtcClickGUi.java similarity index 96% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/OtcClickGUi.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/OtcClickGUi.java index 662e5ec879..689d32c1b2 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/OtcClickGUi.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/OtcClickGUi.java @@ -1,8 +1,8 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap; import net.ccbluex.liquidbounce.features.module.ModuleCategory; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Utils.OtcScroll; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Utils.OtcScroll; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import net.ccbluex.liquidbounce.utils.render.RoundedUtil; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/BoolSetting.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/BoolSetting.java similarity index 84% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/BoolSetting.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/BoolSetting.java index 32342f6a49..9d6e97b88b 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/BoolSetting.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/BoolSetting.java @@ -1,9 +1,9 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Settings; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Settings; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Downward; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.ModuleRender; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.OtcClickGUi; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Downward; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.ModuleRender; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.OtcClickGUi; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import net.ccbluex.liquidbounce.features.value.BoolValue; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/ColorSetting.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/ColorSetting.java similarity index 97% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/ColorSetting.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/ColorSetting.java index fe3198828e..107cfc3cbd 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/ColorSetting.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/ColorSetting.java @@ -1,8 +1,8 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Settings; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Settings; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Downward; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.ModuleRender; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.OtcClickGUi; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Downward; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.ModuleRender; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.OtcClickGUi; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import net.ccbluex.liquidbounce.features.value.ColorValue; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/FloatSetting.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/FloatSetting.java similarity index 91% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/FloatSetting.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/FloatSetting.java index f939933f15..fefa448316 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/FloatSetting.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/FloatSetting.java @@ -1,10 +1,10 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Settings; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Settings; import net.ccbluex.liquidbounce.FDPClient; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Downward; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.ModuleRender; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.OtcClickGUi; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Downward; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.ModuleRender; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.OtcClickGUi; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.MathUtils; import net.ccbluex.liquidbounce.utils.render.RenderUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/ListSetting.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/ListSetting.java similarity index 95% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/ListSetting.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/ListSetting.java index 1a2d3d65cf..0086eea7d1 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/ListSetting.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/ListSetting.java @@ -1,7 +1,7 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Settings; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Settings; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.*; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.*; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.misc.Direction; import net.ccbluex.liquidbounce.utils.misc.EaseInOutQuad; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/NumberSetting.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/NumberSetting.java similarity index 95% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/NumberSetting.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/NumberSetting.java index 053b82de54..65629402e3 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/NumberSetting.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/NumberSetting.java @@ -1,8 +1,8 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Settings; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Settings; import net.ccbluex.liquidbounce.FDPClient; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.*; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.*; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.MathUtils; import net.ccbluex.liquidbounce.utils.render.RenderUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/TextSetting.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/TextSetting.java similarity index 95% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/TextSetting.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/TextSetting.java index e3be893584..f81f597923 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Settings/TextSetting.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Settings/TextSetting.java @@ -1,7 +1,7 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Settings; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Settings; -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.*; +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.*; import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import net.ccbluex.liquidbounce.features.value.TextValue; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Utils/OtcScroll.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Utils/OtcScroll.java new file mode 100644 index 0000000000..18b3b0d14e --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Utils/OtcScroll.java @@ -0,0 +1,7 @@ +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Utils; + +public enum OtcScroll +{ + UP, + DOWN; +} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Utils/Position.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Utils/Position.java similarity index 93% rename from src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Utils/Position.java rename to src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Utils/Position.java index 74767b991d..ee1428d406 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Utils/Position.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/onetap/Utils/Position.java @@ -1,4 +1,4 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Utils; +package net.ccbluex.liquidbounce.ui.clickgui.style.styles.onetap.Utils; import com.google.gson.annotations.Expose; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/GuiMainMenu.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/GuiMainMenu.java index b3f8da2756..543d822bc6 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/GuiMainMenu.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/GuiMainMenu.java @@ -6,7 +6,7 @@ package net.ccbluex.liquidbounce.ui.client.gui; import net.ccbluex.liquidbounce.FDPClient; -import net.ccbluex.liquidbounce.font.FontLoaders; +import net.ccbluex.liquidbounce.ui.font.FontLoaders; import net.ccbluex.liquidbounce.ui.client.altmanager.GuiAltManager; import net.ccbluex.liquidbounce.utils.MainMenuButton; import net.ccbluex.liquidbounce.utils.render.ParticleUtils; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/JelloStyle.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/JelloStyle.java deleted file mode 100644 index 4f11a7eae6..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/JelloStyle.java +++ /dev/null @@ -1,296 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles; - -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.Panel; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ButtonElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.elements.ModuleElement; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.Style; -import net.ccbluex.liquidbounce.ui.font.Fonts; -import net.ccbluex.liquidbounce.font.FontLoaders; -import net.ccbluex.liquidbounce.ui.font.GameFontRenderer; -import net.ccbluex.liquidbounce.ui.i18n.LanguageManager; -import net.ccbluex.liquidbounce.utils.block.BlockUtils; -import net.ccbluex.liquidbounce.utils.render.RenderUtils; -import net.ccbluex.liquidbounce.features.value.*; -import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StringUtils; -import org.lwjgl.input.Mouse; - -import java.awt.*; -import java.math.BigDecimal; -import java.util.List; - - -public class JelloStyle extends Style { - - private boolean mouseDown; - private boolean rightMouseDown; - - public static float drawSlider(final float value, final float min, final float max, final int x, final int y, final int width, final int mouseX, final int mouseY, final Color color) { - final float displayValue = Math.max(min, Math.min(value, max)); - - final float sliderValue = (float) x + (float) width * (displayValue - min) / (max - min); - - RenderUtils.drawRect(x, y, x + width, y + 2, Integer.MAX_VALUE); - RenderUtils.drawRect(x, y, sliderValue, y + 2, color); - RenderUtils.drawFilledCircle((int) sliderValue, y + 1, 3, color); - - if (mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + 3 && Mouse.isButtonDown(0)) { - double i = MathHelper.clamp_double(((double) mouseX - (double) x) / ((double) width - 3), 0, 1); - - BigDecimal bigDecimal = new BigDecimal(Double.toString((min + (max - min) * i))); - bigDecimal = bigDecimal.setScale(2, 4); - return bigDecimal.floatValue(); - } - - return value; - } - - @Override - public void drawPanel(int mouseX, int mouseY, Panel panel) { - RenderUtils.newDrawRect((float) panel.getX(), (float) panel.getY() + 16, (float) panel.getX() + panel.getWidth(), (float) panel.getY() -16, new Color(231,229,230).getRGB()); - RenderUtils.newDrawRect((float) panel.getX(), (float) panel.getY() - 3, (float) panel.getX() + panel.getWidth(), (float) panel.getY() + 15, new Color(231,229,230).getRGB()); - GlStateManager.resetColor(); - float textWidth = Fonts.font35.getStringWidth("§f" + StringUtils.stripControlCodes(LanguageManager.INSTANCE.get(panel.getName().replaceAll("%","")))); - FontLoaders.JELLO30.DisplayFont(FontLoaders.JELLO30, LanguageManager.INSTANCE.get(panel.getName().replaceAll("%","")), panel.getX() + 10, panel.getY() - 6, new Color(116,114,115).getRGB()); - } - - @Override - public void drawDescription(int mouseX, int mouseY, String text) { - /* - int textWidth = Fonts.font35.getStringWidth(LanguageManager.INSTANCE.get(text.replaceAll("%",""))); - - RenderUtils.drawBorderedRect(mouseX + 9, mouseY, mouseX + textWidth + 14, mouseY + Fonts.font35.FONT_HEIGHT + 3, 3F, new Color(217, 217, 217).getRGB(), new Color(217, 217, 217).getRGB()); - GlStateManager.resetColor(); - Fonts.font35.drawString(LanguageManager.INSTANCE.get(text.replaceAll("%","")), mouseX + 12, mouseY + (Fonts.font35.FONT_HEIGHT / 2), Color.BLACK.getRGB()); - */ - } - - @Override - public void drawButtonElement(int mouseX, int mouseY, ButtonElement buttonElement) { - Gui.drawRect(buttonElement.getX() - 1, buttonElement.getY() - 1, buttonElement.getX() + buttonElement.getWidth() + 1, buttonElement.getY() + buttonElement.getHeight() + 1, hoverColor(buttonElement.getColor() != Integer.MAX_VALUE ? new Color(14, 159, 255) : new Color(217,217,217)).getRGB()); - - GlStateManager.resetColor(); - - Fonts.font35.drawString(LanguageManager.INSTANCE.get(buttonElement.getDisplayName().replaceAll("%","")), buttonElement.getX() + 5, buttonElement.getY() + 5, Color.BLACK.getRGB()); - } - - @Override - public void drawModuleElement(int mouseX, int mouseY, ModuleElement moduleElement) { - Gui.drawRect(moduleElement.getX(), moduleElement.getY() - 1, moduleElement.getX() + moduleElement.getWidth(), moduleElement.getY() + moduleElement.getHeight() + 1, new Color(250,250,250).getRGB()); - Gui.drawRect(moduleElement.getX(), moduleElement.getY() - 1, moduleElement.getX() + moduleElement.getWidth(), moduleElement.getY() + moduleElement.getHeight() + 1, hoverColor(new Color(100,165,241, moduleElement.slowlyFade)).getRGB()); - GlStateManager.resetColor(); - int colour = 0; - if(moduleElement.getModule().getState() == true){ - FontLoaders.JELLO20.DisplayFont(FontLoaders.JELLO20, " " + LanguageManager.INSTANCE.get(moduleElement.getDisplayName().replaceAll("%","")), moduleElement.getX() + 5, moduleElement.getY() + 3, Color.WHITE.getRGB()); - } else { - FontLoaders.JELLO20.DisplayFont(FontLoaders.JELLO20," " + LanguageManager.INSTANCE.get(moduleElement.getDisplayName().replaceAll("%","")), moduleElement.getX() + 5, moduleElement.getY() + 3, Color.BLACK.getRGB()); - } - - // Draw settings - final List> moduleValues = moduleElement.getModule().getValues(); - - if (!moduleValues.isEmpty()) { - - if (moduleElement.isShowSettings()) { - if (moduleElement.getSettingsWidth() > 0F && moduleElement.slowlySettingsYPos > moduleElement.getY() + 6) - RenderUtils.newDrawRect(moduleElement.getX() + moduleElement.getWidth() + 4, moduleElement.getY() + 6, moduleElement.getX() + moduleElement.getWidth() + moduleElement.getSettingsWidth(), moduleElement.slowlySettingsYPos + 2, Color.white.getRGB()); - - moduleElement.slowlySettingsYPos = moduleElement.getY() + 6; - for (final Value value : moduleValues) { - if(!value.getDisplayable()) - continue; - - if (value instanceof BoolValue) { - final String text = value.getName(); - final float textWidth = Fonts.font35.getStringWidth(text); - - if (moduleElement.getSettingsWidth() < textWidth + 8) - moduleElement.setSettingsWidth(textWidth + 8); - - if (mouseX >= moduleElement.getX() + moduleElement.getWidth() + 4 && mouseX <= moduleElement.getX() + moduleElement.getWidth() + moduleElement.getSettingsWidth() && mouseY >= moduleElement.slowlySettingsYPos && mouseY <= moduleElement.slowlySettingsYPos + 12 && Mouse.isButtonDown(0) && moduleElement.isntPressed()) { - final BoolValue boolValue = (BoolValue) value; - - boolValue.set(!boolValue.get()); - mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F)); - } - - Fonts.font35.drawString(text, moduleElement.getX() + moduleElement.getWidth() + 6, moduleElement.slowlySettingsYPos + 2, ((BoolValue) value).get() ? Color.BLACK.getRGB() : new Color(120, 120, 120).getRGB()); - moduleElement.slowlySettingsYPos += 11; - } else if (value instanceof ListValue) { - final ListValue listValue = (ListValue) value; - - final String text = value.getName(); - final float textWidth = Fonts.font35.getStringWidth(text); - - if (moduleElement.getSettingsWidth() < textWidth + 16) - moduleElement.setSettingsWidth(textWidth + 16); - - Fonts.font35.drawString(text, moduleElement.getX() + moduleElement.getWidth() + 6, moduleElement.slowlySettingsYPos + 2, 0xFF000000); - Fonts.font35.drawString(listValue.openList ? "-" : "+", (int) (moduleElement.getX() + moduleElement.getWidth() + moduleElement.getSettingsWidth() - (listValue.openList ? 5 : 6)), moduleElement.slowlySettingsYPos + 2, 0xFF000000); - - if (mouseX >= moduleElement.getX() + moduleElement.getWidth() + 4 && mouseX <= moduleElement.getX() + moduleElement.getWidth() + moduleElement.getSettingsWidth() && mouseY >= moduleElement.slowlySettingsYPos && mouseY <= moduleElement.slowlySettingsYPos + Fonts.font35.FONT_HEIGHT && Mouse.isButtonDown(0) && moduleElement.isntPressed()) { - listValue.openList = !listValue.openList; - mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F)); - } - - moduleElement.slowlySettingsYPos += Fonts.font35.FONT_HEIGHT + 1; - - for (final String valueOfList : listValue.getValues()) { - final float textWidth2 = Fonts.font35.getStringWidth("- " + valueOfList); - - if (moduleElement.getSettingsWidth() < textWidth2 + 12) - moduleElement.setSettingsWidth(textWidth2 + 12); - - if (listValue.openList) { - if (mouseX >= moduleElement.getX() + moduleElement.getWidth() + 4 && mouseX <= moduleElement.getX() + moduleElement.getWidth() + moduleElement.getSettingsWidth() && mouseY >= moduleElement.slowlySettingsYPos + 2 && mouseY <= moduleElement.slowlySettingsYPos + 14 && Mouse.isButtonDown(0) && moduleElement.isntPressed()) { - listValue.set(valueOfList); - mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F)); - } - - GlStateManager.resetColor(); - Fonts.font35.drawString("- " + valueOfList, moduleElement.getX() + moduleElement.getWidth() + 6, moduleElement.slowlySettingsYPos + 2, listValue.get() != null && listValue.get().equalsIgnoreCase(valueOfList) ? Color.BLACK.getRGB() : new Color(120, 120, 120).getRGB()); - moduleElement.slowlySettingsYPos += Fonts.font35.FONT_HEIGHT + 1; - } - } - - if (!listValue.openList) { - moduleElement.slowlySettingsYPos += 1; - } - } else if (value instanceof FloatValue) { - final FloatValue floatValue = (FloatValue) value; - final String text = value.getName() + ": " + round(floatValue.get()); - final float textWidth = Fonts.font35.getStringWidth(text); - - if (moduleElement.getSettingsWidth() < textWidth + 8) - moduleElement.setSettingsWidth(textWidth + 8); - - final float valueOfSlide = drawSlider(floatValue.get(), floatValue.getMinimum(), floatValue.getMaximum(), moduleElement.getX() + moduleElement.getWidth() + 8, moduleElement.slowlySettingsYPos + 14, (int) moduleElement.getSettingsWidth() - 12, mouseX, mouseY, new Color(7, 152, 252)); - - if (valueOfSlide != floatValue.get()) - floatValue.set(valueOfSlide); - - Fonts.font35.drawString(text, moduleElement.getX() + moduleElement.getWidth() + 6, moduleElement.slowlySettingsYPos + 3, 0xFF000000); - moduleElement.slowlySettingsYPos += 19; - } else if (value instanceof IntegerValue) { - final IntegerValue integerValue = (IntegerValue) value; - final String text = value.getName() + ": " + (value instanceof BlockValue ? BlockUtils.getBlockName(integerValue.get()) + " (" + integerValue.get() + ")" : integerValue.get()); - final float textWidth = Fonts.font35.getStringWidth(text); - - if (moduleElement.getSettingsWidth() < textWidth + 8) - moduleElement.setSettingsWidth(textWidth + 8); - - final float valueOfSlide = drawSlider(integerValue.get(), integerValue.getMinimum(), integerValue.getMaximum(), moduleElement.getX() + moduleElement.getWidth() + 8, moduleElement.slowlySettingsYPos + 14, (int) moduleElement.getSettingsWidth() - 12, mouseX, mouseY, new Color(7, 152, 252)); - - if (valueOfSlide != integerValue.get()) - integerValue.set((int) valueOfSlide); - - Fonts.font35.drawString(text, moduleElement.getX() + moduleElement.getWidth() + 6, moduleElement.slowlySettingsYPos + 3, 0xFF000000); - moduleElement.slowlySettingsYPos += 19; - } else if (value instanceof FontValue) { - final FontValue fontValue = (FontValue) value; - final FontRenderer fontRenderer = fontValue.get(); - - String displayString = "Font: Unknown"; - - if (fontRenderer instanceof GameFontRenderer) { - final GameFontRenderer liquidFontRenderer = (GameFontRenderer) fontRenderer; - - displayString = "Font: " + liquidFontRenderer.getDefaultFont().getFont().getName() + " - " + liquidFontRenderer.getDefaultFont().getFont().getSize(); - } else if (fontRenderer == Fonts.minecraftFont) - displayString = "Font: Minecraft"; - else { - final Object[] objects = Fonts.getFontDetails(fontRenderer); - - if (objects != null) { - displayString = objects[0] + ((int) objects[1] != -1 ? " - " + objects[1] : ""); - } - } - - Fonts.font35.drawString(displayString, moduleElement.getX() + moduleElement.getWidth() + 6, moduleElement.slowlySettingsYPos + 2, Color.BLACK.getRGB()); - int stringWidth = Fonts.font35.getStringWidth(displayString); - - if (moduleElement.getSettingsWidth() < stringWidth + 8) - moduleElement.setSettingsWidth(stringWidth + 8); - - if ((Mouse.isButtonDown(0) && !mouseDown || Mouse.isButtonDown(1) && !rightMouseDown) && mouseX >= moduleElement.getX() + moduleElement.getWidth() + 4 && mouseX <= moduleElement.getX() + moduleElement.getWidth() + moduleElement.getSettingsWidth() && mouseY >= moduleElement.slowlySettingsYPos && mouseY <= moduleElement.slowlySettingsYPos + 12) { - final List fonts = Fonts.getFonts(); - - if (Mouse.isButtonDown(0)) { - for (int i = 0; i < fonts.size(); i++) { - final FontRenderer font = fonts.get(i); - - if (font == fontRenderer) { - i++; - - if (i >= fonts.size()) - i = 0; - - fontValue.set(fonts.get(i)); - break; - } - } - } else { - for (int i = fonts.size() - 1; i >= 0; i--) { - final FontRenderer font = fonts.get(i); - - if (font == fontRenderer) { - i--; - - if (i >= fonts.size()) - i = 0; - - if (i < 0) - i = fonts.size() - 1; - - fontValue.set(fonts.get(i)); - break; - } - } - } - } - - moduleElement.slowlySettingsYPos += 11; - } else { - final String text = value.getName() + ": " + value.get(); - final float textWidth = Fonts.font35.getStringWidth(text); - - if (moduleElement.getSettingsWidth() < textWidth + 8) - moduleElement.setSettingsWidth(textWidth + 8); - - GlStateManager.resetColor(); - Fonts.font35.drawString(text, moduleElement.getX() + moduleElement.getWidth() + 6, moduleElement.slowlySettingsYPos + 4, 0xFF000000); - moduleElement.slowlySettingsYPos += 12; - } - } - - moduleElement.updatePressed(); - mouseDown = Mouse.isButtonDown(0); - rightMouseDown = Mouse.isButtonDown(1); - } - } - } - - private BigDecimal round(final float v) { - BigDecimal bigDecimal = new BigDecimal(Float.toString(v)); - bigDecimal = bigDecimal.setScale(2, 4); - return bigDecimal; - } - - private Color hoverColor(final Color color) { - final int r = color.getRed(); - final int g = color.getGreen(); - final int b = color.getBlue(); - - return new Color(Math.max(r, 0), Math.max(g, 0), Math.max(b, 0), color.getAlpha()); - } -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Utils/OtcScroll.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Utils/OtcScroll.java deleted file mode 100644 index 6e5e6093ad..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/style/styles/onetap/Utils/OtcScroll.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.onetap.Utils; - -public enum OtcScroll -{ - UP, - DOWN; -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/Animation.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/Animation.java deleted file mode 100644 index ded5dddfee..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/Animation.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations; - -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.normal.TimerUtil; - -public abstract class Animation { - - public final TimerUtil timerUtil = new TimerUtil(); - protected int duration; - protected double endPoint; - protected Direction direction; - - public Animation(int ms, double endPoint) { - this.duration = ms; - this.endPoint = endPoint; - this.direction = Direction.FORWARDS; - } - - public Animation(int ms, double endPoint, Direction direction) { - this.duration = ms; //Time in milliseconds of how long you want the animation to take. - this.endPoint = endPoint; //The desired distance for the animated object to go. - this.direction = direction; //Direction in which the graph is going. If backwards, will start from endPoint and go to 0. - } - - public boolean finished(Direction direction) { - return isDone() && this.direction.equals(direction); - } - - public boolean isDone() { - return timerUtil.hasTimeElapsed(duration); - } - - public Direction getDirection() { - return direction; - } - - public void setDirection(Direction direction) { - if (this.direction != direction) { - this.direction = direction; - timerUtil.setTime(System.currentTimeMillis() - (duration - Math.min(duration, timerUtil.getTime()))); - } - } - - protected boolean correctOutput() { - return false; - } - - public double getOutput() { - if (direction == Direction.FORWARDS) { - if (isDone()) - return endPoint; - return (getEquation(timerUtil.getTime()) * endPoint); - } else { - if (isDone()) return 0; - if (correctOutput()) { - double revTime = Math.min(duration, Math.max(0, duration - timerUtil.getTime())); - return getEquation(revTime) * endPoint; - } else return (1 - getEquation(timerUtil.getTime())) * endPoint; - } - } - - protected abstract double getEquation(double x); - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/Direction.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/Direction.java deleted file mode 100644 index 25573aa194..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/Direction.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations; - -public enum Direction { - FORWARDS, - BACKWARDS; - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/DecelerateAnimation.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/DecelerateAnimation.java deleted file mode 100644 index 9e7eb2faae..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/DecelerateAnimation.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.impl; - -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Animation; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Direction; - -public class DecelerateAnimation extends Animation { - - public DecelerateAnimation(int ms, double endPoint) { - super(ms, endPoint); - } - - public DecelerateAnimation(int ms, double endPoint, Direction direction) { - super(ms, endPoint, direction); - } - - protected double getEquation(double x) { - double x1 = x / duration; - return 1 - ((x1 - 1) * (x1 - 1)); - } -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/EaseBackIn.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/EaseBackIn.java deleted file mode 100644 index f05be0bcd3..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/EaseBackIn.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.impl; - -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Animation; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Direction; - -public class EaseBackIn extends Animation { - private final float easeAmount; - - public EaseBackIn(int ms, double endPoint, float easeAmount) { - super(ms, endPoint); - this.easeAmount = easeAmount; - } - - public EaseBackIn(int ms, double endPoint, float easeAmount, Direction direction) { - super(ms, endPoint, direction); - this.easeAmount = easeAmount; - } - - @Override - protected boolean correctOutput() { - return true; - } - - @Override - protected double getEquation(double x) { - double x1 = x / duration; - float shrink = easeAmount + 1; - return Math.max(0, 1 + shrink * Math.pow(x1 - 1, 3) + easeAmount * Math.pow(x1 - 1, 2)); - } - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/EaseInOutQuad.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/EaseInOutQuad.java deleted file mode 100644 index 9b5ed4f177..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/EaseInOutQuad.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.impl; - -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Animation; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Direction; - -public class EaseInOutQuad extends Animation { - - public EaseInOutQuad(int ms, double endPoint) { - super(ms, endPoint); - } - - public EaseInOutQuad(int ms, double endPoint, Direction direction) { - super(ms, endPoint, direction); - } - - protected double getEquation(double x1) { - double x = x1 / duration; - return x < 0.5 ? 2 * Math.pow(x, 2) : 1 - Math.pow(-2 * x + 2, 2) / 2; - } - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/ElasticAnimation.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/ElasticAnimation.java deleted file mode 100644 index 7c1943e498..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/ElasticAnimation.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.impl; - -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Animation; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Direction; - -public class ElasticAnimation extends Animation { - - final float easeAmount; - final float smooth; - final boolean reallyElastic; - - public ElasticAnimation(int ms, double endPoint, float elasticity, float smooth, boolean moreElasticity) { - super(ms, endPoint); - this.easeAmount = elasticity; - this.smooth = smooth; - this.reallyElastic = moreElasticity; - } - - public ElasticAnimation(int ms, double endPoint, float elasticity, float smooth, boolean moreElasticity, Direction direction) { - super(ms, endPoint, direction); - this.easeAmount = elasticity; - this.smooth = smooth; - this.reallyElastic = moreElasticity; - } - - @Override - protected double getEquation(double x) { - double x1 = Math.pow(x / duration, smooth); //Used to force input to range from 0 - 1 - double elasticity = easeAmount * .1f; - return Math.pow(2, -10 * (reallyElastic ? Math.sqrt(x1) : x1)) * Math.sin((x1 - (elasticity / 4)) * ((2 * Math.PI) / elasticity)) + 1; - } -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/SmoothStepAnimation.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/SmoothStepAnimation.java deleted file mode 100644 index bc36d73a2c..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/animations/impl/SmoothStepAnimation.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.impl; - -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Animation; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Direction; - -public class SmoothStepAnimation extends Animation { - - public SmoothStepAnimation(int ms, double endPoint) { - super(ms, endPoint); - } - - public SmoothStepAnimation(int ms, double endPoint, Direction direction) { - super(ms, endPoint, direction); - } - - protected double getEquation(double x) { - double x1 = x / (double) duration; - return -2 * Math.pow(x1, 3) + (3 * Math.pow(x1, 2)); - } - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/Main.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/Main.java deleted file mode 100644 index 2e25b35871..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/Main.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.normal; - -import net.ccbluex.liquidbounce.features.module.Module; -import net.ccbluex.liquidbounce.features.module.ModuleCategory; -import net.ccbluex.liquidbounce.features.module.ModuleManager; - -import java.util.List; -import java.util.stream.Collectors; - -public class Main{ - - public static int categoryCount; - - public static boolean reloadModules; - - public static float allowedClickGuiHeight = 300; - - public static List getModulesInCategory(ModuleCategory c, ModuleManager moduleManager) { - return moduleManager.getModules().stream().filter(m -> m.getCategory() == c).collect(Collectors.toList()); - } - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/Screen.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/Screen.java deleted file mode 100644 index 569331a4e0..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/Screen.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.normal; - -public interface Screen extends Utils { - - void initGui(); - - void keyTyped(char typedChar, int keyCode); - - void drawScreen(int mouseX, int mouseY); - - void mouseClicked(int mouseX, int mouseY, int button); - - void mouseReleased(int mouseX, int mouseY, int state); - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/TimerUtil.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/TimerUtil.java deleted file mode 100644 index e8081e0fad..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/TimerUtil.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.normal; - -public class TimerUtil { - - public long lastMS = System.currentTimeMillis(); - - - public boolean hasTimeElapsed(long time) { - return System.currentTimeMillis() - lastMS > time; - } - - - public long getTime() { - return System.currentTimeMillis() - lastMS; - } - - public void setTime(long time) { - lastMS = time; - } - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/Utils.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/Utils.java deleted file mode 100644 index 5e6729bc04..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/normal/Utils.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.normal; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -public interface Utils { - Minecraft mc = Minecraft.getMinecraft(); - FontRenderer fr = mc.fontRendererObj; -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/objects/Drag.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/objects/Drag.java deleted file mode 100644 index b60648a034..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/objects/Drag.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.objects; - -public class Drag { - - private float xPos, yPos; - private float startX, startY; - private boolean dragging; - - public Drag(float initialXVal, float initialYVal) { - this.xPos = initialXVal; - this.yPos = initialYVal; - } - - public float getX() { - return xPos; - } - - public void setX(float x) { - this.xPos = x; - } - - public float getY() { - return yPos; - } - - public void setY(float y) { - this.yPos = y; - } - - public final void onDraw(int mouseX, int mouseY) { - if (dragging) { - xPos = (mouseX - startX); - yPos = (mouseY - startY); - } - } - - public final void onDrawNegX(int mouseX, int mouseY) { - if (dragging) { - xPos = -(mouseX - startX); - yPos = (mouseY - startY); - } - } - - public final void onClick(int mouseX, int mouseY, int button, boolean canDrag) { - if (button == 0 && canDrag) { - dragging = true; - startX = (int) (mouseX - xPos); - startY = (int) (mouseY - yPos); - } - } - - public final void onClickAddX(int mouseX, int mouseY, int button, boolean canDrag) { - if (button == 0 && canDrag) { - dragging = true; - startX = (int) (mouseX + xPos); - startY = (int) (mouseY - yPos); - } - } - - public final void onRelease(int button) { - if (button == 0) dragging = false; - } - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/objects/PasswordField.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/objects/PasswordField.java deleted file mode 100644 index 6b35a2c78e..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/objects/PasswordField.java +++ /dev/null @@ -1,619 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.objects; - -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontRenderer; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiPageButtonList; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.ChatAllowedCharacters; -import net.minecraft.util.MathHelper; - -import java.util.function.Predicate; - -public class PasswordField extends Gui { - - private final int id; - private final int height; - private final FontRenderer fontRenderer; - /** - * The width of this text field. - */ - public final int width; - public int bottomBarColor = -1; - public int textColor = -1; - public final int cursorColor = -1; - public final int xPosition; - public final int yPosition; - public final String placeholder; - public double placeHolderTextX; - /** - * Has the current text being edited on the textbox. - */ - private String text = ""; - private int maxStringLength = 32; - private int cursorCounter; - private boolean enableBackgroundDrawing = true; - /** - * if true the textbox can lose focus by clicking elsewhere on the screen - */ - private boolean canLoseFocus = true; - /** - * If this value is true along with isEnabled, keyTyped will process the keys. - */ - private boolean isFocused; - /** - * If this value is true along with isFocused, keyTyped will process the keys. - */ - private boolean isEnabled = true; - /** - * The current character index that should be used as start of the rendered text. - */ - private int lineScrollOffset; - private int cursorPosition; - /** - * other selection position, maybe the same as the cursor - */ - private int selectionEnd; - /** - * True if this textbox is visible - */ - private boolean visible = true; - private GuiPageButtonList.GuiResponder field_175210_x; - private Predicate field_175209_y = s -> true; - - public PasswordField(String placeholder, int componentId, int x, int y, int par5Width, int par6Height, FontRenderer fr) { - this.placeholder = placeholder; - this.id = componentId; - this.xPosition = x; - this.yPosition = y; - this.width = par5Width; - this.height = par6Height; - this.fontRenderer = fr; - placeHolderTextX = (xPosition + width) / 2f; - } - - /** - * Returns the contents of the textbox - */ - public String getText() { - return this.text; - } - - /** - * Sets the text of the textbox - */ - public void setText(String p_146180_1_) { - if (this.field_175209_y.test(p_146180_1_)) { - if (p_146180_1_.length() > this.maxStringLength) { - this.text = p_146180_1_.substring(0, this.maxStringLength); - } else { - this.text = p_146180_1_; - } - - this.setCursorPositionEnd(); - } - } - - /** - * returns the text between the cursor and selectionEnd - */ - public String getSelectedText() { - int i = Math.min(this.cursorPosition, this.selectionEnd); - int j = Math.max(this.cursorPosition, this.selectionEnd); - return this.text.substring(i, j); - } - - /** - * replaces selected text, or inserts text at the position on the cursor - */ - public void writeText(String text) { - String s = ""; - String s1 = ChatAllowedCharacters.filterAllowedCharacters(text); - int i = Math.min(this.cursorPosition, this.selectionEnd); - int j = Math.max(this.cursorPosition, this.selectionEnd); - int k = this.maxStringLength - this.text.length() - (i - j); - int l; - - if (this.text.length() > 0) { - s = s + this.text.substring(0, i); - } - - if (k < s1.length()) { - s = s + s1.substring(0, k); - l = k; - } else { - s = s + s1; - l = s1.length(); - } - - if (this.text.length() > 0 && j < this.text.length()) { - s = s + this.text.substring(j); - } - - if (this.field_175209_y.test(s)) { - this.text = s; - this.moveCursorBy(i - this.selectionEnd + l); - - if (this.field_175210_x != null) { - this.field_175210_x.func_175319_a(this.id, this.text); - } - } - } - - /** - * Deletes the specified number of words starting at the cursor position. Negative numbers will delete words left of - * the cursor. - */ - public void deleteWords(int p_146177_1_) { - if (this.text.length() != 0) { - if (this.selectionEnd != this.cursorPosition) { - this.writeText(""); - } else { - this.deleteFromCursor(this.getNthWordFromCursor(p_146177_1_) - this.cursorPosition); - } - } - } - - public void drawTextBox() { - drawTextBox(text, false); - } - - /** - * delete the selected text, otherwsie deletes characters from either side of the cursor. params: delete num - */ - public void deleteFromCursor(int p_146175_1_) { - if (this.text.length() != 0) { - if (this.selectionEnd != this.cursorPosition) { - this.writeText(""); - } else { - boolean flag = p_146175_1_ < 0; - int i = flag ? this.cursorPosition + p_146175_1_ : this.cursorPosition; - int j = flag ? this.cursorPosition : this.cursorPosition + p_146175_1_; - String s = ""; - - if (i >= 0) { - s = this.text.substring(0, i); - } - - if (j < this.text.length()) { - s = s + this.text.substring(j); - } - - if (this.field_175209_y.test(s)) { - this.text = s; - - if (flag) { - this.moveCursorBy(p_146175_1_); - } - - if (this.field_175210_x != null) { - this.field_175210_x.func_175319_a(this.id, this.text); - } - } - } - } - } - - /** - * see @getNthNextWordFromPos() params: N, position - */ - public int getNthWordFromCursor(int p_146187_1_) { - return this.getNthWordFromPos(p_146187_1_, this.getCursorPosition()); - } - - /** - * gets the position of the nth word. N may be negative, then it looks backwards. params: N, position - */ - public int getNthWordFromPos(int p_146183_1_, int p_146183_2_) { - return this.func_146197_a(p_146183_1_, p_146183_2_, true); - } - - public int func_146197_a(int p_146197_1_, int p_146197_2_, boolean p_146197_3_) { - int i = p_146197_2_; - boolean flag = p_146197_1_ < 0; - int j = Math.abs(p_146197_1_); - - for (int k = 0; k < j; ++k) { - if (!flag) { - int l = this.text.length(); - i = this.text.indexOf(32, i); - - if (i == -1) { - i = l; - } else { - while (p_146197_3_ && i < l && this.text.charAt(i) == 32) { - ++i; - } - } - } else { - while (p_146197_3_ && i > 0 && this.text.charAt(i - 1) == 32) { - --i; - } - - while (i > 0 && this.text.charAt(i - 1) != 32) { - --i; - } - } - } - - return i; - } - - /** - * Moves the text cursor by a specified number of characters and clears the selection - */ - public void moveCursorBy(int p_146182_1_) { - this.setCursorPosition(this.selectionEnd + p_146182_1_); - } - - /** - * sets the cursors position to the beginning - */ - public void setCursorPositionZero() { - this.setCursorPosition(0); - } - - /** - * sets the cursors position to after the text - */ - public void setCursorPositionEnd() { - this.setCursorPosition(this.text.length()); - } - - /** - * Call this method from your GuiScreen to process the keys into the textbox - */ - public void textboxKeyTyped(char p_146201_1_, int p_146201_2_) { - if (!this.isFocused) { - } else if (GuiScreen.isKeyComboCtrlA(p_146201_2_)) { - this.setCursorPositionEnd(); - this.setSelectionPos(0); - } else if (GuiScreen.isKeyComboCtrlC(p_146201_2_)) { - GuiScreen.setClipboardString(this.getSelectedText()); - } else if (GuiScreen.isKeyComboCtrlV(p_146201_2_)) { - if (this.isEnabled) { - this.writeText(GuiScreen.getClipboardString()); - } - - } else if (GuiScreen.isKeyComboCtrlX(p_146201_2_)) { - GuiScreen.setClipboardString(this.getSelectedText()); - - if (this.isEnabled) { - this.writeText(""); - } - - } else { - switch (p_146201_2_) { - case 14: - if (GuiScreen.isCtrlKeyDown()) { - if (this.isEnabled) { - this.deleteWords(-1); - } - } else if (this.isEnabled) { - this.deleteFromCursor(-1); - } - - return; - - case 199: - if (GuiScreen.isShiftKeyDown()) { - this.setSelectionPos(0); - } else { - this.setCursorPositionZero(); - } - - return; - - case 203: - if (GuiScreen.isShiftKeyDown()) { - if (GuiScreen.isCtrlKeyDown()) { - this.setSelectionPos(this.getNthWordFromPos(-1, this.getSelectionEnd())); - } else { - this.setSelectionPos(this.getSelectionEnd() - 1); - } - } else if (GuiScreen.isCtrlKeyDown()) { - this.setCursorPosition(this.getNthWordFromCursor(-1)); - } else { - this.moveCursorBy(-1); - } - - return; - - case 205: - if (GuiScreen.isShiftKeyDown()) { - if (GuiScreen.isCtrlKeyDown()) { - this.setSelectionPos(this.getNthWordFromPos(1, this.getSelectionEnd())); - } else { - this.setSelectionPos(this.getSelectionEnd() + 1); - } - } else if (GuiScreen.isCtrlKeyDown()) { - this.setCursorPosition(this.getNthWordFromCursor(1)); - } else { - this.moveCursorBy(1); - } - - return; - - case 207: - if (GuiScreen.isShiftKeyDown()) { - this.setSelectionPos(this.text.length()); - } else { - this.setCursorPositionEnd(); - } - - return; - - case 211: - if (GuiScreen.isCtrlKeyDown()) { - if (this.isEnabled) { - this.deleteWords(1); - } - } else if (this.isEnabled) { - this.deleteFromCursor(1); - } - - return; - - default: - if (ChatAllowedCharacters.isAllowedCharacter(p_146201_1_)) { - if (this.isEnabled) { - this.writeText(Character.toString(p_146201_1_)); - } - - } else { - } - } - } - } - - /** - * Args: x, y, buttonClicked - */ - public void mouseClicked(int p_146192_1_, int p_146192_2_, int p_146192_3_) { - boolean flag = p_146192_1_ >= this.xPosition && p_146192_1_ < this.xPosition + this.width && p_146192_2_ >= this.yPosition && p_146192_2_ < this.yPosition + this.height; - - if (this.canLoseFocus) { - this.setFocused(flag); - } - - if (this.isFocused && flag && p_146192_3_ == 0) { - int i = p_146192_1_ - this.xPosition; - - if (this.enableBackgroundDrawing) { - i -= 4; - } - - String s = fontRenderer.trimStringToWidth(this.text.substring(this.lineScrollOffset), this.getWidth()); - this.setCursorPosition(fontRenderer.trimStringToWidth(s, i).length() + this.lineScrollOffset); - } - } - - /** - * Draws the textbox - */ - public void drawTextBox(String text, boolean password) { - if (password) - text = text.replaceAll(".", "*"); - - if (this.getVisible()) { - if (this.getEnableBackgroundDrawing()) { - GlStateManager.color(1, 1, 1, 1); - drawRect(this.xPosition, this.yPosition + this.height, this.xPosition + this.width, this.yPosition + this.height + 1, bottomBarColor); - } - - GlStateManager.color(1, 1, 1, 1); - int i = textColor; - int j = this.cursorPosition - this.lineScrollOffset; - int k = this.selectionEnd - this.lineScrollOffset; - String s = fontRenderer.trimStringToWidth(text.substring(this.lineScrollOffset), this.getWidth()); - boolean flag = j >= 0 && j <= s.length(); - boolean flag1 = this.isFocused && this.cursorCounter / 6 % 2 == 0 && flag; - int l = this.enableBackgroundDrawing ? this.xPosition + 4 : this.xPosition; - int i1 = this.enableBackgroundDrawing ? this.yPosition + (this.height - 8) / 4 : this.yPosition; - int j1 = l; - - if (!isFocused && placeholder != null && text.isEmpty()) { - fontRenderer.drawCenteredString(placeholder, (float) placeHolderTextX, i1, textColor); - } - - if (k > s.length()) { - k = s.length(); - } - - if (s.length() > 0) { - String s1 = flag ? s.substring(0, j) : s; - j1 = (int) fontRenderer.drawString(s1, (float) l, (float) i1, i); - } - - boolean flag2 = this.cursorPosition < text.length() || text.length() >= this.getMaxStringLength(); - int k1 = j1; - - if (!flag) { - k1 = j > 0 ? l + this.width : l; - } else if (flag2) { - k1 = j1 - 1; - --j1; - } - - if (s.length() > 0 && flag && j < s.length()) { - GlStateManager.color(1, 1, 1, 1); - j1 = (int) fontRenderer.drawString(s.substring(j), (float) j1 + 6, (float) i1, i); - } - - if (flag1) { - GlStateManager.color(1, 1, 1, 1); - if (flag2) { - Gui.drawRect(k1 + 4, i1 - 1, k1 + 5, i1 + 1 + fontRenderer.getHeight(), this.cursorColor); - } else { - fontRenderer.drawString("|", (float) k1 + 4, (float) i1, textColor); - } - } - - if (k != j) { - int l1 = l + fontRenderer.stringWidth(s.substring(0, k)); - this.drawCursorVertical(k1, i1 - 1, l1 - 1, i1 + 1 + fontRenderer.getHeight()); - } - - GlStateManager.color(1, 1, 1, 1); - } - } - - /** - * draws the vertical line cursor in the textbox - */ - private void drawCursorVertical(int p_146188_1_, int p_146188_2_, int p_146188_3_, int p_146188_4_) { - if (p_146188_1_ < p_146188_3_) { - int i = p_146188_1_; - p_146188_1_ = p_146188_3_; - p_146188_3_ = i; - } - - if (p_146188_2_ < p_146188_4_) { - int j = p_146188_2_; - p_146188_2_ = p_146188_4_; - p_146188_4_ = j; - } - - if (p_146188_3_ > this.xPosition + this.width) { - p_146188_3_ = this.xPosition + this.width; - } - - if (p_146188_1_ > this.xPosition + this.width) { - p_146188_1_ = this.xPosition + this.width; - } - - Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - GlStateManager.color(0.0F, 0.0F, 255.0F, 255.0F); - GlStateManager.disableTexture2D(); - GlStateManager.enableColorLogic(); - GlStateManager.colorLogicOp(5387); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); - worldrenderer.pos(p_146188_1_, p_146188_4_, 0.0D).endVertex(); - worldrenderer.pos(p_146188_3_, p_146188_4_, 0.0D).endVertex(); - worldrenderer.pos(p_146188_3_, p_146188_2_, 0.0D).endVertex(); - worldrenderer.pos(p_146188_1_, p_146188_2_, 0.0D).endVertex(); - tessellator.draw(); - GlStateManager.disableColorLogic(); - GlStateManager.enableTexture2D(); - } - - /** - * returns the maximum number of character that can be contained in this textbox - */ - public int getMaxStringLength() { - return this.maxStringLength; - } - - - /** - * returns the current position of the cursor - */ - public int getCursorPosition() { - return this.cursorPosition; - } - - /** - * sets the position of the cursor to the provided index - */ - public void setCursorPosition(int p_146190_1_) { - this.cursorPosition = p_146190_1_; - int i = this.text.length(); - this.cursorPosition = MathHelper.clamp_int(this.cursorPosition, 0, i); - this.setSelectionPos(this.cursorPosition); - } - - /** - * get enable drawing background and outline - */ - public boolean getEnableBackgroundDrawing() { - return this.enableBackgroundDrawing; - } - - /** - * Getter for the focused field - */ - public boolean isFocused() { - return this.isFocused; - } - - /** - * Sets focus to this gui element - */ - public void setFocused(boolean p_146195_1_) { - if (p_146195_1_ && !this.isFocused) { - this.cursorCounter = 0; - } - - this.isFocused = p_146195_1_; - } - - /** - * the side of the selection that is not the cursor, may be the same as the cursor - */ - public int getSelectionEnd() { - return this.selectionEnd; - } - - /** - * returns the width of the textbox depending on if background drawing is enabled - */ - public int getWidth() { - return this.getEnableBackgroundDrawing() ? this.width - 8 : this.width; - } - - /** - * Sets the position of the selection anchor (i.e. position the selection was started at) - */ - public void setSelectionPos(int p_146199_1_) { - int i = this.text.length(); - - if (p_146199_1_ > i) { - p_146199_1_ = i; - } - - if (p_146199_1_ < 0) { - p_146199_1_ = 0; - } - - this.selectionEnd = p_146199_1_; - - if (fontRenderer != null) { - if (this.lineScrollOffset > i) { - this.lineScrollOffset = i; - } - - int j = this.getWidth(); - String s = fontRenderer.trimStringToWidth(this.text.substring(this.lineScrollOffset), j); - int k = s.length() + this.lineScrollOffset; - - if (p_146199_1_ == this.lineScrollOffset) { - this.lineScrollOffset -= fontRenderer.trimStringToWidth(this.text, j, true).length(); - } - - if (p_146199_1_ > k) { - this.lineScrollOffset += p_146199_1_ - k; - } else if (p_146199_1_ <= this.lineScrollOffset) { - this.lineScrollOffset -= this.lineScrollOffset - p_146199_1_; - } - - this.lineScrollOffset = MathHelper.clamp_int(this.lineScrollOffset, 0, i); - } - } - - /** - * returns true if this textbox is visible - */ - public boolean getVisible() { - return this.visible; - } - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/DrRenderUtils.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/DrRenderUtils.java deleted file mode 100644 index 388baff982..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/DrRenderUtils.java +++ /dev/null @@ -1,308 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.render; - -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Animation; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.normal.Utils; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import org.lwjgl.opengl.GL11; - -import java.awt.*; - -import static org.lwjgl.opengl.GL11.*; - -public class DrRenderUtils implements Utils { - /** - * Draws a textured rectangle at z = 0. Args: x, y, u, v, width, height, textureWidth, textureHeight - */ - public static void drawModalRectWithCustomSizedTexture(float x, float y, float u, float v, float width, float height, float textureWidth, float textureHeight) { - float f = 1.0F / textureWidth; - float f1 = 1.0F / textureHeight; - Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); - worldrenderer.pos(x, y + height, 0.0D).tex(u * f, (v + height) * f1).endVertex(); - worldrenderer.pos(x + width, y + height, 0.0D).tex((u + width) * f, (v + height) * f1).endVertex(); - worldrenderer.pos(x + width, y, 0.0D).tex((u + width) * f, v * f1).endVertex(); - worldrenderer.pos(x, y, 0.0D).tex(u * f, v * f1).endVertex(); - tessellator.draw(); - } - public static void drawGradientRect2(double x, double y, double width, double height, int startColor, int endColor) { - drawGradientRect(x, y, x + width, y + height, startColor, endColor); - } - public static int fadeBetween(int startColour, int endColour, double progress) { - if (progress > 1) progress = 1 - progress % 1; - return fadeTo(startColour, endColour, progress); - } - public static int fadeTo(int startColour, int endColour, double progress) { - double invert = 1.0 - progress; - int r = (int) ((startColour >> 16 & 0xFF) * invert + - (endColour >> 16 & 0xFF) * progress); - int g = (int) ((startColour >> 8 & 0xFF) * invert + - (endColour >> 8 & 0xFF) * progress); - int b = (int) ((startColour & 0xFF) * invert + - (endColour & 0xFF) * progress); - int a = (int) ((startColour >> 24 & 0xFF) * invert + - (endColour >> 24 & 0xFF) * progress); - return ((a & 0xFF) << 24) | - ((r & 0xFF) << 16) | - ((g & 0xFF) << 8) | - (b & 0xFF); - } - public static void drawGradientRect(double left, double top, double right, double bottom, int startColor, int endColor) { - float f = (float) (startColor >> 24 & 255) / 255.0F; - float f1 = (float) (startColor >> 16 & 255) / 255.0F; - float f2 = (float) (startColor >> 8 & 255) / 255.0F; - float f3 = (float) (startColor & 255) / 255.0F; - float f4 = (float) (endColor >> 24 & 255) / 255.0F; - float f5 = (float) (endColor >> 16 & 255) / 255.0F; - float f6 = (float) (endColor >> 8 & 255) / 255.0F; - float f7 = (float) (endColor & 255) / 255.0F; - GlStateManager.disableTexture2D(); - GlStateManager.enableBlend(); - GlStateManager.disableAlpha(); - GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); - GlStateManager.shadeModel(7425); - Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); - worldrenderer.pos(right, top, zLevel).color(f1, f2, f3, f).endVertex(); - worldrenderer.pos(left, top, zLevel).color(f1, f2, f3, f).endVertex(); - worldrenderer.pos(left, bottom, zLevel).color(f5, f6, f7, f4).endVertex(); - worldrenderer.pos(right, bottom, zLevel).color(f5, f6, f7, f4).endVertex(); - tessellator.draw(); - GlStateManager.shadeModel(7424); - GlStateManager.disableBlend(); - GlStateManager.enableAlpha(); - GlStateManager.enableTexture2D(); - } - - public static float zLevel; - public static void drawGradientRectSideways2(double x, double y, double width, double height, int startColor, int endColor) { - drawGradientRectSideways(x, y, x + width, y + height, startColor, endColor); - } - - public static void drawGradientRectSideways(double left, double top, double right, double bottom, int startColor, int endColor) { - float f = (float) (startColor >> 24 & 255) / 255.0F; - float f1 = (float) (startColor >> 16 & 255) / 255.0F; - float f2 = (float) (startColor >> 8 & 255) / 255.0F; - float f3 = (float) (startColor & 255) / 255.0F; - float f4 = (float) (endColor >> 24 & 255) / 255.0F; - float f5 = (float) (endColor >> 16 & 255) / 255.0F; - float f6 = (float) (endColor >> 8 & 255) / 255.0F; - float f7 = (float) (endColor & 255) / 255.0F; - GlStateManager.disableTexture2D(); - GlStateManager.enableBlend(); - GlStateManager.disableAlpha(); - GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); - GlStateManager.shadeModel(7425); - Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); - worldrenderer.pos(right, top, zLevel).color(f5, f6, f7, f4).endVertex(); - worldrenderer.pos(left, top, zLevel).color(f1, f2, f3, f).endVertex(); - worldrenderer.pos(left, bottom, zLevel).color(f1, f2, f3, f).endVertex(); - worldrenderer.pos(right, bottom, zLevel).color(f5, f6, f7, f4).endVertex(); - tessellator.draw(); - GlStateManager.shadeModel(7424); - GlStateManager.disableBlend(); - GlStateManager.enableAlpha(); - GlStateManager.enableTexture2D(); - } - public static void scissor(double x, double y, double width, double height) { - ScaledResolution sr = new ScaledResolution(mc); - final double scale = sr.getScaleFactor(); - double finalHeight = height * scale; - double finalY = (sr.getScaledHeight() - y) * scale; - double finalX = x * scale; - double finalWidth = width * scale; - glScissor((int) finalX, (int) (finalY - finalHeight), (int) finalWidth, (int) finalHeight); - } - public static int interpolateColor(int color1, int color2, float amount) { - amount = Math.min(1, Math.max(0, amount)); - Color cColor1 = new Color(color1); - Color cColor2 = new Color(color2); - return interpolateColorC(cColor1, cColor2, amount).getRGB(); - } - - // Bad rounded rect method but the shader one requires scaling that sucks - public static void renderRoundedRect(float x, float y, float width, float height, float radius, int color) { - drawGoodCircle(x + radius, y + radius, radius, color); - drawGoodCircle(x + width - radius, y + radius, radius, color); - drawGoodCircle(x + radius, y + height - radius, radius, color); - drawGoodCircle(x + width - radius, y + height - radius, radius, color); - - drawRect2(x + radius, y, width - radius * 2, height, color); - drawRect2(x, y + radius, width, height - radius * 2, color); - } - - public static Color darker(Color color, float FACTOR) { - return new Color(Math.max((int) (color.getRed() * FACTOR), 0), - Math.max((int) (color.getGreen() * FACTOR), 0), - Math.max((int) (color.getBlue() * FACTOR), 0), - color.getAlpha()); - } - // Arrow for clickgui - public static void drawClickGuiArrow(float x, float y, float size, Animation animation, int color) { - glTranslatef(x, y, 0); - GLUtil.setup2DRendering(() -> GLUtil.render(GL_TRIANGLE_STRIP, () -> { - color(color); - - - double interpolation = interpolate(0.0, size / 2.0, animation.getOutput()); - if (animation.getOutput() >= .48) { - glVertex2d(size / 2f, interpolate(size / 2.0, 0.0, animation.getOutput())); - } - glVertex2d(0, interpolation); - - if (animation.getOutput() < .48) { - glVertex2d(size / 2f, interpolate(size / 2.0, 0.0, animation.getOutput())); - } - glVertex2d(size, interpolation); - - })); - glTranslatef(-x, -y, 0); - } - public static Color interpolateColorC(Color color1, Color color2, float amount) { - amount = Math.min(1, Math.max(0, amount)); - return new Color(interpolateInt(color1.getRed(), color2.getRed(), amount), - interpolateInt(color1.getGreen(), color2.getGreen(), amount), - interpolateInt(color1.getBlue(), color2.getBlue(), amount), - interpolateInt(color1.getAlpha(), color2.getAlpha(), amount)); - } - - public static int interpolateInt(int oldValue, int newValue, double interpolationValue){ - return interpolate(oldValue, newValue, (float) interpolationValue).intValue(); - } - public static Double interpolate(double oldValue, double newValue, double interpolationValue){ - return (oldValue + (newValue - oldValue) * interpolationValue); - } - - public static boolean isHovering(float x, float y, float width, float height, int mouseX, int mouseY) { - return mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height; - } - public static Color applyOpacity(Color color, float opacity) { - opacity = Math.min(1, Math.max(0, opacity)); - return new Color(color.getRed(), color.getGreen(), color.getBlue(), (int) (color.getAlpha() * opacity)); - } - public static int applyOpacity(int color, float opacity) { - Color old = new Color(color); - return applyOpacity(old, opacity).getRGB(); - } - // TODO: Replace this with a shader as GL_POINTS is not consistent with gui scales - public static void drawGoodCircle(double x, double y, float radius, int color) { - color(color); - GLUtil.setup2DRendering(() -> { - glEnable(GL_POINT_SMOOTH); - glHint(GL_POINT_SMOOTH_HINT, GL_NICEST); - glPointSize(radius * (2 * mc.gameSettings.guiScale)); - GLUtil.render(GL_POINTS, () -> glVertex2d(x, y)); - }); - } - // animation for sliders and stuff - public static double animate(double endPoint, double current, double speed) { - boolean shouldContinueAnimation = endPoint > current; - if (speed < 0.0D) { - speed = 0.0D; - } else if (speed > 1.0D) { - speed = 1.0D; - } - - double dif = Math.max(endPoint, current) - Math.min(endPoint, current); - double factor = dif * speed; - return current + (shouldContinueAnimation ? factor : -factor); - } - public static void fakeCircleGlow(float posX, float posY, float radius, Color color, float maxAlpha) { - setAlphaLimit(0); - glShadeModel(GL_SMOOTH); - GLUtil.setup2DRendering(() -> GLUtil.render(GL_TRIANGLE_FAN, () -> { - color(color.getRGB(), maxAlpha); - glVertex2d(posX, posY); - color(color.getRGB(), 0); - for (int i = 0; i <= 100; i++) { - double angle = (i * .06283) + 3.1415; - double x2 = Math.sin(angle) * radius; - double y2 = Math.cos(angle) * radius; - glVertex2d(posX + x2, posY + y2); - } - })); - glShadeModel(GL_FLAT); - setAlphaLimit(1); - } - - public static Color brighter(Color color, float FACTOR) { - int r = color.getRed(); - int g = color.getGreen(); - int b = color.getBlue(); - int alpha = color.getAlpha(); - - /* From 2D group: - * 1. black.brighter() should return grey - * 2. applying brighter to blue will always return blue, brighter - * 3. non pure color (non zero rgb) will eventually return white - */ - int i = (int) (1.0 / (1.0 - FACTOR)); - if (r == 0 && g == 0 && b == 0) { - return new Color(i, i, i, alpha); - } - if (r > 0 && r < i) r = i; - if (g > 0 && g < i) g = i; - if (b > 0 && b < i) b = i; - - return new Color(Math.min((int) (r / FACTOR), 255), - Math.min((int) (g / FACTOR), 255), - Math.min((int) (b / FACTOR), 255), - alpha); - } - // Scales the data that you put in the runnable - public static void scale(float x, float y, float scale, Runnable data) { - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, 0); - GL11.glScalef(scale, scale, 1); - GL11.glTranslatef(-x, -y, 0); - data.run(); - GL11.glPopMatrix(); - } - - // Sometimes colors get messed up in for loops, so we use this method to reset it to allow new colors to be used - public static void resetColor() { - GlStateManager.color(1, 1, 1, 1); - } - - public static void drawRect2(double x, double y, double width, double height, int color) { - resetColor(); - GLUtil.setup2DRendering(() -> GLUtil.render(GL11.GL_QUADS, () -> { - color(color); - GL11.glVertex2d(x, y); - GL11.glVertex2d(x, y + height); - GL11.glVertex2d(x + width, y + height); - GL11.glVertex2d(x + width, y); - })); - } - // This method colors the next avalible texture with a specified alpha value ranging from 0-1 - public static void color(int color, float alpha) { - float r = (float) (color >> 16 & 255) / 255.0F; - float g = (float) (color >> 8 & 255) / 255.0F; - float b = (float) (color & 255) / 255.0F; - GlStateManager.color(r, g, b, alpha); - } - - // This will set the alpha limit to a specified value ranging from 0-1 - public static void setAlphaLimit(float limit) { - GlStateManager.enableAlpha(); - GlStateManager.alphaFunc(GL_GREATER, (float) (limit * .01)); - } - - // Colors the next texture without a specified alpha value - public static void color(int color) { - color(color, (float) (color >> 24 & 255) / 255.0F); - } -} - diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/GLUtil.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/GLUtil.java deleted file mode 100644 index 566ab04d39..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/GLUtil.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.render; - -import net.minecraft.client.renderer.GlStateManager; - -import static org.lwjgl.opengl.GL11.*; - -public class GLUtil { - - public static void render(int mode, Runnable render){ - glBegin(mode); - render.run(); - glEnd(); - } - - public static void setup2DRendering(Runnable f) { - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDisable(GL_TEXTURE_2D); - f.run(); - glEnable(GL_TEXTURE_2D); - GlStateManager.disableBlend(); - } - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/GuiEvents.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/GuiEvents.java deleted file mode 100644 index f119a4e7a8..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/GuiEvents.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.render; - -public enum GuiEvents { - - DRAW, - CLICK, - RELEASE - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/Scroll.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/Scroll.java deleted file mode 100644 index 585e9d547e..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/Scroll.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.render; - -import lombok.Getter; -import lombok.Setter; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Animation; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.Direction; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.animations.impl.SmoothStepAnimation; -import org.lwjgl.input.Mouse; - -/** - * @author cedo - * @author Zywl - */ -public class Scroll { - - @Getter - @Setter - public float maxScroll = Float.MAX_VALUE, minScroll = 0, rawScroll; - public float scroll; - private Animation scrollAnimation = new SmoothStepAnimation(0, 0, Direction.BACKWARDS); - - public void onScroll(int ms) { - scroll = (float) (rawScroll - scrollAnimation.getOutput()); - rawScroll += Mouse.getDWheel() / 4f; - rawScroll = Math.max(Math.min(minScroll, rawScroll), -maxScroll); - scrollAnimation = new SmoothStepAnimation(ms, rawScroll - scroll, Direction.BACKWARDS); - } - - public boolean isScrollAnimationDone() { - return scrollAnimation.isDone(); - } - - public double getScroll() { - scroll = (float) (rawScroll - scrollAnimation.getOutput()); - return scroll; - } - - public void setMinScroll(float val) { - minScroll = val; - } - - public void setMaxScroll(float val) { - maxScroll = val; - } - -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/StencilUtil.java b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/StencilUtil.java deleted file mode 100644 index 0fa5987d79..0000000000 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/clickgui/utils/render/StencilUtil.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * FDPClient Hacked Client - * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce. - * https://github.com/SkidderMC/FDPClient/ - */ -package net.ccbluex.liquidbounce.ui.client.gui.clickgui.utils.render; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.shader.Framebuffer; -import org.lwjgl.opengl.EXTFramebufferObject; -import org.lwjgl.opengl.EXTPackedDepthStencil; - -import static org.lwjgl.opengl.GL11.*; - -public class StencilUtil { - static final Minecraft mc = Minecraft.getMinecraft(); - - public static void checkSetupFBO(Framebuffer framebuffer) { - if (framebuffer != null) { - if (framebuffer.depthBuffer > -1) { - setupFBO(framebuffer); - framebuffer.depthBuffer = -1; - } - } - } - - /** - * @param framebuffer - * @implNote Sets up the Framebuffer for Stencil use - */ - - public static void setupFBO(Framebuffer framebuffer) { - EXTFramebufferObject.glDeleteRenderbuffersEXT(framebuffer.depthBuffer); - final int stencilDepthBufferID = EXTFramebufferObject.glGenRenderbuffersEXT(); - EXTFramebufferObject.glBindRenderbufferEXT(EXTFramebufferObject.GL_RENDERBUFFER_EXT, stencilDepthBufferID); - EXTFramebufferObject.glRenderbufferStorageEXT(EXTFramebufferObject.GL_RENDERBUFFER_EXT, EXTPackedDepthStencil.GL_DEPTH_STENCIL_EXT, mc.displayWidth, mc.displayHeight); - EXTFramebufferObject.glFramebufferRenderbufferEXT(EXTFramebufferObject.GL_FRAMEBUFFER_EXT, EXTFramebufferObject.GL_STENCIL_ATTACHMENT_EXT, EXTFramebufferObject.GL_RENDERBUFFER_EXT, stencilDepthBufferID); - EXTFramebufferObject.glFramebufferRenderbufferEXT(EXTFramebufferObject.GL_FRAMEBUFFER_EXT, EXTFramebufferObject.GL_DEPTH_ATTACHMENT_EXT, EXTFramebufferObject.GL_RENDERBUFFER_EXT, stencilDepthBufferID); - } - - /** - * @implNote Initializes the Stencil Buffer to write to - */ - public static void initStencilToWrite() { - //init - mc.getFramebuffer().bindFramebuffer(false); - checkSetupFBO(mc.getFramebuffer()); - glClear(GL_STENCIL_BUFFER_BIT); - glEnable(GL_STENCIL_TEST); - - glStencilFunc(GL_ALWAYS, 1, 1); - glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE); - glColorMask(false, false, false, false); - } - - /** - * @param ref (usually 1) - * @implNote Reads the Stencil Buffer and stencils it onto everything until - * @see StencilUtil#uninitStencilBuffer() is called - */ - public static void readStencilBuffer(int ref) { - glColorMask(true, true, true, true); - glStencilFunc(GL_EQUAL, ref, 1); - glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); - } - - public static void uninitStencilBuffer() { - glDisable(GL_STENCIL_TEST); - } -} diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/options/LegacyUiLaunchOption.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/options/LegacyUiLaunchOption.kt index b4e3395e0b..fe9dd9722c 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/options/LegacyUiLaunchOption.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/options/LegacyUiLaunchOption.kt @@ -4,10 +4,10 @@ import net.ccbluex.liquidbounce.FDPClient import net.ccbluex.liquidbounce.ui.client.gui.EnumLaunchFilter import net.ccbluex.liquidbounce.ui.client.gui.LaunchFilterInfo import net.ccbluex.liquidbounce.ui.client.gui.LaunchOption -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule -import net.ccbluex.liquidbounce.ui.client.gui.ClickGuiConfig +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule +import net.ccbluex.liquidbounce.ui.clickgui.ClickGuiConfig import net.ccbluex.liquidbounce.ui.client.gui.GuiMainMenu -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.ClickGui +import net.ccbluex.liquidbounce.ui.clickgui.ClickGui import java.io.File @LaunchFilterInfo([EnumLaunchFilter.MODERN_UI]) diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/designer/EditorPanel.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/designer/EditorPanel.kt index 7d7ff72bb0..5b3816e7e4 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/designer/EditorPanel.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/designer/EditorPanel.kt @@ -17,7 +17,7 @@ import net.ccbluex.liquidbounce.ui.font.GameFontRenderer import net.ccbluex.liquidbounce.utils.MinecraftInstance import net.ccbluex.liquidbounce.utils.render.RenderUtils import net.ccbluex.liquidbounce.features.value.* -import net.ccbluex.liquidbounce.ui.client.gui.ClickGUIModule +import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule import net.minecraft.client.gui.Gui import net.minecraft.util.MathHelper import org.lwjgl.input.Mouse diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Notifications.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Notifications.kt index 27b80c102f..3c32a41dd5 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Notifications.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Notifications.kt @@ -6,8 +6,8 @@ package net.ccbluex.liquidbounce.ui.client.hud.element.elements import net.ccbluex.liquidbounce.FDPClient -import net.ccbluex.liquidbounce.font.CFontRenderer -import net.ccbluex.liquidbounce.font.FontLoaders +import net.ccbluex.liquidbounce.ui.font.CFontRenderer +import net.ccbluex.liquidbounce.ui.font.FontLoaders import net.ccbluex.liquidbounce.ui.client.hud.designer.GuiHudDesigner import net.ccbluex.liquidbounce.ui.client.hud.element.* import net.ccbluex.liquidbounce.utils.render.RenderUtils @@ -111,7 +111,7 @@ class Notification( index: Int, font: CFontRenderer, alpha: Int, blurRadius: Float, x: Float, y: Float, scale: Float, contentShadow: Boolean, titleShadow: Boolean, - motionBlur: Boolean, + motionBlur: Boolean, whiteText: Boolean, modeColored: Boolean, parent: Notifications.Companion diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Targets.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Targets.kt index f079da0aff..aa924ad0a9 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Targets.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Targets.kt @@ -7,7 +7,7 @@ package net.ccbluex.liquidbounce.ui.client.hud.element.elements import net.ccbluex.liquidbounce.FDPClient import net.ccbluex.liquidbounce.features.value.* -import net.ccbluex.liquidbounce.font.FontLoaders +import net.ccbluex.liquidbounce.ui.font.FontLoaders import net.ccbluex.liquidbounce.ui.client.hud.designer.GuiHudDesigner import net.ccbluex.liquidbounce.ui.client.hud.element.Border import net.ccbluex.liquidbounce.ui.client.hud.element.Element @@ -24,14 +24,12 @@ import net.ccbluex.liquidbounce.utils.render.* import net.ccbluex.liquidbounce.utils.render.ColorUtils.interpolateColorC import net.minecraft.client.gui.Gui import net.minecraft.client.gui.ScaledResolution -import net.minecraft.client.gui.inventory.GuiInventory import net.minecraft.client.renderer.GlStateManager import net.minecraft.client.renderer.OpenGlHelper import net.minecraft.client.renderer.RenderHelper import net.minecraft.entity.Entity import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.ItemStack import net.minecraft.util.ResourceLocation import org.lwjgl.opengl.GL11 import java.awt.Color diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/keybind/KeyBindManager.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/keybind/KeyBindManager.kt index da40da9b04..3a3bd47d15 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/keybind/KeyBindManager.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/keybind/KeyBindManager.kt @@ -1,7 +1,7 @@ package net.ccbluex.liquidbounce.ui.client.keybind import net.ccbluex.liquidbounce.FDPClient -import net.ccbluex.liquidbounce.font.FontLoaders +import net.ccbluex.liquidbounce.ui.font.FontLoaders import net.ccbluex.liquidbounce.ui.client.other.PopUI import net.ccbluex.liquidbounce.utils.render.RenderUtils import net.minecraft.client.gui.GuiScreen diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/keybind/KeyInfo.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/keybind/KeyInfo.kt index f609294201..0935e58d71 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/client/keybind/KeyInfo.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/keybind/KeyInfo.kt @@ -8,7 +8,7 @@ package net.ccbluex.liquidbounce.ui.client.keybind import net.ccbluex.liquidbounce.FDPClient import net.ccbluex.liquidbounce.handler.macro.Macro import net.ccbluex.liquidbounce.features.module.Module -import net.ccbluex.liquidbounce.font.FontLoaders +import net.ccbluex.liquidbounce.ui.font.FontLoaders import net.ccbluex.liquidbounce.ui.font.Fonts import net.ccbluex.liquidbounce.ui.i18n.LanguageManager import net.ccbluex.liquidbounce.utils.MinecraftInstance diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/font/AWTFontRenderer.kt b/src/main/java/net/ccbluex/liquidbounce/ui/font/AWTFontRenderer.kt index 646b530f5b..21accf827a 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/font/AWTFontRenderer.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/font/AWTFontRenderer.kt @@ -118,7 +118,7 @@ class AWTFontRenderer(val font: Font, startChar: Int = 0, stopChar: Int = 255) { GL11.glBegin(GL11.GL_QUADS) for (char in text.toCharArray()) { - if (char.toInt() >= charLocations.size) { + if (char.code >= charLocations.size) { GL11.glEnd() // Ugly solution, because floating point numbers, but I think that shouldn't be that much of a problem @@ -132,7 +132,7 @@ class AWTFontRenderer(val font: Font, startChar: Int = 0, stopChar: Int = 255) { GL11.glBegin(GL11.GL_QUADS) } else { - val fontChar = charLocations[char.toInt()] ?: continue + val fontChar = charLocations[char.code] ?: continue drawChar(fontChar, currX.toFloat(), 0f) currX += fontChar.width - 8.0 @@ -269,10 +269,10 @@ class AWTFontRenderer(val font: Font, startChar: Int = 0, stopChar: Int = 255) { for (c in text.toCharArray()) { val fontChar = charLocations[ - if (c.toInt() < charLocations.size) - c.toInt() - else - '\u0003'.toInt() + if (c.code < charLocations.size) + c.code + else + '\u0003'.code ] ?: continue width += fontChar.width - 8 @@ -280,7 +280,6 @@ class AWTFontRenderer(val font: Font, startChar: Int = 0, stopChar: Int = 255) { return width / 2 } - fun drawOutlineStringWithoutGL(s: String, x: Float, y: Float, color: Int,font: FontRenderer) { font.drawString(ColorUtils.stripColor(s), (x * 2 - 1).toInt(), (y * 2).toInt(), Color.BLACK.rgb) diff --git a/src/main/java/net/ccbluex/liquidbounce/font/CFont.java b/src/main/java/net/ccbluex/liquidbounce/ui/font/CFont.java similarity index 99% rename from src/main/java/net/ccbluex/liquidbounce/font/CFont.java rename to src/main/java/net/ccbluex/liquidbounce/ui/font/CFont.java index ff3de3604b..a46b5d2062 100644 --- a/src/main/java/net/ccbluex/liquidbounce/font/CFont.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/font/CFont.java @@ -4,7 +4,7 @@ * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.font; +package net.ccbluex.liquidbounce.ui.font; import net.minecraft.client.renderer.texture.DynamicTexture; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/net/ccbluex/liquidbounce/font/CFontRenderer.java b/src/main/java/net/ccbluex/liquidbounce/ui/font/CFontRenderer.java similarity index 99% rename from src/main/java/net/ccbluex/liquidbounce/font/CFontRenderer.java rename to src/main/java/net/ccbluex/liquidbounce/ui/font/CFontRenderer.java index a725b99705..c7dacdef1f 100644 --- a/src/main/java/net/ccbluex/liquidbounce/font/CFontRenderer.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/font/CFontRenderer.java @@ -4,9 +4,8 @@ * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.font; +package net.ccbluex.liquidbounce.ui.font; -import net.ccbluex.liquidbounce.ui.font.Fonts; import net.ccbluex.liquidbounce.ui.i18n.LanguageManager; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/net/ccbluex/liquidbounce/font/FontLoaders.java b/src/main/java/net/ccbluex/liquidbounce/ui/font/FontLoaders.java similarity index 99% rename from src/main/java/net/ccbluex/liquidbounce/font/FontLoaders.java rename to src/main/java/net/ccbluex/liquidbounce/ui/font/FontLoaders.java index a7f0350c30..4fb32291a0 100644 --- a/src/main/java/net/ccbluex/liquidbounce/font/FontLoaders.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/font/FontLoaders.java @@ -4,7 +4,7 @@ * https://github.com/SkidderMC/FDPClient/ */ -package net.ccbluex.liquidbounce.font; +package net.ccbluex.liquidbounce.ui.font; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/font/GameFontRenderer.kt b/src/main/java/net/ccbluex/liquidbounce/ui/font/GameFontRenderer.kt index c73efcf288..3d840ac19d 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/font/GameFontRenderer.kt +++ b/src/main/java/net/ccbluex/liquidbounce/ui/font/GameFontRenderer.kt @@ -22,8 +22,7 @@ import org.lwjgl.opengl.GL20 import java.awt.Color import java.awt.Font -class -GameFontRenderer(font: Font) : FontRenderer(Minecraft.getMinecraft().gameSettings, +class GameFontRenderer(font: Font) : FontRenderer(Minecraft.getMinecraft().gameSettings, ResourceLocation("textures/font/ascii.png"), Minecraft.getMinecraft().textureManager, false) { var defaultFont = AWTFontRenderer(font) @@ -41,7 +40,7 @@ GameFontRenderer(font: Font) : FontRenderer(Minecraft.getMinecraft().gameSetting FONT_HEIGHT = height } - fun getColorIndex2(type: Char): Int { + private fun getColorIndex2(type: Char): Int { return when (type) { in '0'..'9' -> type - '0' in 'a'..'f' -> type - 'a' + 10 @@ -91,7 +90,7 @@ GameFontRenderer(font: Font) : FontRenderer(Minecraft.getMinecraft().gameSetting private fun drawText(text: String?, x: Float, y: Float, color: Int, ignoreColor: Boolean, rainbow: Boolean = false): Int { if (text == null) return 0 - if (text.isNullOrEmpty()) + if (text.isEmpty()) return x.toInt() GlStateManager.translate(x - 1.5, y + 0.5, 0.0) @@ -209,7 +208,7 @@ GameFontRenderer(font: Font) : FontRenderer(Minecraft.getMinecraft().gameSetting private fun drawText(text: String?, x: Float, y: Float, colorHex: Int, ignoreColor: Boolean): Int { if (text == null) return 0 - if (text.isNullOrEmpty()) + if (text.isEmpty()) return x.toInt() GlStateManager.translate(x - 1.5, y + 0.5, 0.0) diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/font/TTFFontRenderer.java b/src/main/java/net/ccbluex/liquidbounce/ui/font/TTFFontRenderer.java index cc0e42b7bf..8039adde45 100644 --- a/src/main/java/net/ccbluex/liquidbounce/ui/font/TTFFontRenderer.java +++ b/src/main/java/net/ccbluex/liquidbounce/ui/font/TTFFontRenderer.java @@ -5,10 +5,11 @@ */ package net.ccbluex.liquidbounce.ui.font; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.api.FontRenderer; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.api.FontRenderer; import net.ccbluex.liquidbounce.utils.render.ColorUtils; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.MathHelper; +import org.jetbrains.annotations.NotNull; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Vector2f; @@ -27,32 +28,32 @@ public class TTFFontRenderer { /** * The font to be drawn. */ - private Font font; + private final Font font; /** * If fractional metrics should be used in the font renderer. */ - private boolean fractionalMetrics = false; + private final boolean fractionalMetrics; /** * All the character data information (regular). */ - private CharacterData[] regularData; + private final CharacterData[] regularData; /** * All the character data information (bold). */ - private CharacterData[] boldData; + private final CharacterData[] boldData; /** * All the character data information (italics). */ - private CharacterData[] italicsData; + private final CharacterData[] italicsData; /** * All the color codes used in minecraft. */ - private int[] colorCodes = new int[32]; + private final int[] colorCodes = new int[32]; /** * The margin on each texture. @@ -67,7 +68,7 @@ public class TTFFontRenderer { /** * The random offset in obfuscated text. */ - private static int RANDOM_OFFSET = 1; + private static final int RANDOM_OFFSET = 1; public TTFFontRenderer(Font font) { this(font, 256); @@ -77,6 +78,10 @@ public TTFFontRenderer(Font font, int characterCount) { this(font, characterCount, true); } + public TTFFontRenderer(Font font, boolean fractionalMetrics) { + this(font, 256, fractionalMetrics); + } + public TTFFontRenderer(Font font, int characterCount, boolean fractionalMetrics) { this.font = font; this.fractionalMetrics = fractionalMetrics; @@ -130,23 +135,9 @@ private CharacterData[] setup(CharacterData[] characterData, int type) { BufferedImage characterImage = new BufferedImage(MathHelper.ceiling_double_int(width), MathHelper.ceiling_double_int(height), BufferedImage.TYPE_INT_ARGB); // The graphics of the character image. - Graphics2D graphics = (Graphics2D) characterImage.getGraphics(); - - // Sets the font to the input font/ - graphics.setFont(font); - - // Sets the color to white with no alpha. - graphics.setColor(new Color(255, 255, 255, 0)); - - // Fills the entire image with the color above, makes it transparent. - graphics.fillRect(0, 0, characterImage.getWidth(), characterImage.getHeight()); - - // Sets the color to white to draw the character. - graphics.setColor(Color.WHITE); + Graphics2D graphics = getGraphics2D(characterImage, font); // Enables anti-aliasing so the font doesn't have aliasing. - //graphics.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); - //graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, this.fractionalMetrics ? RenderingHints.VALUE_FRACTIONALMETRICS_ON : RenderingHints.VALUE_FRACTIONALMETRICS_OFF); @@ -160,13 +151,31 @@ private CharacterData[] setup(CharacterData[] characterData, int type) { createTexture(textureId, characterImage); // Initiates the character data and stores it in the data array. - characterData[index] = new CharacterData(characterImage.getWidth(), characterImage.getHeight(), textureId); + characterData[index] = new CharacterData(character, characterImage.getWidth(), characterImage.getHeight(), textureId); } // Returns the filled character data array. return characterData; } + @NotNull + private static Graphics2D getGraphics2D(BufferedImage characterImage, Font font) { + Graphics2D graphics = (Graphics2D) characterImage.getGraphics(); + + // Sets the font to the input font/ + graphics.setFont(font); + + // Sets the color to white with no alpha. + graphics.setColor(new Color(255, 255, 255, 0)); + + // Fills the entire image with the color above, makes it transparent. + graphics.fillRect(0, 0, characterImage.getWidth(), characterImage.getHeight()); + + // Sets the color to white to draw the character. + graphics.setColor(Color.WHITE); + return graphics; + } + /** * Uploads the opengl texture. * @@ -215,7 +224,6 @@ private void createTexture(int textureId, BufferedImage image) { GlStateManager.bindTexture(0); } - /** * Renders the given string. * @@ -228,6 +236,31 @@ public void drawString(String text, float x, float y, int color) { renderString(text, x, y, color, false); } + /** + * Renders the given string. + * + * @param text The text to be rendered. + * @param x The x position of the text. + * @param y The y position of the text. + * @param color The color of the text. + */ + public void drawStringWithShadow(String text, float x, float y, int color) { + GL11.glTranslated(0.5, 0.5, 0); + renderString(text, x, y, color, true); + GL11.glTranslated(-0.5, -0.5, 0); + renderString(text, x, y, color, false); + } + + public static void drawOutlineStringWithoutGL(String s, float x, float y, int color, FontRenderer fontRenderer) { + fontRenderer.drawString(ColorUtils.stripColor(s), (int) (x * 2 - 1), (int) (y * 2), Color.BLACK.getRGB()); + fontRenderer.drawString(ColorUtils.stripColor(s), (int) (x * 2 + 1), (int) (y * 2), Color.BLACK.getRGB()); + fontRenderer.drawString(ColorUtils.stripColor(s), (int) (x * 2), (int) (y * 2 - 1), Color.BLACK.getRGB()); + fontRenderer.drawString(ColorUtils.stripColor(s), (int) (x * 2), (int) (y * 2 + 1), Color.BLACK.getRGB()); + fontRenderer.drawString(s, (int) (x * 2), (int) (y * 2), color); + } + + + /** * Renders the given string. * @@ -239,7 +272,7 @@ public void drawString(String text, float x, float y, int color) { */ private void renderString(String text, float x, float y, int color, boolean shadow) { // Returns if the text is empty. - if (text.length() == 0) return; + if (text.isEmpty()) return; // Pushes the matrix to store gl values. GL11.glPushMatrix(); @@ -248,8 +281,8 @@ private void renderString(String text, float x, float y, int color, boolean shad GlStateManager.scale(0.5, 0.5, 1); // Removes half the margin to render in the right spot. - x -= MARGIN / 2; - y -= MARGIN / 2; + x -= (float) MARGIN / 2; + y -= (float) MARGIN / 2; // Adds 0.5 to x and y. x += 0.5F; @@ -292,7 +325,7 @@ private void renderString(String text, float x, float y, int color, boolean shad if (previous == COLOR_INVOKER) continue; // Sets the color if the character is the color invoker and the character index is less than the length. - if (character == COLOR_INVOKER && i < length) { + if (character == COLOR_INVOKER) { // The color index of the character after the current character. int index = "0123456789abcdefklmnor".indexOf(text.toLowerCase(Locale.ENGLISH).charAt(i + 1)); @@ -308,7 +341,7 @@ private void renderString(String text, float x, float y, int color, boolean shad characterData = regularData; // Clamps the index just to be safe in case an odd character somehow gets in here. - if (index < 0 || index > 15) index = 15; + if (index < 0) index = 15; // Adds 16 to the color index to get the darker shadow color. if (shadow) index += 16; @@ -330,7 +363,7 @@ else if (index == 19) else if (index == 20) // Sets the character data to the italics type. characterData = italicsData; - else if (index == 21) { + else { // Resets the style. obfuscated = false; strikethrough = false; @@ -407,7 +440,7 @@ public float getWidth(String text) { if (previous == COLOR_INVOKER) continue; // Sets the color if the character is the color invoker and the character index is less than the length. - if (character == COLOR_INVOKER && i < length) { + if (character == COLOR_INVOKER) { // The color index of the character after the current character. int index = "0123456789abcdefklmnor".indexOf(text.toLowerCase(Locale.ENGLISH).charAt(i + 1)); @@ -434,7 +467,66 @@ else if (index == 21) } // Returns the width. - return width + MARGIN / 2; + return width + (float) MARGIN / 2; + } + + /** + * Gets the height of the given text. + * + * @param text The text to get the height of. + * @return The height of the given text. + */ + public float getHeight(String text) { + + // The height of the string. + float height = 0; + + // The character texture set to be used. (Regular by default) + CharacterData[] characterData = regularData; + + // The length of the text. + int length = text.length(); + + // Loops through the text. + for (int i = 0; i < length; i++) { + // The character at the index of 'i'. + char character = text.charAt(i); + + // The previous character. + char previous = i > 0 ? text.charAt(i - 1) : '.'; + + // Continues if the previous color was the color invoker. + if (previous == COLOR_INVOKER) continue; + + // Sets the color if the character is the color invoker and the character index is less than the length. + if (character == COLOR_INVOKER) { + + // The color index of the character after the current character. + int index = "0123456789abcdefklmnor".indexOf(text.toLowerCase(Locale.ENGLISH).charAt(i + 1)); + + if (index == 17) + // Sets the character data to the bold type. + characterData = boldData; + else if (index == 20) + // Sets the character data to the italics type. + characterData = italicsData; + else if (index == 21) + // Sets the character data to the regular type. + characterData = regularData; + } else { + // Continues to not crash! + if (character > 255) continue; + + // The character data for the given character. + CharacterData charData = characterData[character]; + + // Sets the height if its bigger. + height = Math.max(height, charData.height); + } + } + + // Returns the height. + return height / 2 - (float) MARGIN / 2; } /** @@ -521,7 +613,7 @@ private void generateColors() { int green = (i >> 1 & 1) * 170 + thingy; // The blue value of the color. - int blue = (i >> 0 & 1) * 170 + thingy; + int blue = (i & 1) * 170 + thingy; // Increments the red by 85, not sure why does this in minecraft's font renderer. if (i == 6) red += 85; @@ -538,11 +630,20 @@ private void generateColors() { } } + public Font getFont() { + return font; + } + /** * Class that holds the data for each character. */ static class CharacterData { + /** + * The character the data belongs to. + */ + public char character; + /** * The width of the character. */ @@ -556,9 +657,10 @@ static class CharacterData { /** * The id of the character texture. */ - private int textureId; + private final int textureId; - public CharacterData(float width, float height, int textureId) { + public CharacterData(char character, float width, float height, int textureId) { + this.character = character; this.width = width; this.height = height; this.textureId = textureId; diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/MainMenuButton.java b/src/main/java/net/ccbluex/liquidbounce/utils/MainMenuButton.java index 515789d1d5..2fbd068bd3 100644 --- a/src/main/java/net/ccbluex/liquidbounce/utils/MainMenuButton.java +++ b/src/main/java/net/ccbluex/liquidbounce/utils/MainMenuButton.java @@ -5,7 +5,7 @@ */ package net.ccbluex.liquidbounce.utils; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.fonts.impl.Fonts; +import net.ccbluex.liquidbounce.ui.clickgui.fonts.impl.Fonts; import net.ccbluex.liquidbounce.utils.render.RenderUtils; import java.awt.*; diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/Translate.java b/src/main/java/net/ccbluex/liquidbounce/utils/Translate.java index c65078ac80..d0aec5fe21 100644 --- a/src/main/java/net/ccbluex/liquidbounce/utils/Translate.java +++ b/src/main/java/net/ccbluex/liquidbounce/utils/Translate.java @@ -5,7 +5,7 @@ */ package net.ccbluex.liquidbounce.utils; -import net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.novoline.AnimationUtil; +import net.ccbluex.liquidbounce.ui.clickgui.style.styles.novoline.AnimationUtil; public final class Translate { private boolean AckerRunCRACKED_f; diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.java b/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.java index c2a27dc4bb..d4ddfba94e 100644 --- a/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.java +++ b/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.java @@ -50,7 +50,7 @@ import java.util.*; import static java.lang.Math.*; -import static net.ccbluex.liquidbounce.ui.client.gui.clickgui.style.styles.novoline.AnimationUtil.getAnimationState; +import static net.ccbluex.liquidbounce.ui.clickgui.style.styles.novoline.AnimationUtil.getAnimationState; import static net.minecraft.client.renderer.GlStateManager.disableBlend; import static net.minecraft.client.renderer.GlStateManager.enableTexture2D; import static org.lwjgl.opengl.GL11.*;