diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/ActiveModulesCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/ActiveModulesCommand.java index 4d71a04a..42c9e2ae 100644 --- a/src/main/java/me/zeroeightsix/kami/command/commands/ActiveModulesCommand.java +++ b/src/main/java/me/zeroeightsix/kami/command/commands/ActiveModulesCommand.java @@ -3,14 +3,10 @@ package me.zeroeightsix.kami.command.commands; import me.zeroeightsix.kami.command.Command; import me.zeroeightsix.kami.command.syntax.ChunkBuilder; import me.zeroeightsix.kami.module.Module; -import me.zeroeightsix.kami.module.modules.gui.ActiveModules; +import me.zeroeightsix.kami.module.modules.client.ActiveModules; import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; -import java.util.stream.Collectors; import static me.zeroeightsix.kami.KamiMod.MODULE_MANAGER; diff --git a/src/main/java/me/zeroeightsix/kami/event/ForgeEventProcessor.java b/src/main/java/me/zeroeightsix/kami/event/ForgeEventProcessor.java index b691973b..d70a906e 100644 --- a/src/main/java/me/zeroeightsix/kami/event/ForgeEventProcessor.java +++ b/src/main/java/me/zeroeightsix/kami/event/ForgeEventProcessor.java @@ -7,7 +7,7 @@ import me.zeroeightsix.kami.event.events.DisplaySizeChangedEvent; import me.zeroeightsix.kami.gui.UIRenderer; import me.zeroeightsix.kami.gui.kami.KamiGUI; import me.zeroeightsix.kami.gui.rgui.component.container.use.Frame; -import me.zeroeightsix.kami.module.modules.gui.CommandConfig; +import me.zeroeightsix.kami.module.modules.client.CommandConfig; import me.zeroeightsix.kami.module.modules.render.BossStack; import me.zeroeightsix.kami.util.KamiTessellator; import me.zeroeightsix.kami.util.Wrapper; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java index c5da0d89..be2e7fe9 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java @@ -17,7 +17,7 @@ import me.zeroeightsix.kami.gui.rgui.render.theme.Theme; import me.zeroeightsix.kami.gui.rgui.util.ContainerHelper; import me.zeroeightsix.kami.gui.rgui.util.Docking; import me.zeroeightsix.kami.module.Module; -import me.zeroeightsix.kami.module.modules.gui.InfoOverlay; +import me.zeroeightsix.kami.module.modules.client.InfoOverlay; import me.zeroeightsix.kami.util.ColourHolder; import me.zeroeightsix.kami.util.Friends; import me.zeroeightsix.kami.util.Pair; @@ -45,7 +45,7 @@ import static me.zeroeightsix.kami.util.InfoCalculator.cardinalToAxis; /** * Created by 086 on 25/06/2017. * Updated by S-B99 on 28/01/20 - * @see me.zeroeightsix.kami.module.modules.gui.InventoryViewer + * @see me.zeroeightsix.kami.module.modules.client.InventoryViewer */ public class KamiGUI extends GUI { @@ -248,7 +248,7 @@ public class KamiGUI extends GUI { /** * Inventory Viewer * - * {@link me.zeroeightsix.kami.module.modules.gui.InventoryViewer} + * {@link me.zeroeightsix.kami.module.modules.client.InventoryViewer} */ frame = new Frame(getTheme(), new Stretcherlayout(1), "Inventory Viewer"); frame.setCloseable(false); diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiActiveModulesUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiActiveModulesUI.java index 6e752b10..79fa1232 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiActiveModulesUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiActiveModulesUI.java @@ -4,7 +4,7 @@ import me.zeroeightsix.kami.KamiMod; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.module.Module; -import me.zeroeightsix.kami.module.modules.gui.ActiveModules; +import me.zeroeightsix.kami.module.modules.client.ActiveModules; import me.zeroeightsix.kami.util.Wrapper; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/me/zeroeightsix/kami/module/Module.java b/src/main/java/me/zeroeightsix/kami/module/Module.java index f153d1b2..13b60fd8 100644 --- a/src/main/java/me/zeroeightsix/kami/module/Module.java +++ b/src/main/java/me/zeroeightsix/kami/module/Module.java @@ -84,7 +84,7 @@ public class Module { /** * @see me.zeroeightsix.kami.command.commands.GenerateWebsiteCommand - * @see me.zeroeightsix.kami.module.modules.gui.ActiveModules + * @see me.zeroeightsix.kami.module.modules.client.ActiveModules */ public enum Category { CHAT("Chat", false), diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/gui/ActiveModules.java b/src/main/java/me/zeroeightsix/kami/module/modules/client/ActiveModules.java similarity index 99% rename from src/main/java/me/zeroeightsix/kami/module/modules/gui/ActiveModules.java rename to src/main/java/me/zeroeightsix/kami/module/modules/client/ActiveModules.java index ec730b80..545ac424 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/gui/ActiveModules.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/client/ActiveModules.java @@ -1,4 +1,4 @@ -package me.zeroeightsix.kami.module.modules.gui; +package me.zeroeightsix.kami.module.modules.client; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.setting.Setting; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/gui/CommandConfig.java b/src/main/java/me/zeroeightsix/kami/module/modules/client/CommandConfig.java similarity index 95% rename from src/main/java/me/zeroeightsix/kami/module/modules/gui/CommandConfig.java rename to src/main/java/me/zeroeightsix/kami/module/modules/client/CommandConfig.java index c7029ac0..1a6bdd81 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/gui/CommandConfig.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/client/CommandConfig.java @@ -1,4 +1,4 @@ -package me.zeroeightsix.kami.module.modules.gui; +package me.zeroeightsix.kami.module.modules.client; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.setting.Setting; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/gui/InfoOverlay.java b/src/main/java/me/zeroeightsix/kami/module/modules/client/InfoOverlay.java similarity index 99% rename from src/main/java/me/zeroeightsix/kami/module/modules/gui/InfoOverlay.java rename to src/main/java/me/zeroeightsix/kami/module/modules/client/InfoOverlay.java index 59c2feb9..088df1ac 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/gui/InfoOverlay.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/client/InfoOverlay.java @@ -1,4 +1,4 @@ -package me.zeroeightsix.kami.module.modules.gui; +package me.zeroeightsix.kami.module.modules.client; import me.zeroeightsix.kami.KamiMod; import me.zeroeightsix.kami.module.Module; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/gui/InventoryViewer.java b/src/main/java/me/zeroeightsix/kami/module/modules/client/InventoryViewer.java similarity index 99% rename from src/main/java/me/zeroeightsix/kami/module/modules/gui/InventoryViewer.java rename to src/main/java/me/zeroeightsix/kami/module/modules/client/InventoryViewer.java index 029cf293..f237a1ba 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/gui/InventoryViewer.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/client/InventoryViewer.java @@ -1,4 +1,4 @@ -package me.zeroeightsix.kami.module.modules.gui; +package me.zeroeightsix.kami.module.modules.client; import me.zeroeightsix.kami.gui.rgui.component.container.use.Frame; import me.zeroeightsix.kami.module.Module; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AntiChainPop.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AntiChainPop.java index 271d1d7d..b797e398 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AntiChainPop.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AntiChainPop.java @@ -11,7 +11,7 @@ import net.minecraft.init.Items; import net.minecraft.network.play.server.SPacketEntityStatus; import static me.zeroeightsix.kami.KamiMod.MODULE_MANAGER; -import static me.zeroeightsix.kami.module.modules.gui.InfoOverlay.getItems; +import static me.zeroeightsix.kami.module.modules.client.InfoOverlay.getItems; /** * @author S-B99 diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTotem.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTotem.java index 55d65510..a9be2892 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTotem.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTotem.java @@ -9,7 +9,7 @@ import net.minecraft.inventory.ClickType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import static me.zeroeightsix.kami.module.modules.gui.InfoOverlay.getItems; +import static me.zeroeightsix.kami.module.modules.client.InfoOverlay.getItems; /** * Created by 086 on 22/01/2018. diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java index 8b23031b..283c82a4 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java @@ -38,7 +38,7 @@ import java.util.Objects; import java.util.stream.Collectors; import static me.zeroeightsix.kami.KamiMod.MODULE_MANAGER; -import static me.zeroeightsix.kami.module.modules.gui.InfoOverlay.getItems; +import static me.zeroeightsix.kami.module.modules.client.InfoOverlay.getItems; import static me.zeroeightsix.kami.util.ColourConverter.rgbToInt; import static me.zeroeightsix.kami.util.ColourConverter.toF; import static me.zeroeightsix.kami.util.EntityUtil.calculateLookAt; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/OffhandGap.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/OffhandGap.java index beb52975..af0e733e 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/OffhandGap.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/OffhandGap.java @@ -16,7 +16,7 @@ import java.util.Comparator; import java.util.Objects; import static me.zeroeightsix.kami.KamiMod.MODULE_MANAGER; -import static me.zeroeightsix.kami.module.modules.gui.InfoOverlay.getItems; +import static me.zeroeightsix.kami.module.modules.client.InfoOverlay.getItems; /** * @author polymer (main listener switch function xd) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/hidden/RunConfig.java b/src/main/java/me/zeroeightsix/kami/module/modules/hidden/RunConfig.java index 0346c845..5baf783d 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/hidden/RunConfig.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/hidden/RunConfig.java @@ -3,10 +3,10 @@ package me.zeroeightsix.kami.module.modules.hidden; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.module.modules.capes.Capes; import me.zeroeightsix.kami.module.modules.chat.CustomChat; -import me.zeroeightsix.kami.module.modules.gui.ActiveModules; -import me.zeroeightsix.kami.module.modules.gui.CommandConfig; -import me.zeroeightsix.kami.module.modules.gui.InfoOverlay; -import me.zeroeightsix.kami.module.modules.gui.InventoryViewer; +import me.zeroeightsix.kami.module.modules.client.ActiveModules; +import me.zeroeightsix.kami.module.modules.client.CommandConfig; +import me.zeroeightsix.kami.module.modules.client.InfoOverlay; +import me.zeroeightsix.kami.module.modules.client.InventoryViewer; import me.zeroeightsix.kami.module.modules.misc.DiscordSettings; import me.zeroeightsix.kami.module.modules.render.TabFriends; import me.zeroeightsix.kami.setting.Setting; diff --git a/src/main/java/me/zeroeightsix/kami/util/CommandUtil.java b/src/main/java/me/zeroeightsix/kami/util/CommandUtil.java index 8b1d4df4..7d95929a 100644 --- a/src/main/java/me/zeroeightsix/kami/util/CommandUtil.java +++ b/src/main/java/me/zeroeightsix/kami/util/CommandUtil.java @@ -1,7 +1,7 @@ package me.zeroeightsix.kami.util; import me.zeroeightsix.kami.command.Command; -import me.zeroeightsix.kami.module.modules.gui.CommandConfig; +import me.zeroeightsix.kami.module.modules.client.CommandConfig; import static me.zeroeightsix.kami.KamiMod.MODULE_MANAGER; diff --git a/src/main/java/me/zeroeightsix/kami/util/TimeUtil.java b/src/main/java/me/zeroeightsix/kami/util/TimeUtil.java index 6cbd2ab5..0c0a75eb 100644 --- a/src/main/java/me/zeroeightsix/kami/util/TimeUtil.java +++ b/src/main/java/me/zeroeightsix/kami/util/TimeUtil.java @@ -6,7 +6,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import static me.zeroeightsix.kami.module.modules.gui.InfoOverlay.getStringColour; +import static me.zeroeightsix.kami.module.modules.client.InfoOverlay.getStringColour; /** * @author S-B99