diff --git a/src/main/java/dev/resent/client/Resent.java b/src/main/java/dev/resent/client/Resent.java index 87ef77d1..3cc32645 100644 --- a/src/main/java/dev/resent/client/Resent.java +++ b/src/main/java/dev/resent/client/Resent.java @@ -4,8 +4,8 @@ import java.io.PrintWriter; import dev.resent.module.base.ModManager; import dev.resent.module.base.RenderMod; -import dev.resent.module.setting.BooleanSetting; -import dev.resent.module.setting.ModeSetting; +import dev.resent.module.base.setting.BooleanSetting; +import dev.resent.module.base.setting.ModeSetting; import dev.resent.sound.SoundManager; public class Resent { diff --git a/src/main/java/dev/resent/module/base/Mod.java b/src/main/java/dev/resent/module/base/Mod.java index 4f5a6b1f..9c2be7af 100644 --- a/src/main/java/dev/resent/module/base/Mod.java +++ b/src/main/java/dev/resent/module/base/Mod.java @@ -1,9 +1,10 @@ package dev.resent.module.base; import dev.resent.annotation.Module; -import dev.resent.module.setting.Setting; -import dev.resent.ui.Theme; +import dev.resent.module.base.setting.Setting; import dev.resent.util.render.RenderUtils; +import dev.resent.visual.ui.Theme; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/dev/resent/module/setting/BooleanSetting.java b/src/main/java/dev/resent/module/base/setting/BooleanSetting.java similarity index 92% rename from src/main/java/dev/resent/module/setting/BooleanSetting.java rename to src/main/java/dev/resent/module/base/setting/BooleanSetting.java index f53c8cde..b81f9c53 100644 --- a/src/main/java/dev/resent/module/setting/BooleanSetting.java +++ b/src/main/java/dev/resent/module/base/setting/BooleanSetting.java @@ -1,4 +1,4 @@ -package dev.resent.module.setting; +package dev.resent.module.base.setting; public class BooleanSetting extends Setting { diff --git a/src/main/java/dev/resent/module/setting/CustomRectSettingDraw.java b/src/main/java/dev/resent/module/base/setting/CustomRectSettingDraw.java similarity index 82% rename from src/main/java/dev/resent/module/setting/CustomRectSettingDraw.java rename to src/main/java/dev/resent/module/base/setting/CustomRectSettingDraw.java index e5c872a2..371bc38f 100644 --- a/src/main/java/dev/resent/module/setting/CustomRectSettingDraw.java +++ b/src/main/java/dev/resent/module/base/setting/CustomRectSettingDraw.java @@ -1,4 +1,4 @@ -package dev.resent.module.setting; +package dev.resent.module.base.setting; public class CustomRectSettingDraw extends Setting{ public CustomRectSettingDraw(String name, String description){ diff --git a/src/main/java/dev/resent/module/setting/ModeSetting.java b/src/main/java/dev/resent/module/base/setting/ModeSetting.java similarity index 96% rename from src/main/java/dev/resent/module/setting/ModeSetting.java rename to src/main/java/dev/resent/module/base/setting/ModeSetting.java index da1f6430..1c2e4c51 100644 --- a/src/main/java/dev/resent/module/setting/ModeSetting.java +++ b/src/main/java/dev/resent/module/base/setting/ModeSetting.java @@ -1,4 +1,4 @@ -package dev.resent.module.setting; +package dev.resent.module.base.setting; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/dev/resent/module/setting/NumberSetting.java b/src/main/java/dev/resent/module/base/setting/NumberSetting.java similarity index 97% rename from src/main/java/dev/resent/module/setting/NumberSetting.java rename to src/main/java/dev/resent/module/base/setting/NumberSetting.java index 04f32050..73dfcfcd 100644 --- a/src/main/java/dev/resent/module/setting/NumberSetting.java +++ b/src/main/java/dev/resent/module/base/setting/NumberSetting.java @@ -1,4 +1,4 @@ -package dev.resent.module.setting; +package dev.resent.module.base.setting; import net.minecraft.util.MathHelper; diff --git a/src/main/java/dev/resent/module/setting/Setting.java b/src/main/java/dev/resent/module/base/setting/Setting.java similarity index 92% rename from src/main/java/dev/resent/module/setting/Setting.java rename to src/main/java/dev/resent/module/base/setting/Setting.java index 586fa3c9..09f68cf6 100644 --- a/src/main/java/dev/resent/module/setting/Setting.java +++ b/src/main/java/dev/resent/module/base/setting/Setting.java @@ -1,4 +1,4 @@ -package dev.resent.module.setting; +package dev.resent.module.base.setting; public class Setting { 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 5f8e8918..2dd6b573 100644 --- a/src/main/java/dev/resent/module/impl/hud/ArmorHud.java +++ b/src/main/java/dev/resent/module/impl/hud/ArmorHud.java @@ -2,8 +2,8 @@ package dev.resent.module.impl.hud; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; +import dev.resent.module.base.setting.BooleanSetting; import dev.resent.module.base.RenderMod; -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/BPS.java b/src/main/java/dev/resent/module/impl/hud/BPS.java index 6c1a1ca8..769de84a 100644 --- a/src/main/java/dev/resent/module/impl/hud/BPS.java +++ b/src/main/java/dev/resent/module/impl/hud/BPS.java @@ -4,8 +4,8 @@ import java.text.DecimalFormat; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; +import dev.resent.visual.ui.Theme; import dev.resent.module.base.RenderMod; -import dev.resent.ui.Theme; @RenderModule(name = "BPS", category = Category.HUD, x = 4, y = 16) public class BPS extends RenderMod{ 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 36ba5a25..b956beaa 100644 --- a/src/main/java/dev/resent/module/impl/hud/CPS.java +++ b/src/main/java/dev/resent/module/impl/hud/CPS.java @@ -3,8 +3,9 @@ package dev.resent.module.impl.hud; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; import dev.resent.module.base.RenderMod; -import dev.resent.ui.Theme; import dev.resent.util.misc.FuncUtils; +import dev.resent.visual.ui.Theme; + import java.util.ArrayList; import java.util.List; 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 679f6406..3a17f210 100644 --- a/src/main/java/dev/resent/module/impl/hud/ComboCounter.java +++ b/src/main/java/dev/resent/module/impl/hud/ComboCounter.java @@ -2,8 +2,8 @@ package dev.resent.module.impl.hud; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; +import dev.resent.visual.ui.Theme; import dev.resent.module.base.RenderMod; -import dev.resent.ui.Theme; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; 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 12b63124..90f9b477 100644 --- a/src/main/java/dev/resent/module/impl/hud/FPS.java +++ b/src/main/java/dev/resent/module/impl/hud/FPS.java @@ -2,8 +2,8 @@ package dev.resent.module.impl.hud; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; +import dev.resent.visual.ui.Theme; import dev.resent.module.base.RenderMod; -import dev.resent.ui.Theme; import net.minecraft.client.Minecraft; @RenderModule(name = "FPS", category = Category.HUD, x = 4, y = 38) 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 31eb7a2a..a1722045 100644 --- a/src/main/java/dev/resent/module/impl/hud/Hitboxes.java +++ b/src/main/java/dev/resent/module/impl/hud/Hitboxes.java @@ -3,8 +3,8 @@ package dev.resent.module.impl.hud; import dev.resent.annotation.Module; import dev.resent.module.base.Mod; import dev.resent.module.base.Mod.Category; -import dev.resent.module.setting.BooleanSetting; -import dev.resent.module.setting.ModeSetting; +import dev.resent.module.base.setting.BooleanSetting; +import dev.resent.module.base.setting.ModeSetting; @Module(name = "Hitboxes", category = Category.HUD, hasSetting = true) 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 895e8850..05d15d10 100644 --- a/src/main/java/dev/resent/module/impl/hud/Info.java +++ b/src/main/java/dev/resent/module/impl/hud/Info.java @@ -2,10 +2,10 @@ package dev.resent.module.impl.hud; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; +import dev.resent.module.base.setting.BooleanSetting; import dev.resent.module.base.RenderMod; -import dev.resent.module.setting.BooleanSetting; -import dev.resent.ui.Theme; import dev.resent.util.render.Color; +import dev.resent.visual.ui.Theme; import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; 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 1f5612ce..85da5e70 100644 --- a/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java +++ b/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java @@ -2,13 +2,14 @@ package dev.resent.module.impl.hud; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; +import dev.resent.module.base.setting.BooleanSetting; +import dev.resent.module.base.setting.ModeSetting; import dev.resent.module.base.RenderMod; -import dev.resent.module.setting.BooleanSetting; -import dev.resent.module.setting.ModeSetting; -import dev.resent.ui.Theme; import dev.resent.util.misc.FuncUtils; import dev.resent.util.render.Color; import dev.resent.util.render.RenderUtils; +import dev.resent.visual.ui.Theme; + import java.util.ArrayList; import java.util.List; import net.lax1dude.eaglercraft.v1_8.Mouse; 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 21017c3d..565efd06 100644 --- a/src/main/java/dev/resent/module/impl/hud/PotCounter.java +++ b/src/main/java/dev/resent/module/impl/hud/PotCounter.java @@ -2,8 +2,8 @@ package dev.resent.module.impl.hud; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; +import dev.resent.visual.ui.Theme; import dev.resent.module.base.RenderMod; -import dev.resent.ui.Theme; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/dev/resent/module/impl/hud/ReachDisplay.java b/src/main/java/dev/resent/module/impl/hud/ReachDisplay.java index 54ddcb61..927fffa9 100644 --- a/src/main/java/dev/resent/module/impl/hud/ReachDisplay.java +++ b/src/main/java/dev/resent/module/impl/hud/ReachDisplay.java @@ -2,8 +2,9 @@ package dev.resent.module.impl.hud; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; +import dev.resent.visual.ui.Theme; import dev.resent.module.base.RenderMod; -import dev.resent.ui.Theme; + import java.text.DecimalFormat; import net.minecraft.entity.Entity; import net.minecraft.util.Vec3; 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 de70c62f..aa0a95e3 100644 --- a/src/main/java/dev/resent/module/impl/misc/AutoGG.java +++ b/src/main/java/dev/resent/module/impl/misc/AutoGG.java @@ -3,7 +3,7 @@ package dev.resent.module.impl.misc; import dev.resent.annotation.Module; import dev.resent.module.base.Mod; import dev.resent.module.base.Mod.Category; -import dev.resent.module.setting.BooleanSetting; +import dev.resent.module.base.setting.BooleanSetting; @Module(name = "AutoGG", category = Category.MISC, hasSetting = true) public class AutoGG extends Mod { diff --git a/src/main/java/dev/resent/module/impl/misc/Cape.java b/src/main/java/dev/resent/module/impl/misc/Cape.java index 5973d3ca..73c5e614 100644 --- a/src/main/java/dev/resent/module/impl/misc/Cape.java +++ b/src/main/java/dev/resent/module/impl/misc/Cape.java @@ -1,12 +1,12 @@ package dev.resent.module.impl.misc; import dev.resent.annotation.Module; -import dev.resent.cape.CapeUi; import dev.resent.module.base.Mod; import dev.resent.module.base.Mod.Category; -import dev.resent.module.setting.BooleanSetting; -import dev.resent.module.setting.CustomRectSettingDraw; -import dev.resent.module.setting.ModeSetting; +import dev.resent.module.base.setting.BooleanSetting; +import dev.resent.module.base.setting.CustomRectSettingDraw; +import dev.resent.module.base.setting.ModeSetting; +import dev.resent.visual.cape.CapeUi; @Module(name = "Cape", category = Category.MISC, hasSetting = true) public class Cape 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 be0f0126..ea414de6 100644 --- a/src/main/java/dev/resent/module/impl/misc/Cosmetics.java +++ b/src/main/java/dev/resent/module/impl/misc/Cosmetics.java @@ -3,8 +3,8 @@ package dev.resent.module.impl.misc; import dev.resent.annotation.Module; import dev.resent.module.base.Mod; import dev.resent.module.base.Mod.Category; -import dev.resent.module.setting.BooleanSetting; -import dev.resent.module.setting.ModeSetting; +import dev.resent.module.base.setting.BooleanSetting; +import dev.resent.module.base.setting.ModeSetting; @Module(name = "Cosmetics", category = Category.MISC, hasSetting = true) public class Cosmetics 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 4d145fc2..a02efac6 100644 --- a/src/main/java/dev/resent/module/impl/misc/HUD.java +++ b/src/main/java/dev/resent/module/impl/misc/HUD.java @@ -3,8 +3,8 @@ package dev.resent.module.impl.misc; import dev.resent.annotation.Module; import dev.resent.module.base.Mod; import dev.resent.module.base.Mod.Category; -import dev.resent.module.setting.BooleanSetting; -import dev.resent.module.setting.ModeSetting; +import dev.resent.module.base.setting.BooleanSetting; +import dev.resent.module.base.setting.ModeSetting; @Module(name = "Theme", category = Category.MISC, hasSetting = true) public class HUD extends Mod { 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 ef22ddca..4da69e62 100644 --- a/src/main/java/dev/resent/module/impl/misc/Scoreboard.java +++ b/src/main/java/dev/resent/module/impl/misc/Scoreboard.java @@ -3,7 +3,7 @@ package dev.resent.module.impl.misc; import dev.resent.annotation.Module; import dev.resent.module.base.Mod; import dev.resent.module.base.Mod.Category; -import dev.resent.module.setting.BooleanSetting; +import dev.resent.module.base.setting.BooleanSetting; @Module(name = "Scoreboard", category = Category.MISC, hasSetting = true) public class Scoreboard extends Mod { diff --git a/src/main/java/dev/resent/module/impl/misc/Sprint.java b/src/main/java/dev/resent/module/impl/misc/Sprint.java index 52ac5ac9..a9cb7b1d 100644 --- a/src/main/java/dev/resent/module/impl/misc/Sprint.java +++ b/src/main/java/dev/resent/module/impl/misc/Sprint.java @@ -2,9 +2,9 @@ package dev.resent.module.impl.misc; import dev.resent.annotation.RenderModule; import dev.resent.module.base.Mod.Category; +import dev.resent.module.base.setting.BooleanSetting; import dev.resent.module.base.RenderMod; -import dev.resent.module.setting.BooleanSetting; -import dev.resent.ui.Theme; +import dev.resent.visual.ui.Theme; @RenderModule(name = "ToggleSprint", category = Category.MISC, x = 4, y = 122, hasSetting = true) public class Sprint extends RenderMod { diff --git a/src/main/java/dev/resent/util/render/RenderUtils.java b/src/main/java/dev/resent/util/render/RenderUtils.java index 173066ab..5daa9a41 100644 --- a/src/main/java/dev/resent/util/render/RenderUtils.java +++ b/src/main/java/dev/resent/util/render/RenderUtils.java @@ -1,6 +1,6 @@ package dev.resent.util.render; -import dev.resent.module.setting.ModeSetting; +import dev.resent.module.base.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/dev/resent/cape/CapeManager.java b/src/main/java/dev/resent/visual/cape/CapeManager.java similarity index 96% rename from src/main/java/dev/resent/cape/CapeManager.java rename to src/main/java/dev/resent/visual/cape/CapeManager.java index e391f98c..1f3edb78 100644 --- a/src/main/java/dev/resent/cape/CapeManager.java +++ b/src/main/java/dev/resent/visual/cape/CapeManager.java @@ -1,4 +1,4 @@ -package dev.resent.cape; +package dev.resent.visual.cape; import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.minecraft.client.Minecraft; diff --git a/src/main/java/dev/resent/cape/CapeUi.java b/src/main/java/dev/resent/visual/cape/CapeUi.java similarity index 98% rename from src/main/java/dev/resent/cape/CapeUi.java rename to src/main/java/dev/resent/visual/cape/CapeUi.java index 4e628210..59f7ab1e 100644 --- a/src/main/java/dev/resent/cape/CapeUi.java +++ b/src/main/java/dev/resent/visual/cape/CapeUi.java @@ -1,4 +1,4 @@ -package dev.resent.cape; +package dev.resent.visual.cape; import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.Keyboard; diff --git a/src/main/java/dev/resent/cosmetic/CosmeticBase.java b/src/main/java/dev/resent/visual/cosmetic/CosmeticBase.java similarity index 97% rename from src/main/java/dev/resent/cosmetic/CosmeticBase.java rename to src/main/java/dev/resent/visual/cosmetic/CosmeticBase.java index 4e88a6f6..383c959c 100644 --- a/src/main/java/dev/resent/cosmetic/CosmeticBase.java +++ b/src/main/java/dev/resent/visual/cosmetic/CosmeticBase.java @@ -1,4 +1,4 @@ -package dev.resent.cosmetic; +package dev.resent.visual.cosmetic; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/dev/resent/cosmetic/CosmeticController.java b/src/main/java/dev/resent/visual/cosmetic/CosmeticController.java similarity index 98% rename from src/main/java/dev/resent/cosmetic/CosmeticController.java rename to src/main/java/dev/resent/visual/cosmetic/CosmeticController.java index 42d3ea78..2457d0ed 100644 --- a/src/main/java/dev/resent/cosmetic/CosmeticController.java +++ b/src/main/java/dev/resent/visual/cosmetic/CosmeticController.java @@ -1,4 +1,4 @@ -package dev.resent.cosmetic; +package dev.resent.visual.cosmetic; import dev.resent.module.base.ModManager; import dev.resent.module.impl.misc.Cosmetics; diff --git a/src/main/java/dev/resent/cosmetic/impl/CrystalWings.java b/src/main/java/dev/resent/visual/cosmetic/impl/CrystalWings.java similarity index 97% rename from src/main/java/dev/resent/cosmetic/impl/CrystalWings.java rename to src/main/java/dev/resent/visual/cosmetic/impl/CrystalWings.java index 3c103c22..fd4464ce 100644 --- a/src/main/java/dev/resent/cosmetic/impl/CrystalWings.java +++ b/src/main/java/dev/resent/visual/cosmetic/impl/CrystalWings.java @@ -1,7 +1,7 @@ -package dev.resent.cosmetic.impl; +package dev.resent.visual.cosmetic.impl; -import dev.resent.cosmetic.CosmeticBase; -import dev.resent.cosmetic.CosmeticController; +import dev.resent.visual.cosmetic.CosmeticBase; +import dev.resent.visual.cosmetic.CosmeticController; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; diff --git a/src/main/java/dev/resent/cosmetic/impl/Glasses.java b/src/main/java/dev/resent/visual/cosmetic/impl/Glasses.java similarity index 97% rename from src/main/java/dev/resent/cosmetic/impl/Glasses.java rename to src/main/java/dev/resent/visual/cosmetic/impl/Glasses.java index 1e89fdd4..789873b0 100644 --- a/src/main/java/dev/resent/cosmetic/impl/Glasses.java +++ b/src/main/java/dev/resent/visual/cosmetic/impl/Glasses.java @@ -1,7 +1,7 @@ -package dev.resent.cosmetic.impl; +package dev.resent.visual.cosmetic.impl; -import dev.resent.cosmetic.CosmeticBase; -import dev.resent.cosmetic.CosmeticController; +import dev.resent.visual.cosmetic.CosmeticBase; +import dev.resent.visual.cosmetic.CosmeticController; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/dev/resent/cosmetic/impl/Halo.java b/src/main/java/dev/resent/visual/cosmetic/impl/Halo.java similarity index 95% rename from src/main/java/dev/resent/cosmetic/impl/Halo.java rename to src/main/java/dev/resent/visual/cosmetic/impl/Halo.java index 5d785817..445ede9a 100644 --- a/src/main/java/dev/resent/cosmetic/impl/Halo.java +++ b/src/main/java/dev/resent/visual/cosmetic/impl/Halo.java @@ -1,8 +1,8 @@ -package dev.resent.cosmetic.impl; +package dev.resent.visual.cosmetic.impl; -import dev.resent.cosmetic.CosmeticBase; -import dev.resent.cosmetic.CosmeticController; import dev.resent.util.render.Color; +import dev.resent.visual.cosmetic.CosmeticBase; +import dev.resent.visual.cosmetic.CosmeticController; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; diff --git a/src/main/java/dev/resent/cosmetic/impl/TopHat.java b/src/main/java/dev/resent/visual/cosmetic/impl/TopHat.java similarity index 94% rename from src/main/java/dev/resent/cosmetic/impl/TopHat.java rename to src/main/java/dev/resent/visual/cosmetic/impl/TopHat.java index 93fed9e4..974e9422 100644 --- a/src/main/java/dev/resent/cosmetic/impl/TopHat.java +++ b/src/main/java/dev/resent/visual/cosmetic/impl/TopHat.java @@ -1,7 +1,7 @@ -package dev.resent.cosmetic.impl; +package dev.resent.visual.cosmetic.impl; -import dev.resent.cosmetic.CosmeticBase; -import dev.resent.cosmetic.CosmeticController; +import dev.resent.visual.cosmetic.CosmeticBase; +import dev.resent.visual.cosmetic.CosmeticController; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/dev/resent/ui/ClickGUI.java b/src/main/java/dev/resent/visual/ui/ClickGUI.java similarity index 97% rename from src/main/java/dev/resent/ui/ClickGUI.java rename to src/main/java/dev/resent/visual/ui/ClickGUI.java index a0a6c833..bae6823d 100644 --- a/src/main/java/dev/resent/ui/ClickGUI.java +++ b/src/main/java/dev/resent/visual/ui/ClickGUI.java @@ -1,18 +1,18 @@ -package dev.resent.ui; +package dev.resent.visual.ui; import java.io.IOException; import dev.resent.client.Resent; import dev.resent.module.base.Mod; -import dev.resent.module.setting.BooleanSetting; -import dev.resent.module.setting.CustomRectSettingDraw; -import dev.resent.module.setting.ModeSetting; -import dev.resent.module.setting.Setting; -import dev.resent.ui.animation.Animation; -import dev.resent.ui.animation.Direction; +import dev.resent.module.base.setting.BooleanSetting; +import dev.resent.module.base.setting.CustomRectSettingDraw; +import dev.resent.module.base.setting.ModeSetting; +import dev.resent.module.base.setting.Setting; import dev.resent.util.misc.GlUtils; import dev.resent.util.render.Color; import dev.resent.util.render.RenderUtils; +import dev.resent.visual.ui.animation.Animation; +import dev.resent.visual.ui.animation.Direction; import net.lax1dude.eaglercraft.v1_8.Keyboard; import net.lax1dude.eaglercraft.v1_8.Mouse; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; diff --git a/src/main/java/dev/resent/ui/ClientButton.java b/src/main/java/dev/resent/visual/ui/ClientButton.java similarity index 97% rename from src/main/java/dev/resent/ui/ClientButton.java rename to src/main/java/dev/resent/visual/ui/ClientButton.java index 7348b23e..62b8f163 100644 --- a/src/main/java/dev/resent/ui/ClientButton.java +++ b/src/main/java/dev/resent/visual/ui/ClientButton.java @@ -1,4 +1,4 @@ -package dev.resent.ui; +package dev.resent.visual.ui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/dev/resent/ui/HUDConfigScreen.java b/src/main/java/dev/resent/visual/ui/HUDConfigScreen.java similarity index 96% rename from src/main/java/dev/resent/ui/HUDConfigScreen.java rename to src/main/java/dev/resent/visual/ui/HUDConfigScreen.java index c5a5d819..40fe484f 100644 --- a/src/main/java/dev/resent/ui/HUDConfigScreen.java +++ b/src/main/java/dev/resent/visual/ui/HUDConfigScreen.java @@ -1,4 +1,4 @@ -package dev.resent.ui; +package dev.resent.visual.ui; import dev.resent.client.Resent; import dev.resent.module.base.RenderMod; diff --git a/src/main/java/dev/resent/ui/PreGUI.java b/src/main/java/dev/resent/visual/ui/PreGUI.java similarity index 98% rename from src/main/java/dev/resent/ui/PreGUI.java rename to src/main/java/dev/resent/visual/ui/PreGUI.java index 9b3b917a..4e107ccb 100644 --- a/src/main/java/dev/resent/ui/PreGUI.java +++ b/src/main/java/dev/resent/visual/ui/PreGUI.java @@ -1,4 +1,4 @@ -package dev.resent.ui; +package dev.resent.visual.ui; import dev.resent.util.misc.GlUtils; import dev.resent.util.render.RenderUtils; diff --git a/src/main/java/dev/resent/ui/Theme.java b/src/main/java/dev/resent/visual/ui/Theme.java similarity index 84% rename from src/main/java/dev/resent/ui/Theme.java rename to src/main/java/dev/resent/visual/ui/Theme.java index 39285012..d7b08a42 100644 --- a/src/main/java/dev/resent/ui/Theme.java +++ b/src/main/java/dev/resent/visual/ui/Theme.java @@ -1,13 +1,13 @@ -package dev.resent.ui; +package dev.resent.visual.ui; import dev.resent.module.impl.misc.HUD; -import dev.resent.ui.animation.Animation; -import dev.resent.ui.animation.impl.DecelerateAnimation; -import dev.resent.ui.animation.impl.EaseBackIn; -import dev.resent.ui.animation.impl.EaseInOutQuad; -import dev.resent.ui.animation.impl.ElasticAnimation; -import dev.resent.ui.animation.impl.SmoothStepAnimation; import dev.resent.util.render.RenderUtils; +import dev.resent.visual.ui.animation.Animation; +import dev.resent.visual.ui.animation.impl.DecelerateAnimation; +import dev.resent.visual.ui.animation.impl.EaseBackIn; +import dev.resent.visual.ui.animation.impl.EaseInOutQuad; +import dev.resent.visual.ui.animation.impl.ElasticAnimation; +import dev.resent.visual.ui.animation.impl.SmoothStepAnimation; public class Theme { diff --git a/src/main/java/dev/resent/ui/animation/Animation.java b/src/main/java/dev/resent/visual/ui/animation/Animation.java similarity index 98% rename from src/main/java/dev/resent/ui/animation/Animation.java rename to src/main/java/dev/resent/visual/ui/animation/Animation.java index fbcb4529..470b319a 100644 --- a/src/main/java/dev/resent/ui/animation/Animation.java +++ b/src/main/java/dev/resent/visual/ui/animation/Animation.java @@ -1,4 +1,4 @@ -package dev.resent.ui.animation; +package dev.resent.visual.ui.animation; public abstract class Animation { diff --git a/src/main/java/dev/resent/ui/animation/AnimationUtils.java b/src/main/java/dev/resent/visual/ui/animation/AnimationUtils.java similarity index 94% rename from src/main/java/dev/resent/ui/animation/AnimationUtils.java rename to src/main/java/dev/resent/visual/ui/animation/AnimationUtils.java index c6d0fc36..80f3fa46 100644 --- a/src/main/java/dev/resent/ui/animation/AnimationUtils.java +++ b/src/main/java/dev/resent/visual/ui/animation/AnimationUtils.java @@ -1,4 +1,4 @@ -package dev.resent.ui.animation; +package dev.resent.visual.ui.animation; public class AnimationUtils { diff --git a/src/main/java/dev/resent/ui/animation/Direction.java b/src/main/java/dev/resent/visual/ui/animation/Direction.java similarity index 84% rename from src/main/java/dev/resent/ui/animation/Direction.java rename to src/main/java/dev/resent/visual/ui/animation/Direction.java index 0eb58214..eacb1aa0 100644 --- a/src/main/java/dev/resent/ui/animation/Direction.java +++ b/src/main/java/dev/resent/visual/ui/animation/Direction.java @@ -1,4 +1,4 @@ -package dev.resent.ui.animation; +package dev.resent.visual.ui.animation; public enum Direction { FORWARDS, diff --git a/src/main/java/dev/resent/ui/animation/SimpleAnimation.java b/src/main/java/dev/resent/visual/ui/animation/SimpleAnimation.java similarity index 95% rename from src/main/java/dev/resent/ui/animation/SimpleAnimation.java rename to src/main/java/dev/resent/visual/ui/animation/SimpleAnimation.java index ec3878cd..4d6cf3e2 100644 --- a/src/main/java/dev/resent/ui/animation/SimpleAnimation.java +++ b/src/main/java/dev/resent/visual/ui/animation/SimpleAnimation.java @@ -1,4 +1,4 @@ -package dev.resent.ui.animation; +package dev.resent.visual.ui.animation; public class SimpleAnimation { diff --git a/src/main/java/dev/resent/ui/animation/impl/DecelerateAnimation.java b/src/main/java/dev/resent/visual/ui/animation/impl/DecelerateAnimation.java similarity index 73% rename from src/main/java/dev/resent/ui/animation/impl/DecelerateAnimation.java rename to src/main/java/dev/resent/visual/ui/animation/impl/DecelerateAnimation.java index 100feba0..d68c343c 100644 --- a/src/main/java/dev/resent/ui/animation/impl/DecelerateAnimation.java +++ b/src/main/java/dev/resent/visual/ui/animation/impl/DecelerateAnimation.java @@ -1,7 +1,7 @@ -package dev.resent.ui.animation.impl; +package dev.resent.visual.ui.animation.impl; -import dev.resent.ui.animation.Animation; -import dev.resent.ui.animation.Direction; +import dev.resent.visual.ui.animation.Animation; +import dev.resent.visual.ui.animation.Direction; public class DecelerateAnimation extends Animation { diff --git a/src/main/java/dev/resent/ui/animation/impl/EaseBackIn.java b/src/main/java/dev/resent/visual/ui/animation/impl/EaseBackIn.java similarity index 83% rename from src/main/java/dev/resent/ui/animation/impl/EaseBackIn.java rename to src/main/java/dev/resent/visual/ui/animation/impl/EaseBackIn.java index 29dbe131..24535555 100644 --- a/src/main/java/dev/resent/ui/animation/impl/EaseBackIn.java +++ b/src/main/java/dev/resent/visual/ui/animation/impl/EaseBackIn.java @@ -1,7 +1,7 @@ -package dev.resent.ui.animation.impl; +package dev.resent.visual.ui.animation.impl; -import dev.resent.ui.animation.Animation; -import dev.resent.ui.animation.Direction; +import dev.resent.visual.ui.animation.Animation; +import dev.resent.visual.ui.animation.Direction; public class EaseBackIn extends Animation { diff --git a/src/main/java/dev/resent/ui/animation/impl/EaseInOutQuad.java b/src/main/java/dev/resent/visual/ui/animation/impl/EaseInOutQuad.java similarity index 74% rename from src/main/java/dev/resent/ui/animation/impl/EaseInOutQuad.java rename to src/main/java/dev/resent/visual/ui/animation/impl/EaseInOutQuad.java index eb645fd8..84cb5094 100644 --- a/src/main/java/dev/resent/ui/animation/impl/EaseInOutQuad.java +++ b/src/main/java/dev/resent/visual/ui/animation/impl/EaseInOutQuad.java @@ -1,7 +1,7 @@ -package dev.resent.ui.animation.impl; +package dev.resent.visual.ui.animation.impl; -import dev.resent.ui.animation.Animation; -import dev.resent.ui.animation.Direction; +import dev.resent.visual.ui.animation.Animation; +import dev.resent.visual.ui.animation.Direction; public class EaseInOutQuad extends Animation { diff --git a/src/main/java/dev/resent/ui/animation/impl/ElasticAnimation.java b/src/main/java/dev/resent/visual/ui/animation/impl/ElasticAnimation.java similarity index 87% rename from src/main/java/dev/resent/ui/animation/impl/ElasticAnimation.java rename to src/main/java/dev/resent/visual/ui/animation/impl/ElasticAnimation.java index 504e5760..bd66ac5c 100644 --- a/src/main/java/dev/resent/ui/animation/impl/ElasticAnimation.java +++ b/src/main/java/dev/resent/visual/ui/animation/impl/ElasticAnimation.java @@ -1,7 +1,7 @@ -package dev.resent.ui.animation.impl; +package dev.resent.visual.ui.animation.impl; -import dev.resent.ui.animation.Animation; -import dev.resent.ui.animation.Direction; +import dev.resent.visual.ui.animation.Animation; +import dev.resent.visual.ui.animation.Direction; public class ElasticAnimation extends Animation { diff --git a/src/main/java/dev/resent/ui/animation/impl/SmoothStepAnimation.java b/src/main/java/dev/resent/visual/ui/animation/impl/SmoothStepAnimation.java similarity index 76% rename from src/main/java/dev/resent/ui/animation/impl/SmoothStepAnimation.java rename to src/main/java/dev/resent/visual/ui/animation/impl/SmoothStepAnimation.java index fa27972b..a03ded0a 100644 --- a/src/main/java/dev/resent/ui/animation/impl/SmoothStepAnimation.java +++ b/src/main/java/dev/resent/visual/ui/animation/impl/SmoothStepAnimation.java @@ -1,7 +1,7 @@ -package dev.resent.ui.animation.impl; +package dev.resent.visual.ui.animation.impl; -import dev.resent.ui.animation.Animation; -import dev.resent.ui.animation.Direction; +import dev.resent.visual.ui.animation.Animation; +import dev.resent.visual.ui.animation.Direction; public class SmoothStepAnimation extends Animation { diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java index 34fc8618..ccdd8eb8 100644 --- a/src/main/java/net/minecraft/client/Minecraft.java +++ b/src/main/java/net/minecraft/client/Minecraft.java @@ -25,8 +25,8 @@ import com.google.common.collect.Lists; import dev.resent.client.Resent; import dev.resent.module.base.ModManager; -import dev.resent.ui.PreGUI; import dev.resent.util.misc.W; +import dev.resent.visual.ui.PreGUI; import net.lax1dude.eaglercraft.v1_8.Display; import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.HString; diff --git a/src/main/java/net/minecraft/client/gui/GuiChat.java b/src/main/java/net/minecraft/client/gui/GuiChat.java index 189f54ba..7b442b14 100644 --- a/src/main/java/net/minecraft/client/gui/GuiChat.java +++ b/src/main/java/net/minecraft/client/gui/GuiChat.java @@ -1,8 +1,10 @@ package net.minecraft.client.gui; import com.google.common.collect.Lists; -import dev.resent.ui.animation.SimpleAnimation; + import dev.resent.util.misc.GlUtils; +import dev.resent.visual.ui.animation.SimpleAnimation; + import java.io.IOException; import java.util.List; import net.lax1dude.eaglercraft.v1_8.Keyboard; diff --git a/src/main/java/net/minecraft/client/gui/GuiIngame.java b/src/main/java/net/minecraft/client/gui/GuiIngame.java index 083f6921..f701e1e8 100644 --- a/src/main/java/net/minecraft/client/gui/GuiIngame.java +++ b/src/main/java/net/minecraft/client/gui/GuiIngame.java @@ -11,9 +11,10 @@ import com.google.common.collect.Lists; import dev.resent.client.Resent; import dev.resent.module.base.RenderMod; -import dev.resent.ui.animation.SimpleAnimation; import dev.resent.util.misc.W; import dev.resent.util.render.Color; +import dev.resent.visual.ui.animation.SimpleAnimation; + import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java b/src/main/java/net/minecraft/client/gui/GuiMainMenu.java index 832f52e0..f0e5bf6e 100644 --- a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java +++ b/src/main/java/net/minecraft/client/gui/GuiMainMenu.java @@ -1,7 +1,7 @@ package net.minecraft.client.gui; -import dev.resent.ui.ClientButton; import dev.resent.util.misc.GlUtils; +import dev.resent.visual.ui.ClientButton; import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile; import net.minecraft.client.Minecraft; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiInventory.java b/src/main/java/net/minecraft/client/gui/inventory/GuiInventory.java index e23621eb..2da48c83 100644 --- a/src/main/java/net/minecraft/client/gui/inventory/GuiInventory.java +++ b/src/main/java/net/minecraft/client/gui/inventory/GuiInventory.java @@ -1,8 +1,8 @@ package net.minecraft.client.gui.inventory; -import dev.resent.ui.Theme; -import dev.resent.ui.animation.Animation; import dev.resent.util.misc.GlUtils; +import dev.resent.visual.ui.Theme; +import dev.resent.visual.ui.animation.Animation; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java b/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java index 385566e5..79dc607f 100644 --- a/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java +++ b/src/main/java/net/minecraft/client/renderer/entity/RenderPlayer.java @@ -1,9 +1,9 @@ package net.minecraft.client.renderer.entity; -import dev.resent.cosmetic.impl.CrystalWings; -import dev.resent.cosmetic.impl.Glasses; -import dev.resent.cosmetic.impl.Halo; -import dev.resent.cosmetic.impl.TopHat; +import dev.resent.visual.cosmetic.impl.CrystalWings; +import dev.resent.visual.cosmetic.impl.Glasses; +import dev.resent.visual.cosmetic.impl.Halo; +import dev.resent.visual.cosmetic.impl.TopHat; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.EntityPlayerSP; 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 c2ab94df..9cc1f320 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,7 +1,7 @@ package net.minecraft.client.renderer.entity.layers; -import dev.resent.cape.CapeManager; import dev.resent.module.base.ModManager; +import dev.resent.visual.cape.CapeManager; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelPlayer;