diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java index 7baab926..bbe69ea2 100644 --- a/src/main/java/net/minecraft/client/Minecraft.java +++ b/src/main/java/net/minecraft/client/Minecraft.java @@ -46,7 +46,6 @@ import net.minecraft.client.gui.GuiControls; import net.minecraft.client.gui.GuiGameOver; import net.minecraft.client.gui.GuiIngame; import net.minecraft.client.gui.GuiIngameMenu; -import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiMemoryErrorScreen; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiSleepMP; @@ -55,7 +54,6 @@ import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.achievement.GuiAchievement; import net.minecraft.client.gui.inventory.GuiInventory; -import net.minecraft.client.gui.stream.GuiStreamUnavailable; import net.minecraft.client.main.GameConfiguration; import net.minecraft.client.multiplayer.GuiConnecting; import net.minecraft.client.multiplayer.PlayerControllerMP; @@ -194,10 +192,10 @@ import rip.athena.client.events.types.input.MouseDownEvent; import rip.athena.client.events.types.input.MouseMoveEvent; import rip.athena.client.events.types.render.RenderEvent; import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.gui.menu.AthenaMenu; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; -import rip.athena.client.modules.impl.mods.HitDelayFix; -import rip.athena.client.modules.impl.render.MotionBlur; +import rip.athena.client.ui.menu.AthenaMenu; +import rip.athena.client.modules.fpssettings.OptimizerMod; +import rip.athena.client.modules.mods.HitDelayFix; +import rip.athena.client.modules.render.MotionBlur; public class Minecraft implements IThreadListener, IPlayerUsage { @@ -632,7 +630,7 @@ public class Minecraft implements IThreadListener, IPlayerUsage private void createDisplay() throws LWJGLException { Display.setResizable(true); - Display.setTitle(Athena.INSTANCE.getClientName() + " | " + Athena.INSTANCE.getClientBuild()); + Display.setTitle(Athena.INSTANCE.getClientName() + " v" + Athena.INSTANCE.getClientVersion() + " | b" + Athena.INSTANCE.getClientBuild()); try { @@ -1225,7 +1223,7 @@ public class Minecraft implements IThreadListener, IPlayerUsage public void updateDisplay() { - if(Athena.INSTANCE.getModuleManager().get(MotionBlur.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(MotionBlur.class).isToggled()) { if(Minecraft.getMinecraft().thePlayer != null) { MotionBlur.createAccumulation(); } @@ -1543,7 +1541,7 @@ public class Minecraft implements IThreadListener, IPlayerUsage if (this.playerController.isNotCreative()) { - if(Athena.INSTANCE.getModuleManager().get(HitDelayFix.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(HitDelayFix.class).isToggled()) { this.leftClickCounter = 0; } else { this.leftClickCounter = 10; @@ -2307,7 +2305,7 @@ public class Minecraft implements IThreadListener, IPlayerUsage public void launchIntegratedServer(String folderName, String worldName, WorldSettings worldSettingsIn) { this.loadWorld((WorldClient) null); - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); if (!mod.FAST_WORLD_LOADING) { System.gc(); diff --git a/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java b/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java index 71a6f81a..54b6613b 100644 --- a/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java +++ b/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java @@ -46,7 +46,7 @@ import net.minecraft.util.*; import net.minecraft.world.IInteractionObject; import net.minecraft.world.World; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.mods.ToggleSprint; +import rip.athena.client.modules.mods.ToggleSprint; public class EntityPlayerSP extends AbstractClientPlayer { @@ -780,7 +780,7 @@ public class EntityPlayerSP extends AbstractClientPlayer float f = 0.8F; boolean flag2 = this.movementInput.moveForward >= f; - if(Athena.INSTANCE.getModuleManager().get(ToggleSprint.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(ToggleSprint.class).isToggled()) { ToggleSprint.update(mc, (MovementInputFromOptions) this.movementInput, this); } else { this.movementInput.updatePlayerMoveState(); @@ -800,7 +800,7 @@ public class EntityPlayerSP extends AbstractClientPlayer boolean flag3 = (float)this.getFoodStats().getFoodLevel() > 6.0F || this.capabilities.allowFlying; - if(Athena.INSTANCE.getModuleManager().get(ToggleSprint.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(ToggleSprint.class).isToggled()) { boolean isSprintDisabled = !ToggleSprint.optionToggleSprint; boolean canDoubleTap = ToggleSprint.optionDoubleTap; @@ -897,7 +897,7 @@ public class EntityPlayerSP extends AbstractClientPlayer this.setSprinting(false); } - if(Athena.INSTANCE.getModuleManager().get(ToggleSprint.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(ToggleSprint.class).isToggled()) { if(ToggleSprint.optionEnableFlyBoost && this.capabilities.isFlying && ToggleSprint.sprint) { diff --git a/src/main/java/net/minecraft/client/gui/FontRenderer.java b/src/main/java/net/minecraft/client/gui/FontRenderer.java index 7db75664..f1ed58e4 100644 --- a/src/main/java/net/minecraft/client/gui/FontRenderer.java +++ b/src/main/java/net/minecraft/client/gui/FontRenderer.java @@ -28,7 +28,7 @@ import optifine.FontUtils; import org.apache.commons.io.IOUtils; import org.lwjgl.opengl.GL11; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.other.NickHider; +import rip.athena.client.modules.other.NickHider; public class FontRenderer implements IResourceManagerReloadListener { @@ -435,9 +435,9 @@ public class FontRenderer implements IResourceManagerReloadListener */ private void renderStringAtPos(String p_78255_1_, boolean p_78255_2_) { - NickHider mod = (NickHider) Athena.INSTANCE.getModuleManager().get(NickHider.class); + NickHider mod = (NickHider) Athena.INSTANCE.getModuleRepository().get(NickHider.class); - if(Athena.INSTANCE.getModuleManager().get(NickHider.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(NickHider.class).isToggled()) { if(Minecraft.getMinecraft().thePlayer != null) { if (p_78255_1_.contains(Minecraft.getMinecraft().thePlayer.getName())) { p_78255_1_ = p_78255_1_.replace(Minecraft.getMinecraft().thePlayer.getName(), mod.nick); @@ -666,9 +666,9 @@ public class FontRenderer implements IResourceManagerReloadListener */ public int getStringWidth(String text) { - NickHider mod = (NickHider) Athena.INSTANCE.getModuleManager().get(NickHider.class); + NickHider mod = (NickHider) Athena.INSTANCE.getModuleRepository().get(NickHider.class); - if (Athena.INSTANCE.getModuleManager().get(NickHider.class).isToggled()) { + if (Athena.INSTANCE.getModuleRepository().get(NickHider.class).isToggled()) { if (Minecraft.getMinecraft().thePlayer != null) { if (text.contains(Minecraft.getMinecraft().thePlayer.getName())) { text = text.replace(Minecraft.getMinecraft().thePlayer.getName(), mod.nick); diff --git a/src/main/java/net/minecraft/client/gui/GuiButton.java b/src/main/java/net/minecraft/client/gui/GuiButton.java index ac318993..3f62738e 100644 --- a/src/main/java/net/minecraft/client/gui/GuiButton.java +++ b/src/main/java/net/minecraft/client/gui/GuiButton.java @@ -5,11 +5,8 @@ import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; -import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; import rip.athena.client.utils.animations.simple.SimpleAnimation; import rip.athena.client.utils.render.ColorUtil; -import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/net/minecraft/client/gui/GuiChat.java b/src/main/java/net/minecraft/client/gui/GuiChat.java index 37198382..5ab26298 100644 --- a/src/main/java/net/minecraft/client/gui/GuiChat.java +++ b/src/main/java/net/minecraft/client/gui/GuiChat.java @@ -17,7 +17,7 @@ import org.apache.logging.log4j.Logger; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.render.Chat; +import rip.athena.client.modules.render.Chat; public class GuiChat extends GuiScreen { @@ -304,7 +304,7 @@ public class GuiChat extends GuiScreen */ public void drawScreen(int mouseX, int mouseY, float partialTicks) { - Chat module = (Chat) Athena.INSTANCE.getModuleManager().get(Chat.class); // Get chat module + Chat module = (Chat) Athena.INSTANCE.getModuleRepository().get(Chat.class); // Get chat module int color = (module.isToggled() ? new Color(0, 0, 0, module.transparency).getRGB() : Integer.MIN_VALUE); // If toggled on, take a peak at transparnecy diff --git a/src/main/java/net/minecraft/client/gui/GuiGameOver.java b/src/main/java/net/minecraft/client/gui/GuiGameOver.java index 58ea1cd2..2426408a 100644 --- a/src/main/java/net/minecraft/client/gui/GuiGameOver.java +++ b/src/main/java/net/minecraft/client/gui/GuiGameOver.java @@ -5,7 +5,7 @@ import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.EnumChatFormatting; -import rip.athena.client.gui.menu.AthenaMenu; +import rip.athena.client.ui.menu.AthenaMenu; public class GuiGameOver extends GuiScreen implements GuiYesNoCallback { diff --git a/src/main/java/net/minecraft/client/gui/GuiIngame.java b/src/main/java/net/minecraft/client/gui/GuiIngame.java index 5593cd37..21871f3e 100644 --- a/src/main/java/net/minecraft/client/gui/GuiIngame.java +++ b/src/main/java/net/minecraft/client/gui/GuiIngame.java @@ -46,7 +46,7 @@ import optifine.CustomColors; import rip.athena.client.Athena; import rip.athena.client.events.types.render.RenderEvent; import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.modules.impl.mods.OldAnimations; +import rip.athena.client.modules.mods.OldAnimations; public class GuiIngame extends Gui { @@ -627,9 +627,9 @@ public class GuiIngame extends Gui int i = MathHelper.ceiling_float_int(entityplayer.getHealth()); boolean flag = this.healthUpdateCounter > (long)this.updateCounter && (this.healthUpdateCounter - (long)this.updateCounter) / 3L % 2L == 1L; - OldAnimations mod = (OldAnimations) Athena.INSTANCE.getModuleManager().get(OldAnimations.class); + OldAnimations mod = (OldAnimations) Athena.INSTANCE.getModuleRepository().get(OldAnimations.class); - if(Athena.INSTANCE.getModuleManager().get(OldAnimations.class).isToggled() && mod.DISABLE_HEALTH_FLASH) { + if(Athena.INSTANCE.getModuleRepository().get(OldAnimations.class).isToggled() && mod.DISABLE_HEALTH_FLASH) { flag = false; } diff --git a/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java b/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java index 0b7a39f1..3edf24b1 100644 --- a/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java +++ b/src/main/java/net/minecraft/client/gui/GuiIngameMenu.java @@ -6,7 +6,9 @@ import net.minecraft.client.gui.achievement.GuiStats; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.resources.I18n; import net.minecraft.realms.RealmsBridge; -import rip.athena.client.gui.menu.AthenaMenu; +import rip.athena.client.Athena; +import rip.athena.client.modules.render.GUIMod; +import rip.athena.client.ui.menu.AthenaMenu; public class GuiIngameMenu extends GuiScreen { @@ -23,7 +25,8 @@ public class GuiIngameMenu extends GuiScreen this.buttonList.clear(); int i = -16; int j = 98; - this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 120 + i, I18n.format("menu.returnToMenu", new Object[0]))); + this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 145 + i, I18n.format("menu.returnToMenu", new Object[0]))); + this.buttonList.add(new GuiButton(69, this.width / 2 - 100, this.height / 4 + 120 + i, I18n.format("Athena Settings", new Object[0]))); if (!this.mc.isIntegratedServerRunning()) { @@ -91,6 +94,9 @@ public class GuiIngameMenu extends GuiScreen case 7: this.mc.displayGuiScreen(new GuiShareToLan(this)); + break; + case 69: + Athena.INSTANCE.getModuleRepository().get(GUIMod.class).setEnabled(true); } } diff --git a/src/main/java/net/minecraft/client/gui/GuiMemoryErrorScreen.java b/src/main/java/net/minecraft/client/gui/GuiMemoryErrorScreen.java index a6af3ac4..0f225cee 100644 --- a/src/main/java/net/minecraft/client/gui/GuiMemoryErrorScreen.java +++ b/src/main/java/net/minecraft/client/gui/GuiMemoryErrorScreen.java @@ -2,7 +2,7 @@ package net.minecraft.client.gui; import java.io.IOException; import net.minecraft.client.resources.I18n; -import rip.athena.client.gui.menu.AthenaMenu; +import rip.athena.client.ui.menu.AthenaMenu; public class GuiMemoryErrorScreen extends GuiScreen { diff --git a/src/main/java/net/minecraft/client/gui/GuiNewChat.java b/src/main/java/net/minecraft/client/gui/GuiNewChat.java index d5d35d9e..c0b0d391 100644 --- a/src/main/java/net/minecraft/client/gui/GuiNewChat.java +++ b/src/main/java/net/minecraft/client/gui/GuiNewChat.java @@ -14,9 +14,7 @@ import net.minecraft.util.MathHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.modules.impl.render.Chat; -import rip.athena.client.utils.render.RoundedUtils; +import rip.athena.client.modules.render.Chat; public class GuiNewChat extends Gui { @@ -86,10 +84,9 @@ public class GuiNewChat extends Gui int i2 = 0; int j2 = -i1 * 9; - Chat module = (Chat) Athena.INSTANCE.getModuleManager().get(Chat.class); - RoundedUtils.drawRoundedRect(i2, j2 - 9, i2 + l + 4, j2, 6, new Color(1, 1, 1, module.transparency).getRGB()); + Chat module = (Chat) Athena.INSTANCE.getModuleRepository().get(Chat.class); + drawRect(i2, j2 - 9, i2 + l + 4, j2, new Color(1, 1, 1, module.transparency).getRGB()); - //drawRect(i2, j2 - 9, i2 + l + 4, j2, new Color(1, 1, 1, module.transparency).getRGB()); String s = chatline.getChatComponent().getFormattedText(); GlStateManager.color(1,1,1); GlStateManager.enableBlend(); @@ -169,7 +166,7 @@ public class GuiNewChat extends Gui this.field_146253_i.add(0, new ChatLine(p_146237_3_, ichatcomponent, p_146237_2_)); } - Chat mod = (Chat) Athena.INSTANCE.getModuleManager().get(Chat.class); + Chat mod = (Chat) Athena.INSTANCE.getModuleRepository().get(Chat.class); if(!mod.isToggled() && !mod.infiniteChat) { diff --git a/src/main/java/net/minecraft/client/model/ModelChest.java b/src/main/java/net/minecraft/client/model/ModelChest.java index 80a28f8d..1d51e66e 100644 --- a/src/main/java/net/minecraft/client/model/ModelChest.java +++ b/src/main/java/net/minecraft/client/model/ModelChest.java @@ -1,7 +1,7 @@ package net.minecraft.client.model; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; +import rip.athena.client.modules.fpssettings.OptimizerMod; public class ModelChest extends ModelBase { @@ -37,7 +37,7 @@ public class ModelChest extends ModelBase */ public void renderAll() { - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); if(mod.noBetterChests) { this.chestBelow.render(0.0625F); diff --git a/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java b/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java index fad30dec..fbe21ff3 100644 --- a/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java +++ b/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java @@ -22,7 +22,6 @@ import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiDisconnected; import net.minecraft.client.gui.GuiDownloadTerrain; -import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiMerchant; import net.minecraft.client.gui.GuiMultiplayer; import net.minecraft.client.gui.GuiScreen; @@ -211,7 +210,7 @@ import net.minecraft.world.chunk.Chunk; import net.minecraft.world.storage.MapData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import rip.athena.client.gui.menu.AthenaMenu; +import rip.athena.client.ui.menu.AthenaMenu; public class NetHandlerPlayClient implements INetHandlerPlayClient { diff --git a/src/main/java/net/minecraft/client/particle/EntityFX.java b/src/main/java/net/minecraft/client/particle/EntityFX.java index e148282e..6ff7670e 100644 --- a/src/main/java/net/minecraft/client/particle/EntityFX.java +++ b/src/main/java/net/minecraft/client/particle/EntityFX.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; +import rip.athena.client.modules.fpssettings.OptimizerMod; public class EntityFX extends Entity { @@ -197,7 +197,7 @@ public class EntityFX extends Entity int i = 15728880; - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); if(!mod.STATIC_PARTICLE_COLOR) { i = this.getBrightnessForRender(partialTicks); diff --git a/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java b/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java index 3531f327..b3055265 100644 --- a/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java @@ -13,7 +13,7 @@ import net.minecraft.world.IBlockAccess; import optifine.CustomColors; import optifine.RenderEnv; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; +import rip.athena.client.modules.fpssettings.OptimizerMod; public class BlockFluidRenderer { @@ -37,7 +37,7 @@ public class BlockFluidRenderer public boolean renderFluid(IBlockAccess blockAccess, IBlockState blockStateIn, BlockPos blockPosIn, WorldRenderer worldRendererIn) { - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); if(mod.noLagClearWater) { return false; diff --git a/src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java b/src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java index bd500ee5..2cc950ea 100644 --- a/src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java +++ b/src/main/java/net/minecraft/client/renderer/BlockRendererDispatcher.java @@ -22,7 +22,7 @@ import net.minecraft.world.WorldType; import optifine.Config; import optifine.Reflector; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; +import rip.athena.client.modules.fpssettings.OptimizerMod; import shadersmod.client.SVertexBuilder; public class BlockRendererDispatcher implements IResourceManagerReloadListener @@ -113,7 +113,7 @@ public class BlockRendererDispatcher implements IResourceManagerReloadListener case 3: IBakedModel ibakedmodel = this.getModelFromBlockState(state, blockAccess, pos); - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); if(state.getBlock() instanceof BlockReed && mod.noLagCane) { if(Math.sqrt(Minecraft.getMinecraft().thePlayer.getPosition().distanceSq(pos.getX(),pos.getY(),pos.getZ())) >= 16) { diff --git a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java b/src/main/java/net/minecraft/client/renderer/EntityRenderer.java index 7461b57e..bee0f7d4 100644 --- a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/EntityRenderer.java @@ -87,7 +87,7 @@ import org.lwjgl.util.glu.Project; import rip.athena.client.Athena; import rip.athena.client.events.types.render.RenderEvent; import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.modules.impl.mods.*; +import rip.athena.client.modules.mods.*; import shadersmod.client.Shaders; import shadersmod.client.ShadersRender; @@ -625,7 +625,7 @@ public class EntityRenderer implements IResourceManagerReloadListener if (flag) { - Zoom zoom = (Zoom) Athena.INSTANCE.getModuleManager().get(Zoom.class); + Zoom zoom = (Zoom) Athena.INSTANCE.getModuleRepository().get(Zoom.class); if (!Config.zoomMode) { @@ -675,7 +675,7 @@ public class EntityRenderer implements IResourceManagerReloadListener private void hurtCameraEffect(float partialTicks) { - if(Athena.INSTANCE.getModuleManager().get(NoHurtCam.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(NoHurtCam.class).isToggled()) { return; } if (this.mc.getRenderViewEntity() instanceof EntityLivingBase) @@ -776,7 +776,7 @@ public class EntityRenderer implements IResourceManagerReloadListener f2 += 180.0F; } - Freelook mod = (Freelook) Athena.INSTANCE.getModuleManager().get(Freelook.class); + Freelook mod = (Freelook) Athena.INSTANCE.getModuleRepository().get(Freelook.class); if(mod.isToggled() && mod.perspectiveToggled) { f1 = mod.getCameraYaw(); @@ -832,7 +832,7 @@ public class EntityRenderer implements IResourceManagerReloadListener { GlStateManager.translate(0.0F, 0.0F, -0.1F); } - Freelook mod = (Freelook) Athena.INSTANCE.getModuleManager().get(Freelook.class); + Freelook mod = (Freelook) Athena.INSTANCE.getModuleRepository().get(Freelook.class); if (Reflector.EntityViewRenderEvent_CameraSetup_Constructor.exists() || (mod.isToggled() && mod.perspectiveToggled)) { @@ -938,8 +938,8 @@ public class EntityRenderer implements IResourceManagerReloadListener if (this.mc.gameSettings.viewBobbing) { - MinimalBobbing module = (MinimalBobbing) Athena.INSTANCE.getModuleManager().get(MinimalBobbing.class); - if(Athena.INSTANCE.getModuleManager().get(MinimalBobbing.class).isToggled() && module.screenBobbing) { + MinimalBobbing module = (MinimalBobbing) Athena.INSTANCE.getModuleRepository().get(MinimalBobbing.class); + if(Athena.INSTANCE.getModuleRepository().get(MinimalBobbing.class).isToggled() && module.screenBobbing) { } else { this.setupViewBobbing(partialTicks); } @@ -1002,9 +1002,9 @@ public class EntityRenderer implements IResourceManagerReloadListener public void renderHand(float p_renderHand_1_, int p_renderHand_2_, boolean p_renderHand_3_, boolean p_renderHand_4_, boolean p_renderHand_5_) { - OldAnimations mod = (OldAnimations) Athena.INSTANCE.getModuleManager().get(OldAnimations.class); + OldAnimations mod = (OldAnimations) Athena.INSTANCE.getModuleRepository().get(OldAnimations.class); - if(Athena.INSTANCE.getModuleManager().get(OldAnimations.class).isToggled() && mod.OLD_EAT_USE_ANIMATION) { + if(Athena.INSTANCE.getModuleRepository().get(OldAnimations.class).isToggled() && mod.OLD_EAT_USE_ANIMATION) { mod.attemptSwing(); } @@ -1042,8 +1042,8 @@ public class EntityRenderer implements IResourceManagerReloadListener if (this.mc.gameSettings.viewBobbing) { - MinimalBobbing module = (MinimalBobbing) Athena.INSTANCE.getModuleManager().get(MinimalBobbing.class); - if(Athena.INSTANCE.getModuleManager().get(MinimalBobbing.class).isToggled() && module.handBobbing) { + MinimalBobbing module = (MinimalBobbing) Athena.INSTANCE.getModuleRepository().get(MinimalBobbing.class); + if(Athena.INSTANCE.getModuleRepository().get(MinimalBobbing.class).isToggled() && module.handBobbing) { } else { this.setupViewBobbing(p_renderHand_1_); } @@ -1086,8 +1086,8 @@ public class EntityRenderer implements IResourceManagerReloadListener if (this.mc.gameSettings.viewBobbing) { - MinimalBobbing module = (MinimalBobbing) Athena.INSTANCE.getModuleManager().get(MinimalBobbing.class); - if(Athena.INSTANCE.getModuleManager().get(MinimalBobbing.class).isToggled() && module.handBobbing) { + MinimalBobbing module = (MinimalBobbing) Athena.INSTANCE.getModuleRepository().get(MinimalBobbing.class); + if(Athena.INSTANCE.getModuleRepository().get(MinimalBobbing.class).isToggled() && module.handBobbing) { } else { this.setupViewBobbing(p_renderHand_1_); } @@ -1324,7 +1324,7 @@ public class EntityRenderer implements IResourceManagerReloadListener Mouse.setGrabbed(true); } - Freelook mod = Athena.INSTANCE.getModuleManager() == null ? null : (Freelook) Athena.INSTANCE.getModuleManager().get(Freelook.class); + Freelook mod = Athena.INSTANCE.getModuleRepository() == null ? null : (Freelook) Athena.INSTANCE.getModuleRepository().get(Freelook.class); if(mod != null && mod.isToggled() && mod.perspectiveToggled) { mod.overrideMouse(); diff --git a/src/main/java/net/minecraft/client/renderer/ItemRenderer.java b/src/main/java/net/minecraft/client/renderer/ItemRenderer.java index 7953ee65..e15fd569 100644 --- a/src/main/java/net/minecraft/client/renderer/ItemRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/ItemRenderer.java @@ -31,7 +31,7 @@ import optifine.Reflector; import org.lwjgl.opengl.GL11; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.mods.OldAnimations; +import rip.athena.client.modules.mods.OldAnimations; import shadersmod.client.Shaders; public class ItemRenderer @@ -348,7 +348,7 @@ public class ItemRenderer else if (entityplayersp.getItemInUseCount() > 0) { EnumAction enumaction = this.itemToRender.getItemUseAction(); - OldAnimations mod = (OldAnimations) Athena.INSTANCE.getModuleManager().get(OldAnimations.class); + OldAnimations mod = (OldAnimations) Athena.INSTANCE.getModuleRepository().get(OldAnimations.class); switch (ItemRenderer.ItemRenderer$1.field_178094_a[enumaction.ordinal()]) { @@ -358,7 +358,7 @@ public class ItemRenderer case 2: case 3: - if(Athena.INSTANCE.getModuleManager().get(OldAnimations.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(OldAnimations.class).isToggled()) { this.func_178104_a(entityplayersp, partialTicks); this.transformFirstPersonItem(f,f1); } else { @@ -368,7 +368,7 @@ public class ItemRenderer break; case 4: - if(Athena.INSTANCE.getModuleManager().get(OldAnimations.class).isToggled() && mod.OLD_BLOCKING_HITTING) { + if(Athena.INSTANCE.getModuleRepository().get(OldAnimations.class).isToggled() && mod.OLD_BLOCKING_HITTING) { transformFirstPersonItem(f, f1); this.func_178103_d(); GlStateManager.scale(0.83f, 0.88f, 0.85f); @@ -380,7 +380,7 @@ public class ItemRenderer break; case 5: - if(Athena.INSTANCE.getModuleManager().get(OldAnimations.class).isToggled() && mod.OLD_BOW) { + if(Athena.INSTANCE.getModuleRepository().get(OldAnimations.class).isToggled() && mod.OLD_BOW) { this.transformFirstPersonItem(f, f1); this.func_178098_a(partialTicks, entityplayersp); GlStateManager.translate(0.0F, 0.1F, -0.15F); diff --git a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java b/src/main/java/net/minecraft/client/renderer/RenderGlobal.java index 86b0d9fb..f977842f 100644 --- a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java +++ b/src/main/java/net/minecraft/client/renderer/RenderGlobal.java @@ -109,8 +109,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Vector3f; import org.lwjgl.util.vector.Vector4f; import rip.athena.client.Athena; -import rip.athena.client.gui.clickgui.pages.SettingsPage; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; +import rip.athena.client.ui.clickgui.pages.SettingsPage; +import rip.athena.client.modules.fpssettings.OptimizerMod; import shadersmod.client.Shaders; import shadersmod.client.ShadersRender; import shadersmod.client.ShadowUtils; @@ -777,7 +777,7 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene continue; } - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); boolean newRenderE = false; int entDist = mod.noLagEntityDistance; @@ -908,7 +908,7 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene Shaders.nextBlockEntity(tileentity); } - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); int dist = mod.noLagBlockDistance; boolean rdy = dist != 64; diff --git a/src/main/java/net/minecraft/client/renderer/ThreadDownloadImageData.java b/src/main/java/net/minecraft/client/renderer/ThreadDownloadImageData.java index d8b8b41a..8aef6e60 100644 --- a/src/main/java/net/minecraft/client/renderer/ThreadDownloadImageData.java +++ b/src/main/java/net/minecraft/client/renderer/ThreadDownloadImageData.java @@ -24,8 +24,8 @@ import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; -import rip.athena.client.modules.impl.fpssettings.impl.ThreadDownloadImageDataHook; +import rip.athena.client.modules.fpssettings.OptimizerMod; +import rip.athena.client.modules.fpssettings.impl.ThreadDownloadImageDataHook; public class ThreadDownloadImageData extends SimpleTexture { @@ -86,7 +86,7 @@ public class ThreadDownloadImageData extends SimpleTexture { if (this.bufferedImage == null && this.textureLocation != null) { - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); if(mod.BETTER_SKIN_LOADING) { ThreadDownloadImageDataHook.getImprovedCacheLoading(this); diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java b/src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java index edbdbe12..7c3a0bef 100644 --- a/src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java +++ b/src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.lwjgl.opengl.GL11; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; +import rip.athena.client.modules.fpssettings.OptimizerMod; public class ChunkRenderDispatcher { @@ -192,7 +192,7 @@ public class ChunkRenderDispatcher public ChunkCompileTaskGenerator getNextChunkUpdate() throws InterruptedException { - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); if (mod.CHUNK_UPDATE_LIMITE_ENABLED) { int limiter = mod.CHUNK_UPDATE_LIMITER; diff --git a/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java b/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java index 681a1643..488c7119 100644 --- a/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java +++ b/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java @@ -9,7 +9,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import optifine.IntegerCache; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; +import rip.athena.client.modules.fpssettings.OptimizerMod; public class VisGraph { @@ -80,7 +80,7 @@ public class VisGraph int i = ((Integer)arraydeque.poll()).intValue(); this.func_178610_a(i, enumset); - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); if(mod.CULLING_FIX) { if(p_178604_1_ < enumset.size()) { diff --git a/src/main/java/net/minecraft/client/renderer/entity/Render.java b/src/main/java/net/minecraft/client/renderer/entity/Render.java index eae97123..b01d1930 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/Render.java +++ b/src/main/java/net/minecraft/client/renderer/entity/Render.java @@ -24,8 +24,7 @@ import optifine.Config; import org.lwjgl.opengl.GL11; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.other.NickHider; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.modules.other.Settings; import rip.athena.client.socket.SocketClient; import shadersmod.client.Shaders; diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java b/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java index a0382c8d..4f1d562a 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java @@ -12,8 +12,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; -import rip.athena.client.modules.impl.mods.ItemPhysics; +import rip.athena.client.modules.fpssettings.OptimizerMod; +import rip.athena.client.modules.mods.ItemPhysics; public class RenderEntityItem extends Render { @@ -46,7 +46,7 @@ public class RenderEntityItem extends Render float f2 = p_177077_9_.getItemCameraTransforms().getTransform(ItemCameraTransforms.TransformType.GROUND).scale.y; GlStateManager.translate((float)p_177077_2_, (float)p_177077_4_ + f1 + 0.25F * f2, (float)p_177077_6_); - OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + OptimizerMod mod = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); if(!mod.STATIC_DROPS) { if (flag || this.renderManager.options != null) { @@ -118,7 +118,7 @@ public class RenderEntityItem extends Render int i = this.func_177077_a(entity, x, y, z, partialTicks, ibakedmodel); int rotation = (int) (((System.nanoTime() / 3000000) + entity.getEntityId() * 10000) % 360); - if(Athena.INSTANCE.getModuleManager().get(ItemPhysics.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(ItemPhysics.class).isToggled()) { if (entity.onGround) rotation = 90; GL11.glRotatef(rotation / 2, 0, 1, 0); GL11.glRotatef(rotation, 1, 0, 0); diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderManager.java b/src/main/java/net/minecraft/client/renderer/entity/RenderManager.java index 0c503290..874f7a35 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderManager.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderManager.java @@ -104,7 +104,7 @@ import net.minecraft.world.World; import optifine.PlayerItemsLayer; import optifine.Reflector; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.mods.Freelook; +import rip.athena.client.modules.mods.Freelook; public class RenderManager { @@ -290,7 +290,7 @@ public class RenderManager this.playerViewY += 180.0F; } - Freelook mod = (Freelook) Athena.INSTANCE.getModuleManager().get(Freelook.class); + Freelook mod = (Freelook) Athena.INSTANCE.getModuleRepository().get(Freelook.class); if (mod.isToggled() && mod.perspectiveToggled) { this.playerViewY = mod.getCameraYaw(); diff --git a/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java b/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java index 89417a3c..eb7704c2 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; @@ -31,9 +30,8 @@ import org.apache.logging.log4j.Logger; import org.lwjgl.opengl.GL11; import rip.athena.client.Athena; import rip.athena.client.events.types.render.RenderEntityEvent; -import rip.athena.client.modules.impl.other.NickHider; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.modules.impl.render.CustomHitColor; +import rip.athena.client.modules.other.Settings; +import rip.athena.client.modules.render.CustomHitColor; import shadersmod.client.Shaders; public abstract class RendererLivingEntity extends Render @@ -361,9 +359,9 @@ public abstract class RendererLivingEntity extends R if (flag1) { - CustomHitColor mod = (CustomHitColor) Athena.INSTANCE.getModuleManager().get(CustomHitColor.class); + CustomHitColor mod = (CustomHitColor) Athena.INSTANCE.getModuleRepository().get(CustomHitColor.class); - if(Athena.INSTANCE.getModuleManager().get(CustomHitColor.class).isToggled()) { + if(Athena.INSTANCE.getModuleRepository().get(CustomHitColor.class).isToggled()) { this.brightnessBuffer.put(mod.color.getRed() / 255F); this.brightnessBuffer.put(mod.color.getGreen() / 255F); this.brightnessBuffer.put(mod.color.getBlue() / 255F); @@ -552,7 +550,7 @@ public abstract class RendererLivingEntity extends R { if (!Reflector.RenderLivingEvent_Specials_Pre_Constructor.exists() || !Reflector.postForgeBusEvent(Reflector.RenderLivingEvent_Specials_Pre_Constructor, new Object[] {entity, this, Double.valueOf(x), Double.valueOf(y), Double.valueOf(z)})) { - Settings settings = (Settings) Athena.INSTANCE.getModuleManager().get(Settings.class); + Settings settings = (Settings) Athena.INSTANCE.getModuleRepository().get(Settings.class); if (this.canRenderName(entity) || settings.F5Nametags && entity instanceof EntityPlayer && entity == Minecraft.getMinecraft().thePlayer) { diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java index 2191078d..13a77fd6 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java +++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCape.java @@ -1,18 +1,13 @@ package net.minecraft.client.renderer.entity.layers; -import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import rip.athena.client.Athena; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.socket.SocketClient; -public class LayerCape implements LayerRenderer +public class +LayerCape implements LayerRenderer { private final RenderPlayer playerRenderer; private static final String __OBFID = "CL_00002425"; diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java index 5fbca951..be87b4b4 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java +++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java @@ -13,7 +13,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.mods.OldAnimations; +import rip.athena.client.modules.mods.OldAnimations; public class LayerHeldItem implements LayerRenderer { @@ -43,11 +43,11 @@ public class LayerHeldItem implements LayerRenderer //((ModelBiped)this.livingEntityRenderer.getMainModel()).postRenderArm(0.0625F); //GlStateManager.translate(-0.0625F, 0.4375F, 0.0625F); - OldAnimations mod = (OldAnimations) Athena.INSTANCE.getModuleManager().get(OldAnimations.class); + OldAnimations mod = (OldAnimations) Athena.INSTANCE.getModuleRepository().get(OldAnimations.class); Label_0327: if (entitylivingbaseIn instanceof EntityPlayer) { - if (Athena.INSTANCE.getModuleManager().get(OldAnimations.class).isToggled() && mod.OLD_BLOCKING) { + if (Athena.INSTANCE.getModuleRepository().get(OldAnimations.class).isToggled() && mod.OLD_BLOCKING) { if (((EntityPlayer) entitylivingbaseIn).isBlocking()) { if (entitylivingbaseIn.isSneaking()) { ((ModelBiped) livingEntityRenderer.getMainModel()).postRenderArm(0.0325f); @@ -69,7 +69,7 @@ public class LayerHeldItem implements LayerRenderer } else { ((ModelBiped) livingEntityRenderer.getMainModel()).postRenderArm(0.0625f); } - if (Athena.INSTANCE.getModuleManager().get(OldAnimations.class).isToggled() && mod.OLD_ITEM_HELD) { + if (Athena.INSTANCE.getModuleRepository().get(OldAnimations.class).isToggled() && mod.OLD_ITEM_HELD) { if (!((EntityPlayer) entitylivingbaseIn).isBlocking()) { GlStateManager.translate(-0.0855f, 0.4775f, 0.1585f); GlStateManager.rotate(-19.0f, 20.0f, 0.0f, -6.0f); diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java index 5aa7a35d..47e24b73 100644 --- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java +++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java @@ -6,7 +6,7 @@ import net.minecraft.entity.Entity; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntityMobSpawner; import rip.athena.client.Athena; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; +import rip.athena.client.modules.fpssettings.OptimizerMod; public class TileEntityMobSpawnerRenderer extends TileEntitySpecialRenderer { @@ -23,7 +23,7 @@ public class TileEntityMobSpawnerRenderer extends TileEntitySpecialRenderer configEntries; + private List configEntries; private List hudElements; private int keyBind = Keyboard.CHAR_NONE; @@ -47,24 +48,12 @@ public class Module { /** * Constructs a Module with the specified name and category. - * - * @param name The name of the module. - * @param category The category of the module. */ - public Module(String name, Category category, String icon) { - this.name = name; - this.category = category; - this.icon = icon; - - configEntries = new ArrayList<>(); - hudElements = new ArrayList<>(); - - processFields(); - } - - public Module(String name, Category category) { - this.name = name; - this.category = category; + public Module() { + IModuleMetaData metaData = this.getClass().getAnnotation(IModuleMetaData.class); + this.name = metaData.name(); + this.category = metaData.type(); + this.icon = metaData.icon(); configEntries = new ArrayList<>(); hudElements = new ArrayList<>(); @@ -124,7 +113,7 @@ public class Module { * * @return The list of config entries. */ - public List getEntries() { + public List getEntries() { return configEntries; } diff --git a/src/main/java/rip/athena/client/modules/ModuleManager.java b/src/main/java/rip/athena/api/module/ModuleRepository.java similarity index 96% rename from src/main/java/rip/athena/client/modules/ModuleManager.java rename to src/main/java/rip/athena/api/module/ModuleRepository.java index 3f1456ec..eafa38c2 100644 --- a/src/main/java/rip/athena/client/modules/ModuleManager.java +++ b/src/main/java/rip/athena/api/module/ModuleRepository.java @@ -1,4 +1,4 @@ -package rip.athena.client.modules; +package rip.athena.api.module; import org.reflections.Reflections; import rip.athena.client.Athena; @@ -16,14 +16,14 @@ import java.util.Set; * @project Athena-Client * @date 6/1/2023 */ -public class ModuleManager { +public class ModuleRepository { private final HashMap, Module> modules = new HashMap<>(); /** * Initializes the ModuleManager by scanning for module classes and creating instances. */ - public ModuleManager() { + public ModuleRepository() { Reflections reflections = new Reflections("rip.athena.client.modules"); Set> classes = reflections.getSubTypesOf(Module.class); diff --git a/src/main/java/rip/athena/api/module/annotations/IModuleMetaData.java b/src/main/java/rip/athena/api/module/annotations/IModuleMetaData.java new file mode 100644 index 00000000..c8e29ea0 --- /dev/null +++ b/src/main/java/rip/athena/api/module/annotations/IModuleMetaData.java @@ -0,0 +1,16 @@ +package rip.athena.api.module.annotations; + +import rip.athena.api.module.EnumModuleType; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface IModuleMetaData { + String name(); + String icon(); + EnumModuleType type(); +} diff --git a/src/main/java/rip/athena/client/Athena.java b/src/main/java/rip/athena/client/Athena.java index e68c69aa..404dd0ef 100644 --- a/src/main/java/rip/athena/client/Athena.java +++ b/src/main/java/rip/athena/client/Athena.java @@ -4,16 +4,16 @@ import lombok.Getter; import net.minecraft.client.Minecraft; import org.lwjgl.opengl.Display; -import rip.athena.client.account.AccountManager; -import rip.athena.client.config.save.ConfigManager; +import rip.athena.api.module.ModuleRepository; +import rip.athena.api.account.AccountManager; +import rip.athena.api.config.save.ConfigManager; import rip.athena.client.cosmetics.CosmeticsController; import rip.athena.client.events.EventBus; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.client.ClientTickEvent; -import rip.athena.client.gui.hud.HUDManager; -import rip.athena.client.gui.notifications.NotificationManager; -import rip.athena.client.macros.MacroManager; -import rip.athena.client.modules.ModuleManager; +import rip.athena.client.ui.hud.HUDManager; +import rip.athena.client.ui.notifications.NotificationManager; +import rip.athena.api.macros.MacroManager; import rip.athena.client.socket.SocketClient; import rip.athena.client.theme.ThemeManager; import rip.athena.client.utils.PrefixedLogger; @@ -48,7 +48,7 @@ public class Athena { private final PrefixedLogger log = new PrefixedLogger("Athena"); - private final String clientName = "Athena"; + private final String clientName = "ATHENA"; private final String clientVersion = "0.0.3"; private final String clientBuild = "062623"; @@ -56,7 +56,7 @@ public class Athena { private CosmeticsController cosmeticsController; private AccountManager accountManager; private ConfigManager configManager; - private ModuleManager moduleManager; + private ModuleRepository moduleRepository; private ThemeManager themeManager; private MacroManager macroManager; private HUDManager hudManager; @@ -75,7 +75,7 @@ public class Athena { String os = System.getProperty("os.name"); if (os.toLowerCase().contains("win")) { - this.discordRPC = new DiscordRPC(); + //this.discordRPC = new DiscordRPC(); } createDirectoryIfNotExists(MAIN_DIR); @@ -88,7 +88,7 @@ public class Athena { this.configManager = new ConfigManager(CONFIGS_DIR); this.accountManager = new AccountManager(); - this.moduleManager = new ModuleManager(); + this.moduleRepository = new ModuleRepository(); this.themeManager = new ThemeManager(); this.macroManager = new MacroManager(); this.hudManager = new HUDManager(); diff --git a/src/main/java/rip/athena/client/config/ConfigEntry.java b/src/main/java/rip/athena/client/config/AbstractConfigEntry.java similarity index 87% rename from src/main/java/rip/athena/client/config/ConfigEntry.java rename to src/main/java/rip/athena/client/config/AbstractConfigEntry.java index a2ca42b3..ec870635 100644 --- a/src/main/java/rip/athena/client/config/ConfigEntry.java +++ b/src/main/java/rip/athena/client/config/AbstractConfigEntry.java @@ -2,6 +2,7 @@ package rip.athena.client.config; import java.lang.reflect.Field; +import rip.athena.api.config.IConfigEntry; import rip.athena.client.Athena; /** @@ -9,13 +10,13 @@ import rip.athena.client.Athena; * @project Athena-Client * @date 6/6/2023 */ -public abstract class ConfigEntry implements IConfigEntry { +public abstract class AbstractConfigEntry implements IConfigEntry { private Field field; private String key; private String description; private boolean visible; - public ConfigEntry(Field field, String key, String description, boolean visible) { + public AbstractConfigEntry(Field field, String key, String description, boolean visible) { this.field = field; this.key = key; this.description = description; diff --git a/src/main/java/rip/athena/client/config/types/BooleanEntry.java b/src/main/java/rip/athena/client/config/entries/BooleanEntry.java similarity index 78% rename from src/main/java/rip/athena/client/config/types/BooleanEntry.java rename to src/main/java/rip/athena/client/config/entries/BooleanEntry.java index be3e3142..6a9d14e0 100644 --- a/src/main/java/rip/athena/client/config/types/BooleanEntry.java +++ b/src/main/java/rip/athena/client/config/entries/BooleanEntry.java @@ -1,16 +1,16 @@ -package rip.athena.client.config.types; +package rip.athena.client.config.entries; import java.lang.reflect.Field; import org.json.JSONObject; -import rip.athena.client.config.ConfigEntry; +import rip.athena.client.config.AbstractConfigEntry; /** * @author Athena Development * @project Athena-Client * @date 6/6/2023 */ -public class BooleanEntry extends ConfigEntry { +public class BooleanEntry extends AbstractConfigEntry { public BooleanEntry(Field field, String key, String description, boolean visible) { super(field, key, description, visible); } diff --git a/src/main/java/rip/athena/client/config/types/ColorEntry.java b/src/main/java/rip/athena/client/config/entries/ColorEntry.java similarity index 83% rename from src/main/java/rip/athena/client/config/types/ColorEntry.java rename to src/main/java/rip/athena/client/config/entries/ColorEntry.java index 9fcf2eef..7c5f4ebc 100644 --- a/src/main/java/rip/athena/client/config/types/ColorEntry.java +++ b/src/main/java/rip/athena/client/config/entries/ColorEntry.java @@ -1,18 +1,18 @@ -package rip.athena.client.config.types; +package rip.athena.client.config.entries; import java.awt.Color; import java.lang.reflect.Field; import org.json.JSONObject; -import rip.athena.client.config.ConfigEntry; +import rip.athena.client.config.AbstractConfigEntry; /** * @author Athena Development * @project Athena-Client * @date 6/6/2023 */ -public class ColorEntry extends ConfigEntry { +public class ColorEntry extends AbstractConfigEntry { public ColorEntry(Field field, String key, String description, boolean visible) { super(field, key, description, visible); } diff --git a/src/main/java/rip/athena/client/config/types/DoubleEntry.java b/src/main/java/rip/athena/client/config/entries/DoubleEntry.java similarity index 83% rename from src/main/java/rip/athena/client/config/types/DoubleEntry.java rename to src/main/java/rip/athena/client/config/entries/DoubleEntry.java index 5547fa02..e7abac27 100644 --- a/src/main/java/rip/athena/client/config/types/DoubleEntry.java +++ b/src/main/java/rip/athena/client/config/entries/DoubleEntry.java @@ -1,17 +1,17 @@ -package rip.athena.client.config.types; +package rip.athena.client.config.entries; import java.lang.reflect.Field; import org.json.JSONObject; -import rip.athena.client.config.ConfigEntry; +import rip.athena.client.config.AbstractConfigEntry; /** * @author Athena Development * @project Athena-Client * @date 6/6/2023 */ -public class DoubleEntry extends ConfigEntry { +public class DoubleEntry extends AbstractConfigEntry { private double min; private double max; diff --git a/src/main/java/rip/athena/client/config/types/FloatEntry.java b/src/main/java/rip/athena/client/config/entries/FloatEntry.java similarity index 83% rename from src/main/java/rip/athena/client/config/types/FloatEntry.java rename to src/main/java/rip/athena/client/config/entries/FloatEntry.java index ed343c42..6d1a9894 100644 --- a/src/main/java/rip/athena/client/config/types/FloatEntry.java +++ b/src/main/java/rip/athena/client/config/entries/FloatEntry.java @@ -1,17 +1,17 @@ -package rip.athena.client.config.types; +package rip.athena.client.config.entries; import java.lang.reflect.Field; import org.json.JSONObject; -import rip.athena.client.config.ConfigEntry; +import rip.athena.client.config.AbstractConfigEntry; /** * @author Athena Development * @project Athena-Client * @date 6/6/2023 */ -public class FloatEntry extends ConfigEntry { +public class FloatEntry extends AbstractConfigEntry { private float min; private float max; diff --git a/src/main/java/rip/athena/client/config/types/IntEntry.java b/src/main/java/rip/athena/client/config/entries/IntEntry.java similarity index 86% rename from src/main/java/rip/athena/client/config/types/IntEntry.java rename to src/main/java/rip/athena/client/config/entries/IntEntry.java index fede776e..19aef923 100644 --- a/src/main/java/rip/athena/client/config/types/IntEntry.java +++ b/src/main/java/rip/athena/client/config/entries/IntEntry.java @@ -1,17 +1,17 @@ -package rip.athena.client.config.types; +package rip.athena.client.config.entries; import java.lang.reflect.Field; import org.json.JSONObject; -import rip.athena.client.config.ConfigEntry; +import rip.athena.client.config.AbstractConfigEntry; /** * @author Athena Development * @project Athena-Client * @date 6/6/2023 */ -public class IntEntry extends ConfigEntry { +public class IntEntry extends AbstractConfigEntry { private int min; private int max; private boolean isKeyBind; diff --git a/src/main/java/rip/athena/client/config/types/ListEntry.java b/src/main/java/rip/athena/client/config/entries/ListEntry.java similarity index 84% rename from src/main/java/rip/athena/client/config/types/ListEntry.java rename to src/main/java/rip/athena/client/config/entries/ListEntry.java index 25e368d0..1cb854f7 100644 --- a/src/main/java/rip/athena/client/config/types/ListEntry.java +++ b/src/main/java/rip/athena/client/config/entries/ListEntry.java @@ -1,20 +1,20 @@ -package rip.athena.client.config.types; +package rip.athena.client.config.entries; import java.lang.reflect.Field; import org.json.JSONException; import org.json.JSONObject; +import rip.athena.api.module.Module; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigEntry; -import rip.athena.client.modules.Module; +import rip.athena.client.config.AbstractConfigEntry; /** * @author Athena Development * @project Athena-Client * @date 6/6/2023 */ -public class ListEntry extends ConfigEntry { +public class ListEntry extends AbstractConfigEntry { private Module module; private String[] values; diff --git a/src/main/java/rip/athena/client/config/types/StringEntry.java b/src/main/java/rip/athena/client/config/entries/StringEntry.java similarity index 78% rename from src/main/java/rip/athena/client/config/types/StringEntry.java rename to src/main/java/rip/athena/client/config/entries/StringEntry.java index e0353725..ab0f7807 100644 --- a/src/main/java/rip/athena/client/config/types/StringEntry.java +++ b/src/main/java/rip/athena/client/config/entries/StringEntry.java @@ -1,17 +1,17 @@ -package rip.athena.client.config.types; +package rip.athena.client.config.entries; import java.lang.reflect.Field; import org.json.JSONObject; -import rip.athena.client.config.ConfigEntry; +import rip.athena.client.config.AbstractConfigEntry; /** * @author Athena Development * @project Athena-Client * @date 6/6/2023 */ -public class StringEntry extends ConfigEntry { +public class StringEntry extends AbstractConfigEntry { public StringEntry(Field field, String key, String description, boolean visible) { super(field, key, description, visible); } diff --git a/src/main/java/rip/athena/client/cosmetics/cape/CapeManager.java b/src/main/java/rip/athena/client/cosmetics/cape/CapeManager.java index 28723e3b..ad3da948 100644 --- a/src/main/java/rip/athena/client/cosmetics/cape/CapeManager.java +++ b/src/main/java/rip/athena/client/cosmetics/cape/CapeManager.java @@ -2,9 +2,7 @@ package rip.athena.client.cosmetics.cape; import lombok.Getter; import lombok.Setter; -import net.minecraft.util.ResourceLocation; import rip.athena.client.Athena; -import rip.athena.client.modules.Module; import java.util.ArrayList; diff --git a/src/main/java/rip/athena/client/events/EventBus.java b/src/main/java/rip/athena/client/events/EventBus.java index ffe08511..5f06cdf7 100644 --- a/src/main/java/rip/athena/client/events/EventBus.java +++ b/src/main/java/rip/athena/client/events/EventBus.java @@ -40,7 +40,7 @@ public class EventBus { if(Event.class.isAssignableFrom(parameters[0])) { registered.add(method); } else if(DEBUG) { - debug("Tried subscribing to a event in class " + clazz.getClass().getName() + ", but the paramater " + parameters[0].getName() + " in method " + method.getName() + " isnt a subscribable event."); + debug("Tried subscribing to a event in class " + clazz.getClass().getName() + ", but the parameter " + parameters[0].getName() + " in method " + method.getName() + " isn't a subscribable event."); } } } diff --git a/src/main/java/rip/athena/client/modules/Category.java b/src/main/java/rip/athena/client/modules/Category.java deleted file mode 100644 index c95d6cd3..00000000 --- a/src/main/java/rip/athena/client/modules/Category.java +++ /dev/null @@ -1,54 +0,0 @@ -package rip.athena.client.modules; - -/** - * The Category enum represents the categories of modules in the Athena Client. - * It provides predefined categories for organizing and classifying modules. - * - * Example Usage: - * Category.MODS - * Category.RENDER - * Category.FPS_SETTINGS - * - * Example: - * Category.NEW_CATEGORY - * - * @author Athena Development - * @project Athena-Client - * @date 6/1/2023 - */ - -public enum Category { - ALL_MODS(0, "ALL MODS",false), - MODS(1, "MODS",false), - RENDER(2, "RENDER",false), - MOVEMENT(3, "MOVEMENT",false), - FACTIONS(4, "FACTIONS",false), - OTHER(5, "OTHER",false), - HIDDEN(6, "", true), - - FPS_SETTINGS(7, "",true), - - GROUPS(8, "",true); - - private int index; - private String text; - private boolean hidden; - - Category(int index, String text, boolean hidden) { - this.index = index; - this.text = text; - this.hidden = hidden; - } - - public int getIndex() { - return index; - } - - public String getText() { - return text; - } - - public boolean isHidden() { - return hidden; - } -} diff --git a/src/main/java/rip/athena/client/modules/impl/fpssettings/OptimizerMod.java b/src/main/java/rip/athena/client/modules/fpssettings/OptimizerMod.java similarity index 68% rename from src/main/java/rip/athena/client/modules/impl/fpssettings/OptimizerMod.java rename to src/main/java/rip/athena/client/modules/fpssettings/OptimizerMod.java index 913d3ddc..103655f0 100644 --- a/src/main/java/rip/athena/client/modules/impl/fpssettings/OptimizerMod.java +++ b/src/main/java/rip/athena/client/modules/fpssettings/OptimizerMod.java @@ -1,46 +1,48 @@ -package rip.athena.client.modules.impl.fpssettings; +package rip.athena.client.modules.fpssettings; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; /** * @author Athena Development * @project Athena-Client * @date 6/1/2023 */ +@IModuleMetaData(name = "Optimizer", type = EnumModuleType.FPS_SETTINGS, icon = "") public class OptimizerMod extends Module { @ConfigValue.Boolean(name = "Culling fix", description = "Fixes a bug which can cause chunks to not sometimes render, this can affect fps negatively.") - public boolean CULLING_FIX = true; - public boolean ENTITY_CULLING = true; + public boolean CULLING_FIX = false; + public boolean ENTITY_CULLING = false; public int ENTITY_CULLING_INTERVAL = 0; - public boolean SMART_ENTITY_CULLING = true; - public boolean DONT_CULL_PLAYER_NAMETAGS = true; - public boolean DONT_CULL_ENTITY_NAMETAGS = true; - public boolean DONT_CULL_ARMOR_STANDS_NAMETAGS = true; + public boolean SMART_ENTITY_CULLING = false; + public boolean DONT_CULL_PLAYER_NAMETAGS = false; + public boolean DONT_CULL_ENTITY_NAMETAGS = false; + public boolean DONT_CULL_ARMOR_STANDS_NAMETAGS = false; @ConfigValue.Boolean(name = "Static particle color", description = "Makes particles render at full brightness.") - public boolean STATIC_PARTICLE_COLOR = true; + public boolean STATIC_PARTICLE_COLOR = false; @ConfigValue.Boolean(name = "Better skin loading", description = "Makes so skin loading should be less stuttery when you join servers.") - public boolean BETTER_SKIN_LOADING = true; + public boolean BETTER_SKIN_LOADING = false; @ConfigValue.Boolean(name = "Remove light calculation", description = "Removes light calculations, rendering the game in full brightness.") - public boolean LIGHT_CALCULATION_REMOVAL = true; + public boolean LIGHT_CALCULATION_REMOVAL = false; @ConfigValue.Boolean(name = "Chunk update limiter", description = "Enable a chunk update limiter to improve performance") - public boolean CHUNK_UPDATE_LIMITE_ENABLED = true; + public boolean CHUNK_UPDATE_LIMITE_ENABLED = false; @ConfigValue.Integer(name = "Chunk updates per second", description = "Lower value, better fps.", min = 1, max = 250) public int CHUNK_UPDATE_LIMITER = 50; @ConfigValue.Boolean(name = "Remove mob spawner entity", description = "Removes the spinning entity inside of mob spawners.") - public boolean REMOVE_ENTITY_SPAWNER = true; + public boolean REMOVE_ENTITY_SPAWNER = false; @ConfigValue.Boolean(name = "Static drops", description = "Items on ground no longer rotate.") - public boolean STATIC_DROPS = true; - public boolean FAST_WORLD_LOADING = true; + public boolean STATIC_DROPS = false; + public boolean FAST_WORLD_LOADING = false; @ConfigValue.Boolean(name = "Custom Cane Renderer", description = "Only render cane in a certain radius to help FPS") public boolean noLagCane = false; @@ -57,10 +59,6 @@ public class OptimizerMod extends Module { @ConfigValue.Boolean(name = "Better Chests", description = "Disable render of knob/lid/reduce size of chests") public boolean noBetterChests = false; - public OptimizerMod() { - super("Optimizer", Category.FPS_SETTINGS); - } - @Override public void onEnable() { super.onEnable(); diff --git a/src/main/java/rip/athena/client/modules/impl/fpssettings/impl/EntityCulling.java b/src/main/java/rip/athena/client/modules/fpssettings/impl/EntityCulling.java similarity index 96% rename from src/main/java/rip/athena/client/modules/impl/fpssettings/impl/EntityCulling.java rename to src/main/java/rip/athena/client/modules/fpssettings/impl/EntityCulling.java index 2dfdec9c..75f5429c 100644 --- a/src/main/java/rip/athena/client/modules/impl/fpssettings/impl/EntityCulling.java +++ b/src/main/java/rip/athena/client/modules/fpssettings/impl/EntityCulling.java @@ -1,4 +1,4 @@ -package rip.athena.client.modules.impl.fpssettings.impl; +package rip.athena.client.modules.fpssettings.impl; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; @@ -20,7 +20,7 @@ import rip.athena.client.Athena; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.client.ClientTickEvent; import rip.athena.client.events.types.render.RenderEntityEvent; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; +import rip.athena.client.modules.fpssettings.OptimizerMod; import java.util.ArrayList; import java.util.List; @@ -68,7 +68,7 @@ public class EntityCulling { @SubscribeEvent public void shouldRenderEntity(RenderEntityEvent event) { if(settings == null) { - settings = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + settings = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); } if(settings.SMART_ENTITY_CULLING && Config.isShaders()) { @@ -163,7 +163,7 @@ public class EntityCulling { private void check() { if(settings == null) { - settings = (OptimizerMod) Athena.INSTANCE.getModuleManager().get(OptimizerMod.class); + settings = (OptimizerMod) Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class); } long delay = 0L; diff --git a/src/main/java/rip/athena/client/modules/impl/fpssettings/impl/ThreadDownloadImageDataHook.java b/src/main/java/rip/athena/client/modules/fpssettings/impl/ThreadDownloadImageDataHook.java similarity index 95% rename from src/main/java/rip/athena/client/modules/impl/fpssettings/impl/ThreadDownloadImageDataHook.java rename to src/main/java/rip/athena/client/modules/fpssettings/impl/ThreadDownloadImageDataHook.java index 5a979896..415e4235 100644 --- a/src/main/java/rip/athena/client/modules/impl/fpssettings/impl/ThreadDownloadImageDataHook.java +++ b/src/main/java/rip/athena/client/modules/fpssettings/impl/ThreadDownloadImageDataHook.java @@ -1,4 +1,4 @@ -package rip.athena.client.modules.impl.fpssettings.impl; +package rip.athena.client.modules.fpssettings.impl; import net.minecraft.client.renderer.ThreadDownloadImageData; import net.minecraft.client.renderer.texture.SimpleTexture; diff --git a/src/main/java/rip/athena/client/modules/impl/mods/HitDelayFix.java b/src/main/java/rip/athena/client/modules/impl/mods/HitDelayFix.java deleted file mode 100644 index c2730123..00000000 --- a/src/main/java/rip/athena/client/modules/impl/mods/HitDelayFix.java +++ /dev/null @@ -1,16 +0,0 @@ -package rip.athena.client.modules.impl.mods; - -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -/** - * @author Athena Development - * @project Athena-Client - * @date 6/4/2023 - */ -public class HitDelayFix extends Module { - - public HitDelayFix() { - super("HitDelayFix", Category.MODS, "Athena/gui/mods/cps.png"); - } -} diff --git a/src/main/java/rip/athena/client/modules/impl/mods/ItemPhysics.java b/src/main/java/rip/athena/client/modules/impl/mods/ItemPhysics.java deleted file mode 100644 index 74649be0..00000000 --- a/src/main/java/rip/athena/client/modules/impl/mods/ItemPhysics.java +++ /dev/null @@ -1,16 +0,0 @@ -package rip.athena.client.modules.impl.mods; - -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -/** - * @author Athena Development - * @project Athena-Client - * @date 6/12/2023 - */ -public class ItemPhysics extends Module { - - public ItemPhysics() { - super("ItemPhysics", Category.MODS); - } -} diff --git a/src/main/java/rip/athena/client/modules/impl/mods/MinimalBobbing.java b/src/main/java/rip/athena/client/modules/impl/mods/MinimalBobbing.java deleted file mode 100644 index bd1bccbb..00000000 --- a/src/main/java/rip/athena/client/modules/impl/mods/MinimalBobbing.java +++ /dev/null @@ -1,23 +0,0 @@ -package rip.athena.client.modules.impl.mods; - -import rip.athena.client.config.ConfigValue; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -/** - * @author Athena Development - * @project Athena-Client - * @date 6/9/2023 - */ -public class MinimalBobbing extends Module { - - @ConfigValue.Boolean(name = "Remove Hand Bobbing") - public boolean handBobbing = true; - - @ConfigValue.Boolean(name = "Remove Screen Bobbing") - public boolean screenBobbing = true; - - public MinimalBobbing() { - super("Minimal Bobbing", Category.MODS, "Athena/gui/mods/nobobbing.png"); - } -} diff --git a/src/main/java/rip/athena/client/modules/impl/mods/MouseDelayFix.java b/src/main/java/rip/athena/client/modules/impl/mods/MouseDelayFix.java deleted file mode 100644 index 11fccc94..00000000 --- a/src/main/java/rip/athena/client/modules/impl/mods/MouseDelayFix.java +++ /dev/null @@ -1,16 +0,0 @@ -package rip.athena.client.modules.impl.mods; - -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -/** - * @author Athena Development - * @project Athena-Client - * @date 6/4/2023 - */ -public class MouseDelayFix extends Module { - - public MouseDelayFix() { - super("MouseDelayFix", Category.MODS, "Athena/gui/mods/cps.png"); - } -} diff --git a/src/main/java/rip/athena/client/modules/impl/mods/NoHurtCam.java b/src/main/java/rip/athena/client/modules/impl/mods/NoHurtCam.java deleted file mode 100644 index 174b90b1..00000000 --- a/src/main/java/rip/athena/client/modules/impl/mods/NoHurtCam.java +++ /dev/null @@ -1,16 +0,0 @@ -package rip.athena.client.modules.impl.mods; - -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -/** - * @author Athena Development - * @project Athena-Client - * @date 6/4/2023 - */ -public class NoHurtCam extends Module { - - public NoHurtCam() { - super("NoHurtCam", Category.MODS, "Athena/gui/mods/nohurtcam.png"); - } -} diff --git a/src/main/java/rip/athena/client/modules/impl/other/NickHider.java b/src/main/java/rip/athena/client/modules/impl/other/NickHider.java deleted file mode 100644 index 9b749f50..00000000 --- a/src/main/java/rip/athena/client/modules/impl/other/NickHider.java +++ /dev/null @@ -1,20 +0,0 @@ -package rip.athena.client.modules.impl.other; - -import rip.athena.client.config.ConfigValue; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -/** - * @author Athena Development - * @project Athena-Client - * @date 6/9/2023 - */ -public class NickHider extends Module { - - @ConfigValue.Text(name = "Nick", description = "Enter the name of your custom nickname") - public String nick = "Custom Nick"; - - public NickHider() { - super("Nick Hider", Category.OTHER, "Athena/gui/mods/nickhider.png"); - } -} diff --git a/src/main/java/rip/athena/client/modules/impl/render/CustomHitColor.java b/src/main/java/rip/athena/client/modules/impl/render/CustomHitColor.java deleted file mode 100644 index c8b4b6d6..00000000 --- a/src/main/java/rip/athena/client/modules/impl/render/CustomHitColor.java +++ /dev/null @@ -1,22 +0,0 @@ -package rip.athena.client.modules.impl.render; - -import rip.athena.client.config.ConfigValue; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -import java.awt.*; - -/** - * @author Athena Development - * @project Athena-Client - * @date 6/4/2023 - */ -public class CustomHitColor extends Module { - - @ConfigValue.Color(name = "Hit Color", description = "Chose the color of your desires") - public Color color = Color.WHITE; - - public CustomHitColor() { - super("Custom Hit Color", Category.RENDER, "Athena/gui/mods/hitcolor.png"); - } -} diff --git a/src/main/java/rip/athena/client/modules/impl/render/MotionBlur.java b/src/main/java/rip/athena/client/modules/impl/render/MotionBlur.java deleted file mode 100644 index 7cd13d1b..00000000 --- a/src/main/java/rip/athena/client/modules/impl/render/MotionBlur.java +++ /dev/null @@ -1,100 +0,0 @@ -package rip.athena.client.modules.impl.render; - -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.FallbackResourceManager; -import net.minecraft.client.resources.IResource; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.SimpleReloadableResourceManager; -import net.minecraft.client.resources.data.IMetadataSection; -import net.minecraft.client.resources.data.IMetadataSerializer; -import net.minecraft.client.settings.GameSettings; -import net.minecraft.client.shader.Framebuffer; -import net.minecraft.util.ResourceLocation; -import org.apache.commons.io.IOUtils; -import org.lwjgl.opengl.GL11; -import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.events.SubscribeEvent; -import rip.athena.client.events.types.client.ClientTickEvent; -import rip.athena.client.events.types.input.KeyDownEvent; -import rip.athena.client.events.types.render.RenderEvent; -import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -import java.io.InputStream; -import java.lang.reflect.Field; -import java.nio.charset.Charset; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - -import static net.minecraft.client.resources.SimpleReloadableResourceManager.domainResourceManagers; - -/** - * @author Athena Development - * @project Athena-Client - * @date 6/2/2023 - */ -public class MotionBlur extends Module { - - @ConfigValue.Integer(name = "Amount", min = 1, max = 10) - public static int amount = 1; - - public static float f; - - public MotionBlur() { - super("Motion Blur", Category.RENDER, "Athena/gui/mods/motionblur.png"); - } - - public static void createAccumulation() { - float f = getAccumulationValue(); - GL11.glAccum(GL11.GL_MULT, f); - GL11.glAccum(GL11.GL_ACCUM, 1.0F - f); - GL11.glAccum(GL11.GL_RETURN, 1.0F); - } - - public static float getMultiplier() { - return amount * 10; - } - - public static float getAccumulationValue() { - f = getMultiplier() * 10.0F; - long lastTimestampInGame = System.currentTimeMillis(); - - if (f > 996.0F) { - f = 996.0F; - } - - if (f > 990.0F) { - f = 990.0F; - } - - long i = System.currentTimeMillis() - lastTimestampInGame; - - if (i > 10000L) { - return 0.0F; - } else { - if (f < 0.0F) { - f = 0.0F; - } - - return f / 1000.0F; - } - } - - @Override - public void onEnable() { - super.onEnable(); - } - - @Override - public void onDisable() { - super.onDisable(); - } -} \ No newline at end of file diff --git a/src/main/java/rip/athena/client/modules/impl/render/TimeChanger.java b/src/main/java/rip/athena/client/modules/impl/render/TimeChanger.java deleted file mode 100644 index 4c4a7fe7..00000000 --- a/src/main/java/rip/athena/client/modules/impl/render/TimeChanger.java +++ /dev/null @@ -1,20 +0,0 @@ -package rip.athena.client.modules.impl.render; - -import rip.athena.client.config.ConfigValue; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -/** - * @author Athena Development - * @project Athena-Client - * @date 6/12/2023 - */ -public class TimeChanger extends Module { - - @ConfigValue.Integer(name = "Time", min = 1, max = 24000) - public int time = 16000; - - public TimeChanger() { - super("Time Changer", Category.RENDER, "Athena/gui/mods/timechanger.png"); - } -} diff --git a/src/main/java/rip/athena/client/modules/impl/mods/Freelook.java b/src/main/java/rip/athena/client/modules/mods/Freelook.java similarity index 91% rename from src/main/java/rip/athena/client/modules/impl/mods/Freelook.java rename to src/main/java/rip/athena/client/modules/mods/Freelook.java index 961df65c..d3143eca 100644 --- a/src/main/java/rip/athena/client/modules/impl/mods/Freelook.java +++ b/src/main/java/rip/athena/client/modules/mods/Freelook.java @@ -1,13 +1,14 @@ -package rip.athena.client.modules.impl.mods; +package rip.athena.client.modules.mods; import net.minecraft.client.Minecraft; import org.lwjgl.opengl.Display; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.input.KeyDownEvent; import rip.athena.client.events.types.input.KeyUpEvent; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; import rip.athena.client.utils.input.KeybindManager; /** @@ -15,6 +16,8 @@ import rip.athena.client.utils.input.KeybindManager; * @project Athena-Client * @date 6/3/2023 */ + +@IModuleMetaData(name = "Freelook", type = EnumModuleType.MODS, icon = "") public class Freelook extends Module { @ConfigValue.Boolean(name = "Require Hold") @@ -28,11 +31,6 @@ public class Freelook extends Module { public static float cameraYaw, cameraPitch = 0F; - - public Freelook() { - super("Freelook", Category.MODS, "Athena/gui/mods/freelook.png"); - } - @SubscribeEvent public void onKeyPress(KeyDownEvent event) { if(KeybindManager.isInvalidScreen(mc.currentScreen)) return; diff --git a/src/main/java/rip/athena/client/modules/mods/HitDelayFix.java b/src/main/java/rip/athena/client/modules/mods/HitDelayFix.java new file mode 100644 index 00000000..ecff7273 --- /dev/null +++ b/src/main/java/rip/athena/client/modules/mods/HitDelayFix.java @@ -0,0 +1,14 @@ +package rip.athena.client.modules.mods; + +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; + +/** + * @author Athena Development + * @project Athena-Client + * @date 6/4/2023 + */ +@IModuleMetaData(name = "Hit Delay Fix", type = EnumModuleType.MODS, icon = "Athena/gui/mods/cps.png") +public class HitDelayFix extends Module { +} diff --git a/src/main/java/rip/athena/client/modules/mods/ItemPhysics.java b/src/main/java/rip/athena/client/modules/mods/ItemPhysics.java new file mode 100644 index 00000000..5f0fbbda --- /dev/null +++ b/src/main/java/rip/athena/client/modules/mods/ItemPhysics.java @@ -0,0 +1,14 @@ +package rip.athena.client.modules.mods; + +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; + +/** + * @author Athena Development + * @project Athena-Client + * @date 6/12/2023 + */ +@IModuleMetaData(name = "Item Physics", type = EnumModuleType.MODS, icon = "") +public class ItemPhysics extends Module { +} diff --git a/src/main/java/rip/athena/client/modules/mods/MinimalBobbing.java b/src/main/java/rip/athena/client/modules/mods/MinimalBobbing.java new file mode 100644 index 00000000..c8f60029 --- /dev/null +++ b/src/main/java/rip/athena/client/modules/mods/MinimalBobbing.java @@ -0,0 +1,22 @@ +package rip.athena.client.modules.mods; + +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; + +/** + * @author Athena Development + * @project Athena-Client + * @date 6/9/2023 + */ +@IModuleMetaData(name = "Minimal Bobbing", type = EnumModuleType.MODS, icon = "Athena/gui/mods/nobobbing.png") +public class MinimalBobbing extends Module { + + @ConfigValue.Boolean(name = "Remove Hand Bobbing") + public boolean handBobbing = true; + + @ConfigValue.Boolean(name = "Remove Screen Bobbing") + public boolean screenBobbing = true; + +} diff --git a/src/main/java/rip/athena/client/modules/mods/MouseDelayFix.java b/src/main/java/rip/athena/client/modules/mods/MouseDelayFix.java new file mode 100644 index 00000000..d1f7a707 --- /dev/null +++ b/src/main/java/rip/athena/client/modules/mods/MouseDelayFix.java @@ -0,0 +1,14 @@ +package rip.athena.client.modules.mods; + +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; + +/** + * @author Athena Development + * @project Athena-Client + * @date 6/4/2023 + */ +@IModuleMetaData(name = "Mouse Delay Fix", type = EnumModuleType.MODS, icon = "Athena/gui/mods/cps.png") +public class MouseDelayFix extends Module { +} diff --git a/src/main/java/rip/athena/client/modules/mods/NoHurtCam.java b/src/main/java/rip/athena/client/modules/mods/NoHurtCam.java new file mode 100644 index 00000000..76cfa9f1 --- /dev/null +++ b/src/main/java/rip/athena/client/modules/mods/NoHurtCam.java @@ -0,0 +1,14 @@ +package rip.athena.client.modules.mods; + +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; + +/** + * @author Athena Development + * @project Athena-Client + * @date 6/4/2023 + */ +@IModuleMetaData(name = "No Hurt Cam", type = EnumModuleType.MODS, icon = "Athena/gui/mods/nohurtcam.png") +public class NoHurtCam extends Module { +} diff --git a/src/main/java/rip/athena/client/modules/impl/mods/OldAnimations.java b/src/main/java/rip/athena/client/modules/mods/OldAnimations.java similarity index 86% rename from src/main/java/rip/athena/client/modules/impl/mods/OldAnimations.java rename to src/main/java/rip/athena/client/modules/mods/OldAnimations.java index 4b63179a..715e12fa 100644 --- a/src/main/java/rip/athena/client/modules/impl/mods/OldAnimations.java +++ b/src/main/java/rip/athena/client/modules/mods/OldAnimations.java @@ -1,17 +1,19 @@ -package rip.athena.client.modules.impl.mods; +package rip.athena.client.modules.mods; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.potion.Potion; import net.minecraft.util.MovingObjectPosition; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; /** * @author Athena Development * @project Athena-Client * @date 6/4/2023 */ +@IModuleMetaData(name = "1.7 Animations", type = EnumModuleType.MODS, icon = "Athena/gui/mods/animation.png") public class OldAnimations extends Module { @ConfigValue.Boolean(name = "Blocking") @@ -35,10 +37,6 @@ public class OldAnimations extends Module { @ConfigValue.Boolean(name = "Disable Health Flash") public boolean DISABLE_HEALTH_FLASH = true; - public OldAnimations() { - super("Old Animations", Category.MODS, "Athena/gui/mods/animation.png"); - } - public void attemptSwing() { if (this.mc.thePlayer.getHeldItem() != null && this.isToggled() && OLD_EAT_USE_ANIMATION) { boolean mouseDown = this.mc.gameSettings.keyBindAttack.isKeyDown() diff --git a/src/main/java/rip/athena/client/modules/impl/mods/ToggleSprint.java b/src/main/java/rip/athena/client/modules/mods/ToggleSprint.java similarity index 96% rename from src/main/java/rip/athena/client/modules/impl/mods/ToggleSprint.java rename to src/main/java/rip/athena/client/modules/mods/ToggleSprint.java index 44898eea..649273d8 100644 --- a/src/main/java/rip/athena/client/modules/impl/mods/ToggleSprint.java +++ b/src/main/java/rip/athena/client/modules/mods/ToggleSprint.java @@ -1,4 +1,4 @@ -package rip.athena.client.modules.impl.mods; +package rip.athena.client.modules.mods; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; @@ -6,11 +6,12 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.settings.GameSettings; import net.minecraft.util.MovementInputFromOptions; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.font.FontManager; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; @@ -24,6 +25,7 @@ import java.text.DecimalFormat; * @project Athena-Client * @date 6/9/2023 */ +@IModuleMetaData(name = "Toggle Sprint", type = EnumModuleType.MODS, icon = "Athena/gui/mods/entityhud.png") public class ToggleSprint extends Module { @ConfigValue.List(name = "Display Mode", values = {"Circle", "Modern", "Fade", "Old"}, description = "Chose display of background") @@ -85,7 +87,6 @@ public class ToggleSprint extends Module { private int height = 10; public ToggleSprint() { - super("ToggleSprint", Category.MODS, "Athena/gui/mods/entityhud.png"); hud = new HUDElement("togglesprint", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/mods/Zoom.java b/src/main/java/rip/athena/client/modules/mods/Zoom.java similarity index 80% rename from src/main/java/rip/athena/client/modules/impl/mods/Zoom.java rename to src/main/java/rip/athena/client/modules/mods/Zoom.java index 12e8fddf..321f8565 100644 --- a/src/main/java/rip/athena/client/modules/impl/mods/Zoom.java +++ b/src/main/java/rip/athena/client/modules/mods/Zoom.java @@ -1,18 +1,20 @@ -package rip.athena.client.modules.impl.mods; +package rip.athena.client.modules.mods; import optifine.Config; import org.lwjgl.input.Mouse; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.client.ClientTickEvent; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; /** * @author Athena Development * @project Athena-Client * @date 6/2/2023 */ +@IModuleMetaData(name = "Zoom", type = EnumModuleType.MODS, icon = "Athena/gui/mods/zoom.png") public class Zoom extends Module { @ConfigValue.Boolean(name = "Smooth Zoom") public boolean smoothZoom = false; @@ -28,10 +30,6 @@ public class Zoom extends Module { public float scrollAmount = 0; - public Zoom() { - super("Zoom", Category.MODS, "Athena/gui/mods/zoom.png"); - } - @SubscribeEvent public void onTick(ClientTickEvent event) { if (Config.zoomMode) { @@ -59,5 +57,4 @@ public class Zoom extends Module { } } } - } diff --git a/src/main/java/rip/athena/client/modules/impl/other/AimTrainer.java b/src/main/java/rip/athena/client/modules/other/AimTrainer.java similarity index 96% rename from src/main/java/rip/athena/client/modules/impl/other/AimTrainer.java rename to src/main/java/rip/athena/client/modules/other/AimTrainer.java index ea8ff05f..e49d535c 100644 --- a/src/main/java/rip/athena/client/modules/impl/other/AimTrainer.java +++ b/src/main/java/rip/athena/client/modules/other/AimTrainer.java @@ -1,21 +1,20 @@ -package rip.athena.client.modules.impl.other; +package rip.athena.client.modules.other; import com.mojang.authlib.GameProfile; import net.minecraft.client.entity.EntityOtherPlayerMP; import net.minecraft.client.gui.Gui; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.Vec3; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.config.ConfigValue; import rip.athena.client.events.SubscribeEvent; -import rip.athena.client.events.types.client.ClientTickEvent; import rip.athena.client.events.types.entity.AttackEntityEvent; import rip.athena.client.events.types.input.MouseDownEvent; import rip.athena.client.events.types.render.RenderEvent; import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.NumberUtils; import rip.athena.client.utils.font.FontManager; import rip.athena.client.utils.render.ColorUtil; @@ -23,8 +22,6 @@ import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; -import java.text.DecimalFormat; -import java.text.Format; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -34,6 +31,7 @@ import java.util.UUID; * @project Athena-Client * @date 6/10/2023 */ +@IModuleMetaData(name = "Aim Trainer", type = EnumModuleType.OTHER, icon = "Athena/gui/mods/time.png") public class AimTrainer extends Module { @ConfigValue.List(name = "Display Mode", values = {"Circle", "Modern", "Fade", "Old"}, description = "Chose display of background") @@ -80,8 +78,6 @@ public class AimTrainer extends Module { private int height = 18; public AimTrainer() { - super("Aim Trainer", Category.RENDER, "Athena/gui/mods/time.png"); - hud = new HUDElement("time", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/other/NickHider.java b/src/main/java/rip/athena/client/modules/other/NickHider.java new file mode 100644 index 00000000..e665212c --- /dev/null +++ b/src/main/java/rip/athena/client/modules/other/NickHider.java @@ -0,0 +1,18 @@ +package rip.athena.client.modules.other; + +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; + +/** + * @author Athena Development + * @project Athena-Client + * @date 6/9/2023 + */ +@IModuleMetaData(name = "Nick Hider", type = EnumModuleType.OTHER, icon = "Athena/gui/mods/nickhider.png") +public class NickHider extends Module { + + @ConfigValue.Text(name = "Nick", description = "Enter the name of your custom nickname") + public String nick = "Custom Nick"; +} diff --git a/src/main/java/rip/athena/client/modules/impl/other/Settings.java b/src/main/java/rip/athena/client/modules/other/Settings.java similarity index 59% rename from src/main/java/rip/athena/client/modules/impl/other/Settings.java rename to src/main/java/rip/athena/client/modules/other/Settings.java index 25f93e35..192179b0 100644 --- a/src/main/java/rip/athena/client/modules/impl/other/Settings.java +++ b/src/main/java/rip/athena/client/modules/other/Settings.java @@ -1,11 +1,11 @@ -package rip.athena.client.modules.impl.other; +package rip.athena.client.modules.other; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; - -import java.awt.*; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; +@IModuleMetaData(name = "General Settings", type = EnumModuleType.OTHER, icon = "Athena/gui/mods/fps.png") public class Settings extends Module { @ConfigValue.Boolean(name = "F5 Nametags", description = "Shows your own nametags in f5 mode") @@ -17,10 +17,6 @@ public class Settings extends Module { @ConfigValue.Boolean(name = "Custom GUI Font") public static boolean customGuiFont = true; - public Settings() { - super("General Settings", Category.HIDDEN, "Athena/gui/mods/fps.png"); - } - @Override public void onEnable() { super.onEnable(); diff --git a/src/main/java/rip/athena/client/modules/impl/render/ArmorStatus.java b/src/main/java/rip/athena/client/modules/render/ArmorStatus.java similarity index 97% rename from src/main/java/rip/athena/client/modules/impl/render/ArmorStatus.java rename to src/main/java/rip/athena/client/modules/render/ArmorStatus.java index c7aa5437..c1073d70 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/ArmorStatus.java +++ b/src/main/java/rip/athena/client/modules/render/ArmorStatus.java @@ -1,4 +1,4 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -7,11 +7,11 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; +import rip.athena.client.ui.hud.HUDElement; import java.awt.*; @@ -20,6 +20,7 @@ import java.awt.*; * @project Athena-Client * @date 6/4/2023 */ +@IModuleMetaData(name = "Armor Status", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/armorstatus.png") public class ArmorStatus extends Module { @ConfigValue.Boolean(name = "Item Name") private boolean armorstatusitemname = false; @@ -50,8 +51,6 @@ public class ArmorStatus extends Module { private int armorstatusheight = 10; public ArmorStatus() { - super("Armor Status", Category.RENDER, "Athena/gui/mods/armorstatus.png"); - hud = new HUDElement("armorstatus", armorstatuswidth, armorstatusheight) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/BlockOverlay.java b/src/main/java/rip/athena/client/modules/render/BlockOverlay.java similarity index 97% rename from src/main/java/rip/athena/client/modules/impl/render/BlockOverlay.java rename to src/main/java/rip/athena/client/modules/render/BlockOverlay.java index 47cce0f5..0622af75 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/BlockOverlay.java +++ b/src/main/java/rip/athena/client/modules/render/BlockOverlay.java @@ -1,4 +1,4 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.GlStateManager; @@ -10,15 +10,17 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import org.lwjgl.opengl.GL11; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.render.RenderEvent; import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; import java.awt.*; +@IModuleMetaData(name = "Block Overlay", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/blockoverlay.png") public class BlockOverlay extends Module { @ConfigValue.List(name = "Mode", values = { "Outline", "Highlight", "Both" }) private String mode = "Outline"; @@ -35,10 +37,6 @@ public class BlockOverlay extends Module { @ConfigValue.Boolean(name = "Chroma") private boolean isUsingChroma = false; - public BlockOverlay() { - super("Block Overlay", Category.RENDER, "Athena/gui/mods/blockoverlay.png"); - } - @SubscribeEvent public void onWorldRenderLast(RenderEvent event) { if (event.getRenderType() != RenderType.WORLD) { diff --git a/src/main/java/rip/athena/client/modules/impl/render/CPS.java b/src/main/java/rip/athena/client/modules/render/CPS.java similarity index 93% rename from src/main/java/rip/athena/client/modules/impl/render/CPS.java rename to src/main/java/rip/athena/client/modules/render/CPS.java index 8047bca3..c63af172 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/CPS.java +++ b/src/main/java/rip/athena/client/modules/render/CPS.java @@ -1,15 +1,16 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.gui.Gui; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.config.ConfigValue; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.input.MouseDownEvent; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.ClickCounter; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; @@ -22,6 +23,7 @@ import java.awt.*; * @project Athena-Client * @date 6/2/2023 */ +@IModuleMetaData(name = "CPS", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/cps.png") public class CPS extends Module { private final ClickCounter leftClickCounter = new ClickCounter(); @@ -60,8 +62,6 @@ public class CPS extends Module { private int height = 18; public CPS() { - super("CPS", Category.RENDER, "Athena/gui/mods/cps.png"); - hud = new HUDElement("cps", width, height) { @Override public void onRender() { render(); } diff --git a/src/main/java/rip/athena/client/modules/impl/render/Chat.java b/src/main/java/rip/athena/client/modules/render/Chat.java similarity index 61% rename from src/main/java/rip/athena/client/modules/impl/render/Chat.java rename to src/main/java/rip/athena/client/modules/render/Chat.java index d380d3d0..a6943836 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Chat.java +++ b/src/main/java/rip/athena/client/modules/render/Chat.java @@ -1,14 +1,16 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; /** * @author Athena Development * @project Athena-Client * @date 6/3/2023 */ +@IModuleMetaData(name = "Chat", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/chat.png") public class Chat extends Module { @ConfigValue.Boolean(name = "Infinite Chat") @@ -17,10 +19,6 @@ public class Chat extends Module { @ConfigValue.Integer(name = "Background Opacity", min = 0, max = 255) public int transparency = 96; // close enough to default opacity - public Chat() { - super("Chat", Category.RENDER, "Athena/gui/mods/chat.png"); - } - @Override public void onEnable() { super.onEnable(); diff --git a/src/main/java/rip/athena/client/modules/impl/render/Clock.java b/src/main/java/rip/athena/client/modules/render/Clock.java similarity index 93% rename from src/main/java/rip/athena/client/modules/impl/render/Clock.java rename to src/main/java/rip/athena/client/modules/render/Clock.java index 5482e5c1..cc30fa65 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Clock.java +++ b/src/main/java/rip/athena/client/modules/render/Clock.java @@ -1,15 +1,13 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.font.FontManager; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; @@ -26,6 +24,7 @@ import static rip.athena.client.utils.render.DrawUtils.drawCircle; * @project Athena-Client * @date 6/2/2023 */ +@IModuleMetaData(name = "Clock", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/time.png") public class Clock extends Module { @ConfigValue.Color(name = "Color") private Color color = Color.WHITE; @@ -63,8 +62,6 @@ public class Clock extends Module { private int height = 18; public Clock() { - super("Clock", Category.RENDER, "Athena/gui/mods/time.png"); - hud = new HUDElement("time", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/Coordinates.java b/src/main/java/rip/athena/client/modules/render/Coordinates.java similarity index 97% rename from src/main/java/rip/athena/client/modules/impl/render/Coordinates.java rename to src/main/java/rip/athena/client/modules/render/Coordinates.java index 994696c4..c0ca175c 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Coordinates.java +++ b/src/main/java/rip/athena/client/modules/render/Coordinates.java @@ -1,7 +1,6 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.Tessellator; @@ -14,14 +13,15 @@ import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.config.ConfigValue; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.input.KeyDownEvent; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; @@ -33,6 +33,7 @@ import java.awt.*; * @project Athena-Client * @date 6/2/2023 */ +@IModuleMetaData(name = "Coordinates", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/coordinates.png") public class Coordinates extends Module { @ConfigValue.Boolean(name = "Show Compass") private boolean showCompass = true; @@ -99,8 +100,6 @@ public class Coordinates extends Module { private HUDElement hud; public Coordinates() { - super("Coordinates", Category.RENDER, "Athena/gui/mods/coordinates.png"); - hud = new HUDElement("coordinates", 70, 30) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/Crosshair.java b/src/main/java/rip/athena/client/modules/render/Crosshair.java similarity index 96% rename from src/main/java/rip/athena/client/modules/impl/render/Crosshair.java rename to src/main/java/rip/athena/client/modules/render/Crosshair.java index 41bc0711..237d38b4 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Crosshair.java +++ b/src/main/java/rip/athena/client/modules/render/Crosshair.java @@ -1,4 +1,4 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; @@ -8,13 +8,14 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Mouse; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.client.ClientTickEvent; import rip.athena.client.events.types.render.RenderEvent; import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; import java.awt.*; import java.awt.image.BufferedImage; @@ -25,6 +26,7 @@ import java.awt.image.BufferedImage; * @date 6/2/2023 */ +@IModuleMetaData(name = "Crosshair", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/crosshair.png") public class Crosshair extends Module { @ConfigValue.Color(name = "Draw color") private Color color = Color.RED; @@ -60,7 +62,6 @@ public class Crosshair extends Module { int groupContainerColor = new Color(35, 35, 35, 255).getRGB(); public Crosshair() { - super("Crosshair", Category.RENDER, "Athena/gui/mods/crosshair.png"); crosshair = new int[84][74]; } diff --git a/src/main/java/rip/athena/client/modules/render/CustomHitColor.java b/src/main/java/rip/athena/client/modules/render/CustomHitColor.java new file mode 100644 index 00000000..1f1260fe --- /dev/null +++ b/src/main/java/rip/athena/client/modules/render/CustomHitColor.java @@ -0,0 +1,21 @@ +package rip.athena.client.modules.render; + +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; + +import java.awt.*; + +/** + * @author Athena Development + * @project Athena-Client + * @date 6/4/2023 + */ +@IModuleMetaData(name = "Custom Hit Color", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/hitcolor.png") +public class CustomHitColor extends Module { + + @ConfigValue.Color(name = "Hit Color", description = "Chose the color of your desires") + public Color color = Color.WHITE; + +} diff --git a/src/main/java/rip/athena/client/modules/impl/render/CustomText.java b/src/main/java/rip/athena/client/modules/render/CustomText.java similarity index 92% rename from src/main/java/rip/athena/client/modules/impl/render/CustomText.java rename to src/main/java/rip/athena/client/modules/render/CustomText.java index 821202c3..83d93ca3 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/CustomText.java +++ b/src/main/java/rip/athena/client/modules/render/CustomText.java @@ -1,13 +1,14 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.gui.Gui; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; @@ -19,6 +20,7 @@ import java.awt.*; * @project Athena-Client * @date 6/4/2023 */ +@IModuleMetaData(name = "Custom Text", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/customtext.png") public class CustomText extends Module { @ConfigValue.Text(name = "Custom Text", description = "Enter choice of text to display") @@ -51,9 +53,8 @@ public class CustomText extends Module { private HUDElement hud; private int width = 56; private int height = 18; - public CustomText() { - super("Custom Text", Category.RENDER, "Athena/gui/mods/customtext.png"); + public CustomText() { hud = new HUDElement("customtext", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/EntityHUD.java b/src/main/java/rip/athena/client/modules/render/EntityHUD.java similarity index 91% rename from src/main/java/rip/athena/client/modules/impl/render/EntityHUD.java rename to src/main/java/rip/athena/client/modules/render/EntityHUD.java index 86ff2aa0..ba15437a 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/EntityHUD.java +++ b/src/main/java/rip/athena/client/modules/render/EntityHUD.java @@ -1,13 +1,14 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.gui.Gui; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; @@ -19,6 +20,7 @@ import java.awt.*; * @project Athena-Client * @date 6/2/2023 */ +@IModuleMetaData(name = "Entity HUD", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/entityhud.png") public class EntityHUD extends Module { @ConfigValue.List(name = "Display Mode", values = {"Circle", "Modern", "Fade", "Old"}, description = "Chose display of background") @@ -50,8 +52,6 @@ public class EntityHUD extends Module { private int height = 18; public EntityHUD() { - super("Entity HUD", Category.RENDER, "Athena/gui/mods/entityhud.png"); - hud = new HUDElement("entityhud", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/FPSMod.java b/src/main/java/rip/athena/client/modules/render/FPSMod.java similarity index 88% rename from src/main/java/rip/athena/client/modules/impl/render/FPSMod.java rename to src/main/java/rip/athena/client/modules/render/FPSMod.java index 2093913f..053f46a6 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/FPSMod.java +++ b/src/main/java/rip/athena/client/modules/render/FPSMod.java @@ -1,33 +1,26 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.GlStateManager; -import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.events.SubscribeEvent; -import rip.athena.client.events.types.render.RenderEvent; -import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.font.FontManager; -import rip.athena.client.font.FontUtils; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.gui.menu.AthenaMenu; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; -import static org.lwjgl.opengl.GL11.GL_GREATER; - /** * @author Athena Development * @project Athena-Client * @date 6/1/2023 */ +@IModuleMetaData(name = "FPS", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/fps.png") public class FPSMod extends Module { @ConfigValue.List(name = "Display Mode", values = {"Circle", "Modern", "Fade", "Old"}, description = "Chose display of background") @@ -59,8 +52,6 @@ public class FPSMod extends Module { private int height = 18; public FPSMod() { - super("FPS", Category.RENDER, "Athena/gui/mods/fps.png"); - hud = new HUDElement("fps", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/Fullbright.java b/src/main/java/rip/athena/client/modules/render/Fullbright.java similarity index 64% rename from src/main/java/rip/athena/client/modules/impl/render/Fullbright.java rename to src/main/java/rip/athena/client/modules/render/Fullbright.java index 7c1f3d4d..441f2d25 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Fullbright.java +++ b/src/main/java/rip/athena/client/modules/render/Fullbright.java @@ -1,23 +1,19 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; -import rip.athena.client.events.SubscribeEvent; -import rip.athena.client.events.types.client.ClientTickEvent; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; /** * @author Athena Development * @project Athena-Client * @date 6/26/2023 */ +@IModuleMetaData(name = "Fullbright", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/fullbright.png") public class Fullbright extends Module { private float savedBrightness = 0F; - public Fullbright() { - super("Fullbright", Category.RENDER, "Athena/gui/mods/fullbright.png"); - } - @Override public void onEnable() { savedBrightness = mc.gameSettings.gammaSetting; diff --git a/src/main/java/rip/athena/client/modules/impl/render/GUIMod.java b/src/main/java/rip/athena/client/modules/render/GUIMod.java similarity index 62% rename from src/main/java/rip/athena/client/modules/impl/render/GUIMod.java rename to src/main/java/rip/athena/client/modules/render/GUIMod.java index aef80640..cca79563 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/GUIMod.java +++ b/src/main/java/rip/athena/client/modules/render/GUIMod.java @@ -1,16 +1,18 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import org.lwjgl.input.Keyboard; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.ui.clickgui.IngameMenu; /** * @author Athena Development * @project Athena-Client * @date 6/1/2023 */ +@IModuleMetaData(name = "GUI", type = EnumModuleType.HIDDEN, icon = "Athena/gui/mods/chat.png") public class GUIMod extends Module { private int width = 1035; @@ -20,7 +22,6 @@ public class GUIMod extends Module { private Menu menu; public GUIMod() { - super("GUI", Category.HIDDEN); setKeyBind(Keyboard.KEY_RSHIFT); menu = new Menu("", width, height); diff --git a/src/main/java/rip/athena/client/modules/impl/render/Keystrokes.java b/src/main/java/rip/athena/client/modules/render/Keystrokes.java similarity index 97% rename from src/main/java/rip/athena/client/modules/impl/render/Keystrokes.java rename to src/main/java/rip/athena/client/modules/render/Keystrokes.java index bede8b1d..8ec492c0 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Keystrokes.java +++ b/src/main/java/rip/athena/client/modules/render/Keystrokes.java @@ -1,13 +1,13 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import org.lwjgl.opengl.GL11; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.input.MouseDownEvent; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.ClickCounter; import rip.athena.client.utils.render.DrawUtils; @@ -18,6 +18,7 @@ import java.awt.*; * @project Athena-Client * @date 6/2/2023 */ +@IModuleMetaData(name = "Keystrokes", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/keystrokes.png") public class Keystrokes extends Module { @ConfigValue.Boolean(name = "Show CPS") @@ -55,8 +56,6 @@ public class Keystrokes extends Module { private final ClickCounter rightClickCounter = new ClickCounter(); public Keystrokes() { - super("Key Strokes", Category.RENDER, "Athena/gui/mods/keystrokes.png"); - hud = new HUDElement("keystrokes", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/MemoryUsage.java b/src/main/java/rip/athena/client/modules/render/MemoryUsage.java similarity index 92% rename from src/main/java/rip/athena/client/modules/impl/render/MemoryUsage.java rename to src/main/java/rip/athena/client/modules/render/MemoryUsage.java index 2dfb270c..116cf522 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/MemoryUsage.java +++ b/src/main/java/rip/athena/client/modules/render/MemoryUsage.java @@ -1,13 +1,14 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.gui.Gui; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; @@ -19,6 +20,7 @@ import java.awt.*; * @project Athena-Client * @date 6/2/2023 */ +@IModuleMetaData(name = "Memory Usage", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/memory.png") public class MemoryUsage extends Module { @ConfigValue.Boolean(name = "Percentage", description = "Show memory usage in percentage.") private boolean percentage = false; @@ -52,8 +54,6 @@ public class MemoryUsage extends Module { private int height = 18; public MemoryUsage() { - super("Memory usage", Category.RENDER, "Athena/gui/mods/memory.png"); - hud = new HUDElement("memory usage", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/render/MotionBlur.java b/src/main/java/rip/athena/client/modules/render/MotionBlur.java new file mode 100644 index 00000000..defe7384 --- /dev/null +++ b/src/main/java/rip/athena/client/modules/render/MotionBlur.java @@ -0,0 +1,67 @@ +package rip.athena.client.modules.render; + +import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; + +/** + * @author Athena Development + * @project Athena-Client + * @date 6/2/2023 + */ +@IModuleMetaData(name = "Motion Blur", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/motionblur.png") +public class MotionBlur extends Module { + + @ConfigValue.Integer(name = "Amount", min = 1, max = 10) + public static int amount = 1; + + public static float f; + + public static void createAccumulation() { + float f = getAccumulationValue(); + GL11.glAccum(GL11.GL_MULT, f); + GL11.glAccum(GL11.GL_ACCUM, 1.0F - f); + GL11.glAccum(GL11.GL_RETURN, 1.0F); + } + + public static float getMultiplier() { + return amount * 10; + } + + public static float getAccumulationValue() { + f = getMultiplier() * 10.0F; + long lastTimestampInGame = System.currentTimeMillis(); + + if (f > 996.0F) { + f = 996.0F; + } + + if (f > 990.0F) { + f = 990.0F; + } + + long i = System.currentTimeMillis() - lastTimestampInGame; + + if (i > 10000L) { + return 0.0F; + } else { + if (f < 0.0F) { + f = 0.0F; + } + + return f / 1000.0F; + } + } + + @Override + public void onEnable() { + super.onEnable(); + } + + @Override + public void onDisable() { + super.onDisable(); + } +} \ No newline at end of file diff --git a/src/main/java/rip/athena/client/modules/impl/render/PackDisplay.java b/src/main/java/rip/athena/client/modules/render/PackDisplay.java similarity index 96% rename from src/main/java/rip/athena/client/modules/impl/render/PackDisplay.java rename to src/main/java/rip/athena/client/modules/render/PackDisplay.java index 8b7072f2..15f15677 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/PackDisplay.java +++ b/src/main/java/rip/athena/client/modules/render/PackDisplay.java @@ -1,4 +1,4 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.texture.DynamicTexture; @@ -7,14 +7,15 @@ import net.minecraft.client.resources.IResourcePack; import net.minecraft.client.resources.ResourcePackRepository; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.config.ConfigValue; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.client.SwitchTextureEvent; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; @@ -27,6 +28,7 @@ import java.util.List; * @project Athena-Client * @date 6/12/2023 */ +@IModuleMetaData(name = "Pack Display", type = EnumModuleType.RENDER, icon = "") public class PackDisplay extends Module { @ConfigValue.List(name = "Display Mode", values = {"Circle", "Modern", "Fade", "Old"}, description = "Chose display of background") @@ -63,8 +65,6 @@ public class PackDisplay extends Module { private int height = 48; public PackDisplay() { - super("PackDisplay", Category.RENDER); - hud = new HUDElement("packdisplay", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/PotCounter.java b/src/main/java/rip/athena/client/modules/render/PotCounter.java similarity index 92% rename from src/main/java/rip/athena/client/modules/impl/render/PotCounter.java rename to src/main/java/rip/athena/client/modules/render/PotCounter.java index 9ef146ec..9d9e695e 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/PotCounter.java +++ b/src/main/java/rip/athena/client/modules/render/PotCounter.java @@ -1,18 +1,15 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; -import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.FoodStats; -import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; @@ -24,6 +21,7 @@ import java.awt.*; * @project Athena-Client * @date 6/4/2023 */ +@IModuleMetaData(name = "Potion Counter", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/potion.png") public class PotCounter extends Module { @ConfigValue.Color(name = "Color") @@ -59,8 +57,6 @@ public class PotCounter extends Module { private int counter = 0; public PotCounter() { - super("Pot Counter", Category.RENDER, "Athena/gui/mods/potion.png"); - hud = new HUDElement("potioncounter", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/ReachDisplay.java b/src/main/java/rip/athena/client/modules/render/ReachDisplay.java similarity index 93% rename from src/main/java/rip/athena/client/modules/impl/render/ReachDisplay.java rename to src/main/java/rip/athena/client/modules/render/ReachDisplay.java index 96380113..76e8d29c 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/ReachDisplay.java +++ b/src/main/java/rip/athena/client/modules/render/ReachDisplay.java @@ -1,18 +1,17 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.client.gui.Gui; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.MovingObjectPosition; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.config.ConfigValue; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.entity.AttackEntityEvent; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; -import rip.athena.client.utils.NumberUtils; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; @@ -25,6 +24,7 @@ import java.text.DecimalFormat; * @project Athena-Client * @date 6/12/2023 */ +@IModuleMetaData(name = "Reach Display", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/reach.png") public class ReachDisplay extends Module { @ConfigValue.List(name = "Display Mode", values = {"Circle", "Modern", "Fade", "Old"}, description = "Chose display of background") @@ -62,8 +62,6 @@ public class ReachDisplay extends Module { private int height = 18; public ReachDisplay() { - super("Reach Display", Category.RENDER, "Athena/gui/mods/reach.png"); - hud = new HUDElement("reachdisplay", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/Scoreboard.java b/src/main/java/rip/athena/client/modules/render/Scoreboard.java similarity index 94% rename from src/main/java/rip/athena/client/modules/impl/render/Scoreboard.java rename to src/main/java/rip/athena/client/modules/render/Scoreboard.java index efd720a3..f193cbff 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Scoreboard.java +++ b/src/main/java/rip/athena/client/modules/render/Scoreboard.java @@ -1,25 +1,23 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.scoreboard.Score; import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.ScorePlayerTeam; import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.config.ConfigValue; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.render.RenderEvent; import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.client.ui.hud.HUDElement; import java.awt.*; import java.util.Collection; @@ -34,6 +32,7 @@ import rip.athena.client.utils.render.RoundedUtils; * @project Athena-Client * @date 6/9/2023 */ +@IModuleMetaData(name = "Scoreboard", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/scoreboard.png") public class Scoreboard extends Module { @ConfigValue.List(name = "Display Mode", values = {"Modern", "Fade", "Custom", "Default"}, description = "Chose display of background") @@ -56,8 +55,6 @@ public class Scoreboard extends Module { private int height = -1; public Scoreboard() { - super("Scoreboard", Category.RENDER, "Athena/gui/mods/scoreboard.png"); - hud = new HUDElement("scoreboard", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/impl/render/TPS.java b/src/main/java/rip/athena/client/modules/render/TPS.java similarity index 94% rename from src/main/java/rip/athena/client/modules/impl/render/TPS.java rename to src/main/java/rip/athena/client/modules/render/TPS.java index 4e615ec0..526617c4 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/TPS.java +++ b/src/main/java/rip/athena/client/modules/render/TPS.java @@ -1,13 +1,14 @@ -package rip.athena.client.modules.impl.render; +package rip.athena.client.modules.render; import net.minecraft.network.play.server.S03PacketTimeUpdate; import org.lwjgl.opengl.GL11; -import rip.athena.client.config.ConfigValue; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.network.IngoingPacketEvent; -import rip.athena.client.gui.hud.HUDElement; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; +import rip.athena.client.ui.hud.HUDElement; import rip.athena.client.utils.render.HUDUtil; import java.awt.*; @@ -19,6 +20,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * @project Athena-Client * @date 6/2/2023 */ +@IModuleMetaData(name = "TPS", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/tps.png") public class TPS extends Module { @ConfigValue.List(name = "Display Mode", values = {"Circle", "Modern", "Fade", "Old"}, description = "Chose display of background") @@ -54,8 +56,6 @@ public class TPS extends Module { private int height = 18; public TPS() { - super("TPS", Category.RENDER, "Athena/gui/mods/tps.png"); - hud = new HUDElement("tps", width, height) { @Override public void onRender() { diff --git a/src/main/java/rip/athena/client/modules/render/TimeChanger.java b/src/main/java/rip/athena/client/modules/render/TimeChanger.java new file mode 100644 index 00000000..156b7af4 --- /dev/null +++ b/src/main/java/rip/athena/client/modules/render/TimeChanger.java @@ -0,0 +1,19 @@ +package rip.athena.client.modules.render; + +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; +import rip.athena.api.config.ConfigValue; +import rip.athena.api.module.annotations.IModuleMetaData; + +/** + * @author Athena Development + * @project Athena-Client + * @date 6/12/2023 + */ +@IModuleMetaData(name = "Time Changer", type = EnumModuleType.RENDER, icon = "Athena/gui/mods/timechanger.png") +public class TimeChanger extends Module { + + @ConfigValue.Integer(name = "Time", min = 1, max = 24000) + public int time = 16000; + +} diff --git a/src/main/java/rip/athena/client/requests/ContentType.java b/src/main/java/rip/athena/client/requests/ContentType.java index 5f8c154a..15a93de0 100644 --- a/src/main/java/rip/athena/client/requests/ContentType.java +++ b/src/main/java/rip/athena/client/requests/ContentType.java @@ -1,7 +1,10 @@ package rip.athena.client.requests; public enum ContentType { - NONE(""), JSON("application/json"), FORM("application/x-www-form-urlencoded"), MULTIPART_FORM("multipart/form-data"); + NONE(""), + JSON("application/json"), + FORM("application/x-www-form-urlencoded"), + MULTIPART_FORM("multipart/form-data"); private String header; diff --git a/src/main/java/rip/athena/client/requests/WebRequest.java b/src/main/java/rip/athena/client/requests/WebRequest.java index b6f51522..0b638643 100644 --- a/src/main/java/rip/athena/client/requests/WebRequest.java +++ b/src/main/java/rip/athena/client/requests/WebRequest.java @@ -38,7 +38,7 @@ public class WebRequest { this.rawData = ""; this.boundary = ""; } - + public void setURL(String url) throws MalformedURLException { this.url = new URL(url); } @@ -59,7 +59,7 @@ public class WebRequest { headers.put(key, value); } - public void setArguement(String key, Object value){ + public void setArgument(String key, Object value){ arguments.put(key, value); } diff --git a/src/main/java/rip/athena/client/socket/SocketClient.java b/src/main/java/rip/athena/client/socket/SocketClient.java index 3483143e..0654f442 100644 --- a/src/main/java/rip/athena/client/socket/SocketClient.java +++ b/src/main/java/rip/athena/client/socket/SocketClient.java @@ -21,7 +21,7 @@ public class SocketClient { private static Map rankCache = new HashMap<>(); private static Map cacheTime = new HashMap<>(); - private static long cacheExpirationTime = 5 * 60 * 1000; // 5 minutes + private static long cacheExpirationTime = 60 * 1000; // 5 minutes private static String currentUsername = ""; diff --git a/src/main/java/rip/athena/client/theme/impl/AccentTheme.java b/src/main/java/rip/athena/client/theme/impl/AccentTheme.java index 97a75681..084db14e 100644 --- a/src/main/java/rip/athena/client/theme/impl/AccentTheme.java +++ b/src/main/java/rip/athena/client/theme/impl/AccentTheme.java @@ -3,7 +3,6 @@ package rip.athena.client.theme.impl; import lombok.AllArgsConstructor; import lombok.Getter; import net.minecraft.util.EnumChatFormatting; -import rip.athena.client.modules.impl.other.Settings; import rip.athena.client.utils.render.ColorUtil; import javax.vecmath.Vector2d; diff --git a/src/main/java/rip/athena/client/gui/clickgui/Category.java b/src/main/java/rip/athena/client/ui/clickgui/Category.java similarity index 94% rename from src/main/java/rip/athena/client/gui/clickgui/Category.java rename to src/main/java/rip/athena/client/ui/clickgui/Category.java index a8216e56..33719304 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/Category.java +++ b/src/main/java/rip/athena/client/ui/clickgui/Category.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.clickgui; +package rip.athena.client.ui.clickgui; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/clickgui/IPage.java b/src/main/java/rip/athena/client/ui/clickgui/IPage.java similarity index 84% rename from src/main/java/rip/athena/client/gui/clickgui/IPage.java rename to src/main/java/rip/athena/client/ui/clickgui/IPage.java index 0f9ae943..e45e03b8 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/IPage.java +++ b/src/main/java/rip/athena/client/ui/clickgui/IPage.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.clickgui; +package rip.athena.client.ui.clickgui; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/clickgui/IngameMenu.java b/src/main/java/rip/athena/client/ui/clickgui/IngameMenu.java similarity index 86% rename from src/main/java/rip/athena/client/gui/clickgui/IngameMenu.java rename to src/main/java/rip/athena/client/ui/clickgui/IngameMenu.java index ad820830..165c1457 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/IngameMenu.java +++ b/src/main/java/rip/athena/client/ui/clickgui/IngameMenu.java @@ -1,26 +1,22 @@ -package rip.athena.client.gui.clickgui; +package rip.athena.client.ui.clickgui; -import net.minecraft.client.Minecraft; +import rip.athena.api.module.Module; import rip.athena.client.Athena; -import rip.athena.client.config.save.Config; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.clickgui.pages.ModsPage; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MinecraftMenuImpl; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.components.MenuDraggable; -import rip.athena.client.gui.framework.components.MenuScrollPane; -import rip.athena.client.gui.framework.draw.DrawImpl; -import rip.athena.client.gui.clickgui.components.mods.CategoryButton; +import rip.athena.api.config.save.Config; +import rip.athena.client.ui.clickgui.pages.ModsPage; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MinecraftMenuImpl; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.components.MenuDraggable; +import rip.athena.client.ui.framework.components.MenuScrollPane; +import rip.athena.client.ui.framework.draw.DrawImpl; +import rip.athena.client.ui.clickgui.components.mods.CategoryButton; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; -import rip.athena.client.modules.Module; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.utils.render.AssetUtils; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.ColorUtil; -import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/Page.java b/src/main/java/rip/athena/client/ui/clickgui/Page.java similarity index 73% rename from src/main/java/rip/athena/client/gui/clickgui/Page.java rename to src/main/java/rip/athena/client/ui/clickgui/Page.java index 34887e38..b1224351 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/Page.java +++ b/src/main/java/rip/athena/client/ui/clickgui/Page.java @@ -1,7 +1,7 @@ -package rip.athena.client.gui.clickgui; +package rip.athena.client.ui.clickgui; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.gui.framework.draw.DrawImpl; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.ui.framework.draw.DrawImpl; import net.minecraft.client.Minecraft; /** diff --git a/src/main/java/rip/athena/client/gui/clickgui/PageManager.java b/src/main/java/rip/athena/client/ui/clickgui/PageManager.java similarity index 90% rename from src/main/java/rip/athena/client/gui/clickgui/PageManager.java rename to src/main/java/rip/athena/client/ui/clickgui/PageManager.java index a6c596ac..bb927963 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/PageManager.java +++ b/src/main/java/rip/athena/client/ui/clickgui/PageManager.java @@ -1,8 +1,8 @@ -package rip.athena.client.gui.clickgui; +package rip.athena.client.ui.clickgui; import net.minecraft.client.Minecraft; -import rip.athena.client.gui.clickgui.pages.*; -import rip.athena.client.gui.framework.Menu; +import rip.athena.client.ui.clickgui.pages.*; +import rip.athena.client.ui.framework.Menu; import java.util.HashMap; import java.util.Map; @@ -28,8 +28,6 @@ public class PageManager { private void init() { Minecraft mc = Minecraft.getMinecraft(); - - pages.put(Category.MODS, new ModsPage(mc, menu, parent)); pages.put(Category.SETTINGS, new SettingsPage(mc, menu, parent)); pages.put(Category.MACROS, new MacrosPage(mc, menu, parent)); diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/capes/CapeButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/capes/CapeButton.java similarity index 88% rename from src/main/java/rip/athena/client/gui/clickgui/components/capes/CapeButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/capes/CapeButton.java index 612b1466..9f1a2c78 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/capes/CapeButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/capes/CapeButton.java @@ -1,20 +1,15 @@ -package rip.athena.client.gui.clickgui.components.capes; +package rip.athena.client.ui.clickgui.components.capes; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; 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 rip.athena.client.Athena; import rip.athena.client.cosmetics.cape.Cape; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.theme.impl.AccentTheme; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticActionButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticActionButton.java similarity index 90% rename from src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticActionButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticActionButton.java index 3f6e77c6..36b6a77d 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticActionButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticActionButton.java @@ -1,7 +1,7 @@ -package rip.athena.client.gui.clickgui.components.cosmetics; +package rip.athena.client.ui.clickgui.components.cosmetics; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import java.awt.*; @@ -52,7 +52,7 @@ public class CosmeticActionButton extends CosmeticGenericButton { int textColor = getColor(DrawType.TEXT, lastState); if(filledBackground) { - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, width, height, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x, y, width, height, backgroundColor); } drawHorizontalLine(x, y, width + 1, 1, lineColor); diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticBindButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticBindButton.java similarity index 95% rename from src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticBindButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticBindButton.java index 8da61a13..5e246a7b 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticBindButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticBindButton.java @@ -1,7 +1,7 @@ -package rip.athena.client.gui.clickgui.components.cosmetics; +package rip.athena.client.ui.clickgui.components.cosmetics; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticCapeView.java b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticCapeView.java similarity index 90% rename from src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticCapeView.java rename to src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticCapeView.java index 12ee6863..2557d4f8 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticCapeView.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticCapeView.java @@ -1,10 +1,10 @@ -package rip.athena.client.gui.clickgui.components.cosmetics; +package rip.athena.client.ui.clickgui.components.cosmetics; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.GlStateManager; @@ -48,7 +48,7 @@ public class CosmeticCapeView extends MenuComponent { int backgroundColor = getColor(DrawType.BACKGROUND, ButtonState.NORMAL); int textColor = getColor(DrawType.TEXT, ButtonState.NORMAL); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, width, height, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x, y, width, height, backgroundColor); //drawText(cape.getName(), x + 2, y + 2, textColor); diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticGenericButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticGenericButton.java similarity index 92% rename from src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticGenericButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticGenericButton.java index c861efec..e0b186e2 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticGenericButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticGenericButton.java @@ -1,11 +1,10 @@ -package rip.athena.client.gui.clickgui.components.cosmetics; +package rip.athena.client.ui.clickgui.components.cosmetics; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.components.macros.MacroButton; -import rip.athena.client.theme.ThemeManager; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.components.macros.MacroButton; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticList.java b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticList.java similarity index 83% rename from src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticList.java rename to src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticList.java index 3fd8692f..b2d18548 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticList.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticList.java @@ -1,10 +1,10 @@ -package rip.athena.client.gui.clickgui.components.cosmetics; +package rip.athena.client.ui.clickgui.components.cosmetics; import net.minecraft.client.Minecraft; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.components.MenuDropdown; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.components.MenuDropdown; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import java.awt.*; @@ -115,8 +115,8 @@ public class CosmeticList extends MenuDropdown { backgroundColor = defBg; } - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, cursorWidth, height + 1, popupColor); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, cursorWidth - 2, height - 1, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x, y, cursorWidth, height + 1, popupColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, cursorWidth - 2, height - 1, backgroundColor); drawText("<", x + 3 + (cursorWidth / 2) - getStringWidth("<") / 2, y + height / 2 - getStringHeight("<") / 2, textColor); if(mouseX < x + width - cursorWidth - 1) { @@ -125,8 +125,8 @@ public class CosmeticList extends MenuDropdown { backgroundColor = cache; } - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + width - cursorWidth, y, cursorWidth, height + 1, popupColor); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + width - cursorWidth + 1, y + 1, cursorWidth - 2, height - 1, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + width - cursorWidth, y, cursorWidth, height + 1, popupColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + width - cursorWidth + 1, y + 1, cursorWidth - 2, height - 1, backgroundColor); drawText(">", x + width - cursorWidth + 3 + (cursorWidth / 2) - getStringWidth(">") / 2, y + height / 2 - getStringHeight(">") / 2, textColor); String text = values[index].toUpperCase(); diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticRainbowButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticRainbowButton.java similarity index 89% rename from src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticRainbowButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticRainbowButton.java index 5021c6cb..23517195 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticRainbowButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticRainbowButton.java @@ -1,10 +1,9 @@ -package rip.athena.client.gui.clickgui.components.cosmetics; +package rip.athena.client.ui.clickgui.components.cosmetics; import net.minecraft.client.Minecraft; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; @@ -53,7 +52,7 @@ public class CosmeticRainbowButton extends CosmeticGenericButton { int textColor = getColor(DrawType.TEXT, lastState); if(filledBackground) { - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, width, height, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x, y, width, height, backgroundColor); } DrawUtils.drawRoundedRect(x, y, x + width, y + height, 4.0f, new Color(50, 50, 50, 255).getRGB()); diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticToggleButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticToggleButton.java similarity index 79% rename from src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticToggleButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticToggleButton.java index 17ace6d4..53953b4e 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticToggleButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticToggleButton.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.clickgui.components.cosmetics; +package rip.athena.client.ui.clickgui.components.cosmetics; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.components.macros.MacroButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.components.macros.MacroButton; import java.awt.*; @@ -37,7 +37,7 @@ public class CosmeticToggleButton extends MacroButton { int lineColor = getColor(DrawType.LINE, lastState); int textColor = getColor(DrawType.TEXT, lastState); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, width, height, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x, y, width, height, backgroundColor); drawHorizontalLine(x, y, width + 1, 1, lineColor); drawVerticalLine(x, y + 1, height - 1, 1, lineColor); diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticUserPreview.java b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticUserPreview.java similarity index 93% rename from src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticUserPreview.java rename to src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticUserPreview.java index e4a543b1..2c5dea52 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticUserPreview.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/cosmetics/CosmeticUserPreview.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.clickgui.components.cosmetics; +package rip.athena.client.ui.clickgui.components.cosmetics; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/fps/FPSGenericButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/fps/FPSGenericButton.java similarity index 86% rename from src/main/java/rip/athena/client/gui/clickgui/components/fps/FPSGenericButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/fps/FPSGenericButton.java index a7ade4ed..4168fb3f 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/fps/FPSGenericButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/fps/FPSGenericButton.java @@ -1,8 +1,8 @@ -package rip.athena.client.gui.clickgui.components.fps; +package rip.athena.client.ui.clickgui.components.fps; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.components.cosmetics.CosmeticGenericButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.components.cosmetics.CosmeticGenericButton; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/fps/FlipButtonFPS.java b/src/main/java/rip/athena/client/ui/clickgui/components/fps/FlipButtonFPS.java similarity index 87% rename from src/main/java/rip/athena/client/gui/clickgui/components/fps/FlipButtonFPS.java rename to src/main/java/rip/athena/client/ui/clickgui/components/fps/FlipButtonFPS.java index b36d7955..5b985005 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/fps/FlipButtonFPS.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/fps/FlipButtonFPS.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.clickgui.components.fps; +package rip.athena.client.ui.clickgui.components.fps; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.components.macros.FlipButton; -import rip.athena.client.gui.clickgui.pages.fps.BlacklistModule; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.components.macros.FlipButton; +import rip.athena.client.ui.clickgui.pages.fps.BlacklistModule; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/fps/FlipButtonParent.java b/src/main/java/rip/athena/client/ui/clickgui/components/fps/FlipButtonParent.java similarity index 81% rename from src/main/java/rip/athena/client/gui/clickgui/components/fps/FlipButtonParent.java rename to src/main/java/rip/athena/client/ui/clickgui/components/fps/FlipButtonParent.java index 9924408d..697c3db0 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/fps/FlipButtonParent.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/fps/FlipButtonParent.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.clickgui.components.fps; +package rip.athena.client.ui.clickgui.components.fps; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.components.waypoints.WaypointTextBarrier; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.components.waypoints.WaypointTextBarrier; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/fps/MainWindowBackgroundPS.java b/src/main/java/rip/athena/client/ui/clickgui/components/fps/MainWindowBackgroundPS.java similarity index 83% rename from src/main/java/rip/athena/client/gui/clickgui/components/fps/MainWindowBackgroundPS.java rename to src/main/java/rip/athena/client/ui/clickgui/components/fps/MainWindowBackgroundPS.java index 5c456dde..dc777770 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/fps/MainWindowBackgroundPS.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/fps/MainWindowBackgroundPS.java @@ -1,10 +1,10 @@ -package rip.athena.client.gui.clickgui.components.fps; +package rip.athena.client.ui.clickgui.components.fps; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/fps/MenuImageButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/fps/MenuImageButton.java similarity index 96% rename from src/main/java/rip/athena/client/gui/clickgui/components/fps/MenuImageButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/fps/MenuImageButton.java index 7d87b27c..18a70aba 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/fps/MenuImageButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/fps/MenuImageButton.java @@ -1,7 +1,7 @@ -package rip.athena.client.gui.clickgui.components.fps; +package rip.athena.client.ui.clickgui.components.fps; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/fps/OptifineParentBackground.java b/src/main/java/rip/athena/client/ui/clickgui/components/fps/OptifineParentBackground.java similarity index 88% rename from src/main/java/rip/athena/client/gui/clickgui/components/fps/OptifineParentBackground.java rename to src/main/java/rip/athena/client/ui/clickgui/components/fps/OptifineParentBackground.java index dda08142..dcb78461 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/fps/OptifineParentBackground.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/fps/OptifineParentBackground.java @@ -1,14 +1,14 @@ -package rip.athena.client.gui.clickgui.components.fps; +package rip.athena.client.ui.clickgui.components.fps; import net.minecraft.client.Minecraft; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; import net.minecraft.util.ResourceLocation; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/FlipButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/macros/FlipButton.java similarity index 93% rename from src/main/java/rip/athena/client/gui/clickgui/components/macros/FlipButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/macros/FlipButton.java index 1e533913..91a9722f 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/FlipButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/macros/FlipButton.java @@ -1,13 +1,13 @@ -package rip.athena.client.gui.clickgui.components.macros; +package rip.athena.client.ui.clickgui.components.macros; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroBase.java b/src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroBase.java similarity index 87% rename from src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroBase.java rename to src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroBase.java index 142017dd..8d6a2699 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroBase.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroBase.java @@ -1,16 +1,15 @@ -package rip.athena.client.gui.clickgui.components.macros; +package rip.athena.client.ui.clickgui.components.macros; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.utils.render.DrawUtils; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroButton.java similarity index 92% rename from src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroButton.java index e091b824..a4076523 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroButton.java @@ -1,12 +1,12 @@ -package rip.athena.client.gui.clickgui.components.macros; +package rip.athena.client.ui.clickgui.components.macros; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroSlimTextField.java b/src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroSlimTextField.java similarity index 93% rename from src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroSlimTextField.java rename to src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroSlimTextField.java index 09e00005..31c4626a 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroSlimTextField.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroSlimTextField.java @@ -1,15 +1,15 @@ -package rip.athena.client.gui.clickgui.components.macros; +package rip.athena.client.ui.clickgui.components.macros; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.components.mods.SearchTextfield; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.components.mods.SearchTextfield; import org.lwjgl.input.Keyboard; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.modules.other.Settings; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroTextfield.java b/src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroTextfield.java similarity index 94% rename from src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroTextfield.java rename to src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroTextfield.java index 54d21171..96520054 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroTextfield.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/macros/MacroTextfield.java @@ -1,14 +1,14 @@ -package rip.athena.client.gui.clickgui.components.macros; +package rip.athena.client.ui.clickgui.components.macros; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.components.mods.SearchTextfield; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.components.mods.SearchTextfield; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/SimpleTextButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/macros/SimpleTextButton.java similarity index 91% rename from src/main/java/rip/athena/client/gui/clickgui/components/macros/SimpleTextButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/macros/SimpleTextButton.java index 4c947207..2d1bf813 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/SimpleTextButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/macros/SimpleTextButton.java @@ -1,13 +1,13 @@ -package rip.athena.client.gui.clickgui.components.macros; +package rip.athena.client.ui.clickgui.components.macros; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/CategoryButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/CategoryButton.java similarity index 87% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/CategoryButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/CategoryButton.java index 9622772c..25f4ac92 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/CategoryButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/CategoryButton.java @@ -1,15 +1,13 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.Category; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.Category; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureText.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/FeatureText.java similarity index 82% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureText.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/FeatureText.java index f02fe87c..8310614b 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureText.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/FeatureText.java @@ -1,12 +1,12 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.components.MenuLabel; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.components.MenuLabel; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureValueText.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/FeatureValueText.java similarity index 79% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureValueText.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/FeatureValueText.java index 27b5c6d9..10bacb39 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureValueText.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/FeatureValueText.java @@ -1,7 +1,7 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/GoBackButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/GoBackButton.java similarity index 94% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/GoBackButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/GoBackButton.java index 650a0b7b..9ecd7260 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/GoBackButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/GoBackButton.java @@ -1,14 +1,14 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModCheckbox.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModCheckbox.java similarity index 93% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModCheckbox.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModCheckbox.java index a8458175..8d5e9a34 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModCheckbox.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModCheckbox.java @@ -1,11 +1,10 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.gui.framework.components.MenuCheckbox; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.utils.render.DrawUtils; +import rip.athena.client.ui.framework.components.MenuCheckbox; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModColorPicker.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModColorPicker.java similarity index 76% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModColorPicker.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModColorPicker.java index 7a4ec10f..ac15a80b 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModColorPicker.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModColorPicker.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.gui.framework.components.MenuColorPicker; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.components.MenuColorPicker; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import org.lwjgl.input.Mouse; import java.awt.*; @@ -43,12 +43,12 @@ public class MenuModColorPicker extends MenuColorPicker { drawHorizontalLine(x, y + height, width + 1, 1, lineColor); drawVerticalLine(x + width, y + 1, height - 1, 1, lineColor); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 2, y + 2, width - 3, height - 3, lineColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 2, y + 2, width - 3, height - 3, lineColor); int index = 0; for(int h = y; h < y + height - 5; h++) { - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 3, h + 3, width - 5, 1, disabled ? lightenColor(index, 7, color).getRGB() : darkenColor(index, 7, color).getRGB()); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 3, h + 3, width - 5, 1, disabled ? lightenColor(index, 7, color).getRGB() : darkenColor(index, 7, color).getRGB()); index++; } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModKeybind.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModKeybind.java similarity index 94% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModKeybind.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModKeybind.java index 34297f61..a3a46668 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModKeybind.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModKeybind.java @@ -1,20 +1,19 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import org.lwjgl.input.Keyboard; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; -import java.util.Set; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModList.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModList.java similarity index 94% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModList.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModList.java index 2db40c13..578bb25d 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModList.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModList.java @@ -1,14 +1,14 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.components.MenuDropdown; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.components.MenuDropdown; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModSlider.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModSlider.java similarity index 95% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModSlider.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModSlider.java index d04a7e24..e9674de7 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModSlider.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/MenuModSlider.java @@ -1,14 +1,14 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.components.MenuSlider; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.components.MenuSlider; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import org.lwjgl.input.Mouse; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModCategoryButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModCategoryButton.java similarity index 91% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/ModCategoryButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/ModCategoryButton.java index 07771383..b51681b2 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModCategoryButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModCategoryButton.java @@ -1,16 +1,16 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; +import rip.athena.api.module.EnumModuleType; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; @@ -30,7 +30,7 @@ public class ModCategoryButton extends MenuButton { private ResourceLocation image; - public ModCategoryButton(Category category, int x, int y, int width, int height) { + public ModCategoryButton(EnumModuleType category, int x, int y, int width, int height) { super(category.getText(), x, y, width, height); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModScrollPane.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModScrollPane.java similarity index 95% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/ModScrollPane.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/ModScrollPane.java index e8ae58d5..8dd72169 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModScrollPane.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModScrollPane.java @@ -1,17 +1,16 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.components.MenuDraggable; -import rip.athena.client.gui.framework.components.MenuScrollPane; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.components.MenuDraggable; +import rip.athena.client.ui.framework.components.MenuScrollPane; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import net.minecraft.client.Minecraft; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModTextbox.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModTextbox.java similarity index 92% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/ModTextbox.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/ModTextbox.java index aeefaed8..fc8373d5 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModTextbox.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModTextbox.java @@ -1,16 +1,15 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.framework.components.MenuTextField; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.framework.components.MenuTextField; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import org.lwjgl.input.Keyboard; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.utils.render.DrawUtils; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModsButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModsButton.java similarity index 94% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/ModsButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/ModsButton.java index ddb86994..4b523964 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModsButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModsButton.java @@ -1,13 +1,13 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModuleBox.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModuleBox.java similarity index 95% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/ModuleBox.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/ModuleBox.java index 5f3af3f1..76b0734a 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModuleBox.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/ModuleBox.java @@ -1,17 +1,16 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; +import rip.athena.api.module.Module; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.modules.Module; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/SearchTextfield.java b/src/main/java/rip/athena/client/ui/clickgui/components/mods/SearchTextfield.java similarity index 93% rename from src/main/java/rip/athena/client/gui/clickgui/components/mods/SearchTextfield.java rename to src/main/java/rip/athena/client/ui/clickgui/components/mods/SearchTextfield.java index ec228c72..ef37b939 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/SearchTextfield.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/mods/SearchTextfield.java @@ -1,16 +1,16 @@ -package rip.athena.client.gui.clickgui.components.mods; +package rip.athena.client.ui.clickgui.components.mods; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.framework.components.MenuTextField; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.framework.components.MenuTextField; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import org.lwjgl.input.Keyboard; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBase.java b/src/main/java/rip/athena/client/ui/clickgui/components/profiles/ProfilesBase.java similarity index 86% rename from src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBase.java rename to src/main/java/rip/athena/client/ui/clickgui/components/profiles/ProfilesBase.java index 7ae843bc..e2702236 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBase.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/profiles/ProfilesBase.java @@ -1,15 +1,14 @@ -package rip.athena.client.gui.clickgui.components.profiles; +package rip.athena.client.ui.clickgui.components.profiles; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.utils.render.DrawUtils; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBlueButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/profiles/ProfilesBlueButton.java similarity index 82% rename from src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBlueButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/profiles/ProfilesBlueButton.java index 12a35955..b6b02a76 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBlueButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/profiles/ProfilesBlueButton.java @@ -1,8 +1,8 @@ -package rip.athena.client.gui.clickgui.components.profiles; +package rip.athena.client.ui.clickgui.components.profiles; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.components.macros.MacroButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.components.macros.MacroButton; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/themes/accent/SimpleGradientButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/themes/accent/SimpleGradientButton.java similarity index 90% rename from src/main/java/rip/athena/client/gui/clickgui/components/themes/accent/SimpleGradientButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/themes/accent/SimpleGradientButton.java index fe6067e9..2182b5c8 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/themes/accent/SimpleGradientButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/themes/accent/SimpleGradientButton.java @@ -1,13 +1,13 @@ -package rip.athena.client.gui.clickgui.components.themes.accent; +package rip.athena.client.ui.clickgui.components.themes.accent; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import rip.athena.client.theme.impl.AccentTheme; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/themes/accent/TriColorGradientButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/themes/accent/TriColorGradientButton.java similarity index 90% rename from src/main/java/rip/athena/client/gui/clickgui/components/themes/accent/TriColorGradientButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/themes/accent/TriColorGradientButton.java index 5a5eeaed..e2b18469 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/themes/accent/TriColorGradientButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/themes/accent/TriColorGradientButton.java @@ -1,13 +1,13 @@ -package rip.athena.client.gui.clickgui.components.themes.accent; +package rip.athena.client.ui.clickgui.components.themes.accent; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import rip.athena.client.theme.impl.AccentTheme; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/themes/primary/PrimaryGradientButton.java b/src/main/java/rip/athena/client/ui/clickgui/components/themes/primary/PrimaryGradientButton.java similarity index 89% rename from src/main/java/rip/athena/client/gui/clickgui/components/themes/primary/PrimaryGradientButton.java rename to src/main/java/rip/athena/client/ui/clickgui/components/themes/primary/PrimaryGradientButton.java index 01420a9e..33ce9115 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/themes/primary/PrimaryGradientButton.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/themes/primary/PrimaryGradientButton.java @@ -1,14 +1,13 @@ -package rip.athena.client.gui.clickgui.components.themes.primary; +package rip.athena.client.ui.clickgui.components.themes.primary; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.theme.impl.AccentTheme; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import rip.athena.client.theme.impl.PrimaryTheme; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointTextBarrier.java b/src/main/java/rip/athena/client/ui/clickgui/components/waypoints/WaypointTextBarrier.java similarity index 87% rename from src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointTextBarrier.java rename to src/main/java/rip/athena/client/ui/clickgui/components/waypoints/WaypointTextBarrier.java index 7773b6ba..94a7dcbb 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointTextBarrier.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/waypoints/WaypointTextBarrier.java @@ -1,13 +1,13 @@ -package rip.athena.client.gui.clickgui.components.waypoints; +package rip.athena.client.ui.clickgui.components.waypoints; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.render.DrawUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointsTextfield.java b/src/main/java/rip/athena/client/ui/clickgui/components/waypoints/WaypointsTextfield.java similarity index 94% rename from src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointsTextfield.java rename to src/main/java/rip/athena/client/ui/clickgui/components/waypoints/WaypointsTextfield.java index e9b61d10..4eb33abd 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointsTextfield.java +++ b/src/main/java/rip/athena/client/ui/clickgui/components/waypoints/WaypointsTextfield.java @@ -1,11 +1,11 @@ -package rip.athena.client.gui.clickgui.components.waypoints; +package rip.athena.client.ui.clickgui.components.waypoints; import net.minecraft.client.Minecraft; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.components.mods.SearchTextfield; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.components.mods.SearchTextfield; import rip.athena.client.utils.render.DrawUtils; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/CosmeticsPage.java b/src/main/java/rip/athena/client/ui/clickgui/pages/CosmeticsPage.java similarity index 88% rename from src/main/java/rip/athena/client/gui/clickgui/pages/CosmeticsPage.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/CosmeticsPage.java index 247e2620..677ce50c 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/CosmeticsPage.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/CosmeticsPage.java @@ -1,17 +1,16 @@ -package rip.athena.client.gui.clickgui.pages; +package rip.athena.client.ui.clickgui.pages; import net.minecraft.client.Minecraft; import rip.athena.client.Athena; import rip.athena.client.cosmetics.cape.Cape; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.Page; -import rip.athena.client.gui.clickgui.components.capes.CapeButton; -import rip.athena.client.gui.clickgui.components.cosmetics.CosmeticGenericButton; -import rip.athena.client.gui.clickgui.components.cosmetics.CosmeticTextComponent; -import rip.athena.client.gui.clickgui.components.mods.ModScrollPane; -import rip.athena.client.gui.clickgui.pages.cosmetics.CosmeticType; -import rip.athena.client.gui.framework.Menu; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.Page; +import rip.athena.client.ui.clickgui.components.capes.CapeButton; +import rip.athena.client.ui.clickgui.components.cosmetics.CosmeticGenericButton; +import rip.athena.client.ui.clickgui.components.mods.ModScrollPane; +import rip.athena.client.ui.clickgui.pages.cosmetics.CosmeticType; +import rip.athena.client.ui.framework.Menu; /** * @author Athena Development @@ -107,8 +106,6 @@ public class CosmeticsPage extends Page { private void populateUnusedPane() { mainPane.getComponents().clear(); cosmeticsPane.getComponents().clear(); - - mainPane.addComponent(new CosmeticTextComponent(mainPane.getX() , mainPane.getY() , 0, 0, -1)); } private void populateCosmeticsScrollPane() { diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/MacrosPage.java b/src/main/java/rip/athena/client/ui/clickgui/pages/MacrosPage.java similarity index 87% rename from src/main/java/rip/athena/client/gui/clickgui/pages/MacrosPage.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/MacrosPage.java index bb692e00..5b180a2c 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/MacrosPage.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/MacrosPage.java @@ -1,19 +1,18 @@ -package rip.athena.client.gui.clickgui.pages; +package rip.athena.client.ui.clickgui.pages; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.Page; -import rip.athena.client.gui.clickgui.components.macros.*; -import rip.athena.client.gui.clickgui.components.mods.MenuModKeybind; -import rip.athena.client.gui.clickgui.components.mods.ModCategoryButton; -import rip.athena.client.gui.clickgui.components.mods.ModScrollPane; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.Page; +import rip.athena.client.ui.clickgui.components.macros.*; +import rip.athena.client.ui.clickgui.components.mods.MenuModKeybind; +import rip.athena.client.ui.clickgui.components.mods.ModScrollPane; import net.minecraft.client.Minecraft; import org.lwjgl.input.Keyboard; -import rip.athena.client.macros.Macro; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.api.macros.Macro; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.font.FontManager; import java.awt.*; @@ -171,9 +170,9 @@ public class MacrosPage extends Page { } //drawHorizontalLine(menu.getX() + 31, menu.getY() + 110, menu.getWidth() - width - 31 * 2, 3, IngameMenu.MENU_LINE_COLOR); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, menu.getHeight() - 58, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getFirstColor()); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, menu.getHeight() - 58, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getFirstColor()); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getFirstColor()); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getFirstColor()); drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width); if(Settings.customGuiFont) { diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/ModsPage.java b/src/main/java/rip/athena/client/ui/clickgui/pages/ModsPage.java similarity index 87% rename from src/main/java/rip/athena/client/gui/clickgui/pages/ModsPage.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/ModsPage.java index a306a8aa..dceefdad 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/ModsPage.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/ModsPage.java @@ -1,27 +1,24 @@ -package rip.athena.client.gui.clickgui.pages; +package rip.athena.client.ui.clickgui.pages; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; +import rip.athena.api.module.EnumModuleType; +import rip.athena.api.module.Module; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigEntry; -import rip.athena.client.config.types.*; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.framework.components.MenuButton; -import rip.athena.client.gui.framework.components.MenuTextField; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.Page; -import rip.athena.client.gui.clickgui.components.mods.*; -import rip.athena.client.gui.hud.HUDEditor; -import rip.athena.client.modules.Category; -import rip.athena.client.modules.Module; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.modules.impl.render.Crosshair; +import rip.athena.client.config.AbstractConfigEntry; +import rip.athena.client.config.entries.*; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.framework.components.MenuButton; +import rip.athena.client.ui.framework.components.MenuTextField; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.Page; +import rip.athena.client.ui.clickgui.components.mods.*; +import rip.athena.client.ui.hud.HUDEditor; +import rip.athena.client.modules.other.Settings; +import rip.athena.client.modules.render.Crosshair; import rip.athena.client.utils.input.BindType; -import rip.athena.client.utils.render.AssetUtils; -import rip.athena.client.utils.render.DrawUtils; import java.awt.*; import java.util.ArrayList; @@ -42,9 +39,9 @@ public class ModsPage extends Page { public final int MENU_BG_COLOR_MOD_BORDER = new Color(30, 30, 30, IngameMenu.MENU_ALPHA).getRGB(); public final static int MENU_SIDE_BG_COLOR = new Color(30, 30, 30, IngameMenu.MENU_ALPHA).getRGB(); - private final ResourceLocation[] MOD_TABS = new ResourceLocation[Category.values().length]; + private final ResourceLocation[] MOD_TABS = new ResourceLocation[EnumModuleType.values().length]; - private Category modCategory = Category.ALL_MODS; + private EnumModuleType modCategory = EnumModuleType.ALL_MODS; public Module activeModule; private String search; @@ -58,7 +55,7 @@ public class ModsPage extends Page { @Override public void onInit() { - for (Category category : Category.values()) { + for (EnumModuleType category : EnumModuleType.values()) { if (!category.isHidden()) { //MOD_TABS[category.getIndex()] = AssetUtils.getResource(icon); } @@ -75,7 +72,7 @@ public class ModsPage extends Page { y += 50; - for (Category category : Category.values()) { + for (EnumModuleType category : EnumModuleType.values()) { if (!category.isHidden()) { y += height + 2 + 10; } @@ -120,12 +117,12 @@ public class ModsPage extends Page { int x = 255; int height = 32; - for (Category category : Category.values()) { + for (EnumModuleType category : EnumModuleType.values()) { if (!category.isHidden()) { MenuButton comp = new ModCategoryButton(category, x - 20, y, (int) (35 + rip.athena.client.utils.font.FontManager.getNunitoBold(30).width(category.getText())), height) { @Override public void onAction() { - for (rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) { + for (rip.athena.client.ui.framework.MenuComponent component : menu.getComponents()) { if (component instanceof ModCategoryButton) { ModCategoryButton button = (ModCategoryButton) component; button.setActive(component == this); @@ -242,14 +239,14 @@ public class ModsPage extends Page { pane.getComponents().clear(); - List toAdd = new ArrayList<>(); + List toAdd = new ArrayList<>(); int xSpacing = 25; int ySpacing = 15; int sliderWidth = pane.getWidth() - xSpacing * 2; - for (ConfigEntry configEntry : activeModule.getEntries()) { + for (AbstractConfigEntry configEntry : activeModule.getEntries()) { GlStateManager.color(1,1,1); final FeatureText label; @@ -391,9 +388,9 @@ public class ModsPage extends Page { int yPos = 25; boolean isText = false; - rip.athena.client.gui.framework.MenuComponent last = null; + rip.athena.client.ui.framework.MenuComponent last = null; - for (rip.athena.client.gui.framework.MenuComponent component : toAdd) { + for (rip.athena.client.ui.framework.MenuComponent component : toAdd) { if (component instanceof FeatureValueText) { if (last != null) { component.setX(xPos); @@ -458,7 +455,7 @@ public class ModsPage extends Page { } private void updateStates() { - for (rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) { + for (rip.athena.client.ui.framework.MenuComponent component : menu.getComponents()) { if (component instanceof ModsButton) { ModsButton button = (ModsButton) component; @@ -471,7 +468,7 @@ public class ModsPage extends Page { } private void initModPage() { - for (rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) { + for (rip.athena.client.ui.framework.MenuComponent component : menu.getComponents()) { if (component instanceof ModScrollPane) { initModPage((ModScrollPane) component); return; @@ -482,7 +479,7 @@ public class ModsPage extends Page { private void initModPage(ModScrollPane pane) { pane.getComponents().clear(); - for (rip.athena.client.gui.framework.MenuComponent c : menu.getComponents()) { + for (rip.athena.client.ui.framework.MenuComponent c : menu.getComponents()) { if (c instanceof ModsButton || c instanceof MenuModList) { menu.getComponents().remove(c); } @@ -494,10 +491,10 @@ public class ModsPage extends Page { int height = 150; int spacing = 16; - List modules = Athena.INSTANCE.getModuleManager().getModules().stream() + List modules = Athena.INSTANCE.getModuleRepository().getModules().stream() .filter(entry -> ((search == null || search.isEmpty()) || entry.getName().toLowerCase().contains(search.toLowerCase())) && - (entry.getCategory() == modCategory || modCategory == Category.ALL_MODS) && !entry.getCategory().isHidden()) + (entry.getCategory() == modCategory || modCategory == EnumModuleType.ALL_MODS) && !entry.getCategory().isHidden()) .collect(Collectors.toList()); modules.sort(Comparator.comparing(module -> module.getName().toLowerCase())); diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/OldCosmeticsPage.java b/src/main/java/rip/athena/client/ui/clickgui/pages/OldCosmeticsPage.java similarity index 90% rename from src/main/java/rip/athena/client/gui/clickgui/pages/OldCosmeticsPage.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/OldCosmeticsPage.java index 40590902..29beb5ee 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/OldCosmeticsPage.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/OldCosmeticsPage.java @@ -1,20 +1,20 @@ -package rip.athena.client.gui.clickgui.pages; +package rip.athena.client.ui.clickgui.pages; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.clickgui.IngameMenu; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.clickgui.IngameMenu; import net.minecraft.client.Minecraft; import org.lwjgl.input.Keyboard; -import rip.athena.client.gui.clickgui.Page; -import rip.athena.client.gui.clickgui.components.cosmetics.*; -import rip.athena.client.gui.clickgui.components.macros.MacroButton; -import rip.athena.client.gui.clickgui.components.mods.MenuModKeybind; -import rip.athena.client.gui.clickgui.components.mods.ModCategoryButton; -import rip.athena.client.gui.clickgui.components.mods.ModScrollPane; -import rip.athena.client.gui.clickgui.pages.cosmetics.BandanaSize; -import rip.athena.client.gui.clickgui.pages.cosmetics.CapeType; -import rip.athena.client.gui.clickgui.pages.cosmetics.CosmeticType; +import rip.athena.client.ui.clickgui.Page; +import rip.athena.client.ui.clickgui.components.cosmetics.*; +import rip.athena.client.ui.clickgui.components.macros.MacroButton; +import rip.athena.client.ui.clickgui.components.mods.MenuModKeybind; +import rip.athena.client.ui.clickgui.components.mods.ModCategoryButton; +import rip.athena.client.ui.clickgui.components.mods.ModScrollPane; +import rip.athena.client.ui.clickgui.pages.cosmetics.BandanaSize; +import rip.athena.client.ui.clickgui.pages.cosmetics.CapeType; +import rip.athena.client.ui.clickgui.pages.cosmetics.CosmeticType; /** * @author Athena Development @@ -390,15 +390,15 @@ public class OldCosmeticsPage extends Page { int y = menu.getY() + 59; int height = 32; - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR); drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width); rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("COSMETIC SETTINGS", menu.getX() + menu.getWidth() - width / 2 - rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width("COSMETIC SETTINGS") / 2, y + height / 2 - FontManager.baloo17.getHeight("COSMETIC SETTINGS") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR); drawShadowDown(menu.getX(), y + height, width); rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("COSMETICS", menu.getX() + width / 2 - rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width("COSMETICS") / 2, y + height / 2 - FontManager.baloo17.getHeight("COSMETICS") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR); diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/ProfilesPage.java b/src/main/java/rip/athena/client/ui/clickgui/pages/ProfilesPage.java similarity index 87% rename from src/main/java/rip/athena/client/gui/clickgui/pages/ProfilesPage.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/ProfilesPage.java index 6ff322c7..8c73a925 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/ProfilesPage.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/ProfilesPage.java @@ -1,25 +1,24 @@ -package rip.athena.client.gui.clickgui.pages; +package rip.athena.client.ui.clickgui.pages; import net.minecraft.client.gui.GuiScreen; import org.apache.commons.lang3.RandomStringUtils; -import org.apache.logging.log4j.core.appender.FileManager; import org.json.JSONException; import rip.athena.client.Athena; -import rip.athena.client.config.save.Config; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.clickgui.components.macros.SimpleTextButton; -import rip.athena.client.gui.clickgui.components.profiles.ProfilesBase; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.Page; -import rip.athena.client.gui.clickgui.components.macros.MacroButton; -import rip.athena.client.gui.clickgui.components.macros.MacroTextfield; -import rip.athena.client.gui.clickgui.components.mods.ModCategoryButton; -import rip.athena.client.gui.clickgui.components.mods.ModScrollPane; -import rip.athena.client.gui.clickgui.components.profiles.ProfilesBlueButton; +import rip.athena.api.config.save.Config; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.clickgui.components.macros.SimpleTextButton; +import rip.athena.client.ui.clickgui.components.profiles.ProfilesBase; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.Page; +import rip.athena.client.ui.clickgui.components.macros.MacroButton; +import rip.athena.client.ui.clickgui.components.macros.MacroTextfield; +import rip.athena.client.ui.clickgui.components.mods.ModCategoryButton; +import rip.athena.client.ui.clickgui.components.mods.ModScrollPane; +import rip.athena.client.ui.clickgui.components.profiles.ProfilesBlueButton; import net.minecraft.client.Minecraft; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.modules.other.Settings; import rip.athena.client.requests.ContentType; import rip.athena.client.requests.WebRequest; import rip.athena.client.requests.WebRequestResult; @@ -243,9 +242,9 @@ public class ProfilesPage extends Page { } //drawHorizontalLine(menu.getX() + 31, menu.getY() + 110, menu.getWidth() - width - 31 * 2, 3, IngameMenu.MENU_LINE_COLOR); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR); drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width); if(Settings.customGuiFont) { @@ -266,7 +265,7 @@ public class ProfilesPage extends Page { y += 120; - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, y, width, height + 1, ModCategoryButton.MAIN_COLOR); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, y, width, height + 1, ModCategoryButton.MAIN_COLOR); drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width); drawShadowUp(menu.getX() + menu.getWidth() - width, y, width); diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/SettingsPage.java b/src/main/java/rip/athena/client/ui/clickgui/pages/SettingsPage.java similarity index 96% rename from src/main/java/rip/athena/client/gui/clickgui/pages/SettingsPage.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/SettingsPage.java index d4479fe1..a671f2d9 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/SettingsPage.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/SettingsPage.java @@ -1,12 +1,13 @@ -package rip.athena.client.gui.clickgui.pages; +package rip.athena.client.ui.clickgui.pages; +import rip.athena.api.module.Module; import rip.athena.client.Athena; -import rip.athena.client.config.ConfigEntry; -import rip.athena.client.config.types.*; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.clickgui.IngameMenu; +import rip.athena.client.config.AbstractConfigEntry; +import rip.athena.client.config.entries.*; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.clickgui.IngameMenu; import net.minecraft.block.*; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityOtherPlayerMP; @@ -22,18 +23,16 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.tileentity.*; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; -import rip.athena.client.gui.clickgui.Page; -import rip.athena.client.gui.clickgui.components.cosmetics.CosmeticGenericButton; -import rip.athena.client.gui.clickgui.components.fps.*; -import rip.athena.client.gui.clickgui.components.macros.FlipButton; -import rip.athena.client.gui.clickgui.components.mods.*; -import rip.athena.client.gui.clickgui.pages.fps.BlacklistModule; -import rip.athena.client.gui.clickgui.pages.fps.BlacklistType; -import rip.athena.client.gui.clickgui.pages.fps.FPSSubTab; -import rip.athena.client.modules.Module; -import rip.athena.client.modules.impl.fpssettings.OptimizerMod; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.utils.render.AssetUtils; +import rip.athena.client.ui.clickgui.Page; +import rip.athena.client.ui.clickgui.components.cosmetics.CosmeticGenericButton; +import rip.athena.client.ui.clickgui.components.fps.*; +import rip.athena.client.ui.clickgui.components.macros.FlipButton; +import rip.athena.client.ui.clickgui.components.mods.*; +import rip.athena.client.ui.clickgui.pages.fps.BlacklistModule; +import rip.athena.client.ui.clickgui.pages.fps.BlacklistType; +import rip.athena.client.ui.clickgui.pages.fps.FPSSubTab; +import rip.athena.client.modules.fpssettings.OptimizerMod; +import rip.athena.client.modules.other.Settings; import java.awt.*; import java.util.ArrayList; @@ -405,7 +404,7 @@ public class SettingsPage extends Page { } if(subTab == FPSSubTab.FPS) { - initSettings(Athena.INSTANCE.getModuleManager().get(OptimizerMod.class)); + initSettings(Athena.INSTANCE.getModuleRepository().get(OptimizerMod.class)); } else if(subTab == FPSSubTab.OPTIFINE) { genericPane.addComponent(new OptifineParentBackground(OF_HIGH, "BEST FPS", "LOW QUALITY", 15, 16, 200, 280)); genericPane.addComponent(new OptifineParentBackground(OF_MEDMED, "MEDIUM FPS", "MEDIUM QUALITY", 240, 16, 200, 280)); @@ -435,7 +434,7 @@ public class SettingsPage extends Page { } }); } else if(subTab == FPSSubTab.SETTINGS) { - initSettings(Athena.INSTANCE.getModuleManager().get(Settings.class)); + initSettings(Athena.INSTANCE.getModuleRepository().get(Settings.class)); } } @@ -734,7 +733,7 @@ public class SettingsPage extends Page { int sliderWidth = genericPane.getWidth() - xSpacing * 2; - for(ConfigEntry configEntry : module.getEntries()) { + for(AbstractConfigEntry configEntry : module.getEntries()) { final FeatureText label; String key = configEntry.getKey().toUpperCase(); diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/ThemesPage.java b/src/main/java/rip/athena/client/ui/clickgui/pages/ThemesPage.java similarity index 88% rename from src/main/java/rip/athena/client/gui/clickgui/pages/ThemesPage.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/ThemesPage.java index 8adaab48..b8598543 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/ThemesPage.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/ThemesPage.java @@ -1,15 +1,15 @@ -package rip.athena.client.gui.clickgui.pages; +package rip.athena.client.ui.clickgui.pages; import net.minecraft.client.Minecraft; import rip.athena.client.Athena; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.Page; -import rip.athena.client.gui.clickgui.components.mods.ModScrollPane; -import rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton; -import rip.athena.client.gui.clickgui.components.themes.accent.TriColorGradientButton; -import rip.athena.client.gui.clickgui.components.themes.primary.PrimaryGradientButton; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.Page; +import rip.athena.client.ui.clickgui.components.mods.ModScrollPane; +import rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton; +import rip.athena.client.ui.clickgui.components.themes.accent.TriColorGradientButton; +import rip.athena.client.ui.clickgui.components.themes.primary.PrimaryGradientButton; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.modules.other.Settings; import rip.athena.client.theme.impl.AccentTheme; import rip.athena.client.theme.impl.PrimaryTheme; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/WaypointsPage.java b/src/main/java/rip/athena/client/ui/clickgui/pages/WaypointsPage.java similarity index 87% rename from src/main/java/rip/athena/client/gui/clickgui/pages/WaypointsPage.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/WaypointsPage.java index 0b06672f..dabf1853 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/WaypointsPage.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/WaypointsPage.java @@ -1,18 +1,18 @@ -package rip.athena.client.gui.clickgui.pages; +package rip.athena.client.ui.clickgui.pages; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.Menu; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.clickgui.IngameMenu; -import rip.athena.client.gui.clickgui.Page; -import rip.athena.client.gui.clickgui.components.macros.*; -import rip.athena.client.gui.clickgui.components.mods.MenuModColorPicker; -import rip.athena.client.gui.clickgui.components.mods.ModCategoryButton; -import rip.athena.client.gui.clickgui.components.mods.ModScrollPane; -import rip.athena.client.gui.clickgui.components.waypoints.WaypointTextBarrier; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.Menu; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.clickgui.IngameMenu; +import rip.athena.client.ui.clickgui.Page; +import rip.athena.client.ui.clickgui.components.macros.*; +import rip.athena.client.ui.clickgui.components.mods.MenuModColorPicker; +import rip.athena.client.ui.clickgui.components.mods.ModCategoryButton; +import rip.athena.client.ui.clickgui.components.mods.ModScrollPane; +import rip.athena.client.ui.clickgui.components.waypoints.WaypointTextBarrier; import net.minecraft.client.Minecraft; -import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.modules.other.Settings; import rip.athena.client.utils.StringUtils; import java.awt.*; @@ -213,9 +213,9 @@ public class WaypointsPage extends Page { } //drawHorizontalLine(menu.getX() + 31, menu.getY() + 110, menu.getWidth() - width - 31 * 2, 3, IngameMenu.MENU_LINE_COLOR); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR); drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width); Minecraft.getMinecraft().fontRendererObj.drawString("ADD NEW WAYPOINT", menu.getX() + menu.getWidth() - width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth("ADD NEW WAYPOINT") / 2, y + height / 2 - Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, IngameMenu.MENU_HEADER_TEXT_COLOR); diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/cosmetics/BandanaSize.java b/src/main/java/rip/athena/client/ui/clickgui/pages/cosmetics/BandanaSize.java similarity index 83% rename from src/main/java/rip/athena/client/gui/clickgui/pages/cosmetics/BandanaSize.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/cosmetics/BandanaSize.java index e6e621fc..d94003ec 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/cosmetics/BandanaSize.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/cosmetics/BandanaSize.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.clickgui.pages.cosmetics; +package rip.athena.client.ui.clickgui.pages.cosmetics; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/cosmetics/CapeType.java b/src/main/java/rip/athena/client/ui/clickgui/pages/cosmetics/CapeType.java similarity index 85% rename from src/main/java/rip/athena/client/gui/clickgui/pages/cosmetics/CapeType.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/cosmetics/CapeType.java index ad44cc25..ef9520df 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/cosmetics/CapeType.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/cosmetics/CapeType.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.clickgui.pages.cosmetics; +package rip.athena.client.ui.clickgui.pages.cosmetics; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/cosmetics/CosmeticType.java b/src/main/java/rip/athena/client/ui/clickgui/pages/cosmetics/CosmeticType.java similarity index 85% rename from src/main/java/rip/athena/client/gui/clickgui/pages/cosmetics/CosmeticType.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/cosmetics/CosmeticType.java index 36ce3c5b..689e3d08 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/cosmetics/CosmeticType.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/cosmetics/CosmeticType.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.clickgui.pages.cosmetics; +package rip.athena.client.ui.clickgui.pages.cosmetics; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/fps/BlacklistModule.java b/src/main/java/rip/athena/client/ui/clickgui/pages/fps/BlacklistModule.java similarity index 96% rename from src/main/java/rip/athena/client/gui/clickgui/pages/fps/BlacklistModule.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/fps/BlacklistModule.java index c277e68d..564fc545 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/fps/BlacklistModule.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/fps/BlacklistModule.java @@ -1,6 +1,6 @@ -package rip.athena.client.gui.clickgui.pages.fps; +package rip.athena.client.ui.clickgui.pages.fps; -import rip.athena.client.gui.clickgui.pages.SettingsPage; +import rip.athena.client.ui.clickgui.pages.SettingsPage; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/fps/BlacklistType.java b/src/main/java/rip/athena/client/ui/clickgui/pages/fps/BlacklistType.java similarity index 75% rename from src/main/java/rip/athena/client/gui/clickgui/pages/fps/BlacklistType.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/fps/BlacklistType.java index 3dbfc50a..ecbdedd7 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/fps/BlacklistType.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/fps/BlacklistType.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.clickgui.pages.fps; +package rip.athena.client.ui.clickgui.pages.fps; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/fps/FPSSubTab.java b/src/main/java/rip/athena/client/ui/clickgui/pages/fps/FPSSubTab.java similarity index 73% rename from src/main/java/rip/athena/client/gui/clickgui/pages/fps/FPSSubTab.java rename to src/main/java/rip/athena/client/ui/clickgui/pages/fps/FPSSubTab.java index 9a351507..718b9d2b 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/fps/FPSSubTab.java +++ b/src/main/java/rip/athena/client/ui/clickgui/pages/fps/FPSSubTab.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.clickgui.pages.fps; +package rip.athena.client.ui.clickgui.pages.fps; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/Menu.java b/src/main/java/rip/athena/client/ui/framework/Menu.java similarity index 97% rename from src/main/java/rip/athena/client/gui/framework/Menu.java rename to src/main/java/rip/athena/client/ui/framework/Menu.java index f3cfa0c8..26a28dfa 100644 --- a/src/main/java/rip/athena/client/gui/framework/Menu.java +++ b/src/main/java/rip/athena/client/ui/framework/Menu.java @@ -1,7 +1,7 @@ -package rip.athena.client.gui.framework; +package rip.athena.client.ui.framework; -import rip.athena.client.gui.framework.components.MenuDraggable; -import rip.athena.client.gui.framework.components.MenuScrollPane; +import rip.athena.client.ui.framework.components.MenuDraggable; +import rip.athena.client.ui.framework.components.MenuScrollPane; import java.util.Collections; import java.util.Comparator; diff --git a/src/main/java/rip/athena/client/gui/framework/MenuComponent.java b/src/main/java/rip/athena/client/ui/framework/MenuComponent.java similarity index 92% rename from src/main/java/rip/athena/client/gui/framework/MenuComponent.java rename to src/main/java/rip/athena/client/ui/framework/MenuComponent.java index 3c1223ea..ea542a8a 100644 --- a/src/main/java/rip/athena/client/gui/framework/MenuComponent.java +++ b/src/main/java/rip/athena/client/ui/framework/MenuComponent.java @@ -1,7 +1,7 @@ -package rip.athena.client.gui.framework; +package rip.athena.client.ui.framework; -import rip.athena.client.gui.framework.draw.DrawImpl; -import rip.athena.client.gui.framework.draw.MenuColorType; +import rip.athena.client.ui.framework.draw.DrawImpl; +import rip.athena.client.ui.framework.draw.MenuColorType; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/MenuComponentImpl.java b/src/main/java/rip/athena/client/ui/framework/MenuComponentImpl.java similarity index 91% rename from src/main/java/rip/athena/client/gui/framework/MenuComponentImpl.java rename to src/main/java/rip/athena/client/ui/framework/MenuComponentImpl.java index 195e83d7..f7543dcb 100644 --- a/src/main/java/rip/athena/client/gui/framework/MenuComponentImpl.java +++ b/src/main/java/rip/athena/client/ui/framework/MenuComponentImpl.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.framework; +package rip.athena.client.ui.framework; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/MenuPriority.java b/src/main/java/rip/athena/client/ui/framework/MenuPriority.java similarity index 88% rename from src/main/java/rip/athena/client/gui/framework/MenuPriority.java rename to src/main/java/rip/athena/client/ui/framework/MenuPriority.java index cde2328b..f43d5797 100644 --- a/src/main/java/rip/athena/client/gui/framework/MenuPriority.java +++ b/src/main/java/rip/athena/client/ui/framework/MenuPriority.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.framework; +package rip.athena.client.ui.framework; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/MinecraftMenuImpl.java b/src/main/java/rip/athena/client/ui/framework/MinecraftMenuImpl.java similarity index 97% rename from src/main/java/rip/athena/client/gui/framework/MinecraftMenuImpl.java rename to src/main/java/rip/athena/client/ui/framework/MinecraftMenuImpl.java index fd389e8e..ea7c231f 100644 --- a/src/main/java/rip/athena/client/gui/framework/MinecraftMenuImpl.java +++ b/src/main/java/rip/athena/client/ui/framework/MinecraftMenuImpl.java @@ -1,11 +1,11 @@ -package rip.athena.client.gui.framework; +package rip.athena.client.ui.framework; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import rip.athena.client.modules.Module; +import rip.athena.api.module.Module; import rip.athena.client.utils.input.BindType; import java.io.IOException; diff --git a/src/main/java/rip/athena/client/gui/framework/TextPattern.java b/src/main/java/rip/athena/client/ui/framework/TextPattern.java similarity index 79% rename from src/main/java/rip/athena/client/gui/framework/TextPattern.java rename to src/main/java/rip/athena/client/ui/framework/TextPattern.java index d5c25ed2..36a63152 100644 --- a/src/main/java/rip/athena/client/gui/framework/TextPattern.java +++ b/src/main/java/rip/athena/client/ui/framework/TextPattern.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.framework; +package rip.athena.client.ui.framework; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuButton.java b/src/main/java/rip/athena/client/ui/framework/components/MenuButton.java similarity index 93% rename from src/main/java/rip/athena/client/gui/framework/components/MenuButton.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuButton.java index 6290ba52..73424413 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuButton.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuButton.java @@ -1,10 +1,10 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.cosmetics.cape.Cape; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import rip.athena.client.theme.impl.AccentTheme; import rip.athena.client.theme.impl.PrimaryTheme; @@ -146,7 +146,7 @@ public class MenuButton extends MenuComponent { GlStateManager.color(1, 1,1); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 1, height - 1, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 1, height - 1, backgroundColor); drawHorizontalLine(x, y, width + 1, 1, lineColor); drawVerticalLine(x, y + 1, height - 1, 1, lineColor); diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuCheckbox.java b/src/main/java/rip/athena/client/ui/framework/components/MenuCheckbox.java similarity index 92% rename from src/main/java/rip/athena/client/gui/framework/components/MenuCheckbox.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuCheckbox.java index 9b0737f2..9933a913 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuCheckbox.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuCheckbox.java @@ -1,12 +1,12 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; import rip.athena.client.Athena; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import rip.athena.client.gui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuComponent; import java.awt.*; @@ -163,7 +163,7 @@ public class MenuCheckbox extends MenuComponent { int lineColor = getColor(DrawType.LINE, lastState); int textColor = getColor(DrawType.TEXT, lastState); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 2, y + 2, width - 3, height - 3, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 2, y + 2, width - 3, height - 3, backgroundColor); drawHorizontalLine(x, y, width + 1, 1, lineColor); drawVerticalLine(x, y + 1, height - 1, 1, lineColor); @@ -190,7 +190,7 @@ public class MenuCheckbox extends MenuComponent { mouseX -= tipWidth; } - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(mouseX, mouseY, tipWidth, tipHeight, getColor(DrawType.BACKGROUND, ButtonState.POPUP)); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(mouseX, mouseY, tipWidth, tipHeight, getColor(DrawType.BACKGROUND, ButtonState.POPUP)); drawHorizontalLine(mouseX, mouseY, tipWidth + 1, 1, lineColor); drawVerticalLine(mouseX, mouseY + 1, tipHeight - 1, 1, lineColor); drawHorizontalLine(mouseX, mouseY + tipHeight, tipWidth + 1, 1, lineColor); diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuColorPicker.java b/src/main/java/rip/athena/client/ui/framework/components/MenuColorPicker.java similarity index 95% rename from src/main/java/rip/athena/client/gui/framework/components/MenuColorPicker.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuColorPicker.java index 402c0e39..3c72c801 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuColorPicker.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuColorPicker.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.DynamicTexture; @@ -212,7 +212,7 @@ public class MenuColorPicker extends MenuComponent { int index = 0; for(int h = y; h < y + height; h++) { - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, h, width - 1, 1, disabled ? lightenColor(index, 7, color).getRGB() : darkenColor(index, 7, color).getRGB()); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 1, h, width - 1, 1, disabled ? lightenColor(index, 7, color).getRGB() : darkenColor(index, 7, color).getRGB()); index++; } @@ -311,7 +311,7 @@ public class MenuColorPicker extends MenuComponent { } } - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(startPos.x + 1, startPos.y + 1, pickerWindowWidth - 1, pickerWindowHeight - 1, backgroundColor ); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(startPos.x + 1, startPos.y + 1, pickerWindowWidth - 1, pickerWindowHeight - 1, backgroundColor ); drawHorizontalLine(startPos.x, startPos.y, pickerWindowWidth + 1, 1, lineColor); drawVerticalLine(startPos.x, startPos.y + 1, pickerWindowHeight - 1, 1, lineColor); drawHorizontalLine(startPos.x, startPos.y + pickerWindowHeight, pickerWindowWidth + 1, 1, lineColor); diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuColumn.java b/src/main/java/rip/athena/client/ui/framework/components/MenuColumn.java similarity index 77% rename from src/main/java/rip/athena/client/gui/framework/components/MenuColumn.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuColumn.java index e041c91e..b92c8625 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuColumn.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuColumn.java @@ -1,6 +1,6 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuComponent; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuComboBox.java b/src/main/java/rip/athena/client/ui/framework/components/MenuComboBox.java similarity index 93% rename from src/main/java/rip/athena/client/gui/framework/components/MenuComboBox.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuComboBox.java index 4d192238..f2580c32 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuComboBox.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuComboBox.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import java.awt.*; import java.util.ArrayList; @@ -217,7 +217,7 @@ public class MenuComboBox extends MenuComponent { int lineColor = getColor(DrawType.LINE, lastState); int textColor = getColor(DrawType.TEXT, ButtonState.NORMAL); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 2 + arrowOffset, height - 1, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 2 + arrowOffset, height - 1, backgroundColor); drawHorizontalLine(x, y, width + 1, 1, lineColor); drawVerticalLine(x, y + 1, height - 1, 1, lineColor); @@ -260,7 +260,7 @@ public class MenuComboBox extends MenuComponent { int width = this.width + textOffset + arrowOffset - 1; int height = totalHeight + values.length; - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y + this.height + 1, width, height, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x, y + this.height + 1, width, height, backgroundColor); drawHorizontalLine(x, y + this.height + 1, width + 1, 1, lineColor); drawVerticalLine(x, y + this.height + 2, height - 1, 1, lineColor); drawHorizontalLine(x, y + this.height + 1 + height, width + 1, 1, lineColor); @@ -280,7 +280,7 @@ public class MenuComboBox extends MenuComponent { if (mouseX >= x + 1 && mouseX <= x + width - 1) { if (mouseY >= y && mouseY <= y + sHeight) { hover = true; - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y, width - 1, sHeight, getColor(DrawType.BACKGROUND, ButtonState.HOVERACTIVE)); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 1, y, width - 1, sHeight, getColor(DrawType.BACKGROUND, ButtonState.HOVERACTIVE)); if(mouseDown) { items[i] = !items[i]; diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuDraggable.java b/src/main/java/rip/athena/client/ui/framework/components/MenuDraggable.java similarity index 91% rename from src/main/java/rip/athena/client/gui/framework/components/MenuDraggable.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuDraggable.java index cdf3f48b..e5daab65 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuDraggable.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuDraggable.java @@ -1,7 +1,7 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; import org.lwjgl.input.Mouse; /** diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuDropdown.java b/src/main/java/rip/athena/client/ui/framework/components/MenuDropdown.java similarity index 92% rename from src/main/java/rip/athena/client/gui/framework/components/MenuDropdown.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuDropdown.java index 0199fd58..8aa55131 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuDropdown.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuDropdown.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import java.awt.*; import java.util.ArrayList; @@ -222,7 +222,7 @@ public class MenuDropdown extends MenuComponent { int lineColor = getColor(DrawType.LINE, lastState); int textColor = getColor(DrawType.TEXT, ButtonState.NORMAL); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 2 + arrowOffset, height - 1, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 2 + arrowOffset, height - 1, backgroundColor); drawHorizontalLine(x, y, width + 1, 1, lineColor); drawVerticalLine(x, y + 1, height - 1, 1, lineColor); @@ -266,7 +266,7 @@ public class MenuDropdown extends MenuComponent { int width = this.width + textOffset + arrowOffset - 1; int height = totalHeight + values.length; - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y + this.height + 1, width, height, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x, y + this.height + 1, width, height, backgroundColor); drawHorizontalLine(x, y + this.height + 1, width + 1, 1, lineColor); drawVerticalLine(x, y + this.height + 2, height - 1, 1, lineColor); drawHorizontalLine(x, y + this.height + 1 + height, width + 1, 1, lineColor); @@ -285,7 +285,7 @@ public class MenuDropdown extends MenuComponent { if (mouseY >= y && mouseY <= y + sHeight) { hover = true; - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y, width - 1, sHeight, getColor(DrawType.BACKGROUND, ButtonState.HOVERACTIVE)); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 1, y, width - 1, sHeight, getColor(DrawType.BACKGROUND, ButtonState.HOVERACTIVE)); if(mouseDown) { index = i; diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuLabel.java b/src/main/java/rip/athena/client/ui/framework/components/MenuLabel.java similarity index 90% rename from src/main/java/rip/athena/client/gui/framework/components/MenuLabel.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuLabel.java index e199b934..2cacf4d3 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuLabel.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuLabel.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -135,7 +135,7 @@ public class MenuLabel extends MenuComponent { mouseX -= tipWidth; } - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(mouseX, mouseY, tipWidth, tipHeight, getColor(DrawType.BACKGROUND, ButtonState.POPUP)); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(mouseX, mouseY, tipWidth, tipHeight, getColor(DrawType.BACKGROUND, ButtonState.POPUP)); drawHorizontalLine(mouseX, mouseY, tipWidth + 1, 1, lineColor); drawVerticalLine(mouseX, mouseY + 1, tipHeight - 1, 1, lineColor); drawHorizontalLine(mouseX, mouseY + tipHeight, tipWidth + 1, 1, lineColor); diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuNoDrag.java b/src/main/java/rip/athena/client/ui/framework/components/MenuNoDrag.java similarity index 84% rename from src/main/java/rip/athena/client/gui/framework/components/MenuNoDrag.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuNoDrag.java index 33854dc6..8b1a4e6d 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuNoDrag.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuNoDrag.java @@ -1,7 +1,7 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuPage.java b/src/main/java/rip/athena/client/ui/framework/components/MenuPage.java similarity index 76% rename from src/main/java/rip/athena/client/gui/framework/components/MenuPage.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuPage.java index 75b8592f..02ab381d 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuPage.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuPage.java @@ -1,6 +1,6 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuComponent; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuScrollPane.java b/src/main/java/rip/athena/client/ui/framework/components/MenuScrollPane.java similarity index 95% rename from src/main/java/rip/athena/client/gui/framework/components/MenuScrollPane.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuScrollPane.java index 5a6d076a..45e9986e 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuScrollPane.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuScrollPane.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import org.lwjgl.input.Mouse; import java.awt.*; @@ -236,7 +236,7 @@ public class MenuScrollPane extends MenuComponent { int lineColor = getColor(DrawType.LINE, lastState); int textColor = getColor(DrawType.TEXT, lastState); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 1, height - 1, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 1, height - 1, backgroundColor); int scrollerX = x + width - scrollerWidth; int scrollerY = y + 1; @@ -377,7 +377,7 @@ public class MenuScrollPane extends MenuComponent { } } - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, width, minOffset * 2, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x, y, width, minOffset * 2, backgroundColor); if(text.length() > 0) { int minus = getStringWidth(text) + minOffset * 3; @@ -397,7 +397,7 @@ public class MenuScrollPane extends MenuComponent { int newY = scrollerY + Math.round(scrollerHeight * scrollerDelta); if(newSize > 4) { - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(scrollerX, newY + 1, scrollerWidth, newSize - 4, getColor(DrawType.BACKGROUND, scrollerState)); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(scrollerX, newY + 1, scrollerWidth, newSize - 4, getColor(DrawType.BACKGROUND, scrollerState)); } mouseDown = false; diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuSlider.java b/src/main/java/rip/athena/client/ui/framework/components/MenuSlider.java similarity index 94% rename from src/main/java/rip/athena/client/gui/framework/components/MenuSlider.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuSlider.java index 855beac3..dc5eccc9 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuSlider.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuSlider.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import org.lwjgl.input.Mouse; import rip.athena.client.utils.animations.simple.SimpleAnimation; @@ -169,7 +169,7 @@ public class MenuSlider extends MenuComponent { int lineColor = getColor(DrawType.LINE, lastState); int textColor = getColor(DrawType.TEXT, lastState); - rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 1, height - 1, backgroundColor); + rip.athena.client.ui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, width - 1, height - 1, backgroundColor); drawHorizontalLine(x, y, width + 1, 1, lineColor); drawVerticalLine(x, y + 1, height - 1, 1, lineColor); drawHorizontalLine(x, y + height, width + 1, 1, lineColor); diff --git a/src/main/java/rip/athena/client/gui/framework/components/MenuTextField.java b/src/main/java/rip/athena/client/ui/framework/components/MenuTextField.java similarity index 97% rename from src/main/java/rip/athena/client/gui/framework/components/MenuTextField.java rename to src/main/java/rip/athena/client/ui/framework/components/MenuTextField.java index 7be7957a..9e4153bb 100644 --- a/src/main/java/rip/athena/client/gui/framework/components/MenuTextField.java +++ b/src/main/java/rip/athena/client/ui/framework/components/MenuTextField.java @@ -1,12 +1,12 @@ -package rip.athena.client.gui.framework.components; +package rip.athena.client.ui.framework.components; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.gui.framework.MenuComponent; -import rip.athena.client.gui.framework.MenuPriority; -import rip.athena.client.gui.framework.TextPattern; -import rip.athena.client.gui.framework.draw.ButtonState; -import rip.athena.client.gui.framework.draw.DrawType; +import rip.athena.client.ui.framework.MenuComponent; +import rip.athena.client.ui.framework.MenuPriority; +import rip.athena.client.ui.framework.TextPattern; +import rip.athena.client.ui.framework.draw.ButtonState; +import rip.athena.client.ui.framework.draw.DrawType; import org.lwjgl.input.Keyboard; import rip.athena.client.utils.render.DrawUtils; diff --git a/src/main/java/rip/athena/client/gui/framework/draw/ButtonState.java b/src/main/java/rip/athena/client/ui/framework/draw/ButtonState.java similarity index 88% rename from src/main/java/rip/athena/client/gui/framework/draw/ButtonState.java rename to src/main/java/rip/athena/client/ui/framework/draw/ButtonState.java index f337ae1d..8e50e849 100644 --- a/src/main/java/rip/athena/client/gui/framework/draw/ButtonState.java +++ b/src/main/java/rip/athena/client/ui/framework/draw/ButtonState.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.framework.draw; +package rip.athena.client.ui.framework.draw; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/draw/DrawImpl.java b/src/main/java/rip/athena/client/ui/framework/draw/DrawImpl.java similarity index 99% rename from src/main/java/rip/athena/client/gui/framework/draw/DrawImpl.java rename to src/main/java/rip/athena/client/ui/framework/draw/DrawImpl.java index 6cd013fd..ff92317a 100644 --- a/src/main/java/rip/athena/client/gui/framework/draw/DrawImpl.java +++ b/src/main/java/rip/athena/client/ui/framework/draw/DrawImpl.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.framework.draw; +package rip.athena.client.ui.framework.draw; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; @@ -11,7 +11,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; +import rip.athena.api.font.FontManager; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/framework/draw/DrawType.java b/src/main/java/rip/athena/client/ui/framework/draw/DrawType.java similarity index 86% rename from src/main/java/rip/athena/client/gui/framework/draw/DrawType.java rename to src/main/java/rip/athena/client/ui/framework/draw/DrawType.java index bbdffba1..a85dba2b 100644 --- a/src/main/java/rip/athena/client/gui/framework/draw/DrawType.java +++ b/src/main/java/rip/athena/client/ui/framework/draw/DrawType.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.framework.draw; +package rip.athena.client.ui.framework.draw; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/framework/draw/MenuColorType.java b/src/main/java/rip/athena/client/ui/framework/draw/MenuColorType.java similarity index 93% rename from src/main/java/rip/athena/client/gui/framework/draw/MenuColorType.java rename to src/main/java/rip/athena/client/ui/framework/draw/MenuColorType.java index 27027073..fed937cd 100644 --- a/src/main/java/rip/athena/client/gui/framework/draw/MenuColorType.java +++ b/src/main/java/rip/athena/client/ui/framework/draw/MenuColorType.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.framework.draw; +package rip.athena.client.ui.framework.draw; import java.awt.*; import java.util.HashMap; diff --git a/src/main/java/rip/athena/client/gui/hud/HUDEditor.java b/src/main/java/rip/athena/client/ui/hud/HUDEditor.java similarity index 94% rename from src/main/java/rip/athena/client/gui/hud/HUDEditor.java rename to src/main/java/rip/athena/client/ui/hud/HUDEditor.java index 40a9e19a..8b55a4b5 100644 --- a/src/main/java/rip/athena/client/gui/hud/HUDEditor.java +++ b/src/main/java/rip/athena/client/ui/hud/HUDEditor.java @@ -1,20 +1,18 @@ -package rip.athena.client.gui.hud; +package rip.athena.client.ui.hud; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Mouse; +import rip.athena.api.module.Module; import rip.athena.client.Athena; -import rip.athena.client.config.save.Config; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.framework.MinecraftMenuImpl; -import rip.athena.client.gui.framework.draw.DrawImpl; -import rip.athena.client.modules.Module; -import rip.athena.client.modules.impl.other.Settings; -import rip.athena.client.modules.impl.render.GUIMod; +import rip.athena.api.config.save.Config; +import rip.athena.api.font.FontManager; +import rip.athena.client.ui.framework.MinecraftMenuImpl; +import rip.athena.client.ui.framework.draw.DrawImpl; +import rip.athena.client.modules.render.GUIMod; import rip.athena.client.utils.render.AssetUtils; -import rip.athena.client.utils.render.DrawUtils; import java.awt.*; import java.io.IOException; @@ -26,7 +24,7 @@ import java.io.IOException; */ public class HUDEditor extends MinecraftMenuImpl implements DrawImpl { - private final static rip.athena.client.gui.framework.Menu menu = new rip.athena.client.gui.framework.Menu("", Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight); + private final static rip.athena.client.ui.framework.Menu menu = new rip.athena.client.ui.framework.Menu("", Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight); private final static ResourceLocation SETTINGS = AssetUtils.getResource("/gui/settings.png"); private final static int HELPER = new Color(200, 200, 200, 150).getRGB(); @@ -219,7 +217,7 @@ public class HUDEditor extends MinecraftMenuImpl implements DrawImpl { if (mouseX < x + SETTINGS_SIZE && mouseY > y + height - SETTINGS_SIZE) { if (height > SETTINGS_SIZE) { - GUIMod gui = (GUIMod) Athena.INSTANCE.getModuleManager().get(GUIMod.class); + GUIMod gui = (GUIMod) Athena.INSTANCE.getModuleRepository().get(GUIMod.class); gui.menuImpl.openSettings(element.getParent()); gui.setEnabled(true); } diff --git a/src/main/java/rip/athena/client/gui/hud/HUDElement.java b/src/main/java/rip/athena/client/ui/hud/HUDElement.java similarity index 87% rename from src/main/java/rip/athena/client/gui/hud/HUDElement.java rename to src/main/java/rip/athena/client/ui/hud/HUDElement.java index c11e1e8d..2daa41cd 100644 --- a/src/main/java/rip/athena/client/gui/hud/HUDElement.java +++ b/src/main/java/rip/athena/client/ui/hud/HUDElement.java @@ -1,9 +1,6 @@ -package rip.athena.client.gui.hud; +package rip.athena.client.ui.hud; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import rip.athena.client.modules.Module; -import sun.net.www.MimeEntry; +import rip.athena.api.module.Module; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/hud/HUDManager.java b/src/main/java/rip/athena/client/ui/hud/HUDManager.java similarity index 91% rename from src/main/java/rip/athena/client/gui/hud/HUDManager.java rename to src/main/java/rip/athena/client/ui/hud/HUDManager.java index 5c2a0054..8be3092e 100644 --- a/src/main/java/rip/athena/client/gui/hud/HUDManager.java +++ b/src/main/java/rip/athena/client/ui/hud/HUDManager.java @@ -1,13 +1,13 @@ -package rip.athena.client.gui.hud; +package rip.athena.client.ui.hud; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; +import rip.athena.api.module.Module; import rip.athena.client.Athena; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.render.RenderEvent; import rip.athena.client.events.types.render.RenderType; -import rip.athena.client.modules.Module; import java.util.ArrayList; import java.util.List; @@ -24,7 +24,7 @@ public class HUDManager { public HUDManager() { elements = new ArrayList<>(); - for(Module mod : Athena.INSTANCE.getModuleManager().getModules()) { + for(Module mod : Athena.INSTANCE.getModuleRepository().getModules()) { elements.addAll(mod.getHUDElements()); } } diff --git a/src/main/java/rip/athena/client/gui/hud/IHUD.java b/src/main/java/rip/athena/client/ui/hud/IHUD.java similarity index 78% rename from src/main/java/rip/athena/client/gui/hud/IHUD.java rename to src/main/java/rip/athena/client/ui/hud/IHUD.java index f83f1c32..8c70e468 100644 --- a/src/main/java/rip/athena/client/gui/hud/IHUD.java +++ b/src/main/java/rip/athena/client/ui/hud/IHUD.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.hud; +package rip.athena.client.ui.hud; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/menu/AthenaMenu.java b/src/main/java/rip/athena/client/ui/menu/AthenaMenu.java similarity index 85% rename from src/main/java/rip/athena/client/gui/menu/AthenaMenu.java rename to src/main/java/rip/athena/client/ui/menu/AthenaMenu.java index 8828966a..5784a622 100644 --- a/src/main/java/rip/athena/client/gui/menu/AthenaMenu.java +++ b/src/main/java/rip/athena/client/ui/menu/AthenaMenu.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.menu; +package rip.athena.client.ui.menu; import net.minecraft.client.gui.*; @@ -8,8 +8,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URI; -import java.util.Calendar; -import java.util.Date; import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; @@ -17,9 +15,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.io.Charsets; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GLContext; -import org.lwjgl.util.glu.Project; import com.google.common.collect.Lists; @@ -27,26 +23,18 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.texture.DynamicTexture; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; -import net.minecraft.client.settings.GameSettings; import net.minecraft.realms.RealmsBridge; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.demo.DemoWorldServer; import net.minecraft.world.storage.ISaveFormat; import net.minecraft.world.storage.WorldInfo; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.gui.menu.altmanager.GuiAccountManager; -import rip.athena.client.gui.menu.altmanager.GuiAltManager; -import rip.athena.client.utils.MouseUtils; +import rip.athena.client.ui.menu.altmanager.GuiAccountManager; +import rip.athena.client.ui.menu.altmanager.GuiAltManager; import rip.athena.client.utils.animations.Animation; -import rip.athena.client.utils.animations.Direction; import rip.athena.client.utils.animations.impl.EaseBackIn; import rip.athena.client.utils.input.InputUtils; import rip.athena.client.utils.render.ColorUtil; @@ -307,18 +295,19 @@ public class AthenaMenu extends GuiScreen implements GuiYesNoCallback (float) this.width / 2, y, new Color(255, 255, 255).getRGB()); GlStateManager.pushMatrix(); - DrawUtils.drawImage(new ResourceLocation("Athena/menu/exit.png"),startX + startX - 20, 10, 10, 10); - DrawUtils.drawImage(new ResourceLocation("Athena/menu/usericon.png"), startX + startX - 49, 6, 18, 18); + DrawUtils.drawImage(new ResourceLocation("Athena/logo/Athena.png"), this.width / 2 - 50, y - 90, 100, 100); + DrawUtils.drawImage(new ResourceLocation("Athena/menu/exit.png"),10, 10, 10, 10); + DrawUtils.drawImage(new ResourceLocation("Athena/menu/usericon.png"), startX + startX - 24, 6, 18, 18); GlStateManager.popMatrix(); GlStateManager.pushMatrix(); - boolean isOverAccountManager = mouseX >= startX+startX-50 && mouseX <= startX+startX-30 && mouseY >= startY - startY + 5 && mouseY <= startY - startY + 25; - RoundedUtils.drawRoundedRect(startX+startX - 50, startY - startY + 5, startX+startX - 30, startY - startY + 25, 14, isOverAccountManager ? new Color(150,150,150,100).getRGB() : new Color(100,100,100,100).getRGB()); - RoundedUtils.drawRoundedGradientOutlineCorner(startX+startX - 50 + 1, startY - startY + 5 + 1, startX+startX - 30 - 1, startY - startY + 25 - 1, 3, 12, ColorUtil.getClientColor(0, 255).getRGB(), ColorUtil.getClientColor(90, 255).getRGB(), ColorUtil.getClientColor(180, 255).getRGB(), ColorUtil.getClientColor(270, 255).getRGB()); - - boolean isOverExit = mouseX >= startX+startX-25 && mouseX <= startX+startX - 5 && mouseY >= startY - startY + 5 && mouseY <= startY - startY + 25; - RoundedUtils.drawRoundedRect(startX+startX - 25, startY - startY + 5, startX+startX - 5, startY - startY + 25, 14, isOverExit ? new Color(150,150,150,100).getRGB() : new Color(100,100,100,100).getRGB()); + boolean isOverAccountManager = mouseX >= startX+startX-25 && mouseX <= startX+startX-5 && mouseY >= startY - startY + 5 && mouseY <= startY - startY + 25; + RoundedUtils.drawRoundedRect(startX+startX - 25, startY - startY + 5, startX+startX - 5, startY - startY + 25, 14, isOverAccountManager ? new Color(150,150,150,100).getRGB() : new Color(100,100,100,100).getRGB()); RoundedUtils.drawRoundedGradientOutlineCorner(startX+startX - 25 + 1, startY - startY + 5 + 1, startX+startX - 5 - 1, startY - startY + 25 - 1, 3, 12, ColorUtil.getClientColor(0, 255).getRGB(), ColorUtil.getClientColor(90, 255).getRGB(), ColorUtil.getClientColor(180, 255).getRGB(), ColorUtil.getClientColor(270, 255).getRGB()); + + boolean isOverExit = mouseX >= 5 && mouseX <= 25 && mouseY >= startY - startY + 5 && mouseY <= startY - startY + 25; + RoundedUtils.drawRoundedRect(5, startY - startY + 5, 25, startY - startY + 25, 14, isOverExit ? new Color(150,150,150,100).getRGB() : new Color(100,100,100,100).getRGB()); + RoundedUtils.drawRoundedGradientOutlineCorner(5 + 1, startY - startY + 5 + 1, 25 - 1, startY - startY + 25 - 1, 3, 12, ColorUtil.getClientColor(0, 255).getRGB(), ColorUtil.getClientColor(90, 255).getRGB(), ColorUtil.getClientColor(180, 255).getRGB(), ColorUtil.getClientColor(270, 255).getRGB()); GlStateManager.popMatrix(); super.drawScreen(mouseX, mouseY, partialTicks); @@ -335,8 +324,8 @@ public class AthenaMenu extends GuiScreen implements GuiYesNoCallback int startX = size[0] / 2; int startY = size[1] / 2; - boolean isOverExit = mouseX >= startX+startX-25 && mouseX <= startX+startX - 5 && mouseY >= startY - startY + 5 && mouseY <= startY - startY + 25; - boolean isOverAccountManager = mouseX >= startX+startX-50 && mouseX <= startX+startX-30 && mouseY >= startY - startY + 5 && mouseY <= startY - startY + 25; + boolean isOverExit = mouseX >= 5 && mouseX <= 25 && mouseY >= startY - startY + 5 && mouseY <= startY - startY + 25; + boolean isOverAccountManager = mouseX >= startX+startX-25 && mouseX <= startX+startX-5 && mouseY >= startY - startY + 5 && mouseY <= startY - startY + 25; if(isOverExit) { this.mc.shutdown(); diff --git a/src/main/java/rip/athena/client/gui/menu/CloseType.java b/src/main/java/rip/athena/client/ui/menu/CloseType.java similarity index 78% rename from src/main/java/rip/athena/client/gui/menu/CloseType.java rename to src/main/java/rip/athena/client/ui/menu/CloseType.java index 7a1aeeba..34288c9f 100644 --- a/src/main/java/rip/athena/client/gui/menu/CloseType.java +++ b/src/main/java/rip/athena/client/ui/menu/CloseType.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.menu; +package rip.athena.client.ui.menu; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/gui/menu/altmanager/GuiAccountManager.java b/src/main/java/rip/athena/client/ui/menu/altmanager/GuiAccountManager.java similarity index 83% rename from src/main/java/rip/athena/client/gui/menu/altmanager/GuiAccountManager.java rename to src/main/java/rip/athena/client/ui/menu/altmanager/GuiAccountManager.java index b220ad53..c4a8ffbb 100644 --- a/src/main/java/rip/athena/client/gui/menu/altmanager/GuiAccountManager.java +++ b/src/main/java/rip/athena/client/ui/menu/altmanager/GuiAccountManager.java @@ -1,41 +1,35 @@ -package rip.athena.client.gui.menu.altmanager; +package rip.athena.client.ui.menu.altmanager; -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; import fr.litarvan.openauth.microsoft.MicrosoftAuthResult; import fr.litarvan.openauth.microsoft.MicrosoftAuthenticationException; import fr.litarvan.openauth.microsoft.MicrosoftAuthenticator; import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.texture.DynamicTexture; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Session; -import net.minecraft.util.StringUtils; import org.apache.commons.lang3.RandomStringUtils; -import org.lwjgl.opengl.GL11; import rip.athena.client.Athena; -import rip.athena.client.account.Account; -import rip.athena.client.account.AccountType; -import rip.athena.client.gui.menu.altmanager.button.AltTextField; +import rip.athena.api.account.Account; +import rip.athena.api.account.AccountType; +import rip.athena.client.socket.SocketClient; +import rip.athena.client.ui.menu.altmanager.button.AltTextField; import rip.athena.client.utils.GLUtils; import rip.athena.client.utils.MouseUtils; import rip.athena.client.utils.animations.Animation; -import rip.athena.client.utils.animations.Direction; import rip.athena.client.utils.animations.impl.EaseBackIn; import rip.athena.client.utils.animations.simple.SimpleAnimation; import rip.athena.client.utils.font.FontManager; import rip.athena.client.utils.render.*; import rip.athena.client.utils.time.TimerUtil; -import javax.imageio.ImageIO; import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; import java.util.*; import java.util.List; +import java.util.concurrent.CompletableFuture; /** * @author Athena Development @@ -147,14 +141,11 @@ public class GuiAccountManager extends GuiScreen { } for(Account a : Athena.INSTANCE.getAccountManager().getAccounts()) { - RoundedUtils.drawRound(x + 9, y + offsetY + scrollAnimation.getValue() - 1, width - 18, 37, 4, new Color(Athena.INSTANCE.getThemeManager().getPrimaryTheme().getSecondColor())); RoundedUtils.drawRound(x + 10, y + offsetY + scrollAnimation.getValue(), width - 20, 35, 4, new Color(Athena.INSTANCE.getThemeManager().getPrimaryTheme().getFirstColor())); - RoundedUtils.drawGradientRound(x + width - 36, y + offsetY + 7 + scrollAnimation.getValue(), 20, 20, 4, ColorUtil.getClientColor(0, 255), ColorUtil.getClientColor(90, 255), ColorUtil.getClientColor(180, 255), ColorUtil.getClientColor(270, 255)); if(a.getAccountType().equals(AccountType.MICROSOFT)) { - //mc.getTextureManager().bindTexture(face(a.getUsername(), UUID.fromString(a.getUuid()))); mc.getTextureManager().bindTexture(new ResourceLocation("Athena/menu/head.png")); } else { mc.getTextureManager().bindTexture(new ResourceLocation("Athena/menu/head.png")); @@ -164,6 +155,51 @@ public class GuiAccountManager extends GuiScreen { RoundedUtils.drawRoundTextured(x + 17, y + offsetY + 6 + scrollAnimation.getValue(), 24, 24, 4, 1.0F); GlStateManager.disableBlend(); + final ResourceLocation[] rankTexture = {null}; + + if(a.getAccountType().equals(AccountType.MICROSOFT)) { + CompletableFuture isUserFuture = SocketClient.isUserAsync(formatMinecraftUUID(a.getUuid())); + + isUserFuture.thenCompose(isUser -> { + if (isUser) { + return SocketClient.getRankAsync(formatMinecraftUUID(a.getUuid())); + } else { + return CompletableFuture.completedFuture(""); + } + }).thenAccept(rank -> { + switch (rank) { + case "OWNER": + case "MANAGER": + rankTexture[0] = new ResourceLocation("Athena/ranks/owner.png"); + break; + case "DEVELOPER": + rankTexture[0] = new ResourceLocation("Athena/ranks/developer.png"); + break; + case "ADMIN": + rankTexture[0] = new ResourceLocation("Athena/ranks/admin.png"); + break; + case "MOD": + rankTexture[0] = new ResourceLocation("Athena/ranks/mod.png"); + break; + case "PARTNER": + case "MEDIA": + rankTexture[0] = new ResourceLocation("Athena/ranks/partner.png"); + break; + case "PREMIUM": + rankTexture[0] = new ResourceLocation("Athena/ranks/premium.png"); + break; + case "USER": + rankTexture[0] = new ResourceLocation("Athena/ranks/user.png"); + break; + default: + break; + } + }); + } + if (rankTexture[0] != null) { + DrawUtils.drawImage(rankTexture[0], x + 52 + FontManager.getProductSansRegular(22).width(a.getUsername()), (int) (y + offsetY + 11 + scrollAnimation.getValue()), 15, 15); + } + GlStateManager.pushMatrix(); DrawUtils.drawImage(new ResourceLocation("Athena/menu/exit.png"),x + width - 31, (int) (y + offsetY + 12 + scrollAnimation.getValue()), 10, 10); GlStateManager.popMatrix(); @@ -276,7 +312,6 @@ public class GuiAccountManager extends GuiScreen { mc.displayGuiScreen(new GuiAltManager()); } - if(showAddAccount) { usernameField.mouseClicked(mouseX, mouseY, mouseButton); @@ -307,6 +342,9 @@ public class GuiAccountManager extends GuiScreen { delete = true; } + // Clear info for other accounts + a.setInfo(""); + if(!showAddAccount) { if(MouseUtils.isInside(mouseX, mouseY, x + 10, y + offsetY + scrollAnimation.getValue(), width - 50, 35)) { a.isDone = false; @@ -372,4 +410,18 @@ public class GuiAccountManager extends GuiScreen { } } } + + public String formatMinecraftUUID(String uuidStr) { + if (uuidStr.length() != 32) { + throw new IllegalArgumentException("Invalid UUID length. It should be 32 characters long."); + } + + String formattedUUID = uuidStr.substring(0, 8) + "-" + + uuidStr.substring(8, 12) + "-" + + uuidStr.substring(12, 16) + "-" + + uuidStr.substring(16, 20) + "-" + + uuidStr.substring(20); + + return formattedUUID; + } } \ No newline at end of file diff --git a/src/main/java/rip/athena/client/gui/menu/altmanager/GuiAltManager.java b/src/main/java/rip/athena/client/ui/menu/altmanager/GuiAltManager.java similarity index 94% rename from src/main/java/rip/athena/client/gui/menu/altmanager/GuiAltManager.java rename to src/main/java/rip/athena/client/ui/menu/altmanager/GuiAltManager.java index 49d82675..c5781cbe 100644 --- a/src/main/java/rip/athena/client/gui/menu/altmanager/GuiAltManager.java +++ b/src/main/java/rip/athena/client/ui/menu/altmanager/GuiAltManager.java @@ -1,13 +1,13 @@ -package rip.athena.client.gui.menu.altmanager; +package rip.athena.client.ui.menu.altmanager; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; -import rip.athena.client.gui.menu.AthenaMenu; -import rip.athena.client.gui.menu.altmanager.panels.*; -import rip.athena.client.gui.screen.Screen; +import rip.athena.client.ui.menu.AthenaMenu; +import rip.athena.client.ui.menu.altmanager.panels.*; +import rip.athena.client.ui.screen.Screen; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.DrawUtils; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/menu/altmanager/Panel.java b/src/main/java/rip/athena/client/ui/menu/altmanager/Panel.java similarity index 81% rename from src/main/java/rip/athena/client/gui/menu/altmanager/Panel.java rename to src/main/java/rip/athena/client/ui/menu/altmanager/Panel.java index 590ec5ee..9e905ec1 100644 --- a/src/main/java/rip/athena/client/gui/menu/altmanager/Panel.java +++ b/src/main/java/rip/athena/client/ui/menu/altmanager/Panel.java @@ -1,8 +1,8 @@ -package rip.athena.client.gui.menu.altmanager; +package rip.athena.client.ui.menu.altmanager; import lombok.Getter; import lombok.Setter; -import rip.athena.client.gui.screen.Screen; +import rip.athena.client.ui.screen.Screen; import rip.athena.client.utils.render.ColorUtil; import rip.athena.client.utils.render.RoundedUtils; diff --git a/src/main/java/rip/athena/client/gui/menu/altmanager/button/AltButton.java b/src/main/java/rip/athena/client/ui/menu/altmanager/button/AltButton.java similarity index 95% rename from src/main/java/rip/athena/client/gui/menu/altmanager/button/AltButton.java rename to src/main/java/rip/athena/client/ui/menu/altmanager/button/AltButton.java index 999b9bfc..0e15ef80 100644 --- a/src/main/java/rip/athena/client/gui/menu/altmanager/button/AltButton.java +++ b/src/main/java/rip/athena/client/ui/menu/altmanager/button/AltButton.java @@ -1,9 +1,9 @@ -package rip.athena.client.gui.menu.altmanager.button; +package rip.athena.client.ui.menu.altmanager.button; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import rip.athena.client.gui.screen.Screen; +import rip.athena.client.ui.screen.Screen; import rip.athena.client.utils.animations.Animation; import rip.athena.client.utils.animations.Direction; import rip.athena.client.utils.animations.impl.DecelerateAnimation; diff --git a/src/main/java/rip/athena/client/gui/menu/altmanager/button/AltTextField.java b/src/main/java/rip/athena/client/ui/menu/altmanager/button/AltTextField.java similarity index 99% rename from src/main/java/rip/athena/client/gui/menu/altmanager/button/AltTextField.java rename to src/main/java/rip/athena/client/ui/menu/altmanager/button/AltTextField.java index 94b7e023..68062675 100644 --- a/src/main/java/rip/athena/client/gui/menu/altmanager/button/AltTextField.java +++ b/src/main/java/rip/athena/client/ui/menu/altmanager/button/AltTextField.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.menu.altmanager.button; +package rip.athena.client.ui.menu.altmanager.button; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/src/main/java/rip/athena/client/gui/menu/altmanager/panels/LoginPanel.java b/src/main/java/rip/athena/client/ui/menu/altmanager/panels/LoginPanel.java similarity index 96% rename from src/main/java/rip/athena/client/gui/menu/altmanager/panels/LoginPanel.java rename to src/main/java/rip/athena/client/ui/menu/altmanager/panels/LoginPanel.java index bc10d4c6..fa50cc35 100644 --- a/src/main/java/rip/athena/client/gui/menu/altmanager/panels/LoginPanel.java +++ b/src/main/java/rip/athena/client/ui/menu/altmanager/panels/LoginPanel.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.menu.altmanager.panels; +package rip.athena.client.ui.menu.altmanager.panels; import fr.litarvan.openauth.microsoft.MicrosoftAuthResult; import fr.litarvan.openauth.microsoft.MicrosoftAuthenticationException; @@ -7,10 +7,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.util.Session; import org.lwjgl.input.Keyboard; import rip.athena.client.Athena; -import rip.athena.client.account.Account; -import rip.athena.client.account.AccountType; -import rip.athena.client.gui.menu.altmanager.Panel; -import rip.athena.client.gui.menu.altmanager.button.AltButton; +import rip.athena.api.account.Account; +import rip.athena.api.account.AccountType; +import rip.athena.client.ui.menu.altmanager.Panel; +import rip.athena.client.ui.menu.altmanager.button.AltButton; import rip.athena.client.utils.animations.Animation; import rip.athena.client.utils.animations.Direction; import rip.athena.client.utils.animations.impl.DecelerateAnimation; diff --git a/src/main/java/rip/athena/client/gui/notifications/NotiRemovalThread.java b/src/main/java/rip/athena/client/ui/notifications/NotiRemovalThread.java similarity index 90% rename from src/main/java/rip/athena/client/gui/notifications/NotiRemovalThread.java rename to src/main/java/rip/athena/client/ui/notifications/NotiRemovalThread.java index e5632879..b5140bf0 100644 --- a/src/main/java/rip/athena/client/gui/notifications/NotiRemovalThread.java +++ b/src/main/java/rip/athena/client/ui/notifications/NotiRemovalThread.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.notifications; +package rip.athena.client.ui.notifications; import java.util.List; diff --git a/src/main/java/rip/athena/client/gui/notifications/Notification.java b/src/main/java/rip/athena/client/ui/notifications/Notification.java similarity index 95% rename from src/main/java/rip/athena/client/gui/notifications/Notification.java rename to src/main/java/rip/athena/client/ui/notifications/Notification.java index 522a62e5..cc627847 100644 --- a/src/main/java/rip/athena/client/gui/notifications/Notification.java +++ b/src/main/java/rip/athena/client/ui/notifications/Notification.java @@ -1,14 +1,11 @@ -package rip.athena.client.gui.notifications; +package rip.athena.client.ui.notifications; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; -import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; import rip.athena.client.utils.render.DrawUtils; -import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; diff --git a/src/main/java/rip/athena/client/gui/notifications/NotificationManager.java b/src/main/java/rip/athena/client/ui/notifications/NotificationManager.java similarity index 96% rename from src/main/java/rip/athena/client/gui/notifications/NotificationManager.java rename to src/main/java/rip/athena/client/ui/notifications/NotificationManager.java index b937e381..0f6630a0 100644 --- a/src/main/java/rip/athena/client/gui/notifications/NotificationManager.java +++ b/src/main/java/rip/athena/client/ui/notifications/NotificationManager.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.notifications; +package rip.athena.client.ui.notifications; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/rip/athena/client/gui/screen/Screen.java b/src/main/java/rip/athena/client/ui/screen/Screen.java similarity index 90% rename from src/main/java/rip/athena/client/gui/screen/Screen.java rename to src/main/java/rip/athena/client/ui/screen/Screen.java index f5db1418..72cc5b19 100644 --- a/src/main/java/rip/athena/client/gui/screen/Screen.java +++ b/src/main/java/rip/athena/client/ui/screen/Screen.java @@ -1,4 +1,4 @@ -package rip.athena.client.gui.screen; +package rip.athena.client.ui.screen; /** * @author Athena Development diff --git a/src/main/java/rip/athena/client/utils/input/KeybindManager.java b/src/main/java/rip/athena/client/utils/input/KeybindManager.java index 894632c8..8a732adf 100644 --- a/src/main/java/rip/athena/client/utils/input/KeybindManager.java +++ b/src/main/java/rip/athena/client/utils/input/KeybindManager.java @@ -2,12 +2,12 @@ package rip.athena.client.utils.input; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import rip.athena.api.module.Module; import rip.athena.client.Athena; import rip.athena.client.events.SubscribeEvent; import rip.athena.client.events.types.input.KeyDownEvent; import rip.athena.client.events.types.input.KeyUpEvent; -import rip.athena.client.modules.Module; -import rip.athena.client.modules.impl.render.GUIMod; +import rip.athena.client.modules.render.GUIMod; import java.util.stream.Collectors; @@ -36,7 +36,7 @@ public class KeybindManager { return; } - for (Module module : Athena.INSTANCE.getModuleManager().getModules().stream().filter(entry -> + for (Module module : Athena.INSTANCE.getModuleRepository().getModules().stream().filter(entry -> entry.isBound() && entry.getBindType() == BindType.HOLD && entry.getKeyBind() == event.getKey()).collect(Collectors.toList())) { @@ -54,11 +54,7 @@ public class KeybindManager { */ @SubscribeEvent public void onKeyDown(KeyDownEvent event) { - if (isInvalidScreen(Minecraft.getMinecraft().currentScreen)) { - return; - } - - for (Module module : Athena.INSTANCE.getModuleManager().getModules().stream().filter(entry -> + for (Module module : Athena.INSTANCE.getModuleRepository().getModules().stream().filter(entry -> entry.isBound() && entry.getKeyBind() == event.getKey()).collect(Collectors.toList())) { @@ -67,6 +63,7 @@ public class KeybindManager { continue; } + if(isInvalidScreen(Minecraft.getMinecraft().currentScreen)) return; module.setEnabled(module.getBindType() != BindType.TOGGLE || !module.isToggled()); } } diff --git a/src/main/java/rip/athena/client/utils/render/AssetUtils.java b/src/main/java/rip/athena/client/utils/render/AssetUtils.java index 50c1fc17..c3625bce 100644 --- a/src/main/java/rip/athena/client/utils/render/AssetUtils.java +++ b/src/main/java/rip/athena/client/utils/render/AssetUtils.java @@ -1,15 +1,26 @@ package rip.athena.client.utils.render; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.client.renderer.texture.TextureUtil; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL12; import rip.athena.client.Athena; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.*; +import java.net.URL; +import java.nio.ByteBuffer; import java.nio.file.Paths; +import static org.lwjgl.opengl.GL11.*; + /** * @author Athena Development * @project Athena-Client @@ -17,8 +28,68 @@ import java.nio.file.Paths; */ public class AssetUtils { - public AssetUtils() {} - + + private final int textureID; + + public AssetUtils(String url, boolean circular) throws IOException { + BufferedImage image = ImageIO.read(new URL(url)); + if (circular) { + image = RoundedUtils.makeRoundedCorner(image, image.getHeight()); + } + int[] pixels = new int[image.getWidth() * image.getHeight()]; + image.getRGB(0, 0, image.getWidth(), image.getHeight(), pixels, 0, image.getWidth()); + ByteBuffer buffer = BufferUtils.createByteBuffer(image.getWidth() * image.getHeight() * 4); + for (int y = 0; y < image.getHeight(); y++) { + for (int x = 0; x < image.getWidth(); x++) { + int pixel = pixels[y * image.getWidth() + x]; + buffer.put((byte) ((pixel >> 16) & 0xFF)); + buffer.put((byte) ((pixel >> 8) & 0xFF)); + buffer.put((byte) (pixel & 0xFF)); + buffer.put((byte) ((pixel >> 24) & 0xFF)); + } + } + buffer.flip(); + int textureID = TextureUtil.glGenTextures(); + glBindTexture(GL_TEXTURE_2D, textureID); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL12.GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL12.GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, image.getWidth(), image.getHeight(), 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer); + this.textureID = textureID; + } + + public void draw(float x, float y, float width, float height) { + draw(x, y, 0f, 0f, width, height, width, height); + } + + public void draw(float x, float y, float u, float v, float width, float height, float textureWidth, float textureHeight) { + glPushMatrix(); + glDisable(GL_DEPTH_TEST); + GlStateManager.alphaFunc(516, 0.003921569F); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + glBindTexture(GL_TEXTURE_2D, textureID); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + drawSprite(x, y, u, v, width, height, textureWidth, textureHeight); + glPopMatrix(); + } + + private void drawSprite(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.0F).tex(u * f, (v + height) * f1).endVertex(); + worldrenderer.pos((x + width), y + height, 0.0F).tex((u + width) * f, (v + height) * f1).endVertex(); + worldrenderer.pos((x + width), y, 0.0F).tex((u + width) * f, v * f1).endVertex(); + worldrenderer.pos(x, y, 0.0F).tex(u * f, v * f1).endVertex(); + tessellator.draw(); + } + public static ResourceLocation getResourceFromFile(File file) { return getResourceFromPath(file); } diff --git a/src/main/java/rip/athena/client/utils/render/DrawUtils.java b/src/main/java/rip/athena/client/utils/render/DrawUtils.java index 7fd22865..2c8169ef 100644 --- a/src/main/java/rip/athena/client/utils/render/DrawUtils.java +++ b/src/main/java/rip/athena/client/utils/render/DrawUtils.java @@ -11,9 +11,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; -import rip.athena.client.font.FontUtils; import rip.athena.client.utils.font.Font; -import rip.athena.client.utils.font.FontManager; import rip.athena.client.utils.shader.ShaderUtil; import java.awt.*; diff --git a/src/main/java/rip/athena/client/utils/render/HUDUtil.java b/src/main/java/rip/athena/client/utils/render/HUDUtil.java index 9dff7cc6..f3249b28 100644 --- a/src/main/java/rip/athena/client/utils/render/HUDUtil.java +++ b/src/main/java/rip/athena/client/utils/render/HUDUtil.java @@ -10,8 +10,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import org.lwjgl.opengl.GL11; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; -import rip.athena.client.modules.impl.render.TPS; +import rip.athena.api.font.FontManager; +import rip.athena.client.modules.render.TPS; import java.awt.*; diff --git a/src/main/java/rip/athena/client/utils/render/RoundedUtils.java b/src/main/java/rip/athena/client/utils/render/RoundedUtils.java index c6823adb..3214a376 100644 --- a/src/main/java/rip/athena/client/utils/render/RoundedUtils.java +++ b/src/main/java/rip/athena/client/utils/render/RoundedUtils.java @@ -9,6 +9,8 @@ import org.lwjgl.opengl.GL11; import rip.athena.client.utils.shader.ShaderUtil; import java.awt.*; +import java.awt.geom.RoundRectangle2D; +import java.awt.image.BufferedImage; import static org.lwjgl.opengl.GL11.*; public class RoundedUtils { @@ -20,6 +22,23 @@ public class RoundedUtils { private static ShaderUtil roundedTexturedShader = new ShaderUtil("roundRectTexture"); public static ShaderUtil roundedShader = new ShaderUtil("roundedRect"); + public static BufferedImage makeRoundedCorner(BufferedImage image, int cornerRadius) { + int w = image.getWidth(); + int h = image.getHeight(); + BufferedImage output = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB); + Graphics2D g2 = output.createGraphics(); + g2.setComposite(AlphaComposite.Src); + g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2.setColor(Color.WHITE); + g2.fill(new RoundRectangle2D.Float(0, 0, w, h, cornerRadius, cornerRadius)); + g2.setComposite(AlphaComposite.SrcAtop); + g2.drawImage(image, 0, 0, null); + + g2.dispose(); + + return output; + } + public static void drawRound(float x, float y, float width, float height, float radius, Color color) { drawRound(x, y, width, height, radius, false, color); } diff --git a/src/main/resources/assets/minecraft/Athena/menu/close.png b/src/main/resources/assets/minecraft/Athena/menu/close.png new file mode 100644 index 00000000..45bceccd Binary files /dev/null and b/src/main/resources/assets/minecraft/Athena/menu/close.png differ diff --git a/workspace/assets/skins/42/420bcebbbea408391a2bcb0eac8465ddf93f4bd03226373d7f4a4935c8b69821 b/workspace/assets/skins/42/420bcebbbea408391a2bcb0eac8465ddf93f4bd03226373d7f4a4935c8b69821 new file mode 100644 index 00000000..802dadf8 Binary files /dev/null and b/workspace/assets/skins/42/420bcebbbea408391a2bcb0eac8465ddf93f4bd03226373d7f4a4935c8b69821 differ diff --git a/workspace/assets/skins/6e/6e40846d8f6ef75f81f130e4b8f9a912aa13fd30248168be80611c661ac9a77f b/workspace/assets/skins/6e/6e40846d8f6ef75f81f130e4b8f9a912aa13fd30248168be80611c661ac9a77f new file mode 100644 index 00000000..60a2fcde Binary files /dev/null and b/workspace/assets/skins/6e/6e40846d8f6ef75f81f130e4b8f9a912aa13fd30248168be80611c661ac9a77f differ diff --git a/workspace/assets/skins/71/71e588b8ad4e3db3db9d1957f0d1399bf12084d1b2f070dfdcbb9b31fdb55bbc b/workspace/assets/skins/71/71e588b8ad4e3db3db9d1957f0d1399bf12084d1b2f070dfdcbb9b31fdb55bbc new file mode 100644 index 00000000..b55cc64c Binary files /dev/null and b/workspace/assets/skins/71/71e588b8ad4e3db3db9d1957f0d1399bf12084d1b2f070dfdcbb9b31fdb55bbc differ diff --git a/workspace/assets/skins/a6/a639fb33e3281c94da4fa380629208060a776cd0d0d9bd85db6034cf879a5c96 b/workspace/assets/skins/a6/a639fb33e3281c94da4fa380629208060a776cd0d0d9bd85db6034cf879a5c96 new file mode 100644 index 00000000..855cc094 Binary files /dev/null and b/workspace/assets/skins/a6/a639fb33e3281c94da4fa380629208060a776cd0d0d9bd85db6034cf879a5c96 differ diff --git a/workspace/assets/skins/a8/a8d6e4b79d7b191105533926c5432f5607d238e18af723b9d96752a95ac636a b/workspace/assets/skins/a8/a8d6e4b79d7b191105533926c5432f5607d238e18af723b9d96752a95ac636a new file mode 100644 index 00000000..d1e3e36b Binary files /dev/null and b/workspace/assets/skins/a8/a8d6e4b79d7b191105533926c5432f5607d238e18af723b9d96752a95ac636a differ diff --git a/workspace/assets/skins/c7/c7aeeaecf1b35145e41a766a4454811748a528e4baf11b42faba69d55d82c60d b/workspace/assets/skins/c7/c7aeeaecf1b35145e41a766a4454811748a528e4baf11b42faba69d55d82c60d new file mode 100644 index 00000000..1115219a Binary files /dev/null and b/workspace/assets/skins/c7/c7aeeaecf1b35145e41a766a4454811748a528e4baf11b42faba69d55d82c60d differ diff --git a/workspace/assets/skins/e2/e28e8dd2382d2ea7253e29b11987d5f444d3436d3c9d3b4a2b67bc27694496f8 b/workspace/assets/skins/e2/e28e8dd2382d2ea7253e29b11987d5f444d3436d3c9d3b4a2b67bc27694496f8 new file mode 100644 index 00000000..7ade2051 Binary files /dev/null and b/workspace/assets/skins/e2/e28e8dd2382d2ea7253e29b11987d5f444d3436d3c9d3b4a2b67bc27694496f8 differ diff --git a/workspace/assets/skins/e4/e40ae22e00569837ca34a93b342decd584da4eef7f2892d12946edf70f7a12c2 b/workspace/assets/skins/e4/e40ae22e00569837ca34a93b342decd584da4eef7f2892d12946edf70f7a12c2 new file mode 100644 index 00000000..c2314191 Binary files /dev/null and b/workspace/assets/skins/e4/e40ae22e00569837ca34a93b342decd584da4eef7f2892d12946edf70f7a12c2 differ diff --git a/workspace/crash-reports/crash-2023-06-04_11.38.28-client.txt b/workspace/crash-reports/crash-2023-06-04_11.38.28-client.txt index fb25de31..3487f733 100644 --- a/workspace/crash-reports/crash-2023-06-04_11.38.28-client.txt +++ b/workspace/crash-reports/crash-2023-06-04_11.38.28-client.txt @@ -8,9 +8,9 @@ java.lang.ArrayIndexOutOfBoundsException at java.lang.System.arraycopy(Native Method) at java.lang.AbstractStringBuilder.insert(AbstractStringBuilder.java:1215) at java.lang.StringBuilder.insert(StringBuilder.java:338) - at rip.athena.client.gui.framework.components.MenuTextField.onKeyDown(MenuTextField.java:205) - at rip.athena.client.gui.framework.Menu.onKeyDown(Menu.java:144) - at rip.athena.client.gui.framework.MinecraftMenuImpl.keyTyped(MinecraftMenuImpl.java:123) + at rip.athena.client.ui.framework.components.MenuTextField.onKeyDown(MenuTextField.java:205) + at rip.athena.client.ui.framework.Menu.onKeyDown(Menu.java:144) + at rip.athena.client.ui.framework.MinecraftMenuImpl.keyTyped(MinecraftMenuImpl.java:123) at net.minecraft.client.gui.GuiScreen.handleKeyboardInput(GuiScreen.java:627) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:578) at net.minecraft.client.Minecraft.runTick(Minecraft.java:1806) @@ -28,15 +28,15 @@ Stacktrace: at java.lang.System.arraycopy(Native Method) at java.lang.AbstractStringBuilder.insert(AbstractStringBuilder.java:1215) at java.lang.StringBuilder.insert(StringBuilder.java:338) - at rip.athena.client.gui.framework.components.MenuTextField.onKeyDown(MenuTextField.java:205) - at rip.athena.client.gui.framework.Menu.onKeyDown(Menu.java:144) - at rip.athena.client.gui.framework.MinecraftMenuImpl.keyTyped(MinecraftMenuImpl.java:123) + at rip.athena.client.ui.framework.components.MenuTextField.onKeyDown(MenuTextField.java:205) + at rip.athena.client.ui.framework.Menu.onKeyDown(Menu.java:144) + at rip.athena.client.ui.framework.MinecraftMenuImpl.keyTyped(MinecraftMenuImpl.java:123) at net.minecraft.client.gui.GuiScreen.handleKeyboardInput(GuiScreen.java:627) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:578) -- Affected screen -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu -- Affected level -- Details: diff --git a/workspace/crash-reports/crash-2023-06-04_12.16.10-client.txt b/workspace/crash-reports/crash-2023-06-04_12.16.10-client.txt index aa339b2d..d0c29787 100644 --- a/workspace/crash-reports/crash-2023-06-04_12.16.10-client.txt +++ b/workspace/crash-reports/crash-2023-06-04_12.16.10-client.txt @@ -5,10 +5,10 @@ Time: 6/4/23 12:16 PM Description: Rendering screen java.lang.NullPointerException: Rendering screen - at rip.athena.client.gui.framework.components.MenuSlider.onRender(MenuSlider.java:162) - at rip.athena.client.gui.framework.components.MenuColorPicker.drawPicker(MenuColorPicker.java:410) - at rip.athena.client.gui.framework.components.MenuScrollPane.drawExtras(MenuScrollPane.java:415) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:157) + at rip.athena.client.ui.framework.components.MenuSlider.onRender(MenuSlider.java:162) + at rip.athena.client.ui.framework.components.MenuColorPicker.drawPicker(MenuColorPicker.java:410) + at rip.athena.client.ui.framework.components.MenuScrollPane.drawExtras(MenuScrollPane.java:415) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:157) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1420) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1149) at net.minecraft.client.Minecraft.run(Minecraft.java:429) @@ -21,14 +21,14 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.framework.components.MenuSlider.onRender(MenuSlider.java:162) - at rip.athena.client.gui.framework.components.MenuColorPicker.drawPicker(MenuColorPicker.java:410) - at rip.athena.client.gui.framework.components.MenuScrollPane.drawExtras(MenuScrollPane.java:415) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:157) + at rip.athena.client.ui.framework.components.MenuSlider.onRender(MenuSlider.java:162) + at rip.athena.client.ui.framework.components.MenuColorPicker.drawPicker(MenuColorPicker.java:410) + at rip.athena.client.ui.framework.components.MenuScrollPane.drawExtras(MenuScrollPane.java:415) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:157) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (696, 192). Absolute: (1392, 624) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_09.48.35-client.txt b/workspace/crash-reports/crash-2023-06-07_09.48.35-client.txt index 02ae014d..697c5601 100644 --- a/workspace/crash-reports/crash-2023-06-07_09.48.35-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_09.48.35-client.txt @@ -10,10 +10,10 @@ java.lang.NullPointerException: Registering texture at net.minecraft.client.renderer.texture.TextureManager.loadTexture(TextureManager.java:83) at net.minecraft.client.renderer.texture.TextureManager.bindTexture(TextureManager.java:50) at rip.athena.client.utils.render.DrawUtils.drawImage(DrawUtils.java:120) - at rip.athena.client.gui.clickgui.components.mods.ModCategoryButton.onRender(ModCategoryButton.java:74) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.mods.ModCategoryButton.onRender(ModCategoryButton.java:74) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -37,14 +37,14 @@ Stacktrace: at net.minecraft.client.renderer.texture.TextureManager.loadTexture(TextureManager.java:83) at net.minecraft.client.renderer.texture.TextureManager.bindTexture(TextureManager.java:50) at rip.athena.client.utils.render.DrawUtils.drawImage(DrawUtils.java:120) - at rip.athena.client.gui.clickgui.components.mods.ModCategoryButton.onRender(ModCategoryButton.java:74) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.mods.ModCategoryButton.onRender(ModCategoryButton.java:74) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (213, 119). Absolute: (427, 240) Screen size: Scaled: (427, 240). Absolute: (854, 480). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_10.00.35-client.txt b/workspace/crash-reports/crash-2023-06-07_10.00.35-client.txt index d276ffee..47f3d98d 100644 --- a/workspace/crash-reports/crash-2023-06-07_10.00.35-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_10.00.35-client.txt @@ -7,11 +7,11 @@ Description: Rendering screen java.lang.NullPointerException: Rendering screen at net.minecraft.util.ResourceLocation.splitObjectName(ResourceLocation.java:34) at net.minecraft.util.ResourceLocation.(ResourceLocation.java:19) - at rip.athena.client.gui.clickgui.components.mods.ModuleBox.onRender(ModuleBox.java:212) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.mods.ModuleBox.onRender(ModuleBox.java:212) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -26,15 +26,15 @@ A detailed walkthrough of the error, its code path and all known details is as f Stacktrace: at net.minecraft.util.ResourceLocation.splitObjectName(ResourceLocation.java:34) at net.minecraft.util.ResourceLocation.(ResourceLocation.java:19) - at rip.athena.client.gui.clickgui.components.mods.ModuleBox.onRender(ModuleBox.java:212) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.mods.ModuleBox.onRender(ModuleBox.java:212) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (480, 254). Absolute: (960, 508) Screen size: Scaled: (960, 509). Absolute: (1920, 1017). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_10.35.06-client.txt b/workspace/crash-reports/crash-2023-06-07_10.35.06-client.txt index 36291b8a..656285f6 100644 --- a/workspace/crash-reports/crash-2023-06-07_10.35.06-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_10.35.06-client.txt @@ -5,20 +5,20 @@ Time: 07.06.23 10:35 Description: Rendering screen java.lang.NoClassDefFoundError: rip/athena/client/gui/clickgui/pages/ModsPage$9 - at rip.athena.client.gui.clickgui.pages.ModsPage.onLoad(ModsPage.java:284) - at rip.athena.client.gui.clickgui.IngameMenu.initPage(IngameMenu.java:181) - at rip.athena.client.gui.clickgui.pages.ModsPage$16.onOpenSettings(ModsPage.java:514) - at rip.athena.client.gui.clickgui.components.mods.ModuleBox.passesThrough(ModuleBox.java:137) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:151) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.pages.ModsPage.onLoad(ModsPage.java:284) + at rip.athena.client.ui.clickgui.IngameMenu.initPage(IngameMenu.java:181) + at rip.athena.client.ui.clickgui.pages.ModsPage$16.onOpenSettings(ModsPage.java:514) + at rip.athena.client.ui.clickgui.components.mods.ModuleBox.passesThrough(ModuleBox.java:137) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:151) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) at net.minecraft.client.main.Main.main(Main.java:113) at Start.main(Start.java:11) -Caused by: java.lang.ClassNotFoundException: rip.athena.client.gui.clickgui.pages.ModsPage$9 +Caused by: java.lang.ClassNotFoundException: rip.athena.client.ui.clickgui.pages.ModsPage$9 at java.net.URLClassLoader.findClass(URLClassLoader.java:382) at java.lang.ClassLoader.loadClass(ClassLoader.java:424) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:349) @@ -31,18 +31,18 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.clickgui.pages.ModsPage.onLoad(ModsPage.java:284) - at rip.athena.client.gui.clickgui.IngameMenu.initPage(IngameMenu.java:181) - at rip.athena.client.gui.clickgui.pages.ModsPage$16.onOpenSettings(ModsPage.java:514) - at rip.athena.client.gui.clickgui.components.mods.ModuleBox.passesThrough(ModuleBox.java:137) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:151) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.pages.ModsPage.onLoad(ModsPage.java:284) + at rip.athena.client.ui.clickgui.IngameMenu.initPage(IngameMenu.java:181) + at rip.athena.client.ui.clickgui.pages.ModsPage$16.onOpenSettings(ModsPage.java:514) + at rip.athena.client.ui.clickgui.components.mods.ModuleBox.passesThrough(ModuleBox.java:137) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:151) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (684, 208). Absolute: (1369, 601) Screen size: Scaled: (960, 509). Absolute: (1920, 1017). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_10.46.55-client.txt b/workspace/crash-reports/crash-2023-06-07_10.46.55-client.txt index f5b9039e..ac3f2a28 100644 --- a/workspace/crash-reports/crash-2023-06-07_10.46.55-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_10.46.55-client.txt @@ -5,13 +5,13 @@ Time: 07.06.23 10:46 Description: Rendering screen java.lang.NullPointerException: Rendering screen - at rip.athena.client.gui.clickgui.pages.SettingsPage.onLoad(SettingsPage.java:335) - at rip.athena.client.gui.clickgui.IngameMenu.initPage(IngameMenu.java:181) - at rip.athena.client.gui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) - at rip.athena.client.gui.framework.components.MenuButton.onPreSort(MenuButton.java:104) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:87) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.pages.SettingsPage.onLoad(SettingsPage.java:335) + at rip.athena.client.ui.clickgui.IngameMenu.initPage(IngameMenu.java:181) + at rip.athena.client.ui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) + at rip.athena.client.ui.framework.components.MenuButton.onPreSort(MenuButton.java:104) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:87) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -24,17 +24,17 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.clickgui.pages.SettingsPage.onLoad(SettingsPage.java:335) - at rip.athena.client.gui.clickgui.IngameMenu.initPage(IngameMenu.java:181) - at rip.athena.client.gui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) - at rip.athena.client.gui.framework.components.MenuButton.onPreSort(MenuButton.java:104) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:87) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.pages.SettingsPage.onLoad(SettingsPage.java:335) + at rip.athena.client.ui.clickgui.IngameMenu.initPage(IngameMenu.java:181) + at rip.athena.client.ui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) + at rip.athena.client.ui.framework.components.MenuButton.onPreSort(MenuButton.java:104) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:87) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (282, 211). Absolute: (565, 594) Screen size: Scaled: (960, 509). Absolute: (1920, 1017). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_10.47.56-client.txt b/workspace/crash-reports/crash-2023-06-07_10.47.56-client.txt index 61622f05..7eecd820 100644 --- a/workspace/crash-reports/crash-2023-06-07_10.47.56-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_10.47.56-client.txt @@ -5,13 +5,13 @@ Time: 07.06.23 10:47 Description: Rendering screen java.lang.NullPointerException: Rendering screen - at rip.athena.client.gui.clickgui.pages.SettingsPage.onLoad(SettingsPage.java:335) - at rip.athena.client.gui.clickgui.IngameMenu.initPage(IngameMenu.java:181) - at rip.athena.client.gui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) - at rip.athena.client.gui.framework.components.MenuButton.onPreSort(MenuButton.java:104) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:87) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.pages.SettingsPage.onLoad(SettingsPage.java:335) + at rip.athena.client.ui.clickgui.IngameMenu.initPage(IngameMenu.java:181) + at rip.athena.client.ui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) + at rip.athena.client.ui.framework.components.MenuButton.onPreSort(MenuButton.java:104) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:87) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -24,17 +24,17 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.clickgui.pages.SettingsPage.onLoad(SettingsPage.java:335) - at rip.athena.client.gui.clickgui.IngameMenu.initPage(IngameMenu.java:181) - at rip.athena.client.gui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) - at rip.athena.client.gui.framework.components.MenuButton.onPreSort(MenuButton.java:104) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:87) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.pages.SettingsPage.onLoad(SettingsPage.java:335) + at rip.athena.client.ui.clickgui.IngameMenu.initPage(IngameMenu.java:181) + at rip.athena.client.ui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) + at rip.athena.client.ui.framework.components.MenuButton.onPreSort(MenuButton.java:104) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:87) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (310, 210). Absolute: (621, 596) Screen size: Scaled: (960, 509). Absolute: (1920, 1017). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_16.39.42-client.txt b/workspace/crash-reports/crash-2023-06-07_16.39.42-client.txt index 0ed84212..506987dd 100644 --- a/workspace/crash-reports/crash-2023-06-07_16.39.42-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_16.39.42-client.txt @@ -6,11 +6,11 @@ Description: Rendering screen java.lang.StringIndexOutOfBoundsException: String index out of range: -1 at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -24,15 +24,15 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (480, 252). Absolute: (960, 504) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_16.51.46-client.txt b/workspace/crash-reports/crash-2023-06-07_16.51.46-client.txt index 310092c1..1fc405f4 100644 --- a/workspace/crash-reports/crash-2023-06-07_16.51.46-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_16.51.46-client.txt @@ -6,11 +6,11 @@ Description: Rendering screen java.lang.StringIndexOutOfBoundsException: String index out of range: -1 at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -24,15 +24,15 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (480, 252). Absolute: (960, 504) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_16.52.09-client.txt b/workspace/crash-reports/crash-2023-06-07_16.52.09-client.txt index 3c2c836b..e9bc9625 100644 --- a/workspace/crash-reports/crash-2023-06-07_16.52.09-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_16.52.09-client.txt @@ -6,11 +6,11 @@ Description: Rendering screen java.lang.StringIndexOutOfBoundsException: String index out of range: -1 at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -24,15 +24,15 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:193) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (279, 235). Absolute: (559, 538) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_16.54.00-client.txt b/workspace/crash-reports/crash-2023-06-07_16.54.00-client.txt index 7d20b281..dbe30c8d 100644 --- a/workspace/crash-reports/crash-2023-06-07_16.54.00-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_16.54.00-client.txt @@ -6,11 +6,11 @@ Description: Rendering screen java.lang.StringIndexOutOfBoundsException: String index out of range: -1 at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -24,15 +24,15 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (480, 252). Absolute: (960, 504) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_16.56.10-client.txt b/workspace/crash-reports/crash-2023-06-07_16.56.10-client.txt index a3de5e79..d181e014 100644 --- a/workspace/crash-reports/crash-2023-06-07_16.56.10-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_16.56.10-client.txt @@ -6,11 +6,11 @@ Description: Rendering screen java.lang.StringIndexOutOfBoundsException: String index out of range: -1 at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -24,15 +24,15 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (480, 252). Absolute: (960, 504) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-07_16.58.33-client.txt b/workspace/crash-reports/crash-2023-06-07_16.58.33-client.txt index 9bb768f0..d9fb0617 100644 --- a/workspace/crash-reports/crash-2023-06-07_16.58.33-client.txt +++ b/workspace/crash-reports/crash-2023-06-07_16.58.33-client.txt @@ -6,11 +6,11 @@ Description: Rendering screen java.lang.StringIndexOutOfBoundsException: String index out of range: -1 at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -24,15 +24,15 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.lang.String.substring(String.java:1967) - at rip.athena.client.gui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) + at rip.athena.client.ui.clickgui.components.macros.MacroSlimTextField.onRender(MacroSlimTextField.java:109) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:194) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (296, 229). Absolute: (593, 550) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-08_17.27.31-client.txt b/workspace/crash-reports/crash-2023-06-08_17.27.31-client.txt index 9fb3a9b5..761ec6c1 100644 --- a/workspace/crash-reports/crash-2023-06-08_17.27.31-client.txt +++ b/workspace/crash-reports/crash-2023-06-08_17.27.31-client.txt @@ -7,12 +7,12 @@ Description: Rendering screen java.lang.NullPointerException: Rendering screen at rip.athena.client.utils.font.impl.athena.FontRenderer.requiresInternationalFont(FontRenderer.java:285) at rip.athena.client.utils.font.impl.athena.FontRenderer.width(FontRenderer.java:247) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.getStringWidth(SimpleGradientButton.java:91) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:74) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:195) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.getStringWidth(SimpleGradientButton.java:91) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:74) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:195) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -27,16 +27,16 @@ A detailed walkthrough of the error, its code path and all known details is as f Stacktrace: at rip.athena.client.utils.font.impl.athena.FontRenderer.requiresInternationalFont(FontRenderer.java:285) at rip.athena.client.utils.font.impl.athena.FontRenderer.width(FontRenderer.java:247) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.getStringWidth(SimpleGradientButton.java:91) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:74) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:195) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.getStringWidth(SimpleGradientButton.java:91) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:74) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:195) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (291, 317). Absolute: (582, 374) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-08_17.35.41-client.txt b/workspace/crash-reports/crash-2023-06-08_17.35.41-client.txt index b23d616e..db431eb2 100644 --- a/workspace/crash-reports/crash-2023-06-08_17.35.41-client.txt +++ b/workspace/crash-reports/crash-2023-06-08_17.35.41-client.txt @@ -7,12 +7,12 @@ Description: Rendering screen java.lang.NullPointerException: Rendering screen at rip.athena.client.utils.font.impl.athena.FontRenderer.requiresInternationalFont(FontRenderer.java:285) at rip.athena.client.utils.font.impl.athena.FontRenderer.width(FontRenderer.java:247) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.getStringWidth(SimpleGradientButton.java:91) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:74) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:195) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.getStringWidth(SimpleGradientButton.java:91) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:74) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:195) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1431) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1151) at net.minecraft.client.Minecraft.run(Minecraft.java:430) @@ -27,16 +27,16 @@ A detailed walkthrough of the error, its code path and all known details is as f Stacktrace: at rip.athena.client.utils.font.impl.athena.FontRenderer.requiresInternationalFont(FontRenderer.java:285) at rip.athena.client.utils.font.impl.athena.FontRenderer.width(FontRenderer.java:247) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.getStringWidth(SimpleGradientButton.java:91) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:74) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:195) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.getStringWidth(SimpleGradientButton.java:91) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:74) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:195) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (565, 326). Absolute: (1131, 356) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-09_19.49.27-client.txt b/workspace/crash-reports/crash-2023-06-09_19.49.27-client.txt index 589b6db9..4bbb9c6c 100644 --- a/workspace/crash-reports/crash-2023-06-09_19.49.27-client.txt +++ b/workspace/crash-reports/crash-2023-06-09_19.49.27-client.txt @@ -5,11 +5,11 @@ Time: 6/9/23 7:49 PM Description: Rendering screen java.lang.NullPointerException: Rendering screen - at rip.athena.client.gui.clickgui.components.themes.primary.PrimaryGradientButton.onRender(PrimaryGradientButton.java:68) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.themes.primary.PrimaryGradientButton.onRender(PrimaryGradientButton.java:68) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1152) at net.minecraft.client.Minecraft.run(Minecraft.java:431) @@ -22,15 +22,15 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.clickgui.components.themes.primary.PrimaryGradientButton.onRender(PrimaryGradientButton.java:68) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.themes.primary.PrimaryGradientButton.onRender(PrimaryGradientButton.java:68) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (285, 312). Absolute: (570, 384) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-09_19.50.44-client.txt b/workspace/crash-reports/crash-2023-06-09_19.50.44-client.txt index 0bb49af8..98e1c8dd 100644 --- a/workspace/crash-reports/crash-2023-06-09_19.50.44-client.txt +++ b/workspace/crash-reports/crash-2023-06-09_19.50.44-client.txt @@ -5,10 +5,10 @@ Time: 6/9/23 7:50 PM Description: Rendering screen java.lang.NullPointerException: Rendering screen - at rip.athena.client.gui.clickgui.components.mods.CategoryButton.onRender(CategoryButton.java:62) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.mods.CategoryButton.onRender(CategoryButton.java:62) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1152) at net.minecraft.client.Minecraft.run(Minecraft.java:431) @@ -21,14 +21,14 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.clickgui.components.mods.CategoryButton.onRender(CategoryButton.java:62) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.mods.CategoryButton.onRender(CategoryButton.java:62) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (531, 214). Absolute: (1063, 581) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-09_22.19.16-client.txt b/workspace/crash-reports/crash-2023-06-09_22.19.16-client.txt index 49e4c0a1..a4904173 100644 --- a/workspace/crash-reports/crash-2023-06-09_22.19.16-client.txt +++ b/workspace/crash-reports/crash-2023-06-09_22.19.16-client.txt @@ -5,14 +5,14 @@ Time: 6/9/23 10:19 PM Description: Updating screen events java.lang.RuntimeException: java.io.IOException: Server returned HTTP response code: 401 for URL: https://api.minecraftservices.com/minecraft/profile/ - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:157) - at rip.athena.client.gui.menu.altmanager.button.AltButton.mouseClicked(AltButton.java:66) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.lambda$mouseClicked$3(LoginPanel.java:194) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:157) + at rip.athena.client.ui.menu.altmanager.button.AltButton.mouseClicked(AltButton.java:66) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.lambda$mouseClicked$3(LoginPanel.java:194) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:91) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:194) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:91) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:91) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:91) at net.minecraft.client.gui.GuiScreen.handleMouseInput(GuiScreen.java:601) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:570) at net.minecraft.client.Minecraft.runTick(Minecraft.java:1813) @@ -24,7 +24,7 @@ Caused by: java.io.IOException: Server returned HTTP response code: 401 for URL: at sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1894) at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1492) at sun.net.www.protocol.https.HttpsURLConnectionImpl.getInputStream(HttpsURLConnectionImpl.java:263) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:155) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:155) ... 14 more @@ -33,20 +33,20 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:157) - at rip.athena.client.gui.menu.altmanager.button.AltButton.mouseClicked(AltButton.java:66) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.lambda$mouseClicked$3(LoginPanel.java:194) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:157) + at rip.athena.client.ui.menu.altmanager.button.AltButton.mouseClicked(AltButton.java:66) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.lambda$mouseClicked$3(LoginPanel.java:194) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:91) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:194) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:91) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:91) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:91) at net.minecraft.client.gui.GuiScreen.handleMouseInput(GuiScreen.java:601) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:570) -- Affected screen -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAltManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAltManager Stacktrace: at net.minecraft.client.Minecraft.runTick(Minecraft.java:1813) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1126) diff --git a/workspace/crash-reports/crash-2023-06-09_23.33.48-client.txt b/workspace/crash-reports/crash-2023-06-09_23.33.48-client.txt index 4ab2477e..ae17ecae 100644 --- a/workspace/crash-reports/crash-2023-06-09_23.33.48-client.txt +++ b/workspace/crash-reports/crash-2023-06-09_23.33.48-client.txt @@ -5,11 +5,11 @@ Time: 6/9/23 11:33 PM Description: Rendering screen java.lang.NullPointerException: Rendering screen - at rip.athena.client.gui.clickgui.components.mods.ModTextbox.onRender(ModTextbox.java:149) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.mods.ModTextbox.onRender(ModTextbox.java:149) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1152) at net.minecraft.client.Minecraft.run(Minecraft.java:431) @@ -22,15 +22,15 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.clickgui.components.mods.ModTextbox.onRender(ModTextbox.java:149) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.mods.ModTextbox.onRender(ModTextbox.java:149) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (658, 321). Absolute: (1317, 366) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-10_12.29.17-client.txt b/workspace/crash-reports/crash-2023-06-10_12.29.17-client.txt index b028d474..66a43e5d 100644 --- a/workspace/crash-reports/crash-2023-06-10_12.29.17-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_12.29.17-client.txt @@ -6,14 +6,14 @@ Description: Rendering screen java.lang.IllegalArgumentException: Invalid UUID string: 74e897386c9e4f5983efd365849e6049 at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.gui.clickgui.components.mods.ModuleBox.passesThrough(ModuleBox.java:129) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:154) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.mods.ModuleBox.passesThrough(ModuleBox.java:129) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:154) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1152) at net.minecraft.client.Minecraft.run(Minecraft.java:431) @@ -27,18 +27,18 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.gui.clickgui.components.mods.ModuleBox.passesThrough(ModuleBox.java:129) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:154) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.components.mods.ModuleBox.passesThrough(ModuleBox.java:129) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:154) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (431, 263). Absolute: (863, 482) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-10_12.29.35-client.txt b/workspace/crash-reports/crash-2023-06-10_12.29.35-client.txt index 457697f8..1b8c45f5 100644 --- a/workspace/crash-reports/crash-2023-06-10_12.29.35-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_12.29.35-client.txt @@ -5,12 +5,12 @@ Time: 6/10/23 12:29 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:98) at net.minecraft.client.Minecraft.startGame(Minecraft.java:490) at net.minecraft.client.Minecraft.run(Minecraft.java:411) @@ -23,12 +23,12 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:98) at net.minecraft.client.Minecraft.startGame(Minecraft.java:490) diff --git a/workspace/crash-reports/crash-2023-06-10_12.29.48-client.txt b/workspace/crash-reports/crash-2023-06-10_12.29.48-client.txt index 3cdb6dd8..7c33e5af 100644 --- a/workspace/crash-reports/crash-2023-06-10_12.29.48-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_12.29.48-client.txt @@ -5,12 +5,12 @@ Time: 6/10/23 12:29 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:98) at net.minecraft.client.Minecraft.startGame(Minecraft.java:490) at net.minecraft.client.Minecraft.run(Minecraft.java:411) @@ -23,12 +23,12 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:98) at net.minecraft.client.Minecraft.startGame(Minecraft.java:490) diff --git a/workspace/crash-reports/crash-2023-06-10_12.30.30-client.txt b/workspace/crash-reports/crash-2023-06-10_12.30.30-client.txt index c624caf8..32cc65c1 100644 --- a/workspace/crash-reports/crash-2023-06-10_12.30.30-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_12.30.30-client.txt @@ -5,12 +5,12 @@ Time: 6/10/23 12:30 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:98) at net.minecraft.client.Minecraft.startGame(Minecraft.java:490) at net.minecraft.client.Minecraft.run(Minecraft.java:411) @@ -23,12 +23,12 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:98) at net.minecraft.client.Minecraft.startGame(Minecraft.java:490) diff --git a/workspace/crash-reports/crash-2023-06-10_12.31.29-client.txt b/workspace/crash-reports/crash-2023-06-10_12.31.29-client.txt index 97f9eed4..ce569d7b 100644 --- a/workspace/crash-reports/crash-2023-06-10_12.31.29-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_12.31.29-client.txt @@ -5,12 +5,12 @@ Time: 6/10/23 12:31 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:101) at net.minecraft.client.Minecraft.startGame(Minecraft.java:490) at net.minecraft.client.Minecraft.run(Minecraft.java:411) @@ -23,12 +23,12 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.other.AimTrainer.createBot(AimTrainer.java:32) - at rip.athena.client.modules.impl.other.AimTrainer.onEnable(AimTrainer.java:103) + at other.rip.athena.client.modules.AimTrainer.createBot(AimTrainer.java:32) + at other.rip.athena.client.modules.AimTrainer.onEnable(AimTrainer.java:103) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:101) at net.minecraft.client.Minecraft.startGame(Minecraft.java:490) diff --git a/workspace/crash-reports/crash-2023-06-10_13.58.06-client.txt b/workspace/crash-reports/crash-2023-06-10_13.58.06-client.txt index a3ce6d9e..28d57367 100644 --- a/workspace/crash-reports/crash-2023-06-10_13.58.06-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_13.58.06-client.txt @@ -7,8 +7,8 @@ Description: Initializing game java.lang.NullPointerException: Initializing game at net.minecraft.client.Minecraft.isUnicode(Minecraft.java:792) at net.minecraft.client.gui.ScaledResolution.(ScaledResolution.java:19) - at rip.athena.client.gui.hud.HUDElement.setX(HUDElement.java:57) - at rip.athena.client.modules.impl.render.MemoryUsage.(MemoryUsage.java:59) + at rip.athena.client.ui.hud.HUDElement.setX(HUDElement.java:57) + at render.rip.athena.client.modules.MemoryUsage.(MemoryUsage.java:59) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -29,8 +29,8 @@ A detailed walkthrough of the error, its code path and all known details is as f Stacktrace: at net.minecraft.client.Minecraft.isUnicode(Minecraft.java:792) at net.minecraft.client.gui.ScaledResolution.(ScaledResolution.java:19) - at rip.athena.client.gui.hud.HUDElement.setX(HUDElement.java:57) - at rip.athena.client.modules.impl.render.MemoryUsage.(MemoryUsage.java:59) + at rip.athena.client.ui.hud.HUDElement.setX(HUDElement.java:57) + at render.rip.athena.client.modules.MemoryUsage.(MemoryUsage.java:59) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-10_13.59.17-client.txt b/workspace/crash-reports/crash-2023-06-10_13.59.17-client.txt index c129384b..d945f434 100644 --- a/workspace/crash-reports/crash-2023-06-10_13.59.17-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_13.59.17-client.txt @@ -7,8 +7,8 @@ Description: Initializing game java.lang.NullPointerException: Initializing game at net.minecraft.client.Minecraft.isUnicode(Minecraft.java:792) at net.minecraft.client.gui.ScaledResolution.(ScaledResolution.java:19) - at rip.athena.client.gui.hud.HUDElement.setX(HUDElement.java:63) - at rip.athena.client.modules.impl.render.MemoryUsage.(MemoryUsage.java:59) + at rip.athena.client.ui.hud.HUDElement.setX(HUDElement.java:63) + at render.rip.athena.client.modules.MemoryUsage.(MemoryUsage.java:59) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -29,8 +29,8 @@ A detailed walkthrough of the error, its code path and all known details is as f Stacktrace: at net.minecraft.client.Minecraft.isUnicode(Minecraft.java:792) at net.minecraft.client.gui.ScaledResolution.(ScaledResolution.java:19) - at rip.athena.client.gui.hud.HUDElement.setX(HUDElement.java:63) - at rip.athena.client.modules.impl.render.MemoryUsage.(MemoryUsage.java:59) + at rip.athena.client.ui.hud.HUDElement.setX(HUDElement.java:63) + at render.rip.athena.client.modules.MemoryUsage.(MemoryUsage.java:59) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-10_14.00.17-client.txt b/workspace/crash-reports/crash-2023-06-10_14.00.17-client.txt index e91327f1..a4dbbc98 100644 --- a/workspace/crash-reports/crash-2023-06-10_14.00.17-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_14.00.17-client.txt @@ -7,8 +7,8 @@ Description: Initializing game java.lang.NullPointerException: Initializing game at net.minecraft.client.Minecraft.isUnicode(Minecraft.java:792) at net.minecraft.client.gui.ScaledResolution.(ScaledResolution.java:19) - at rip.athena.client.gui.hud.HUDElement.setX(HUDElement.java:64) - at rip.athena.client.modules.impl.render.MemoryUsage.(MemoryUsage.java:59) + at rip.athena.client.ui.hud.HUDElement.setX(HUDElement.java:64) + at render.rip.athena.client.modules.MemoryUsage.(MemoryUsage.java:59) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -29,8 +29,8 @@ A detailed walkthrough of the error, its code path and all known details is as f Stacktrace: at net.minecraft.client.Minecraft.isUnicode(Minecraft.java:792) at net.minecraft.client.gui.ScaledResolution.(ScaledResolution.java:19) - at rip.athena.client.gui.hud.HUDElement.setX(HUDElement.java:64) - at rip.athena.client.modules.impl.render.MemoryUsage.(MemoryUsage.java:59) + at rip.athena.client.ui.hud.HUDElement.setX(HUDElement.java:64) + at render.rip.athena.client.modules.MemoryUsage.(MemoryUsage.java:59) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-10_14.01.02-client.txt b/workspace/crash-reports/crash-2023-06-10_14.01.02-client.txt index 39ad1a87..ec8bd3ad 100644 --- a/workspace/crash-reports/crash-2023-06-10_14.01.02-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_14.01.02-client.txt @@ -7,8 +7,8 @@ Description: Initializing game java.lang.NullPointerException: Initializing game at net.minecraft.client.Minecraft.isUnicode(Minecraft.java:792) at net.minecraft.client.gui.ScaledResolution.(ScaledResolution.java:19) - at rip.athena.client.gui.hud.HUDElement.setX(HUDElement.java:64) - at rip.athena.client.modules.impl.render.MemoryUsage.(MemoryUsage.java:59) + at rip.athena.client.ui.hud.HUDElement.setX(HUDElement.java:64) + at render.rip.athena.client.modules.MemoryUsage.(MemoryUsage.java:59) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -29,8 +29,8 @@ A detailed walkthrough of the error, its code path and all known details is as f Stacktrace: at net.minecraft.client.Minecraft.isUnicode(Minecraft.java:792) at net.minecraft.client.gui.ScaledResolution.(ScaledResolution.java:19) - at rip.athena.client.gui.hud.HUDElement.setX(HUDElement.java:64) - at rip.athena.client.modules.impl.render.MemoryUsage.(MemoryUsage.java:59) + at rip.athena.client.ui.hud.HUDElement.setX(HUDElement.java:64) + at render.rip.athena.client.modules.MemoryUsage.(MemoryUsage.java:59) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-10_18.31.15-client.txt b/workspace/crash-reports/crash-2023-06-10_18.31.15-client.txt index eeaecd48..1749469f 100644 --- a/workspace/crash-reports/crash-2023-06-10_18.31.15-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_18.31.15-client.txt @@ -5,7 +5,7 @@ Time: 6/10/23 6:31 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.gui.menu.AthenaMenu.initGui(AthenaMenu.java:187) + at rip.athena.client.ui.menu.AthenaMenu.initGui(AthenaMenu.java:187) at net.minecraft.client.gui.GuiScreen.setWorldAndResolution(GuiScreen.java:550) at net.minecraft.client.Minecraft.displayGuiScreen(Minecraft.java:1021) at net.minecraft.client.Minecraft.startGame(Minecraft.java:584) @@ -19,7 +19,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.menu.AthenaMenu.initGui(AthenaMenu.java:187) + at rip.athena.client.ui.menu.AthenaMenu.initGui(AthenaMenu.java:187) at net.minecraft.client.gui.GuiScreen.setWorldAndResolution(GuiScreen.java:550) at net.minecraft.client.Minecraft.displayGuiScreen(Minecraft.java:1021) at net.minecraft.client.Minecraft.startGame(Minecraft.java:584) diff --git a/workspace/crash-reports/crash-2023-06-10_18.31.52-client.txt b/workspace/crash-reports/crash-2023-06-10_18.31.52-client.txt index 67cb767f..44d21a75 100644 --- a/workspace/crash-reports/crash-2023-06-10_18.31.52-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_18.31.52-client.txt @@ -5,7 +5,7 @@ Time: 6/10/23 6:31 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.gui.menu.AthenaMenu.initGui(AthenaMenu.java:179) + at rip.athena.client.ui.menu.AthenaMenu.initGui(AthenaMenu.java:179) at net.minecraft.client.gui.GuiScreen.setWorldAndResolution(GuiScreen.java:550) at net.minecraft.client.Minecraft.displayGuiScreen(Minecraft.java:1021) at net.minecraft.client.Minecraft.startGame(Minecraft.java:584) @@ -19,7 +19,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.menu.AthenaMenu.initGui(AthenaMenu.java:179) + at rip.athena.client.ui.menu.AthenaMenu.initGui(AthenaMenu.java:179) at net.minecraft.client.gui.GuiScreen.setWorldAndResolution(GuiScreen.java:550) at net.minecraft.client.Minecraft.displayGuiScreen(Minecraft.java:1021) at net.minecraft.client.Minecraft.startGame(Minecraft.java:584) diff --git a/workspace/crash-reports/crash-2023-06-10_18.41.13-client.txt b/workspace/crash-reports/crash-2023-06-10_18.41.13-client.txt index 14b38b9d..34dfcdcd 100644 --- a/workspace/crash-reports/crash-2023-06-10_18.41.13-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_18.41.13-client.txt @@ -5,8 +5,8 @@ Time: 6/10/23 6:41 PM Description: Updating screen events java.lang.NullPointerException: Updating screen events - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.keyTyped(GuiAccountManager.java:420) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.keyTyped(GuiAccountManager.java:420) at net.minecraft.client.gui.GuiScreen.handleKeyboardInput(GuiScreen.java:627) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:578) at net.minecraft.client.Minecraft.runTick(Minecraft.java:1814) @@ -21,14 +21,14 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.keyTyped(GuiAccountManager.java:420) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.keyTyped(GuiAccountManager.java:420) at net.minecraft.client.gui.GuiScreen.handleKeyboardInput(GuiScreen.java:627) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:578) -- Affected screen -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAccountManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAccountManager Stacktrace: at net.minecraft.client.Minecraft.runTick(Minecraft.java:1814) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1127) diff --git a/workspace/crash-reports/crash-2023-06-10_19.17.20-client.txt b/workspace/crash-reports/crash-2023-06-10_19.17.20-client.txt index 38f67330..64a6a709 100644 --- a/workspace/crash-reports/crash-2023-06-10_19.17.20-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_19.17.20-client.txt @@ -5,9 +5,9 @@ Time: 6/10/23 7:17 PM Description: Rendering screen java.lang.NullPointerException: Rendering screen - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.drawScreen(LoginPanel.java:184) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.drawScreen(GuiAltManager.java:80) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.drawScreen(LoginPanel.java:184) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.drawScreen(GuiAltManager.java:80) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1152) at net.minecraft.client.Minecraft.run(Minecraft.java:431) @@ -20,13 +20,13 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.drawScreen(LoginPanel.java:184) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.drawScreen(GuiAltManager.java:80) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.drawScreen(LoginPanel.java:184) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.drawScreen(GuiAltManager.java:80) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAltManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAltManager Mouse location: Scaled: (0, 239). Absolute: (0, 0) Screen size: Scaled: (427, 240). Absolute: (854, 480). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-10_19.17.56-client.txt b/workspace/crash-reports/crash-2023-06-10_19.17.56-client.txt index 40c53f92..65094e87 100644 --- a/workspace/crash-reports/crash-2023-06-10_19.17.56-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_19.17.56-client.txt @@ -5,9 +5,9 @@ Time: 6/10/23 7:17 PM Description: Rendering screen java.lang.NullPointerException: Rendering screen - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.drawScreen(LoginPanel.java:184) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.drawScreen(GuiAltManager.java:80) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.drawScreen(LoginPanel.java:184) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.drawScreen(GuiAltManager.java:80) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1152) at net.minecraft.client.Minecraft.run(Minecraft.java:431) @@ -20,13 +20,13 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.drawScreen(LoginPanel.java:184) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.drawScreen(GuiAltManager.java:80) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.drawScreen(LoginPanel.java:184) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.drawScreen(GuiAltManager.java:80) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAltManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAltManager Mouse location: Scaled: (0, 239). Absolute: (0, 0) Screen size: Scaled: (427, 240). Absolute: (854, 480). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-10_19.18.42-client.txt b/workspace/crash-reports/crash-2023-06-10_19.18.42-client.txt index 70279262..8f5afdd7 100644 --- a/workspace/crash-reports/crash-2023-06-10_19.18.42-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_19.18.42-client.txt @@ -5,11 +5,11 @@ Time: 6/10/23 7:18 PM Description: Updating screen events java.lang.NullPointerException: Updating screen events - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:238) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:97) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:238) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:97) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:97) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:97) at net.minecraft.client.gui.GuiScreen.handleMouseInput(GuiScreen.java:601) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:570) at net.minecraft.client.Minecraft.runTick(Minecraft.java:1813) @@ -24,17 +24,17 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:238) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:97) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:238) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:97) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:97) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:97) at net.minecraft.client.gui.GuiScreen.handleMouseInput(GuiScreen.java:601) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:570) -- Affected screen -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAltManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAltManager Stacktrace: at net.minecraft.client.Minecraft.runTick(Minecraft.java:1813) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1126) diff --git a/workspace/crash-reports/crash-2023-06-10_19.20.32-client.txt b/workspace/crash-reports/crash-2023-06-10_19.20.32-client.txt index 32f053b9..b89fbe1e 100644 --- a/workspace/crash-reports/crash-2023-06-10_19.20.32-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_19.20.32-client.txt @@ -5,15 +5,15 @@ Time: 6/10/23 7:20 PM Description: Updating screen events java.lang.NullPointerException: Updating screen events - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:126) - at rip.athena.client.gui.menu.altmanager.button.AltButton.mouseClicked(AltButton.java:66) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.lambda$mouseClicked$3(LoginPanel.java:211) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:126) + at rip.athena.client.ui.menu.altmanager.button.AltButton.mouseClicked(AltButton.java:66) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.lambda$mouseClicked$3(LoginPanel.java:211) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:211) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:97) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:211) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:97) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:97) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:97) at net.minecraft.client.gui.GuiScreen.handleMouseInput(GuiScreen.java:601) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:570) at net.minecraft.client.Minecraft.runTick(Minecraft.java:1813) @@ -28,21 +28,21 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.account.AccountManager.save(AccountManager.java:49) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:126) - at rip.athena.client.gui.menu.altmanager.button.AltButton.mouseClicked(AltButton.java:66) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.lambda$mouseClicked$3(LoginPanel.java:211) + at rip.athena.api.account.AccountManager.save(AccountManager.java:49) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.lambda$drawScreen$1(LoginPanel.java:126) + at rip.athena.client.ui.menu.altmanager.button.AltButton.mouseClicked(AltButton.java:66) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.lambda$mouseClicked$3(LoginPanel.java:211) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:211) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:97) + at rip.athena.client.ui.menu.altmanager.panels.LoginPanel.mouseClicked(LoginPanel.java:211) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.lambda$mouseClicked$1(GuiAltManager.java:97) at java.util.ArrayList.forEach(ArrayList.java:1257) - at rip.athena.client.gui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:97) + at rip.athena.client.ui.menu.altmanager.GuiAltManager.mouseClicked(GuiAltManager.java:97) at net.minecraft.client.gui.GuiScreen.handleMouseInput(GuiScreen.java:601) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:570) -- Affected screen -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAltManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAltManager Stacktrace: at net.minecraft.client.Minecraft.runTick(Minecraft.java:1813) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1126) diff --git a/workspace/crash-reports/crash-2023-06-10_21.05.34-client.txt b/workspace/crash-reports/crash-2023-06-10_21.05.34-client.txt index d4936502..efb7f12a 100644 --- a/workspace/crash-reports/crash-2023-06-10_21.05.34-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_21.05.34-client.txt @@ -6,7 +6,7 @@ Description: Rendering screen java.lang.IllegalArgumentException: Invalid UUID string: 74e897386c9e4f5983efd365849e6049 at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:157) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:157) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1152) at net.minecraft.client.Minecraft.run(Minecraft.java:431) @@ -20,11 +20,11 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:157) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:157) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAccountManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAccountManager Mouse location: Scaled: (379, 17). Absolute: (759, 445) Screen size: Scaled: (427, 240). Absolute: (854, 480). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-10_21.09.17-client.txt b/workspace/crash-reports/crash-2023-06-10_21.09.17-client.txt index e350b6c9..91afd7cf 100644 --- a/workspace/crash-reports/crash-2023-06-10_21.09.17-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_21.09.17-client.txt @@ -6,7 +6,7 @@ Description: Rendering screen java.lang.IllegalArgumentException: Invalid UUID string: 74e897386c9e4f5983efd365849e6049 at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:154) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:154) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1152) at net.minecraft.client.Minecraft.run(Minecraft.java:431) @@ -20,11 +20,11 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:154) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:154) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAccountManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAccountManager Mouse location: Scaled: (382, 19). Absolute: (764, 441) Screen size: Scaled: (427, 240). Absolute: (854, 480). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-10_21.15.42-client.txt b/workspace/crash-reports/crash-2023-06-10_21.15.42-client.txt index 536f0542..4b81753c 100644 --- a/workspace/crash-reports/crash-2023-06-10_21.15.42-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_21.15.42-client.txt @@ -7,7 +7,7 @@ Description: Updating screen events java.util.ConcurrentModificationException at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:909) at java.util.ArrayList$Itr.next(ArrayList.java:859) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.mouseClicked(GuiAccountManager.java:320) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.mouseClicked(GuiAccountManager.java:320) at net.minecraft.client.gui.GuiScreen.handleMouseInput(GuiScreen.java:601) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:570) at net.minecraft.client.Minecraft.runTick(Minecraft.java:1813) @@ -24,13 +24,13 @@ A detailed walkthrough of the error, its code path and all known details is as f Stacktrace: at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:909) at java.util.ArrayList$Itr.next(ArrayList.java:859) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.mouseClicked(GuiAccountManager.java:320) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.mouseClicked(GuiAccountManager.java:320) at net.minecraft.client.gui.GuiScreen.handleMouseInput(GuiScreen.java:601) at net.minecraft.client.gui.GuiScreen.handleInput(GuiScreen.java:570) -- Affected screen -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAccountManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAccountManager Stacktrace: at net.minecraft.client.Minecraft.runTick(Minecraft.java:1813) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1126) diff --git a/workspace/crash-reports/crash-2023-06-10_21.26.18-client.txt b/workspace/crash-reports/crash-2023-06-10_21.26.18-client.txt index e1b2b9d4..0404d25e 100644 --- a/workspace/crash-reports/crash-2023-06-10_21.26.18-client.txt +++ b/workspace/crash-reports/crash-2023-06-10_21.26.18-client.txt @@ -6,7 +6,7 @@ Description: Rendering screen java.lang.IllegalArgumentException: Invalid UUID string: 74e897386c9e4f5983efd365849e6049 at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:155) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:155) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1152) at net.minecraft.client.Minecraft.run(Minecraft.java:431) @@ -20,11 +20,11 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:155) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:155) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAccountManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAccountManager Mouse location: Scaled: (386, 8). Absolute: (773, 463) Screen size: Scaled: (427, 240). Absolute: (854, 480). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-11_14.38.42-client.txt b/workspace/crash-reports/crash-2023-06-11_14.38.42-client.txt index ee19615d..bd3630bb 100644 --- a/workspace/crash-reports/crash-2023-06-11_14.38.42-client.txt +++ b/workspace/crash-reports/crash-2023-06-11_14.38.42-client.txt @@ -5,12 +5,12 @@ Time: 6/11/23 2:38 PM Description: Rendering screen java.lang.NullPointerException: Rendering screen - at rip.athena.client.gui.clickgui.IngameMenu.initPage(IngameMenu.java:184) - at rip.athena.client.gui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) - at rip.athena.client.gui.framework.components.MenuButton.onPreSort(MenuButton.java:118) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:87) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.IngameMenu.initPage(IngameMenu.java:184) + at rip.athena.client.ui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) + at rip.athena.client.ui.framework.components.MenuButton.onPreSort(MenuButton.java:118) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:87) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1153) at net.minecraft.client.Minecraft.run(Minecraft.java:432) @@ -23,16 +23,16 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.gui.clickgui.IngameMenu.initPage(IngameMenu.java:184) - at rip.athena.client.gui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) - at rip.athena.client.gui.framework.components.MenuButton.onPreSort(MenuButton.java:118) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:87) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) + at rip.athena.client.ui.clickgui.IngameMenu.initPage(IngameMenu.java:184) + at rip.athena.client.ui.clickgui.IngameMenu$1.onAction(IngameMenu.java:93) + at rip.athena.client.ui.framework.components.MenuButton.onPreSort(MenuButton.java:118) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:87) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:155) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (295, 302). Absolute: (591, 475) Screen size: Scaled: (960, 540). Absolute: (1920, 1080). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-11_22.06.03-client.txt b/workspace/crash-reports/crash-2023-06-11_22.06.03-client.txt index c7bb5487..ab8cead2 100644 --- a/workspace/crash-reports/crash-2023-06-11_22.06.03-client.txt +++ b/workspace/crash-reports/crash-2023-06-11_22.06.03-client.txt @@ -6,7 +6,7 @@ Description: Rendering screen java.lang.IllegalArgumentException: Invalid UUID string: 74e897386c9e4f5983efd365849e6049 at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:199) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:199) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1153) at net.minecraft.client.Minecraft.run(Minecraft.java:432) @@ -20,11 +20,11 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:199) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:199) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAccountManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAccountManager Mouse location: Scaled: (919, 17). Absolute: (1839, 1044) Screen size: Scaled: (960, 540). Absolute: (1920, 1080). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-11_22.10.15-client.txt b/workspace/crash-reports/crash-2023-06-11_22.10.15-client.txt index c434f6b0..5b81b85f 100644 --- a/workspace/crash-reports/crash-2023-06-11_22.10.15-client.txt +++ b/workspace/crash-reports/crash-2023-06-11_22.10.15-client.txt @@ -5,8 +5,8 @@ Time: 6/11/23 10:10 PM Description: Initializing game java.lang.ArrayIndexOutOfBoundsException: 1 - at rip.athena.client.account.AccountManager.load(AccountManager.java:101) - at rip.athena.client.account.AccountManager.(AccountManager.java:38) + at rip.athena.api.account.AccountManager.load(AccountManager.java:101) + at rip.athena.api.account.AccountManager.(AccountManager.java:38) at rip.athena.client.Athena.initClient(Athena.java:101) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) at net.minecraft.client.Minecraft.run(Minecraft.java:412) @@ -19,8 +19,8 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.account.AccountManager.load(AccountManager.java:101) - at rip.athena.client.account.AccountManager.(AccountManager.java:38) + at rip.athena.api.account.AccountManager.load(AccountManager.java:101) + at rip.athena.api.account.AccountManager.(AccountManager.java:38) at rip.athena.client.Athena.initClient(Athena.java:101) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) diff --git a/workspace/crash-reports/crash-2023-06-12_14.36.58-client.txt b/workspace/crash-reports/crash-2023-06-12_14.36.58-client.txt index 54c617df..baa0f8c3 100644 --- a/workspace/crash-reports/crash-2023-06-12_14.36.58-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_14.36.58-client.txt @@ -5,7 +5,7 @@ Time: 6/12/23 2:36 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:53) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:53) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -24,7 +24,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:53) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:53) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-12_14.39.05-client.txt b/workspace/crash-reports/crash-2023-06-12_14.39.05-client.txt index a9b3f39a..0ba079c4 100644 --- a/workspace/crash-reports/crash-2023-06-12_14.39.05-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_14.39.05-client.txt @@ -5,7 +5,7 @@ Time: 6/12/23 2:39 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -24,7 +24,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-12_14.39.59-client.txt b/workspace/crash-reports/crash-2023-06-12_14.39.59-client.txt index 583230ff..b57ff68f 100644 --- a/workspace/crash-reports/crash-2023-06-12_14.39.59-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_14.39.59-client.txt @@ -5,7 +5,7 @@ Time: 6/12/23 2:40 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -24,7 +24,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-12_14.42.27-client.txt b/workspace/crash-reports/crash-2023-06-12_14.42.27-client.txt index 7c4a4740..5c067735 100644 --- a/workspace/crash-reports/crash-2023-06-12_14.42.27-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_14.42.27-client.txt @@ -5,7 +5,7 @@ Time: 6/12/23 2:42 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -24,7 +24,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-12_14.43.20-client.txt b/workspace/crash-reports/crash-2023-06-12_14.43.20-client.txt index 62e43815..d9cd4839 100644 --- a/workspace/crash-reports/crash-2023-06-12_14.43.20-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_14.43.20-client.txt @@ -5,7 +5,7 @@ Time: 6/12/23 2:43 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:54) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:54) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -24,7 +24,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:54) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:54) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-12_14.44.09-client.txt b/workspace/crash-reports/crash-2023-06-12_14.44.09-client.txt index 44bf5cc3..e737c9c2 100644 --- a/workspace/crash-reports/crash-2023-06-12_14.44.09-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_14.44.09-client.txt @@ -5,7 +5,7 @@ Time: 6/12/23 2:44 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -24,7 +24,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-12_14.45.27-client.txt b/workspace/crash-reports/crash-2023-06-12_14.45.27-client.txt index 595a8a14..3e6ef543 100644 --- a/workspace/crash-reports/crash-2023-06-12_14.45.27-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_14.45.27-client.txt @@ -5,7 +5,7 @@ Time: 6/12/23 2:45 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -24,7 +24,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-12_14.45.53-client.txt b/workspace/crash-reports/crash-2023-06-12_14.45.53-client.txt index d7541d3c..f19047c4 100644 --- a/workspace/crash-reports/crash-2023-06-12_14.45.53-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_14.45.53-client.txt @@ -5,7 +5,7 @@ Time: 6/12/23 2:45 PM Description: Initializing game java.lang.NullPointerException: Initializing game - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -24,7 +24,7 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:55) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:55) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-12_14.59.01-client.txt b/workspace/crash-reports/crash-2023-06-12_14.59.01-client.txt index 6aabab88..a425d7e3 100644 --- a/workspace/crash-reports/crash-2023-06-12_14.59.01-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_14.59.01-client.txt @@ -6,12 +6,12 @@ Description: Initializing game java.lang.ExceptionInInitializerError at net.minecraft.client.resources.DefaultResourcePack.getPackImage(DefaultResourcePack.java:94) - at rip.athena.client.modules.impl.render.PackDisplay.loadTexture(PackDisplay.java:167) - at rip.athena.client.modules.impl.render.PackDisplay.onEnable(PackDisplay.java:185) + at render.rip.athena.client.modules.PackDisplay.loadTexture(PackDisplay.java:167) + at render.rip.athena.client.modules.PackDisplay.onEnable(PackDisplay.java:185) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:115) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) at net.minecraft.client.Minecraft.run(Minecraft.java:412) @@ -34,12 +34,12 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at net.minecraft.client.resources.DefaultResourcePack.getPackImage(DefaultResourcePack.java:94) - at rip.athena.client.modules.impl.render.PackDisplay.loadTexture(PackDisplay.java:167) - at rip.athena.client.modules.impl.render.PackDisplay.onEnable(PackDisplay.java:185) + at render.rip.athena.client.modules.PackDisplay.loadTexture(PackDisplay.java:167) + at render.rip.athena.client.modules.PackDisplay.onEnable(PackDisplay.java:185) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:115) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) diff --git a/workspace/crash-reports/crash-2023-06-12_15.00.07-client.txt b/workspace/crash-reports/crash-2023-06-12_15.00.07-client.txt index 6e9a8680..a9370f70 100644 --- a/workspace/crash-reports/crash-2023-06-12_15.00.07-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_15.00.07-client.txt @@ -6,12 +6,12 @@ Description: Initializing game java.lang.ExceptionInInitializerError at net.minecraft.client.resources.DefaultResourcePack.getPackImage(DefaultResourcePack.java:94) - at rip.athena.client.modules.impl.render.PackDisplay.loadTexture(PackDisplay.java:167) - at rip.athena.client.modules.impl.render.PackDisplay.onEnable(PackDisplay.java:185) + at render.rip.athena.client.modules.PackDisplay.loadTexture(PackDisplay.java:167) + at render.rip.athena.client.modules.PackDisplay.onEnable(PackDisplay.java:185) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:115) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) at net.minecraft.client.Minecraft.run(Minecraft.java:412) @@ -34,12 +34,12 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at net.minecraft.client.resources.DefaultResourcePack.getPackImage(DefaultResourcePack.java:94) - at rip.athena.client.modules.impl.render.PackDisplay.loadTexture(PackDisplay.java:167) - at rip.athena.client.modules.impl.render.PackDisplay.onEnable(PackDisplay.java:185) + at render.rip.athena.client.modules.PackDisplay.loadTexture(PackDisplay.java:167) + at render.rip.athena.client.modules.PackDisplay.onEnable(PackDisplay.java:185) at rip.athena.client.modules.Module.setEnabled(Module.java:96) - at rip.athena.client.config.save.Config.load(Config.java:106) - at rip.athena.client.config.save.Config.load(Config.java:64) - at rip.athena.client.config.save.ConfigManager.postInit(ConfigManager.java:52) + at rip.athena.api.config.save.Config.load(Config.java:106) + at rip.athena.api.config.save.Config.load(Config.java:64) + at rip.athena.api.config.save.ConfigManager.postInit(ConfigManager.java:52) at rip.athena.client.Athena.initClient(Athena.java:115) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) diff --git a/workspace/crash-reports/crash-2023-06-12_15.09.00-client.txt b/workspace/crash-reports/crash-2023-06-12_15.09.00-client.txt index a954ded7..a7d1c6e8 100644 --- a/workspace/crash-reports/crash-2023-06-12_15.09.00-client.txt +++ b/workspace/crash-reports/crash-2023-06-12_15.09.00-client.txt @@ -9,7 +9,7 @@ java.lang.NullPointerException: Initializing game at rip.athena.client.utils.font.FontManager.get(FontManager.java:189) at rip.athena.client.utils.font.FontManager.get(FontManager.java:184) at rip.athena.client.utils.font.FontManager.getProductSansRegular(FontManager.java:168) - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:58) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:58) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) @@ -32,7 +32,7 @@ Stacktrace: at rip.athena.client.utils.font.FontManager.get(FontManager.java:189) at rip.athena.client.utils.font.FontManager.get(FontManager.java:184) at rip.athena.client.utils.font.FontManager.getProductSansRegular(FontManager.java:168) - at rip.athena.client.modules.impl.render.PackDisplay.(PackDisplay.java:58) + at render.rip.athena.client.modules.PackDisplay.(PackDisplay.java:58) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) diff --git a/workspace/crash-reports/crash-2023-06-13_16.36.59-client.txt b/workspace/crash-reports/crash-2023-06-13_16.36.59-client.txt index 7e79c9a6..84fc05bf 100644 --- a/workspace/crash-reports/crash-2023-06-13_16.36.59-client.txt +++ b/workspace/crash-reports/crash-2023-06-13_16.36.59-client.txt @@ -11,8 +11,8 @@ java.lang.RuntimeException: java.io.IOException: Server returned HTTP response c at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.minecraftLogin(MicrosoftAuthenticator.java:275) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithTokens(MicrosoftAuthenticator.java:213) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithRefreshToken(MicrosoftAuthenticator.java:184) - at rip.athena.client.account.AccountManager.login(AccountManager.java:114) - at rip.athena.client.account.AccountManager.(AccountManager.java:38) + at rip.athena.api.account.AccountManager.login(AccountManager.java:114) + at rip.athena.api.account.AccountManager.(AccountManager.java:38) at rip.athena.client.Athena.initClient(Athena.java:107) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) at net.minecraft.client.Minecraft.run(Minecraft.java:412) @@ -52,8 +52,8 @@ Stacktrace: at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.minecraftLogin(MicrosoftAuthenticator.java:275) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithTokens(MicrosoftAuthenticator.java:213) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithRefreshToken(MicrosoftAuthenticator.java:184) - at rip.athena.client.account.AccountManager.login(AccountManager.java:114) - at rip.athena.client.account.AccountManager.(AccountManager.java:38) + at rip.athena.api.account.AccountManager.login(AccountManager.java:114) + at rip.athena.api.account.AccountManager.(AccountManager.java:38) at rip.athena.client.Athena.initClient(Athena.java:107) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) diff --git a/workspace/crash-reports/crash-2023-06-16_22.21.29-client.txt b/workspace/crash-reports/crash-2023-06-16_22.21.29-client.txt index aa0262fc..82bb2851 100644 --- a/workspace/crash-reports/crash-2023-06-16_22.21.29-client.txt +++ b/workspace/crash-reports/crash-2023-06-16_22.21.29-client.txt @@ -10,7 +10,7 @@ java.lang.NullPointerException: Registering texture at net.minecraft.client.renderer.texture.TextureManager.loadTexture(TextureManager.java:83) at net.minecraft.client.renderer.texture.TextureManager.bindTexture(TextureManager.java:50) at rip.athena.client.utils.render.DrawUtils.drawImage(DrawUtils.java:188) - at rip.athena.client.gui.menu.AthenaMenu.drawScreen(AthenaMenu.java:296) + at rip.athena.client.ui.menu.AthenaMenu.drawScreen(AthenaMenu.java:296) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1153) at net.minecraft.client.Minecraft.run(Minecraft.java:432) @@ -34,11 +34,11 @@ Stacktrace: at net.minecraft.client.renderer.texture.TextureManager.loadTexture(TextureManager.java:83) at net.minecraft.client.renderer.texture.TextureManager.bindTexture(TextureManager.java:50) at rip.athena.client.utils.render.DrawUtils.drawImage(DrawUtils.java:188) - at rip.athena.client.gui.menu.AthenaMenu.drawScreen(AthenaMenu.java:296) + at rip.athena.client.ui.menu.AthenaMenu.drawScreen(AthenaMenu.java:296) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.AthenaMenu + Screen name: rip.athena.client.ui.menu.AthenaMenu Mouse location: Scaled: (465, 289). Absolute: (930, 430) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-16_22.43.39-client.txt b/workspace/crash-reports/crash-2023-06-16_22.43.39-client.txt index 52ec3bc5..06111998 100644 --- a/workspace/crash-reports/crash-2023-06-16_22.43.39-client.txt +++ b/workspace/crash-reports/crash-2023-06-16_22.43.39-client.txt @@ -9,7 +9,7 @@ java.lang.IllegalArgumentException: Color parameter outside of expected range: A at java.awt.Color.(Color.java:395) at net.minecraft.client.gui.GuiButton.drawButton(GuiButton.java:115) at net.minecraft.client.gui.GuiScreen.drawScreen(GuiScreen.java:94) - at rip.athena.client.gui.menu.AthenaMenu.drawScreen(AthenaMenu.java:325) + at rip.athena.client.ui.menu.AthenaMenu.drawScreen(AthenaMenu.java:325) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1153) at net.minecraft.client.Minecraft.run(Minecraft.java:432) @@ -26,11 +26,11 @@ Stacktrace: at java.awt.Color.(Color.java:395) at net.minecraft.client.gui.GuiButton.drawButton(GuiButton.java:115) at net.minecraft.client.gui.GuiScreen.drawScreen(GuiScreen.java:94) - at rip.athena.client.gui.menu.AthenaMenu.drawScreen(AthenaMenu.java:325) + at rip.athena.client.ui.menu.AthenaMenu.drawScreen(AthenaMenu.java:325) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.AthenaMenu + Screen name: rip.athena.client.ui.menu.AthenaMenu Mouse location: Scaled: (574, 186). Absolute: (1149, 637) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-20_20.19.15-client.txt b/workspace/crash-reports/crash-2023-06-20_20.19.15-client.txt index 873202a0..05874b5d 100644 --- a/workspace/crash-reports/crash-2023-06-20_20.19.15-client.txt +++ b/workspace/crash-reports/crash-2023-06-20_20.19.15-client.txt @@ -6,7 +6,7 @@ Description: Rendering screen java.lang.IllegalArgumentException: Invalid UUID string: 74e897386c9e4f5983efd365849e6049 at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:152) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:152) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1153) at net.minecraft.client.Minecraft.run(Minecraft.java:432) @@ -20,11 +20,11 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:152) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:152) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAccountManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAccountManager Mouse location: Scaled: (504, 275). Absolute: (1008, 458) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-20_20.21.28-client.txt b/workspace/crash-reports/crash-2023-06-20_20.21.28-client.txt index 515b1331..e3b8bc54 100644 --- a/workspace/crash-reports/crash-2023-06-20_20.21.28-client.txt +++ b/workspace/crash-reports/crash-2023-06-20_20.21.28-client.txt @@ -6,7 +6,7 @@ Description: Rendering screen java.lang.IllegalArgumentException: Invalid UUID string: 74e897386c9e4f5983efd365849e6049 at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:153) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:153) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1153) at net.minecraft.client.Minecraft.run(Minecraft.java:432) @@ -20,11 +20,11 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:153) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:153) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAccountManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAccountManager Mouse location: Scaled: (914, 17). Absolute: (1828, 1045) Screen size: Scaled: (960, 540). Absolute: (1920, 1080). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-20_20.27.04-client.txt b/workspace/crash-reports/crash-2023-06-20_20.27.04-client.txt index 33c990c4..e173ddf0 100644 --- a/workspace/crash-reports/crash-2023-06-20_20.27.04-client.txt +++ b/workspace/crash-reports/crash-2023-06-20_20.27.04-client.txt @@ -6,8 +6,8 @@ Description: Rendering screen java.lang.IllegalArgumentException: Invalid UUID string: 74e897386c9e4f5983efd365849e6049 at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.renderPlayerHead(GuiAccountManager.java:397) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:158) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.renderPlayerHead(GuiAccountManager.java:397) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:158) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1153) at net.minecraft.client.Minecraft.run(Minecraft.java:432) @@ -21,12 +21,12 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at java.util.UUID.fromString(UUID.java:194) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.renderPlayerHead(GuiAccountManager.java:397) - at rip.athena.client.gui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:158) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.renderPlayerHead(GuiAccountManager.java:397) + at rip.athena.client.ui.menu.altmanager.GuiAccountManager.drawScreen(GuiAccountManager.java:158) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.menu.altmanager.GuiAccountManager + Screen name: rip.athena.client.ui.menu.altmanager.GuiAccountManager Mouse location: Scaled: (923, 12). Absolute: (1847, 1055) Screen size: Scaled: (960, 540). Absolute: (1920, 1080). Scale factor of 2 Stacktrace: diff --git a/workspace/crash-reports/crash-2023-06-21_22.24.56-client.txt b/workspace/crash-reports/crash-2023-06-21_22.24.56-client.txt index 5dc4011f..b2990310 100644 --- a/workspace/crash-reports/crash-2023-06-21_22.24.56-client.txt +++ b/workspace/crash-reports/crash-2023-06-21_22.24.56-client.txt @@ -9,8 +9,8 @@ java.lang.RuntimeException: java.io.IOException: Server returned HTTP response c at fr.litarvan.openauth.microsoft.HttpClient.readJson(HttpClient.java:93) at fr.litarvan.openauth.microsoft.HttpClient.postFormGetJson(HttpClient.java:70) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithRefreshToken(MicrosoftAuthenticator.java:185) - at rip.athena.client.account.AccountManager.login(AccountManager.java:114) - at rip.athena.client.account.AccountManager.(AccountManager.java:38) + at rip.athena.api.account.AccountManager.login(AccountManager.java:114) + at rip.athena.api.account.AccountManager.(AccountManager.java:38) at rip.athena.client.Athena.initClient(Athena.java:97) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) at net.minecraft.client.Minecraft.run(Minecraft.java:412) @@ -48,8 +48,8 @@ Stacktrace: at fr.litarvan.openauth.microsoft.HttpClient.readJson(HttpClient.java:93) at fr.litarvan.openauth.microsoft.HttpClient.postFormGetJson(HttpClient.java:70) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithRefreshToken(MicrosoftAuthenticator.java:185) - at rip.athena.client.account.AccountManager.login(AccountManager.java:114) - at rip.athena.client.account.AccountManager.(AccountManager.java:38) + at rip.athena.api.account.AccountManager.login(AccountManager.java:114) + at rip.athena.api.account.AccountManager.(AccountManager.java:38) at rip.athena.client.Athena.initClient(Athena.java:97) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) diff --git a/workspace/crash-reports/crash-2023-06-22_15.17.15-client.txt b/workspace/crash-reports/crash-2023-06-22_15.17.15-client.txt index 0029046c..9f2d37a0 100644 --- a/workspace/crash-reports/crash-2023-06-22_15.17.15-client.txt +++ b/workspace/crash-reports/crash-2023-06-22_15.17.15-client.txt @@ -6,11 +6,11 @@ Description: Rendering screen java.lang.NullPointerException: Rendering screen at rip.athena.client.utils.render.RoundedUtils.drawGradientRound(RoundedUtils.java:66) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:67) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:156) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:67) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:156) at net.minecraft.client.renderer.EntityRenderer.func_181560_a(EntityRenderer.java:1442) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1153) at net.minecraft.client.Minecraft.run(Minecraft.java:432) @@ -24,15 +24,15 @@ A detailed walkthrough of the error, its code path and all known details is as f -- Head -- Stacktrace: at rip.athena.client.utils.render.RoundedUtils.drawGradientRound(RoundedUtils.java:66) - at rip.athena.client.gui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:67) - at rip.athena.client.gui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) - at rip.athena.client.gui.framework.Menu.onRender(Menu.java:88) - at rip.athena.client.gui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) - at rip.athena.client.gui.clickgui.IngameMenu.drawScreen(IngameMenu.java:156) + at rip.athena.client.ui.clickgui.components.themes.accent.SimpleGradientButton.onRender(SimpleGradientButton.java:67) + at rip.athena.client.ui.clickgui.components.mods.ModScrollPane.onRender(ModScrollPane.java:196) + at rip.athena.client.ui.framework.Menu.onRender(Menu.java:88) + at rip.athena.client.ui.framework.MinecraftMenuImpl.drawScreen(MinecraftMenuImpl.java:56) + at rip.athena.client.ui.clickgui.IngameMenu.drawScreen(IngameMenu.java:156) -- Screen render details -- Details: - Screen name: rip.athena.client.gui.clickgui.IngameMenu + Screen name: rip.athena.client.ui.clickgui.IngameMenu Mouse location: Scaled: (317, 313). Absolute: (634, 383) Screen size: Scaled: (960, 505). Absolute: (1920, 1009). Scale factor of 2 diff --git a/workspace/crash-reports/crash-2023-06-25_15.55.45-client.txt b/workspace/crash-reports/crash-2023-06-25_15.55.45-client.txt index 2abce4b4..ec770ddc 100644 --- a/workspace/crash-reports/crash-2023-06-25_15.55.45-client.txt +++ b/workspace/crash-reports/crash-2023-06-25_15.55.45-client.txt @@ -11,8 +11,8 @@ java.lang.RuntimeException: java.io.IOException: Server returned HTTP response c at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.xboxLiveLogin(MicrosoftAuthenticator.java:251) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithTokens(MicrosoftAuthenticator.java:205) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithRefreshToken(MicrosoftAuthenticator.java:190) - at rip.athena.client.account.AccountManager.login(AccountManager.java:114) - at rip.athena.client.account.AccountManager.(AccountManager.java:38) + at rip.athena.api.account.AccountManager.login(AccountManager.java:114) + at rip.athena.api.account.AccountManager.(AccountManager.java:38) at rip.athena.client.Athena.initClient(Athena.java:90) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) at net.minecraft.client.Minecraft.run(Minecraft.java:412) @@ -52,8 +52,8 @@ Stacktrace: at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.xboxLiveLogin(MicrosoftAuthenticator.java:251) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithTokens(MicrosoftAuthenticator.java:205) at fr.litarvan.openauth.microsoft.MicrosoftAuthenticator.loginWithRefreshToken(MicrosoftAuthenticator.java:190) - at rip.athena.client.account.AccountManager.login(AccountManager.java:114) - at rip.athena.client.account.AccountManager.(AccountManager.java:38) + at rip.athena.api.account.AccountManager.login(AccountManager.java:114) + at rip.athena.api.account.AccountManager.(AccountManager.java:38) at rip.athena.client.Athena.initClient(Athena.java:90) at net.minecraft.client.Minecraft.startGame(Minecraft.java:491) diff --git a/workspace/hs_err_pid17464.log b/workspace/hs_err_pid17464.log index 6a2e6440..8ba87750 100644 --- a/workspace/hs_err_pid17464.log +++ b/workspace/hs_err_pid17464.log @@ -78,7 +78,7 @@ V [jvm.dll+0x4fa1b0] Current CompileTask: -C2: 119391 10329 4 rip.athena.client.modules.impl.render.ArmorStatus::render (2372 bytes) +C2: 119391 10329 4 render.rip.athena.client.modules.ArmorStatus::render (2372 bytes) --------------- P R O C E S S --------------- @@ -151,15 +151,15 @@ CodeCache: size=245760Kb used=32421Kb max_used=32431Kb free=213338Kb Compilation events (10 events): Event: 118.020 Thread 0x000000001dbbc000 nmethod 10324 0x00000000042afc10 code [0x00000000042afe60, 0x00000000042b1010] -Event: 118.348 Thread 0x000000001dbbd800 10325 3 rip.athena.client.gui.framework.components.MenuScrollPane::passesThrough (169 bytes) +Event: 118.348 Thread 0x000000001dbbd800 10325 3 rip.athena.client.ui.framework.components.MenuScrollPane::passesThrough (169 bytes) Event: 118.348 Thread 0x000000001dbbd800 nmethod 10325 0x0000000004051f90 code [0x0000000004052180, 0x0000000004052eb8] -Event: 118.959 Thread 0x000000001dbbc800 10326 4 rip.athena.client.gui.framework.components.MenuScrollPane::passesThrough (169 bytes) +Event: 118.959 Thread 0x000000001dbbc800 10326 4 rip.athena.client.ui.framework.components.MenuScrollPane::passesThrough (169 bytes) Event: 118.962 Thread 0x000000001dbbc800 nmethod 10326 0x0000000003bd4810 code [0x0000000003bd4980, 0x0000000003bd4f98] Event: 118.998 Thread 0x000000001dbba800 10327 4 net.minecraft.entity.Entity::moveFlying (119 bytes) Event: 118.998 Thread 0x000000001dbbc000 10328 4 net.minecraft.entity.EntityLivingBase::updateFallState (174 bytes) Event: 118.999 Thread 0x000000001dbba800 nmethod 10327 0x000000000404fd10 code [0x000000000404fea0, 0x0000000004050068] Event: 118.999 Thread 0x000000001dbbc000 nmethod 10328 0x0000000004050d90 code [0x0000000004050f20, 0x0000000004051168] -Event: 119.221 Thread 0x000000001dbbc800 10329 4 rip.athena.client.modules.impl.render.ArmorStatus::render (2372 bytes) +Event: 119.221 Thread 0x000000001dbbc800 10329 4 render.rip.athena.client.modules.ArmorStatus::render (2372 bytes) GC Heap History (10 events): Event: 95.372 GC heap before @@ -273,12 +273,12 @@ Event: 109.069 Thread 0x0000000030078800 Uncommon trap: reason=class_check actio Event: 109.081 Thread 0x0000000030078800 Uncommon trap: reason=predicate action=maybe_recompile pc=0x0000000003b62264 method=net.minecraft.entity.EntityLiving.isEntityInsideOpaqueBlock()Z @ 28 Event: 109.081 Thread 0x0000000030078800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000477bcd8 method=net.minecraft.entity.EntityLivingBase.updatePotionEffects()V @ 118 Event: 109.081 Thread 0x0000000030078800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x0000000003c43948 method=net.minecraft.entity.EntityTracker.updateTrackedEntities()V @ 55 -Event: 111.709 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000002cd45a8 method=rip.athena.client.gui.framework.components.MenuLabel.onPreSort()V @ 41 -Event: 113.917 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003db672c method=rip.athena.client.modules.impl.render.ArmorStatus.render()V @ 464 +Event: 111.709 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000002cd45a8 method=rip.athena.client.ui.framework.components.MenuLabel.onPreSort()V @ 41 +Event: 113.917 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003db672c method=render.rip.athena.client.modules.ArmorStatus.render()V @ 464 Event: 115.151 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003d2426c method=net.minecraft.client.renderer.EntityRenderer.updateFogColor(F)V @ 191 -Event: 117.116 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003ebd3e4 method=rip.athena.client.modules.impl.render.ArmorStatus.render()V @ 9 +Event: 117.116 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003ebd3e4 method=render.rip.athena.client.modules.ArmorStatus.render()V @ 9 Event: 117.116 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003bc51e4 method=net.minecraft.client.renderer.entity.RenderItem.renderItemOverlayIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V @ 14 -Event: 118.316 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003a3bf90 method=rip.athena.client.gui.framework.components.MenuScrollPane.passesThrough()Z @ 62 +Event: 118.316 Thread 0x00000000026f4800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003a3bf90 method=rip.athena.client.ui.framework.components.MenuScrollPane.passesThrough()Z @ 62 Classes redefined (0 events): No events diff --git a/workspace/hs_err_pid19364.log b/workspace/hs_err_pid19364.log index 9ff18460..f5f1c9d8 100644 --- a/workspace/hs_err_pid19364.log +++ b/workspace/hs_err_pid19364.log @@ -283,16 +283,16 @@ Event: 248.754 Thread 0x000000003ce0f000 Uncommon trap: reason=class_check actio Event: 248.948 Thread 0x000000003ce16000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00000000055b5214 method=java.util.Collections.reverse(Ljava/util/List;)V @ 1 Classes redefined (10 events): -Event: 39.696 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu, count=1 -Event: 39.725 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu$1, count=1 -Event: 78.487 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu, count=2 -Event: 78.514 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu$1, count=2 -Event: 101.620 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu, count=3 -Event: 101.647 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu$1, count=3 -Event: 120.030 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu, count=4 -Event: 120.056 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu$1, count=4 -Event: 151.786 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu, count=5 -Event: 151.810 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.gui.clickgui.IngameMenu$1, count=5 +Event: 39.696 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu, count=1 +Event: 39.725 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu$1, count=1 +Event: 78.487 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu, count=2 +Event: 78.514 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu$1, count=2 +Event: 101.620 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu, count=3 +Event: 101.647 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu$1, count=3 +Event: 120.030 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu, count=4 +Event: 120.056 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu$1, count=4 +Event: 151.786 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu, count=5 +Event: 151.810 Thread 0x000000001f0e6000 redefined class name=rip.athena.client.ui.clickgui.IngameMenu$1, count=5 Internal exceptions (10 events): Event: 248.242 Thread 0x0000000027841800 Exception (0x00000007841eb310) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336] diff --git a/workspace/hs_err_pid7380.log b/workspace/hs_err_pid7380.log index a58d241b..8ef7249f 100644 --- a/workspace/hs_err_pid7380.log +++ b/workspace/hs_err_pid7380.log @@ -285,10 +285,10 @@ Event: 519.415 Thread 0x0000000028c3b800 Uncommon trap: reason=class_check actio Classes redefined (5 events): Event: 0.078 Thread 0x000000001f596000 redefined class name=java.io.FileOutputStream, count=1 -Event: 47.212 Thread 0x000000001f596000 redefined class name=rip.athena.client.gui.clickgui.components.mods.ModuleBox, count=1 -Event: 66.468 Thread 0x000000001f596000 redefined class name=rip.athena.client.gui.clickgui.components.mods.ModuleBox, count=2 -Event: 114.818 Thread 0x000000001f596000 redefined class name=rip.athena.client.gui.clickgui.components.mods.ModuleBox, count=3 -Event: 128.836 Thread 0x000000001f596000 redefined class name=rip.athena.client.gui.clickgui.components.mods.ModuleBox, count=4 +Event: 47.212 Thread 0x000000001f596000 redefined class name=rip.athena.client.ui.clickgui.components.mods.ModuleBox, count=1 +Event: 66.468 Thread 0x000000001f596000 redefined class name=rip.athena.client.ui.clickgui.components.mods.ModuleBox, count=2 +Event: 114.818 Thread 0x000000001f596000 redefined class name=rip.athena.client.ui.clickgui.components.mods.ModuleBox, count=3 +Event: 128.836 Thread 0x000000001f596000 redefined class name=rip.athena.client.ui.clickgui.components.mods.ModuleBox, count=4 Internal exceptions (10 events): Event: 519.201 Thread 0x000000002803e800 Exception (0x00000007706fca30) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336] diff --git a/workspace/logs/latest.log b/workspace/logs/latest.log index feab7f77..7fb0c6c5 100644 --- a/workspace/logs/latest.log +++ b/workspace/logs/latest.log @@ -1,192 +1,208 @@ -[22:35:28] [Client thread/INFO]: Setting user: Player152 -[22:35:28] [Client thread/INFO]: (Session ID is token:0:Player152) -[22:35:28] [Client thread/INFO]: [OptiFine] *** Reflector Forge *** -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.Attributes -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: mods.betterfoliage.client.BetterFoliageClient -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.asm.transformers.BlamingTransformer -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.ChunkWatchEvent$UnWatch -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.relauncher.CoreModManager -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.DimensionManager -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Pre -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Post -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$CameraSetup -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$FogColors -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.EventBus -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event$Result -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.ExtendedBlockState -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.FMLClientHandler -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.FMLCommonHandler -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.biome.BiomeGenBase.getWaterColorMultiplier -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addDestroyEffects -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addHitEffects -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canCreatureSpawn -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canRenderInLayer -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.doesSideBlockRendering -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getBedDirection -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getExtendedState -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.hasTileEntity -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isAir -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBed -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBedFoot -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isSideSolid -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.canRiderInteract -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.captureDrops -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.capturedDrops -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRenderInPass -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRiderSit -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.ForgeEventFactory -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeHooks -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ForgeHooksClient -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getDurabilityForDisplay -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getModel -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.onEntitySwing -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.shouldCauseReequipAnimation -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.showDurabilityBar -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.ItemRecord.getRecordResource -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeModContainer -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.potion.PotionEffect.isCurativeItem -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.canRenderBreaking -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.getRenderBoundingBox -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.hasFastRenderer -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.shouldRenderInPass -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.preDrawBatch -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.drawBatch -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.preDraw -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.postDraw -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.countEntities -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.getPerWorldStorage -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getCloudRenderer -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getSkyRenderer -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getWeatherRenderer -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.GuiModList -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.IColoredBakedQuad -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.IExtendedBlockState -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.IRenderHandler -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ISmartBlockModel -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ItemModelMesherForge -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraft.launchwrapper.Launch -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.pipeline.LightUtil -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.MinecraftForge -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.MinecraftForgeClient -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ModelLoader -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderBlockOverlayEvent$OverlayType -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.registry.RenderingRegistry -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderItemInFrameEvent -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Pre -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Post -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Pre -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Post -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.SplashProgress -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.WorldEvent$Load -[22:35:28] [Client thread/INFO]: [OptiFine] *** Reflector Vanilla *** -[22:35:28] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: optifine.OptiFineClassTransformer -[22:35:29] [Client thread/ERROR]: [Athena] Failed to load resource outside namespace (C:\Users\remgab001\Desktop\Athena-Client\workspace\.\assets\minecraft\Athena\gui\settings.png).javax.imageio.IIOException: Can't read input file! -[22:35:29] [Client thread/ERROR]: [Athena] Failed to load config default, improper json.org.json.JSONException: Expected a ':' after a key at 4820 [character 1 line 184] -[22:35:29] [Client thread/INFO]: LWJGL Version: 2.9.4 -[22:35:29] [Client thread/INFO]: [OptiFine] -[22:35:29] [Client thread/INFO]: [OptiFine] OptiFine_1.8.8_HD_U_H8 -[22:35:29] [Client thread/INFO]: [OptiFine] Build: null -[22:35:29] [Client thread/INFO]: [OptiFine] OS: Windows 10 (amd64) version 10.0 -[22:35:29] [Client thread/INFO]: [OptiFine] Java: 1.8.0_202, Oracle Corporation -[22:35:29] [Client thread/INFO]: [OptiFine] VM: Java HotSpot(TM) 64-Bit Server VM (mixed mode), Oracle Corporation -[22:35:29] [Client thread/INFO]: [OptiFine] LWJGL: 2.9.4 -[22:35:29] [Client thread/INFO]: [OptiFine] OpenGL: Intel(R) Iris(R) Xe Graphics, version 4.6.0 - Build 31.0.101.4255, Intel -[22:35:29] [Client thread/INFO]: [OptiFine] OpenGL Version: 4.6.0 -[22:35:29] [Client thread/INFO]: [OptiFine] OpenGL Fancy fog: Not available (GL_NV_fog_distance) -[22:35:29] [Client thread/INFO]: [OptiFine] Maximum texture size: 16384x16384 -[22:35:29] [Thread-7/INFO]: [OptiFine] Checking for new version -[22:35:29] [Client thread/INFO]: [Shaders] ShadersMod version: 2.4.12 -[22:35:29] [Client thread/INFO]: [Shaders] OpenGL Version: 4.6.0 - Build 31.0.101.4255 -[22:35:29] [Client thread/INFO]: [Shaders] Vendor: Intel -[22:35:29] [Client thread/INFO]: [Shaders] Renderer: Intel(R) Iris(R) Xe Graphics -[22:35:29] [Client thread/INFO]: [Shaders] Capabilities: 2.0 2.1 3.0 3.2 4.0 -[22:35:29] [Client thread/INFO]: [Shaders] GL_MAX_DRAW_BUFFERS: 8 -[22:35:29] [Client thread/INFO]: [Shaders] GL_MAX_COLOR_ATTACHMENTS_EXT: 8 -[22:35:29] [Client thread/INFO]: [Shaders] GL_MAX_TEXTURE_IMAGE_UNITS: 32 -[22:35:29] [Client thread/INFO]: [Shaders] Load ShadersMod configuration. -[22:35:29] [Client thread/INFO]: [Shaders] Shaders can not be loaded, Fast Render is enabled. -[22:35:29] [Client thread/INFO]: [Shaders] No shaderpack loaded. -[22:35:30] [Client thread/INFO]: Reloading ResourceManager: Default, ! §bPotfast 5kay.zip -[22:35:30] [Client thread/INFO]: [OptiFine] *** Reloading textures *** -[22:35:30] [Client thread/INFO]: [OptiFine] Resource packs: ! §bPotfast 5kay.zip -[22:35:30] [Sound Library Loader/INFO]: Starting up SoundSystem... -[22:35:30] [Thread-8/INFO]: Initializing LWJGL OpenAL -[22:35:30] [Thread-8/INFO]: (The LWJGL binding of OpenAL. For more information, see http://www.lwjgl.org) -[22:35:32] [Thread-8/INFO]: OpenAL initialized. -[22:35:32] [Sound Library Loader/INFO]: Sound engine started -[22:35:32] [Client thread/INFO]: [OptiFine] Sprite size: 32 -[22:35:32] [Client thread/INFO]: [OptiFine] Mipmap levels: 5 -[22:35:32] [Client thread/INFO]: [OptiFine] Multitexture: false -[22:35:33] [Client thread/INFO]: Created: 2048x2048 textures-atlas -[22:35:34] [Client thread/INFO]: [OptiFine] *** Reloading custom textures *** -[22:35:34] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky1.properties -[22:35:34] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky2.properties -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky3.properties -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_sunflare2.png -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky4.properties -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_sunflare1.png -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky5.properties -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_sunflare3.png -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky6.properties -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_sunflare.png -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky7.properties -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_box.png -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky8.properties -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_clouds.png -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky9.properties -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/night_skybox.png -[22:35:35] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky10.properties -[22:35:35] [Client thread/INFO]: [OptiFine] Enable face culling: acacia_leaves, birch_leaves, dark_oak_leaves, jungle_leaves, oak_leaves, spruce_leaves -[22:35:39] [Thread-7/INFO]: [OptiFine] Version found: I7 -[22:35:54] [Server thread/INFO]: Starting integrated minecraft server version 1.8.8 -[22:35:54] [Server thread/INFO]: Generating keypair -[22:35:54] [Server thread/INFO]: Preparing start region for level 0 -[22:35:54] [Server thread/INFO]: Changing view distance to 8, from 10 -[22:35:55] [Server thread/INFO]: ziue[local:E:9c0867d9] logged in with entity id 113 at (717.1791248218557, 70.0, 736.0967719731797) -[22:35:55] [Server thread/INFO]: ziue joined the game -[22:35:56] [Client thread/INFO]: [CHAT] A new §eOptiFine§f version is available: §eHD Ultra I7§f -[22:35:57] [Server thread/INFO]: t -[22:35:57] [Client thread/INFO]: [CHAT] t -[22:36:09] [Server thread/INFO]: ziue has just earned the achievement [Taking Inventory] -[22:36:09] [Client thread/INFO]: [CHAT] ziue has just earned the achievement [Taking Inventory] -[22:36:09] [Server thread/INFO]: Saving and pausing game... -[22:36:09] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld -[22:36:09] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether -[22:36:09] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End -[22:36:10] [Server thread/INFO]: Stopping server -[22:36:10] [Server thread/INFO]: Saving players -[22:36:10] [Server thread/INFO]: Saving worlds -[22:36:10] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld -[22:36:10] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether -[22:36:10] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End -[22:36:22] [Thread-17/INFO]: [Athena] remig06@hotmail.comRg/9173.microsoft -[22:36:41] [Thread-17/INFO]: [Athena] Success: Logged into ziue -[22:36:48] [Client thread/INFO]: Connecting to eu.minemen.club, 25565 -[22:36:50] [Client thread/INFO]: Connecting to eu.minemen.club, 25565 -[22:36:52] [Client thread/INFO]: [CHAT] -[22:36:52] [Client thread/INFO]: [CHAT] Minemen Club -[22:36:52] [Client thread/INFO]: [CHAT] ● Website: minemen.club -[22:36:52] [Client thread/INFO]: [CHAT] ● Store: store.minemen.club -[22:36:52] [Client thread/INFO]: [CHAT] ● Discord: minemen.club/discord -[22:36:52] [Client thread/INFO]: [CHAT] ● Twitter: twitter.com/Minemen_Network -[22:36:52] [Client thread/INFO]: [CHAT] ● Rules: minemen.club/rules -[22:36:52] [Client thread/INFO]: [CHAT] -[22:36:55] [Client thread/INFO]: [CHAT] Club » ziue joined. -[22:36:56] [Client thread/INFO]: [CHAT] [✷] ziue has joined the lobby! -[22:37:34] [Client thread/INFO]: [CHAT] -[22:37:37] [Client thread/INFO]: [CHAT] The server you were on is now down for: -[22:37:37] [Client thread/INFO]: [CHAT] Timed out -[22:37:38] [Client thread/INFO]: [CHAT] -[22:37:38] [Client thread/INFO]: [CHAT] Minemen Club -[22:37:38] [Client thread/INFO]: [CHAT] ● Website: minemen.club -[22:37:38] [Client thread/INFO]: [CHAT] ● Store: store.minemen.club -[22:37:38] [Client thread/INFO]: [CHAT] ● Discord: minemen.club/discord -[22:37:38] [Client thread/INFO]: [CHAT] ● Twitter: twitter.com/Minemen_Network -[22:37:38] [Client thread/INFO]: [CHAT] ● Rules: minemen.club/rules -[22:37:38] [Client thread/INFO]: [CHAT] -[22:37:46] [Client thread/INFO]: [CHAT] [✷] ziue has joined the lobby! -[22:38:22] [Client thread/INFO]: Stopping! -[22:38:22] [Client thread/INFO]: [Athena] Shutting down client -[22:38:22] [Client thread/INFO]: SoundSystem shutting down... -[22:38:22] [Client thread/WARN]: Author: Paul Lamb, www.paulscode.com +[19:04:00] [Client thread/INFO]: Setting user: Player178 +[19:04:00] [Client thread/INFO]: (Session ID is token:0:Player178) +[19:04:01] [Client thread/INFO]: [OptiFine] *** Reflector Forge *** +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.Attributes +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: mods.betterfoliage.client.BetterFoliageClient +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.asm.transformers.BlamingTransformer +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.ChunkWatchEvent$UnWatch +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.relauncher.CoreModManager +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.DimensionManager +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Pre +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Post +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$CameraSetup +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$FogColors +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.EventBus +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event$Result +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.ExtendedBlockState +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.FMLClientHandler +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.FMLCommonHandler +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.biome.BiomeGenBase.getWaterColorMultiplier +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addDestroyEffects +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addHitEffects +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canCreatureSpawn +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canRenderInLayer +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.doesSideBlockRendering +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getBedDirection +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getExtendedState +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.hasTileEntity +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isAir +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBed +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBedFoot +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isSideSolid +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.canRiderInteract +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.captureDrops +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.capturedDrops +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRenderInPass +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRiderSit +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.ForgeEventFactory +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeHooks +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ForgeHooksClient +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getDurabilityForDisplay +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getModel +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.onEntitySwing +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.shouldCauseReequipAnimation +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.showDurabilityBar +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.ItemRecord.getRecordResource +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeModContainer +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.potion.PotionEffect.isCurativeItem +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.canRenderBreaking +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.getRenderBoundingBox +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.hasFastRenderer +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.shouldRenderInPass +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.preDrawBatch +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.drawBatch +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.preDraw +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.postDraw +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.countEntities +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.getPerWorldStorage +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getCloudRenderer +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getSkyRenderer +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getWeatherRenderer +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.GuiModList +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.IColoredBakedQuad +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.IExtendedBlockState +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.IRenderHandler +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ISmartBlockModel +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ItemModelMesherForge +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraft.launchwrapper.Launch +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.pipeline.LightUtil +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.MinecraftForge +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.MinecraftForgeClient +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ModelLoader +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderBlockOverlayEvent$OverlayType +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.registry.RenderingRegistry +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderItemInFrameEvent +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Pre +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Post +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Pre +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Post +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.SplashProgress +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.WorldEvent$Load +[19:04:01] [Client thread/INFO]: [OptiFine] *** Reflector Vanilla *** +[19:04:01] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: optifine.OptiFineClassTransformer +[19:04:04] [Client thread/ERROR]: [Athena] Failed to load resource outside namespace (C:\Users\remgab001\Desktop\Athena-Client\workspace\.\assets\minecraft\Athena\gui\settings.png).javax.imageio.IIOException: Can't read input file! +[19:04:04] [Client thread/WARN]: [Athena] Tried accessing non-existing module: theme +[19:04:04] [Client thread/WARN]: [Athena] Loaded config default with left over setting theme which is no longer used. +[19:04:04] [Client thread/WARN]: [Athena] Tried accessing non-existing module: cape +[19:04:04] [Client thread/WARN]: [Athena] Loaded config default with left over setting cape which is no longer used. +[19:04:04] [Client thread/INFO]: [Athena] rip.athena.client.cosmetics.cape.Cape@f36f34dMinecon 2012Minecon 2012 +[19:04:04] [Client thread/INFO]: LWJGL Version: 2.9.4 +[19:04:04] [Client thread/INFO]: [OptiFine] +[19:04:04] [Client thread/INFO]: [OptiFine] OptiFine_1.8.8_HD_U_H8 +[19:04:04] [Client thread/INFO]: [OptiFine] Build: null +[19:04:04] [Client thread/INFO]: [OptiFine] OS: Windows 10 (amd64) version 10.0 +[19:04:04] [Client thread/INFO]: [OptiFine] Java: 1.8.0_202, Oracle Corporation +[19:04:04] [Client thread/INFO]: [OptiFine] VM: Java HotSpot(TM) 64-Bit Server VM (mixed mode), Oracle Corporation +[19:04:04] [Client thread/INFO]: [OptiFine] LWJGL: 2.9.4 +[19:04:04] [Client thread/INFO]: [OptiFine] OpenGL: Intel(R) Iris(R) Xe Graphics, version 4.6.0 - Build 31.0.101.4255, Intel +[19:04:04] [Client thread/INFO]: [OptiFine] OpenGL Version: 4.6.0 +[19:04:04] [Client thread/INFO]: [OptiFine] OpenGL Fancy fog: Not available (GL_NV_fog_distance) +[19:04:04] [Client thread/INFO]: [OptiFine] Maximum texture size: 16384x16384 +[19:04:04] [Thread-7/INFO]: [OptiFine] Checking for new version +[19:04:04] [Client thread/INFO]: [Shaders] ShadersMod version: 2.4.12 +[19:04:04] [Client thread/INFO]: [Shaders] OpenGL Version: 4.6.0 - Build 31.0.101.4255 +[19:04:04] [Client thread/INFO]: [Shaders] Vendor: Intel +[19:04:04] [Client thread/INFO]: [Shaders] Renderer: Intel(R) Iris(R) Xe Graphics +[19:04:04] [Client thread/INFO]: [Shaders] Capabilities: 2.0 2.1 3.0 3.2 4.0 +[19:04:04] [Client thread/INFO]: [Shaders] GL_MAX_DRAW_BUFFERS: 8 +[19:04:04] [Client thread/INFO]: [Shaders] GL_MAX_COLOR_ATTACHMENTS_EXT: 8 +[19:04:04] [Client thread/INFO]: [Shaders] GL_MAX_TEXTURE_IMAGE_UNITS: 32 +[19:04:04] [Client thread/INFO]: [Shaders] Load ShadersMod configuration. +[19:04:04] [Client thread/INFO]: [Shaders] Shaders can not be loaded, Fast Render is enabled. +[19:04:04] [Client thread/INFO]: [Shaders] No shaderpack loaded. +[19:04:05] [Client thread/INFO]: Reloading ResourceManager: Default, ! §bPotfast 5kay.zip +[19:04:05] [Client thread/INFO]: [OptiFine] *** Reloading textures *** +[19:04:05] [Client thread/INFO]: [OptiFine] Resource packs: ! §bPotfast 5kay.zip +[19:04:05] [Sound Library Loader/INFO]: Starting up SoundSystem... +[19:04:05] [Thread-7/INFO]: [OptiFine] Version found: I7 +[19:04:05] [Thread-8/INFO]: Initializing LWJGL OpenAL +[19:04:05] [Thread-8/INFO]: (The LWJGL binding of OpenAL. For more information, see http://www.lwjgl.org) +[19:04:05] [Thread-8/INFO]: OpenAL initialized. +[19:04:05] [Sound Library Loader/INFO]: Sound engine started +[19:04:05] [Client thread/INFO]: [OptiFine] Sprite size: 32 +[19:04:05] [Client thread/INFO]: [OptiFine] Mipmap levels: 5 +[19:04:06] [Client thread/INFO]: [OptiFine] Multitexture: false +[19:04:06] [Client thread/INFO]: Created: 2048x2048 textures-atlas +[19:04:06] [Client thread/INFO]: [OptiFine] *** Reloading custom textures *** +[19:04:06] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky1.properties +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky2.properties +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky3.properties +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_sunflare2.png +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky4.properties +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_sunflare1.png +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky5.properties +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_sunflare3.png +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky6.properties +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_sunflare.png +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky7.properties +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_box.png +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky8.properties +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/sky_clouds.png +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky9.properties +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky: Texture not found: minecraft:terrain/sky0/night_skybox.png +[19:04:07] [Client thread/INFO]: [OptiFine] CustomSky properties: mcpatcher/sky/world0/sky10.properties +[19:04:07] [Client thread/INFO]: [OptiFine] Enable face culling: acacia_leaves, birch_leaves, dark_oak_leaves, jungle_leaves, oak_leaves, spruce_leaves +[19:12:39] [Server thread/INFO]: Starting integrated minecraft server version 1.8.8 +[19:12:39] [Server thread/INFO]: Generating keypair +[19:12:39] [Server thread/INFO]: Preparing start region for level 0 +[19:12:39] [Server thread/INFO]: Changing view distance to 8, from 10 +[19:12:40] [Server thread/INFO]: ziue[local:E:ff8799a8] logged in with entity id 113 at (725.9586763574575, 67.0, 640.8876713814226) +[19:12:40] [Server thread/INFO]: ziue joined the game +[19:12:40] [Client thread/INFO]: [CHAT] A new §eOptiFine§f version is available: §eHD Ultra I7§f +[19:12:40] [Server thread/INFO]: Saving and pausing game... +[19:12:40] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:12:40] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:12:40] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:12:56] [Server thread/INFO]: Saving and pausing game... +[19:12:56] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:12:56] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:12:56] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:12:58] [Server thread/INFO]: Saving and pausing game... +[19:12:58] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:12:58] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:12:58] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:20:03] [Server thread/INFO]: [ziue: Set the time to 1000] +[19:20:03] [Client thread/INFO]: [CHAT] Set the time to 1000 +[19:20:06] [Server thread/INFO]: Saving and pausing game... +[19:20:06] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:20:06] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:20:06] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:20:07] [Server thread/INFO]: Saving and pausing game... +[19:20:07] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:20:07] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:20:07] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:20:08] [Server thread/INFO]: Saving and pausing game... +[19:20:08] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:20:08] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:20:08] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:20:09] [Server thread/INFO]: Saving and pausing game... +[19:20:09] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:20:09] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:20:09] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:20:13] [Server thread/INFO]: Saving and pausing game... +[19:20:13] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:20:13] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:20:13] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:20:20] [Server thread/INFO]: Saving and pausing game... +[19:20:20] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:20:20] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:20:20] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:20:22] [Server thread/INFO]: Stopping server +[19:20:22] [Server thread/INFO]: Saving players +[19:20:22] [Server thread/INFO]: Saving worlds +[19:20:22] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:20:22] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:20:22] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:27:12] [Server thread/INFO]: Starting integrated minecraft server version 1.8.8 +[19:27:12] [Server thread/INFO]: Generating keypair +[19:27:12] [Server thread/INFO]: Preparing start region for level 0 +[19:27:12] [Server thread/INFO]: Changing view distance to 8, from 10 +[19:27:12] [Server thread/INFO]: ziue[local:E:ea284e68] logged in with entity id 5379 at (758.2747767492808, 64.0, 703.4978291295193) +[19:27:12] [Server thread/INFO]: ziue joined the game +[19:27:14] [Server thread/INFO]: Saving and pausing game... +[19:27:14] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Overworld +[19:27:14] [Server thread/INFO]: Saving chunks for level 'mcpworld'/Nether +[19:27:14] [Server thread/INFO]: Saving chunks for level 'mcpworld'/The End +[19:33:33] [Client Shutdown Thread/INFO]: Stopping server +[19:33:33] [Client Shutdown Thread/INFO]: Saving players diff --git a/workspace/options.txt b/workspace/options.txt index 96394339..69c0e871 100644 --- a/workspace/options.txt +++ b/workspace/options.txt @@ -10,7 +10,7 @@ bobView:true anaglyph3d:false maxFps:260 fboEnable:true -difficulty:1 +difficulty:2 fancyGraphics:false ao:0 renderClouds:false diff --git a/workspace/saves/MCP Development World/data/villages.dat b/workspace/saves/MCP Development World/data/villages.dat index ca237dc8..bc57b6c1 100644 Binary files a/workspace/saves/MCP Development World/data/villages.dat and b/workspace/saves/MCP Development World/data/villages.dat differ diff --git a/workspace/saves/MCP Development World/data/villages_end.dat b/workspace/saves/MCP Development World/data/villages_end.dat index ca237dc8..bc57b6c1 100644 Binary files a/workspace/saves/MCP Development World/data/villages_end.dat and b/workspace/saves/MCP Development World/data/villages_end.dat differ diff --git a/workspace/saves/MCP Development World/data/villages_nether.dat b/workspace/saves/MCP Development World/data/villages_nether.dat index ca237dc8..bc57b6c1 100644 Binary files a/workspace/saves/MCP Development World/data/villages_nether.dat and b/workspace/saves/MCP Development World/data/villages_nether.dat differ diff --git a/workspace/saves/MCP Development World/level.dat b/workspace/saves/MCP Development World/level.dat index a44a4887..1be94579 100644 Binary files a/workspace/saves/MCP Development World/level.dat and b/workspace/saves/MCP Development World/level.dat differ diff --git a/workspace/saves/MCP Development World/level.dat_old b/workspace/saves/MCP Development World/level.dat_old index 2a07cd04..c0c34405 100644 Binary files a/workspace/saves/MCP Development World/level.dat_old and b/workspace/saves/MCP Development World/level.dat_old differ diff --git a/workspace/saves/MCP Development World/playerdata/74e89738-6c9e-4f59-83ef-d365849e6049.dat b/workspace/saves/MCP Development World/playerdata/74e89738-6c9e-4f59-83ef-d365849e6049.dat index 3581877e..8fad88db 100644 Binary files a/workspace/saves/MCP Development World/playerdata/74e89738-6c9e-4f59-83ef-d365849e6049.dat and b/workspace/saves/MCP Development World/playerdata/74e89738-6c9e-4f59-83ef-d365849e6049.dat differ diff --git a/workspace/saves/MCP Development World/region/r.0.-1.mca b/workspace/saves/MCP Development World/region/r.0.-1.mca index a5134e5a..b2c7bc12 100644 Binary files a/workspace/saves/MCP Development World/region/r.0.-1.mca and b/workspace/saves/MCP Development World/region/r.0.-1.mca differ diff --git a/workspace/saves/MCP Development World/region/r.0.0.mca b/workspace/saves/MCP Development World/region/r.0.0.mca index f2529862..cb165d31 100644 Binary files a/workspace/saves/MCP Development World/region/r.0.0.mca and b/workspace/saves/MCP Development World/region/r.0.0.mca differ diff --git a/workspace/saves/MCP Development World/region/r.1.-1.mca b/workspace/saves/MCP Development World/region/r.1.-1.mca index c7637b96..f1fda8fb 100644 Binary files a/workspace/saves/MCP Development World/region/r.1.-1.mca and b/workspace/saves/MCP Development World/region/r.1.-1.mca differ diff --git a/workspace/saves/MCP Development World/region/r.1.0.mca b/workspace/saves/MCP Development World/region/r.1.0.mca index 38efc252..afb2d917 100644 Binary files a/workspace/saves/MCP Development World/region/r.1.0.mca and b/workspace/saves/MCP Development World/region/r.1.0.mca differ diff --git a/workspace/saves/MCP Development World/region/r.1.1.mca b/workspace/saves/MCP Development World/region/r.1.1.mca index 61e6ce75..655ee454 100644 Binary files a/workspace/saves/MCP Development World/region/r.1.1.mca and b/workspace/saves/MCP Development World/region/r.1.1.mca differ diff --git a/workspace/saves/MCP Development World/session.lock b/workspace/saves/MCP Development World/session.lock index ab72474c..a3cd6e90 100644 Binary files a/workspace/saves/MCP Development World/session.lock and b/workspace/saves/MCP Development World/session.lock differ diff --git a/workspace/saves/MCP Development World/stats/74e89738-6c9e-4f59-83ef-d365849e6049.json b/workspace/saves/MCP Development World/stats/74e89738-6c9e-4f59-83ef-d365849e6049.json index 95caa621..2afcef59 100644 --- a/workspace/saves/MCP Development World/stats/74e89738-6c9e-4f59-83ef-d365849e6049.json +++ b/workspace/saves/MCP Development World/stats/74e89738-6c9e-4f59-83ef-d365849e6049.json @@ -1 +1 @@ -{"stat.walkOneCm":16657,"achievement.openInventory":4,"stat.leaveGame":30,"stat.damageTaken":45,"stat.flyOneCm":44215,"stat.jump":155,"stat.playOneMinute":217814,"stat.fallOneCm":211,"stat.timeSinceDeath":217814,"stat.sprintOneCm":11315,"achievement.exploreAllBiomes":{"value":0,"progress":["Beach","Desert"]}} \ No newline at end of file +{"stat.walkOneCm":36309,"achievement.openInventory":6,"stat.leaveGame":32,"stat.damageTaken":45,"stat.flyOneCm":131085,"stat.jump":451,"stat.useItem.minecraft.sand":5,"stat.playOneMinute":233650,"stat.fallOneCm":211,"stat.timeSinceDeath":233650,"stat.sprintOneCm":28181,"achievement.exploreAllBiomes":{"value":0,"progress":["Beach","DesertHills","Desert"]}} \ No newline at end of file diff --git a/workspace/servers.dat b/workspace/servers.dat index e5fdf07c..8a72a4e9 100644 Binary files a/workspace/servers.dat and b/workspace/servers.dat differ diff --git a/workspace/settings/configs/default.json b/workspace/settings/configs/default.json index d087fd45..a701c238 100644 --- a/workspace/settings/configs/default.json +++ b/workspace/settings/configs/default.json @@ -1,5 +1,5 @@ { - "MouseDelayFix": { + "No Hurt Cam": { "settings": {}, "bind": 0, "hud": {}, @@ -27,33 +27,6 @@ "bindtype": "Toggle", "enabled": false }, - "Crosshair": { - "settings": { - "Draw color": { - "red": 255, - "green": 0, - "blue": 0, - "alpha": 255 - }, - "Brush size": 2, - "Rainbow color": false, - "Delete mode": false - }, - "bind": 0, - "hud": {}, - "bindtype": "Toggle", - "enabled": false - }, - "Minimal Bobbing": { - "settings": { - "Remove Screen Bobbing": true, - "Remove Hand Bobbing": true - }, - "bind": 0, - "hud": {}, - "bindtype": "Toggle", - "enabled": false - }, "CPS": { "settings": { "Transparency": 255, @@ -71,7 +44,7 @@ "red": 0, "green": 0, "blue": 0, - "alpha": 150 + "alpha": 153 }, "Display Mode": "Circle", "Right Click Counter": false @@ -79,13 +52,30 @@ "bind": 0, "hud": {"cps": { "visible": true, - "x": 1, - "y": 175, + "x": 48, + "y": 176, "scale": 1 }}, "bindtype": "Toggle", "enabled": false }, + "Crosshair": { + "settings": { + "Draw color": { + "red": 255, + "green": 0, + "blue": 0, + "alpha": 255 + }, + "Brush size": 2, + "Rainbow color": false, + "Delete mode": false + }, + "bind": 0, + "hud": {}, + "bindtype": "Toggle", + "enabled": false + }, "Fullbright": { "settings": {}, "bind": 0, @@ -93,6 +83,16 @@ "bindtype": "Toggle", "enabled": false }, + "Minimal Bobbing": { + "settings": { + "Remove Screen Bobbing": true, + "Remove Hand Bobbing": true + }, + "bind": 0, + "hud": {}, + "bindtype": "Toggle", + "enabled": false + }, "FPS": { "settings": { "Transparency": 255, @@ -147,38 +147,6 @@ "bindtype": "Toggle", "enabled": false }, - "Custom Text": { - "settings": { - "Transparency": 255, - "Static Chroma": false, - "Custom Font": false, - "Background": true, - "Wave Chroma": false, - "Color": { - "red": 255, - "green": 255, - "blue": 255, - "alpha": 255 - }, - "Background Color": { - "red": 0, - "green": 0, - "blue": 0, - "alpha": 150 - }, - "Display Mode": "Circle", - "Custom Text": "Custom Text Here" - }, - "bind": 0, - "hud": {"customtext": { - "visible": true, - "x": 1, - "y": 200, - "scale": 1 - }}, - "bindtype": "Toggle", - "enabled": false - }, "Clock": { "settings": { "Transparency": 255, @@ -211,6 +179,70 @@ "bindtype": "Toggle", "enabled": false }, + "Custom Text": { + "settings": { + "Transparency": 255, + "Static Chroma": false, + "Custom Font": false, + "Background": true, + "Wave Chroma": false, + "Color": { + "red": 255, + "green": 255, + "blue": 255, + "alpha": 255 + }, + "Background Color": { + "red": 0, + "green": 0, + "blue": 0, + "alpha": 150 + }, + "Display Mode": "Circle", + "Custom Text": "Custom Text Here" + }, + "bind": 0, + "hud": {"customtext": { + "visible": true, + "x": 1, + "y": 200, + "scale": 1 + }}, + "bindtype": "Toggle", + "enabled": false + }, + "Potion Counter": { + "settings": { + "Transparency": 255, + "Static Chroma": false, + "Background": true, + "Custom Font": false, + "Wave Chroma": false, + "Potion Type": "Instant Health II", + "Color": { + "red": 255, + "green": 255, + "blue": 255, + "alpha": 255 + }, + "Background Color": { + "red": 0, + "green": 0, + "blue": 0, + "alpha": 150 + }, + "Display Mode": "Circle" + }, + "bind": 0, + "hud": {"potioncounter": { + "visible": true, + "x": 1, + "y": 200, + "scale": 1 + }}, + "bindtype": "Toggle", + "enabled": false + }, "Aim Trainer": { "settings": { "Speed": 4, @@ -223,7 +255,7 @@ "red": 0, "green": 0, "blue": 0, - "alpha": 150 + "alpha": 153 }, "Color": { "red": 255, @@ -244,6 +276,37 @@ "bindtype": "Toggle", "enabled": false }, + "Pack Display": { + "settings": { + "Transparency": 255, + "Static Chroma": false, + "Background": true, + "Custom Font": false, + "Wave Chroma": false, + "Background Color": { + "red": 0, + "green": 0, + "blue": 0, + "alpha": 150 + }, + "Color": { + "red": 255, + "green": 255, + "blue": 255, + "alpha": 255 + }, + "Display Mode": "Circle" + }, + "bind": 0, + "hud": {"packdisplay": { + "visible": true, + "x": 1, + "y": 175, + "scale": 1 + }}, + "bindtype": "Toggle", + "enabled": false + }, "Scoreboard": { "settings": { "Background": true, @@ -267,45 +330,6 @@ "bindtype": "Toggle", "enabled": false }, - "Memory usage": { - "settings": { - "Transparency": 255, - "Static Chroma": false, - "Background": true, - "Custom Font": false, - "Wave Chroma": false, - "Percentage": false, - "Color": { - "red": 255, - "green": 255, - "blue": 255, - "alpha": 255 - }, - "Background Color": { - "red": 0, - "green": 0, - "blue": 0, - "alpha": 150 - }, - "Display Mode": "Circle" - }, - "bind": 0, - "hud": {"memory usage": { - "visible": true, - "x": 1, - "y": 175, - "scale": 1 - }}, - "bindtype": "Toggle", - "enabled": false - }, - "HitDelayFix": { - "settings": {}, - "bind": 0, - "hud": {}, - "bindtype": "Toggle", - "enabled": false - }, "TPS": { "settings": { "Custom Font": false, @@ -362,6 +386,43 @@ "bindtype": "Toggle", "enabled": false }, + "Keystrokes": { + "settings": { + "Static Chroma": false, + "Show CPS": true, + "Custom Font": false, + "Key Unpressed Color": { + "red": 255, + "green": 255, + "blue": 255, + "alpha": 255 + }, + "Wave Chroma": false, + "Show Spacebar": true, + "Background Color": { + "red": 0, + "green": 0, + "blue": 0, + "alpha": 150 + }, + "Show Mouse Buttons": true, + "Key Pressed Color": { + "red": 0, + "green": 0, + "blue": 0, + "alpha": 255 + } + }, + "bind": 0, + "hud": {"keystrokes": { + "visible": true, + "x": 0, + "y": 120, + "scale": 1 + }}, + "bindtype": "Toggle", + "enabled": false + }, "Chat": { "settings": { "Background Opacity": 96, @@ -402,6 +463,13 @@ "bindtype": "Toggle", "enabled": false }, + "Hit Delay Fix": { + "settings": {}, + "bind": 0, + "hud": {}, + "bindtype": "Toggle", + "enabled": false + }, "macros": [], "Coordinates": { "settings": { @@ -503,7 +571,26 @@ "bindtype": "Toggle", "enabled": false }, - "ToggleSprint": { + "Item Physics": { + "settings": {}, + "bind": 0, + "hud": {}, + "bindtype": "Toggle", + "enabled": false + }, + "Custom Hit Color": { + "settings": {"Hit Color": { + "red": 255, + "green": 255, + "blue": 255, + "alpha": 255 + }}, + "bind": 0, + "hud": {}, + "bindtype": "Toggle", + "enabled": false + }, + "Toggle Sprint": { "settings": { "Toggle Sprint": true, "Double Tap Sprint": false, @@ -537,85 +624,14 @@ "bindtype": "Toggle", "enabled": false }, - "Custom Hit Color": { - "settings": {"Hit Color": { - "red": 255, - "green": 255, - "blue": 255, - "alpha": 255 - }}, - "bind": 0, - "hud": {}, - "bindtype": "Toggle", - "enabled": false - }, - "ItemPhysics": { - "settings": {}, - "bind": 0, - "hud": {}, - "bindtype": "Toggle", - "enabled": false - }, - "Key Strokes": { - "settings": { - "Static Chroma": false, - "Show CPS": true, - "Custom Font": false, - "Key Unpressed Color": { - "red": 255, - "green": 255, - "blue": 255, - "alpha": 255 - }, - "Wave Chroma": false, - "Show Spacebar": true, - "Background Color": { - "red": 0, - "green": 0, - "blue": 0, - "alpha": 150 - }, - "Show Mouse Buttons": true, - "Key Pressed Color": { - "red": 0, - "green": 0, - "blue": 0, - "alpha": 255 - } - }, - "bind": 0, - "hud": {"keystrokes": { - "visible": true, - "x": 0, - "y": 120, - "scale": 1 - }}, - "bindtype": "Toggle", - "enabled": false - }, - "Old Animations": { - "settings": { - "Armor Damage Flash": true, - "Blocking Hitting": true, - "Item Held": true, - "Eat/Break Animation": true, - "Blocking": true, - "Bow": true, - "Disable Health Flash": true - }, - "bind": 0, - "hud": {}, - "bindtype": "Toggle", - "enabled": false - }, - "Pot Counter": { + "Memory Usage": { "settings": { "Transparency": 255, "Static Chroma": false, "Background": true, "Custom Font": false, "Wave Chroma": false, - "Potion Type": "Instant Health II", + "Percentage": false, "Color": { "red": 255, "green": 255, @@ -631,10 +647,10 @@ "Display Mode": "Circle" }, "bind": 0, - "hud": {"potioncounter": { + "hud": {"memory usage": { "visible": true, "x": 1, - "y": 200, + "y": 175, "scale": 1 }}, "bindtype": "Toggle", @@ -651,37 +667,6 @@ "bindtype": "Toggle", "enabled": false }, - "PackDisplay": { - "settings": { - "Transparency": 255, - "Static Chroma": false, - "Background": true, - "Custom Font": false, - "Wave Chroma": false, - "Background Color": { - "red": 0, - "green": 0, - "blue": 0, - "alpha": 150 - }, - "Color": { - "red": 255, - "green": 255, - "blue": 255, - "alpha": 255 - }, - "Display Mode": "Circle" - }, - "bind": 0, - "hud": {"packdisplay": { - "visible": true, - "x": 1, - "y": 175, - "scale": 1 - }}, - "bindtype": "Toggle", - "enabled": false - }, "Nick Hider": { "settings": {"Nick": "Custom Nick"}, "bind": 0, @@ -720,6 +705,13 @@ "bindtype": "Toggle", "enabled": false }, + "Mouse Delay Fix": { + "settings": {}, + "bind": 0, + "hud": {}, + "bindtype": "Toggle", + "enabled": false + }, "Motion Blur": { "settings": {"Amount": 1}, "bind": 0, @@ -727,12 +719,20 @@ "bindtype": "Toggle", "enabled": false }, - "cape": "None", - "NoHurtCam": { - "settings": {}, + "1.7 Animations": { + "settings": { + "Armor Damage Flash": true, + "Blocking Hitting": true, + "Item Held": true, + "Eat/Break Animation": true, + "Blocking": true, + "Bow": true, + "Disable Health Flash": true + }, "bind": 0, "hud": {}, "bindtype": "Toggle", - "enabled": false - } + "enabled": true + }, + "cape": "Minecon 2016" } \ No newline at end of file diff --git a/workspace/usercache.json b/workspace/usercache.json index 81bbd14a..3769f2ae 100644 --- a/workspace/usercache.json +++ b/workspace/usercache.json @@ -1 +1 @@ -[{"name":"ziue","uuid":"ae330cf9-3749-3ca0-ba31-8447e2a2786f","expiresOn":"2023-07-27 22:35:55 +0200"}] \ No newline at end of file +[{"name":"ziue","uuid":"74e89738-6c9e-4f59-83ef-d365849e6049","expiresOn":"2023-08-01 19:27:12 +0200"},{"name":"ziue","uuid":"ae330cf9-3749-3ca0-ba31-8447e2a2786f","expiresOn":"2023-08-01 16:58:31 +0200"}] \ No newline at end of file