From ca64190771cde04dadb31c856de23715050abf9c Mon Sep 17 00:00:00 2001 From: UnknownUser1789 Date: Sat, 14 Jan 2023 23:39:22 +0000 Subject: [PATCH] Refactor some files --- src/main/java/dev/resent/module/impl/movement/Sprint.java | 4 ++-- src/main/java/dev/resent/ui/{mods => }/ClickGUI.java | 2 +- src/main/java/dev/resent/ui/{mods => }/ClientButton.java | 4 ++-- src/main/java/dev/resent/ui/{mods => }/GuiScreenModule.java | 1 + src/main/java/dev/resent/ui/{mods => }/HUDConfigScreen.java | 2 +- src/main/java/dev/resent/ui/{mods => }/Settings.java | 1 + src/main/java/net/minecraft/client/Minecraft.java | 2 +- src/main/java/net/minecraft/client/gui/GuiIngame.java | 2 +- src/main/java/net/minecraft/client/gui/GuiMainMenu.java | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) rename src/main/java/dev/resent/ui/{mods => }/ClickGUI.java (99%) rename src/main/java/dev/resent/ui/{mods => }/ClientButton.java (84%) rename src/main/java/dev/resent/ui/{mods => }/GuiScreenModule.java (99%) rename src/main/java/dev/resent/ui/{mods => }/HUDConfigScreen.java (97%) rename src/main/java/dev/resent/ui/{mods => }/Settings.java (99%) diff --git a/src/main/java/dev/resent/module/impl/movement/Sprint.java b/src/main/java/dev/resent/module/impl/movement/Sprint.java index e66ed7fd..01eb993a 100644 --- a/src/main/java/dev/resent/module/impl/movement/Sprint.java +++ b/src/main/java/dev/resent/module/impl/movement/Sprint.java @@ -3,8 +3,8 @@ package dev.resent.module.impl.movement; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; import dev.resent.setting.BooleanSetting; -import dev.resent.ui.mods.ClickGUI; -import dev.resent.ui.mods.HUDConfigScreen; +import dev.resent.ui.ClickGUI; +import dev.resent.ui.HUDConfigScreen; import net.minecraft.client.gui.FontRenderer; public class Sprint extends RenderModule { diff --git a/src/main/java/dev/resent/ui/mods/ClickGUI.java b/src/main/java/dev/resent/ui/ClickGUI.java similarity index 99% rename from src/main/java/dev/resent/ui/mods/ClickGUI.java rename to src/main/java/dev/resent/ui/ClickGUI.java index 8396c44d..ee14e5ac 100644 --- a/src/main/java/dev/resent/ui/mods/ClickGUI.java +++ b/src/main/java/dev/resent/ui/ClickGUI.java @@ -1,4 +1,4 @@ -package dev.resent.ui.mods; +package dev.resent.ui; import java.io.IOException; diff --git a/src/main/java/dev/resent/ui/mods/ClientButton.java b/src/main/java/dev/resent/ui/ClientButton.java similarity index 84% rename from src/main/java/dev/resent/ui/mods/ClientButton.java rename to src/main/java/dev/resent/ui/ClientButton.java index cf5b2f25..61c37643 100644 --- a/src/main/java/dev/resent/ui/mods/ClientButton.java +++ b/src/main/java/dev/resent/ui/ClientButton.java @@ -1,4 +1,4 @@ -package dev.resent.ui.mods; +package dev.resent.ui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -17,6 +17,6 @@ public class ClientButton extends GuiButton this.hovered = (mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height); Gui.drawRect(this.xPosition, this.yPosition, this.xPosition + this.width, this.yPosition + this.height, hovered ? 0x30ffffff :0x20ffffff); - this.drawCenteredString(fr, this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height - 8) / 2, -1); + drawCenteredString(fr, this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height - 8) / 2, -1); } } \ No newline at end of file diff --git a/src/main/java/dev/resent/ui/mods/GuiScreenModule.java b/src/main/java/dev/resent/ui/GuiScreenModule.java similarity index 99% rename from src/main/java/dev/resent/ui/mods/GuiScreenModule.java rename to src/main/java/dev/resent/ui/GuiScreenModule.java index 9b784576..98c0a6c7 100644 --- a/src/main/java/dev/resent/ui/mods/GuiScreenModule.java +++ b/src/main/java/dev/resent/ui/GuiScreenModule.java @@ -1,3 +1,4 @@ +package dev.resent.ui; /*package dev.resent.ui.mods; import java.util.ArrayList; diff --git a/src/main/java/dev/resent/ui/mods/HUDConfigScreen.java b/src/main/java/dev/resent/ui/HUDConfigScreen.java similarity index 97% rename from src/main/java/dev/resent/ui/mods/HUDConfigScreen.java rename to src/main/java/dev/resent/ui/HUDConfigScreen.java index b336a8fa..2de4472d 100644 --- a/src/main/java/dev/resent/ui/mods/HUDConfigScreen.java +++ b/src/main/java/dev/resent/ui/HUDConfigScreen.java @@ -1,4 +1,4 @@ -package dev.resent.ui.mods; +package dev.resent.ui; import dev.resent.Resent; import dev.resent.module.base.RenderModule; diff --git a/src/main/java/dev/resent/ui/mods/Settings.java b/src/main/java/dev/resent/ui/Settings.java similarity index 99% rename from src/main/java/dev/resent/ui/mods/Settings.java rename to src/main/java/dev/resent/ui/Settings.java index 59a2f934..06bc6b3e 100644 --- a/src/main/java/dev/resent/ui/mods/Settings.java +++ b/src/main/java/dev/resent/ui/Settings.java @@ -1,3 +1,4 @@ +package dev.resent.ui; /*package dev.resent.ui.mods; import java.util.ArrayList; diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java index 6c2e8bd3..306dab4e 100644 --- a/src/main/java/net/minecraft/client/Minecraft.java +++ b/src/main/java/net/minecraft/client/Minecraft.java @@ -10,7 +10,7 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_SMOOTH; import com.google.common.collect.Lists; import dev.resent.Resent; -import dev.resent.ui.mods.ClickGUI; +import dev.resent.ui.ClickGUI; import dev.resent.util.misc.W; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/net/minecraft/client/gui/GuiIngame.java b/src/main/java/net/minecraft/client/gui/GuiIngame.java index 2e4a97ac..92923040 100644 --- a/src/main/java/net/minecraft/client/gui/GuiIngame.java +++ b/src/main/java/net/minecraft/client/gui/GuiIngame.java @@ -18,7 +18,7 @@ import dev.resent.module.base.Mod; import dev.resent.module.base.ModManager; import dev.resent.module.base.RenderModule; import dev.resent.module.impl.misc.Crosshair; -import dev.resent.ui.mods.HUDConfigScreen; +import dev.resent.ui.HUDConfigScreen; import dev.resent.util.misc.W; import dev.resent.util.render.RenderUtils; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; diff --git a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java b/src/main/java/net/minecraft/client/gui/GuiMainMenu.java index bde9fb7a..3724a17b 100644 --- a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java +++ b/src/main/java/net/minecraft/client/gui/GuiMainMenu.java @@ -1,6 +1,6 @@ package net.minecraft.client.gui; -import dev.resent.ui.mods.ClientButton; +import dev.resent.ui.ClientButton; import dev.resent.util.render.RenderUtils; import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile; import net.minecraft.client.Minecraft;