From 688c2735ea16a7c22a36f0fc85cdce8ad25f520a Mon Sep 17 00:00:00 2001 From: UnknownUser1789 Date: Fri, 20 Jan 2023 21:15:54 +0000 Subject: [PATCH] Move packages to be more organized --- src/main/java/dev/resent/Resent.java | 4 ++-- src/main/java/dev/resent/module/base/Mod.java | 2 +- src/main/java/dev/resent/module/impl/hud/ArmorHud.java | 2 +- src/main/java/dev/resent/module/impl/hud/CPS.java | 2 +- src/main/java/dev/resent/module/impl/hud/ComboCounter.java | 2 +- src/main/java/dev/resent/module/impl/hud/FPS.java | 2 +- src/main/java/dev/resent/module/impl/hud/Health.java | 2 +- src/main/java/dev/resent/module/impl/hud/Hitboxes.java | 4 ++-- src/main/java/dev/resent/module/impl/hud/Info.java | 2 +- src/main/java/dev/resent/module/impl/hud/KeyStrokes.java | 4 ++-- src/main/java/dev/resent/module/impl/hud/Ping.java | 2 +- src/main/java/dev/resent/module/impl/hud/PotCounter.java | 2 +- src/main/java/dev/resent/module/impl/hud/ServerInfo.java | 2 +- src/main/java/dev/resent/module/impl/misc/AutoGG.java | 2 +- src/main/java/dev/resent/module/impl/misc/Cosmetics.java | 4 ++-- src/main/java/dev/resent/module/impl/misc/Crosshair.java | 2 +- src/main/java/dev/resent/module/impl/misc/HUD.java | 2 +- .../java/dev/resent/module/impl/misc/HotbarAnimation.java | 2 +- src/main/java/dev/resent/module/impl/misc/Scoreboard.java | 2 +- src/main/java/dev/resent/module/impl/movement/Sprint.java | 2 +- .../dev/resent/{ => module}/setting/BooleanSetting.java | 2 +- .../java/dev/resent/{ => module}/setting/ModeSetting.java | 2 +- .../java/dev/resent/{ => module}/setting/NumberSetting.java | 2 +- src/main/java/dev/resent/{ => module}/setting/Setting.java | 2 +- src/main/java/dev/resent/ui/ClickGUI.java | 6 +++--- src/main/java/dev/resent/util/render/RenderUtils.java | 2 +- .../java/net/minecraft/client/settings/GameSettings.java | 6 +++--- 27 files changed, 35 insertions(+), 35 deletions(-) rename src/main/java/dev/resent/{ => module}/setting/BooleanSetting.java (92%) rename src/main/java/dev/resent/{ => module}/setting/ModeSetting.java (96%) rename src/main/java/dev/resent/{ => module}/setting/NumberSetting.java (97%) rename src/main/java/dev/resent/{ => module}/setting/Setting.java (92%) diff --git a/src/main/java/dev/resent/Resent.java b/src/main/java/dev/resent/Resent.java index 9c8159df..c04c7e7b 100644 --- a/src/main/java/dev/resent/Resent.java +++ b/src/main/java/dev/resent/Resent.java @@ -5,12 +5,12 @@ import dev.resent.module.base.ModManager; import net.minecraft.client.Minecraft; public class Resent { + static { INSTANCE = new Resent(); } - public static String NAME = "Resent"; - public static String VERSION = "3.3.2"; + public static String NAME = "Resent", VERSION = "3.3.2"; public static Minecraft mc = Minecraft.getMinecraft(); public static Resent INSTANCE; public ModManager modManager; diff --git a/src/main/java/dev/resent/module/base/Mod.java b/src/main/java/dev/resent/module/base/Mod.java index bb287d78..b236c1e1 100644 --- a/src/main/java/dev/resent/module/base/Mod.java +++ b/src/main/java/dev/resent/module/base/Mod.java @@ -7,7 +7,7 @@ import java.util.List; import dev.resent.Resent; import dev.resent.event.impl.Event; import dev.resent.module.Theme; -import dev.resent.setting.Setting; +import dev.resent.module.setting.Setting; import dev.resent.util.render.RenderUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/dev/resent/module/impl/hud/ArmorHud.java b/src/main/java/dev/resent/module/impl/hud/ArmorHud.java index ac5b3298..723401a8 100644 --- a/src/main/java/dev/resent/module/impl/hud/ArmorHud.java +++ b/src/main/java/dev/resent/module/impl/hud/ArmorHud.java @@ -2,7 +2,7 @@ package dev.resent.module.impl.hud; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.gui.GuiIngame; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/dev/resent/module/impl/hud/CPS.java b/src/main/java/dev/resent/module/impl/hud/CPS.java index 284721bc..a700b15b 100644 --- a/src/main/java/dev/resent/module/impl/hud/CPS.java +++ b/src/main/java/dev/resent/module/impl/hud/CPS.java @@ -2,7 +2,7 @@ package dev.resent.module.impl.hud; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; import dev.resent.util.misc.FuncUtils; import net.lax1dude.eaglercraft.v1_8.Mouse; diff --git a/src/main/java/dev/resent/module/impl/hud/ComboCounter.java b/src/main/java/dev/resent/module/impl/hud/ComboCounter.java index 6f85c7d8..567496bf 100644 --- a/src/main/java/dev/resent/module/impl/hud/ComboCounter.java +++ b/src/main/java/dev/resent/module/impl/hud/ComboCounter.java @@ -5,7 +5,7 @@ import dev.resent.event.impl.EventAttack; import dev.resent.module.Theme; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; import net.minecraft.client.Minecraft; import net.minecraft.network.play.server.S19PacketEntityStatus; diff --git a/src/main/java/dev/resent/module/impl/hud/FPS.java b/src/main/java/dev/resent/module/impl/hud/FPS.java index 0f4c54bc..5d83d4c0 100644 --- a/src/main/java/dev/resent/module/impl/hud/FPS.java +++ b/src/main/java/dev/resent/module/impl/hud/FPS.java @@ -3,7 +3,7 @@ package dev.resent.module.impl.hud; import dev.resent.module.Theme; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; import net.minecraft.client.Minecraft; public class FPS extends RenderModule { diff --git a/src/main/java/dev/resent/module/impl/hud/Health.java b/src/main/java/dev/resent/module/impl/hud/Health.java index abba61d8..5f16c0ad 100644 --- a/src/main/java/dev/resent/module/impl/hud/Health.java +++ b/src/main/java/dev/resent/module/impl/hud/Health.java @@ -3,7 +3,7 @@ package dev.resent.module.impl.hud; import dev.resent.module.Theme; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; public class Health extends RenderModule { diff --git a/src/main/java/dev/resent/module/impl/hud/Hitboxes.java b/src/main/java/dev/resent/module/impl/hud/Hitboxes.java index 183fe708..0ff85e2e 100644 --- a/src/main/java/dev/resent/module/impl/hud/Hitboxes.java +++ b/src/main/java/dev/resent/module/impl/hud/Hitboxes.java @@ -2,8 +2,8 @@ package dev.resent.module.impl.hud; import dev.resent.module.base.Category; import dev.resent.module.base.Mod; -import dev.resent.setting.BooleanSetting; -import dev.resent.setting.ModeSetting; +import dev.resent.module.setting.BooleanSetting; +import dev.resent.module.setting.ModeSetting; public class Hitboxes extends Mod { diff --git a/src/main/java/dev/resent/module/impl/hud/Info.java b/src/main/java/dev/resent/module/impl/hud/Info.java index eb8014b3..e7ba1ce2 100644 --- a/src/main/java/dev/resent/module/impl/hud/Info.java +++ b/src/main/java/dev/resent/module/impl/hud/Info.java @@ -3,7 +3,7 @@ package dev.resent.module.impl.hud; import dev.resent.module.Theme; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; import dev.resent.util.render.Color; import net.minecraft.util.BlockPos; diff --git a/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java b/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java index 6029c14c..c9d68c31 100644 --- a/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java +++ b/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java @@ -2,8 +2,8 @@ package dev.resent.module.impl.hud; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; -import dev.resent.setting.ModeSetting; +import dev.resent.module.setting.BooleanSetting; +import dev.resent.module.setting.ModeSetting; import dev.resent.util.render.RainbowUtil; import dev.resent.util.render.RenderUtils; import net.lax1dude.eaglercraft.v1_8.Keyboard; diff --git a/src/main/java/dev/resent/module/impl/hud/Ping.java b/src/main/java/dev/resent/module/impl/hud/Ping.java index 9865b965..89f2070e 100644 --- a/src/main/java/dev/resent/module/impl/hud/Ping.java +++ b/src/main/java/dev/resent/module/impl/hud/Ping.java @@ -3,7 +3,7 @@ package dev.resent.module.impl.hud; import dev.resent.module.Theme; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; public class Ping extends RenderModule { diff --git a/src/main/java/dev/resent/module/impl/hud/PotCounter.java b/src/main/java/dev/resent/module/impl/hud/PotCounter.java index c6e0f8e8..0974a689 100644 --- a/src/main/java/dev/resent/module/impl/hud/PotCounter.java +++ b/src/main/java/dev/resent/module/impl/hud/PotCounter.java @@ -3,7 +3,7 @@ package dev.resent.module.impl.hud; import dev.resent.module.Theme; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/dev/resent/module/impl/hud/ServerInfo.java b/src/main/java/dev/resent/module/impl/hud/ServerInfo.java index bb52c089..7d427116 100644 --- a/src/main/java/dev/resent/module/impl/hud/ServerInfo.java +++ b/src/main/java/dev/resent/module/impl/hud/ServerInfo.java @@ -3,7 +3,7 @@ package dev.resent.module.impl.hud; import dev.resent.module.Theme; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; public class ServerInfo extends RenderModule { diff --git a/src/main/java/dev/resent/module/impl/misc/AutoGG.java b/src/main/java/dev/resent/module/impl/misc/AutoGG.java index a2377df6..4330489c 100644 --- a/src/main/java/dev/resent/module/impl/misc/AutoGG.java +++ b/src/main/java/dev/resent/module/impl/misc/AutoGG.java @@ -2,7 +2,7 @@ package dev.resent.module.impl.misc; import dev.resent.module.base.Category; import dev.resent.module.base.Mod; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; public class AutoGG extends Mod { diff --git a/src/main/java/dev/resent/module/impl/misc/Cosmetics.java b/src/main/java/dev/resent/module/impl/misc/Cosmetics.java index 276405af..ef2deb89 100644 --- a/src/main/java/dev/resent/module/impl/misc/Cosmetics.java +++ b/src/main/java/dev/resent/module/impl/misc/Cosmetics.java @@ -2,8 +2,8 @@ package dev.resent.module.impl.misc; import dev.resent.module.base.Category; import dev.resent.module.base.Mod; -import dev.resent.setting.BooleanSetting; -import dev.resent.setting.ModeSetting; +import dev.resent.module.setting.BooleanSetting; +import dev.resent.module.setting.ModeSetting; public class Cosmetics extends Mod{ public Cosmetics(){ diff --git a/src/main/java/dev/resent/module/impl/misc/Crosshair.java b/src/main/java/dev/resent/module/impl/misc/Crosshair.java index 435df2b2..efdc3448 100644 --- a/src/main/java/dev/resent/module/impl/misc/Crosshair.java +++ b/src/main/java/dev/resent/module/impl/misc/Crosshair.java @@ -2,7 +2,7 @@ package dev.resent.module.impl.misc; import dev.resent.module.base.Category; import dev.resent.module.base.Mod; -import dev.resent.setting.ModeSetting; +import dev.resent.module.setting.ModeSetting; public class Crosshair extends Mod { diff --git a/src/main/java/dev/resent/module/impl/misc/HUD.java b/src/main/java/dev/resent/module/impl/misc/HUD.java index 6b2d6f4f..f51d440a 100644 --- a/src/main/java/dev/resent/module/impl/misc/HUD.java +++ b/src/main/java/dev/resent/module/impl/misc/HUD.java @@ -2,7 +2,7 @@ package dev.resent.module.impl.misc; import dev.resent.module.base.Category; import dev.resent.module.base.Mod; -import dev.resent.setting.ModeSetting; +import dev.resent.module.setting.ModeSetting; public class HUD extends Mod{ public HUD(){ diff --git a/src/main/java/dev/resent/module/impl/misc/HotbarAnimation.java b/src/main/java/dev/resent/module/impl/misc/HotbarAnimation.java index d2706dd5..145599bb 100644 --- a/src/main/java/dev/resent/module/impl/misc/HotbarAnimation.java +++ b/src/main/java/dev/resent/module/impl/misc/HotbarAnimation.java @@ -2,7 +2,7 @@ package dev.resent.module.impl.misc; import dev.resent.module.base.Category; import dev.resent.module.base.Mod; -import dev.resent.setting.ModeSetting; +import dev.resent.module.setting.ModeSetting; public class HotbarAnimation extends Mod{ public HotbarAnimation(){ diff --git a/src/main/java/dev/resent/module/impl/misc/Scoreboard.java b/src/main/java/dev/resent/module/impl/misc/Scoreboard.java index 25e041b3..13e86eca 100644 --- a/src/main/java/dev/resent/module/impl/misc/Scoreboard.java +++ b/src/main/java/dev/resent/module/impl/misc/Scoreboard.java @@ -2,7 +2,7 @@ package dev.resent.module.impl.misc; import dev.resent.module.base.Category; import dev.resent.module.base.Mod; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; public class Scoreboard extends Mod { 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 774c322b..d54378da 100644 --- a/src/main/java/dev/resent/module/impl/movement/Sprint.java +++ b/src/main/java/dev/resent/module/impl/movement/Sprint.java @@ -3,7 +3,7 @@ package dev.resent.module.impl.movement; import dev.resent.module.Theme; import dev.resent.module.base.Category; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; +import dev.resent.module.setting.BooleanSetting; import net.minecraft.client.gui.FontRenderer; public class Sprint extends RenderModule { diff --git a/src/main/java/dev/resent/setting/BooleanSetting.java b/src/main/java/dev/resent/module/setting/BooleanSetting.java similarity index 92% rename from src/main/java/dev/resent/setting/BooleanSetting.java rename to src/main/java/dev/resent/module/setting/BooleanSetting.java index 1a221194..f53c8cde 100644 --- a/src/main/java/dev/resent/setting/BooleanSetting.java +++ b/src/main/java/dev/resent/module/setting/BooleanSetting.java @@ -1,4 +1,4 @@ -package dev.resent.setting; +package dev.resent.module.setting; public class BooleanSetting extends Setting { diff --git a/src/main/java/dev/resent/setting/ModeSetting.java b/src/main/java/dev/resent/module/setting/ModeSetting.java similarity index 96% rename from src/main/java/dev/resent/setting/ModeSetting.java rename to src/main/java/dev/resent/module/setting/ModeSetting.java index 0ec61602..da1f6430 100644 --- a/src/main/java/dev/resent/setting/ModeSetting.java +++ b/src/main/java/dev/resent/module/setting/ModeSetting.java @@ -1,4 +1,4 @@ -package dev.resent.setting; +package dev.resent.module.setting; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/dev/resent/setting/NumberSetting.java b/src/main/java/dev/resent/module/setting/NumberSetting.java similarity index 97% rename from src/main/java/dev/resent/setting/NumberSetting.java rename to src/main/java/dev/resent/module/setting/NumberSetting.java index cc6acac8..a1e57326 100644 --- a/src/main/java/dev/resent/setting/NumberSetting.java +++ b/src/main/java/dev/resent/module/setting/NumberSetting.java @@ -1,4 +1,4 @@ -package dev.resent.setting; +package dev.resent.module.setting; import net.minecraft.util.MathHelper; diff --git a/src/main/java/dev/resent/setting/Setting.java b/src/main/java/dev/resent/module/setting/Setting.java similarity index 92% rename from src/main/java/dev/resent/setting/Setting.java rename to src/main/java/dev/resent/module/setting/Setting.java index 8761f8c0..4f17a04f 100644 --- a/src/main/java/dev/resent/setting/Setting.java +++ b/src/main/java/dev/resent/module/setting/Setting.java @@ -1,4 +1,4 @@ -package dev.resent.setting; +package dev.resent.module.setting; public class Setting { diff --git a/src/main/java/dev/resent/ui/ClickGUI.java b/src/main/java/dev/resent/ui/ClickGUI.java index 63024d46..021f8b45 100644 --- a/src/main/java/dev/resent/ui/ClickGUI.java +++ b/src/main/java/dev/resent/ui/ClickGUI.java @@ -7,9 +7,9 @@ import dev.resent.animation.Animation; import dev.resent.animation.Direction; import dev.resent.animation.impl.EaseBackIn; import dev.resent.module.base.Mod; -import dev.resent.setting.BooleanSetting; -import dev.resent.setting.ModeSetting; -import dev.resent.setting.Setting; +import dev.resent.module.setting.BooleanSetting; +import dev.resent.module.setting.ModeSetting; +import dev.resent.module.setting.Setting; import dev.resent.util.misc.GlUtils; import dev.resent.util.render.Color; import dev.resent.util.render.RenderUtils; diff --git a/src/main/java/dev/resent/util/render/RenderUtils.java b/src/main/java/dev/resent/util/render/RenderUtils.java index 92b80dbd..7bf63434 100644 --- a/src/main/java/dev/resent/util/render/RenderUtils.java +++ b/src/main/java/dev/resent/util/render/RenderUtils.java @@ -2,7 +2,7 @@ package dev.resent.util.render; import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*; -import dev.resent.setting.ModeSetting; +import dev.resent.module.setting.ModeSetting; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/minecraft/client/settings/GameSettings.java b/src/main/java/net/minecraft/client/settings/GameSettings.java index c63c1570..1e4bd216 100644 --- a/src/main/java/net/minecraft/client/settings/GameSettings.java +++ b/src/main/java/net/minecraft/client/settings/GameSettings.java @@ -8,9 +8,9 @@ import dev.resent.Resent; import dev.resent.module.base.Mod; import dev.resent.module.base.ModManager; import dev.resent.module.base.RenderModule; -import dev.resent.setting.BooleanSetting; -import dev.resent.setting.ModeSetting; -import dev.resent.setting.Setting; +import dev.resent.module.setting.BooleanSetting; +import dev.resent.module.setting.ModeSetting; +import dev.resent.module.setting.Setting; import java.io.BufferedReader; import java.io.ByteArrayOutputStream;