From 4127240f66c62773ffe1c3cd51b54a976a1a1ba0 Mon Sep 17 00:00:00 2001 From: Ossian Winter Date: Wed, 15 Aug 2018 09:55:36 +0200 Subject: [PATCH 1/2] make itemRender private --- .../me/zeroeightsix/kami/module/modules/render/ArmorHUD.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/ArmorHUD.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/ArmorHUD.java index 79de4925..e4985751 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/ArmorHUD.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/render/ArmorHUD.java @@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack; @Module.Info(name = "ArmorHUD", category = Module.Category.RENDER) public class ArmorHUD extends Module { - static RenderItem itemRender = Minecraft.getMinecraft() + private static RenderItem itemRender = Minecraft.getMinecraft() .getRenderItem(); @Setting(name = "Damage") private boolean damage = false; From 9982f579dd3a8a928b5de606ad0ff780a2124243 Mon Sep 17 00:00:00 2001 From: Ossian Winter Date: Wed, 15 Aug 2018 09:58:06 +0200 Subject: [PATCH 2/2] remove unused imports --- .../java/me/zeroeightsix/kami/command/CommandManager.java | 1 - .../zeroeightsix/kami/event/events/PlayerMoveEvent.java | 1 - src/main/java/me/zeroeightsix/kami/gui/UIRenderer.java | 4 ++-- .../me/zeroeightsix/kami/gui/kami/component/Chat.java | 4 ++-- .../kami/gui/kami/component/SettingsPanel.java | 2 +- .../kami/gui/kami/theme/kami/KamiActiveModulesUI.java | 2 +- .../kami/gui/kami/theme/kami/KamiEnumbuttonUI.java | 4 ++-- .../kami/gui/kami/theme/kami/KamiFrameUI.java | 2 +- .../kami/gui/kami/theme/kami/KamiSettingsPanelUI.java | 8 +++----- .../zeroeightsix/kami/gui/kami/theme/kami/KamiTheme.java | 6 +++--- .../kami/gui/kami/theme/kami/KamiUnboundSliderUI.java | 2 +- .../kami/gui/kami/theme/kami/RootButtonUI.java | 4 ++-- .../zeroeightsix/kami/gui/kami/theme/kami/RootChatUI.java | 2 +- .../kami/gui/kami/theme/kami/RootCheckButtonUI.java | 2 +- .../gui/kami/theme/kami/RootColorizedCheckButtonUI.java | 4 ++-- .../kami/gui/kami/theme/kami/RootGroupboxUI.java | 2 +- .../kami/gui/kami/theme/kami/RootInputFieldUI.java | 4 ++-- .../kami/gui/kami/theme/kami/RootLabelUI.java | 2 +- .../kami/gui/kami/theme/kami/RootScrollpaneUI.java | 4 ++-- .../kami/gui/kami/theme/kami/RootSettingsPanelUI.java | 4 ++-- .../kami/gui/kami/theme/kami/RootSliderUI.java | 4 ++-- .../kami/gui/kami/theme/staticui/RadarUI.java | 4 ++-- .../kami/gui/kami/theme/staticui/TabGuiUI.java | 4 ++-- src/main/java/me/zeroeightsix/kami/gui/rgui/GUI.java | 6 +++--- .../kami/gui/rgui/component/AbstractComponent.java | 2 +- .../gui/rgui/component/container/AbstractContainer.java | 4 ++-- .../kami/gui/rgui/component/container/use/Frame.java | 2 +- .../kami/gui/rgui/component/container/use/Scrollpane.java | 6 +++--- .../kami/gui/rgui/component/use/InputField.java | 2 +- .../me/zeroeightsix/kami/gui/rgui/render/util/Shader.java | 4 ++-- .../kami/mixin/client/MixinEntityPlayerSP.java | 1 - .../kami/mixin/client/MixinNetHandlerPlayClient.java | 1 - .../kami/mixin/client/MixinNetworkManager.java | 4 ---- .../kami/mixin/client/MixinStateImplementation.java | 3 --- .../java/me/zeroeightsix/kami/module/ModuleManager.java | 6 ++++-- .../kami/module/modules/combat/AutoTotem.java | 1 - .../kami/module/modules/combat/CrystalAura.java | 3 ++- .../kami/module/modules/misc/NoPacketKick.java | 1 - .../me/zeroeightsix/kami/module/modules/player/Blink.java | 1 - .../zeroeightsix/kami/module/modules/player/Freecam.java | 5 ++--- .../zeroeightsix/kami/module/modules/player/NoFall.java | 7 ------- .../zeroeightsix/kami/module/modules/player/TpsSync.java | 4 ---- .../kami/module/modules/render/Brightness.java | 2 -- .../kami/module/modules/render/EyeFinder.java | 1 - .../zeroeightsix/kami/module/modules/render/Nametags.java | 4 +--- .../kami/module/modules/render/PortalTracers.java | 2 -- src/main/java/me/zeroeightsix/kami/util/Friends.java | 4 +++- .../java/me/zeroeightsix/kami/util/KamiTessellator.java | 4 +--- src/main/java/me/zeroeightsix/kami/util/Wrapper.java | 2 +- 49 files changed, 63 insertions(+), 95 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/command/CommandManager.java b/src/main/java/me/zeroeightsix/kami/command/CommandManager.java index 9263cd63..9b4731ea 100644 --- a/src/main/java/me/zeroeightsix/kami/command/CommandManager.java +++ b/src/main/java/me/zeroeightsix/kami/command/CommandManager.java @@ -4,7 +4,6 @@ import me.zeroeightsix.kami.KamiMod; import me.zeroeightsix.kami.command.commands.BindCommand; import me.zeroeightsix.kami.util.ClassFinder; -import java.io.IOException; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/me/zeroeightsix/kami/event/events/PlayerMoveEvent.java b/src/main/java/me/zeroeightsix/kami/event/events/PlayerMoveEvent.java index 3cbedca9..daa1fa1e 100644 --- a/src/main/java/me/zeroeightsix/kami/event/events/PlayerMoveEvent.java +++ b/src/main/java/me/zeroeightsix/kami/event/events/PlayerMoveEvent.java @@ -2,7 +2,6 @@ package me.zeroeightsix.kami.event.events; import me.zeroeightsix.kami.event.KamiEvent; import net.minecraft.entity.MoverType; -import net.minecraft.util.math.BlockPos; /** * @author 086 diff --git a/src/main/java/me/zeroeightsix/kami/gui/UIRenderer.java b/src/main/java/me/zeroeightsix/kami/gui/UIRenderer.java index 64469281..8632565e 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/UIRenderer.java +++ b/src/main/java/me/zeroeightsix/kami/gui/UIRenderer.java @@ -1,11 +1,11 @@ package me.zeroeightsix.kami.gui; import me.zeroeightsix.kami.KamiMod; +import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; +import me.zeroeightsix.kami.gui.kami.KamiGUI; import me.zeroeightsix.kami.gui.rgui.component.Component; import me.zeroeightsix.kami.gui.rgui.component.container.use.Frame; import me.zeroeightsix.kami.gui.rgui.component.listen.RenderListener; -import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; -import me.zeroeightsix.kami.gui.kami.KamiGUI; import me.zeroeightsix.kami.util.Wrapper; import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/component/Chat.java b/src/main/java/me/zeroeightsix/kami/gui/kami/component/Chat.java index 94c46312..5dbe3b13 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/component/Chat.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/component/Chat.java @@ -1,13 +1,13 @@ package me.zeroeightsix.kami.gui.kami.component; -import org.lwjgl.input.Keyboard; +import me.zeroeightsix.kami.gui.kami.Stretcherlayout; import me.zeroeightsix.kami.gui.rgui.component.container.AbstractContainer; import me.zeroeightsix.kami.gui.rgui.component.container.use.Scrollpane; import me.zeroeightsix.kami.gui.rgui.component.listen.KeyListener; import me.zeroeightsix.kami.gui.rgui.component.use.InputField; import me.zeroeightsix.kami.gui.rgui.component.use.Label; import me.zeroeightsix.kami.gui.rgui.render.theme.Theme; -import me.zeroeightsix.kami.gui.kami.Stretcherlayout; +import org.lwjgl.input.Keyboard; /** * Created by 086 on 2/08/2017. diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/component/SettingsPanel.java b/src/main/java/me/zeroeightsix/kami/gui/kami/component/SettingsPanel.java index fbb675c0..c03917b2 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/component/SettingsPanel.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/component/SettingsPanel.java @@ -1,11 +1,11 @@ package me.zeroeightsix.kami.gui.kami.component; +import me.zeroeightsix.kami.gui.kami.Stretcherlayout; import me.zeroeightsix.kami.gui.rgui.component.Component; import me.zeroeightsix.kami.gui.rgui.component.container.OrganisedContainer; import me.zeroeightsix.kami.gui.rgui.component.use.CheckButton; import me.zeroeightsix.kami.gui.rgui.component.use.Slider; import me.zeroeightsix.kami.gui.rgui.render.theme.Theme; -import me.zeroeightsix.kami.gui.kami.Stretcherlayout; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.setting.SettingsClass; 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 c1bdcd61..46897ca5 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 @@ -1,10 +1,10 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; import me.zeroeightsix.kami.command.Command; +import me.zeroeightsix.kami.gui.kami.component.ActiveModules; import me.zeroeightsix.kami.gui.rgui.component.AlignedComponent; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import me.zeroeightsix.kami.gui.kami.component.ActiveModules; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.module.ModuleManager; import me.zeroeightsix.kami.util.Wrapper; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiEnumbuttonUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiEnumbuttonUI.java index 5c3a1b35..6b3caf11 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiEnumbuttonUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiEnumbuttonUI.java @@ -1,10 +1,10 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; +import me.zeroeightsix.kami.gui.kami.RootSmallFontRenderer; +import me.zeroeightsix.kami.gui.kami.component.EnumButton; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import me.zeroeightsix.kami.gui.kami.RootSmallFontRenderer; -import me.zeroeightsix.kami.gui.kami.component.EnumButton; import org.lwjgl.opengl.GL11; import java.awt.*; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java index f0d9b57d..1c6af8d4 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java @@ -1,6 +1,7 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; import me.zeroeightsix.kami.KamiMod; +import me.zeroeightsix.kami.gui.kami.*; import me.zeroeightsix.kami.gui.rgui.GUI; import me.zeroeightsix.kami.gui.rgui.component.AlignedComponent; import me.zeroeightsix.kami.gui.rgui.component.Component; @@ -13,7 +14,6 @@ import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.gui.rgui.util.ContainerHelper; import me.zeroeightsix.kami.gui.rgui.util.Docking; -import me.zeroeightsix.kami.gui.kami.*; import me.zeroeightsix.kami.util.ColourHolder; import me.zeroeightsix.kami.util.Wrapper; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiSettingsPanelUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiSettingsPanelUI.java index 0bba4733..4134a669 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiSettingsPanelUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiSettingsPanelUI.java @@ -1,13 +1,11 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; -import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; -import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.gui.kami.RenderHelper; import me.zeroeightsix.kami.gui.kami.component.SettingsPanel; +import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; +import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import static org.lwjgl.opengl.GL11.glColor3f; -import static org.lwjgl.opengl.GL11.glColor4f; -import static org.lwjgl.opengl.GL11.glLineWidth; +import static org.lwjgl.opengl.GL11.*; /** * Created by 086 on 16/12/2017. diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiTheme.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiTheme.java index 87f53cad..03a7c637 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiTheme.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiTheme.java @@ -1,13 +1,13 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; +import me.zeroeightsix.kami.gui.kami.KamiGUI; +import me.zeroeightsix.kami.gui.kami.theme.staticui.RadarUI; +import me.zeroeightsix.kami.gui.kami.theme.staticui.TabGuiUI; import me.zeroeightsix.kami.gui.rgui.component.container.use.Frame; import me.zeroeightsix.kami.gui.rgui.component.use.Button; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.gui.rgui.render.theme.AbstractTheme; -import me.zeroeightsix.kami.gui.kami.KamiGUI; -import me.zeroeightsix.kami.gui.kami.theme.staticui.RadarUI; -import me.zeroeightsix.kami.gui.kami.theme.staticui.TabGuiUI; /** * Created by 086 on 26/06/2017. diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiUnboundSliderUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiUnboundSliderUI.java index 931b4b41..df52051f 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiUnboundSliderUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiUnboundSliderUI.java @@ -1,9 +1,9 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; +import me.zeroeightsix.kami.gui.kami.component.UnboundSlider; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import me.zeroeightsix.kami.gui.kami.component.UnboundSlider; import org.lwjgl.opengl.GL11; /** diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootButtonUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootButtonUI.java index 549697bc..0da2856f 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootButtonUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootButtonUI.java @@ -1,11 +1,11 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; +import me.zeroeightsix.kami.gui.kami.KamiGUI; +import me.zeroeightsix.kami.gui.kami.RenderHelper; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.component.use.Button; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import me.zeroeightsix.kami.gui.kami.KamiGUI; -import me.zeroeightsix.kami.gui.kami.RenderHelper; import java.awt.*; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootChatUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootChatUI.java index 04ba119c..d71258b2 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootChatUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootChatUI.java @@ -1,7 +1,7 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; -import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.kami.component.Chat; +import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; /** * Created by 086 on 2/08/2017. diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootCheckButtonUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootCheckButtonUI.java index fcac9b34..8429bad8 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootCheckButtonUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootCheckButtonUI.java @@ -1,10 +1,10 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; +import me.zeroeightsix.kami.gui.kami.KamiGUI; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.component.use.CheckButton; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import me.zeroeightsix.kami.gui.kami.KamiGUI; import java.awt.*; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootColorizedCheckButtonUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootColorizedCheckButtonUI.java index eae76c7b..558ec8a7 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootColorizedCheckButtonUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootColorizedCheckButtonUI.java @@ -1,10 +1,10 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; -import me.zeroeightsix.kami.gui.rgui.component.use.CheckButton; -import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.gui.kami.KamiGUI; import me.zeroeightsix.kami.gui.kami.RootSmallFontRenderer; import me.zeroeightsix.kami.gui.kami.component.ColorizedCheckButton; +import me.zeroeightsix.kami.gui.rgui.component.use.CheckButton; +import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import java.awt.*; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootGroupboxUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootGroupboxUI.java index cea1a707..db505ac0 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootGroupboxUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootGroupboxUI.java @@ -1,10 +1,10 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; -import org.lwjgl.opengl.GL11; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.component.container.use.Groupbox; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; +import org.lwjgl.opengl.GL11; /** * Created by 086 on 26/06/2017. diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootInputFieldUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootInputFieldUI.java index af6df3c5..be0f0283 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootInputFieldUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootInputFieldUI.java @@ -1,11 +1,11 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; -import org.lwjgl.opengl.GL11; +import me.zeroeightsix.kami.gui.kami.RenderHelper; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.component.use.InputField; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import me.zeroeightsix.kami.gui.kami.RenderHelper; +import org.lwjgl.opengl.GL11; /** * Created by 086 on 30/06/2017. diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootLabelUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootLabelUI.java index 55c63bcb..643a07b6 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootLabelUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootLabelUI.java @@ -1,10 +1,10 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; -import org.lwjgl.opengl.GL11; import me.zeroeightsix.kami.gui.rgui.component.AlignedComponent; import me.zeroeightsix.kami.gui.rgui.component.use.Label; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; +import org.lwjgl.opengl.GL11; import static org.lwjgl.opengl.GL11.GL_BLEND; import static org.lwjgl.opengl.GL11.glDisable; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootScrollpaneUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootScrollpaneUI.java index 2524a735..250b7a25 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootScrollpaneUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootScrollpaneUI.java @@ -1,6 +1,6 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; -import org.lwjgl.opengl.GL11; +import me.zeroeightsix.kami.gui.kami.RenderHelper; import me.zeroeightsix.kami.gui.rgui.component.Component; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.component.container.use.Scrollpane; @@ -8,7 +8,7 @@ import me.zeroeightsix.kami.gui.rgui.component.listen.MouseListener; import me.zeroeightsix.kami.gui.rgui.component.listen.RenderListener; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import me.zeroeightsix.kami.gui.kami.RenderHelper; +import org.lwjgl.opengl.GL11; /** * Created by 086 on 27/06/2017. diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootSettingsPanelUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootSettingsPanelUI.java index 1e1b5d9e..74b65d20 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootSettingsPanelUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootSettingsPanelUI.java @@ -1,9 +1,9 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; -import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; -import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.gui.kami.RenderHelper; import me.zeroeightsix.kami.gui.kami.component.SettingsPanel; +import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; +import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import static org.lwjgl.opengl.GL11.glColor4f; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootSliderUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootSliderUI.java index 2bda8b79..a0d62d15 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootSliderUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootSliderUI.java @@ -1,11 +1,11 @@ package me.zeroeightsix.kami.gui.kami.theme.kami; +import me.zeroeightsix.kami.gui.kami.RenderHelper; +import me.zeroeightsix.kami.gui.kami.RootSmallFontRenderer; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.component.use.Slider; import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import me.zeroeightsix.kami.gui.kami.RenderHelper; -import me.zeroeightsix.kami.gui.kami.RootSmallFontRenderer; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/staticui/RadarUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/staticui/RadarUI.java index 10f2699c..a8b1c1c7 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/staticui/RadarUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/staticui/RadarUI.java @@ -1,9 +1,9 @@ package me.zeroeightsix.kami.gui.kami.theme.staticui; -import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; -import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.gui.kami.RenderHelper; import me.zeroeightsix.kami.gui.kami.component.Radar; +import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; +import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.util.EntityUtil; import me.zeroeightsix.kami.util.Wrapper; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/staticui/TabGuiUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/staticui/TabGuiUI.java index 4ecca70c..aa431f6f 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/staticui/TabGuiUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/staticui/TabGuiUI.java @@ -1,9 +1,9 @@ package me.zeroeightsix.kami.gui.kami.theme.staticui; -import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI; -import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.gui.kami.KamiGUI; import me.zeroeightsix.kami.gui.kami.component.TabGUI; +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.util.Wrapper; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/me/zeroeightsix/kami/gui/rgui/GUI.java b/src/main/java/me/zeroeightsix/kami/gui/rgui/GUI.java index 9d173092..720b7690 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/rgui/GUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/rgui/GUI.java @@ -1,14 +1,14 @@ package me.zeroeightsix.kami.gui.rgui; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.Display; import me.zeroeightsix.kami.gui.rgui.component.Component; import me.zeroeightsix.kami.gui.rgui.component.container.AbstractContainer; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.component.listen.KeyListener; import me.zeroeightsix.kami.gui.rgui.component.listen.MouseListener; import me.zeroeightsix.kami.gui.rgui.render.theme.Theme; +import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.Display; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/AbstractComponent.java b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/AbstractComponent.java index e0e49725..9024f77a 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/AbstractComponent.java +++ b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/AbstractComponent.java @@ -1,5 +1,6 @@ package me.zeroeightsix.kami.gui.rgui.component; +import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; import me.zeroeightsix.kami.gui.rgui.GUI; import me.zeroeightsix.kami.gui.rgui.component.container.Container; import me.zeroeightsix.kami.gui.rgui.component.listen.*; @@ -7,7 +8,6 @@ import me.zeroeightsix.kami.gui.rgui.poof.IPoof; import me.zeroeightsix.kami.gui.rgui.poof.PoofInfo; import me.zeroeightsix.kami.gui.rgui.render.ComponentUI; import me.zeroeightsix.kami.gui.rgui.render.theme.Theme; -import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; import me.zeroeightsix.kami.setting.Setting; import java.util.ArrayList; diff --git a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/AbstractContainer.java b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/AbstractContainer.java index 24bc05bf..9bd83eb6 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/AbstractContainer.java +++ b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/AbstractContainer.java @@ -1,11 +1,11 @@ package me.zeroeightsix.kami.gui.rgui.component.container; -import me.zeroeightsix.kami.gui.rgui.component.listen.RenderListener; -import org.lwjgl.opengl.GL11; import me.zeroeightsix.kami.gui.rgui.component.AbstractComponent; import me.zeroeightsix.kami.gui.rgui.component.Component; +import me.zeroeightsix.kami.gui.rgui.component.listen.RenderListener; import me.zeroeightsix.kami.gui.rgui.poof.use.AdditionPoof; import me.zeroeightsix.kami.gui.rgui.render.theme.Theme; +import org.lwjgl.opengl.GL11; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/use/Frame.java b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/use/Frame.java index df2081c4..80aa0a26 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/use/Frame.java +++ b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/use/Frame.java @@ -1,5 +1,6 @@ package me.zeroeightsix.kami.gui.rgui.component.container.use; +import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; import me.zeroeightsix.kami.gui.rgui.component.Component; import me.zeroeightsix.kami.gui.rgui.component.container.OrganisedContainer; import me.zeroeightsix.kami.gui.rgui.component.listen.MouseListener; @@ -12,7 +13,6 @@ import me.zeroeightsix.kami.gui.rgui.poof.use.FramePoof; import me.zeroeightsix.kami.gui.rgui.poof.use.Poof; import me.zeroeightsix.kami.gui.rgui.render.theme.Theme; import me.zeroeightsix.kami.gui.rgui.util.Docking; -import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/use/Scrollpane.java b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/use/Scrollpane.java index 8544444b..6a6a3681 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/use/Scrollpane.java +++ b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/container/use/Scrollpane.java @@ -1,7 +1,6 @@ package me.zeroeightsix.kami.gui.rgui.component.container.use; -import org.lwjgl.opengl.Display; -import org.lwjgl.opengl.GL11; +import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; import me.zeroeightsix.kami.gui.rgui.GUI; import me.zeroeightsix.kami.gui.rgui.component.Component; import me.zeroeightsix.kami.gui.rgui.component.container.Container; @@ -11,7 +10,8 @@ import me.zeroeightsix.kami.gui.rgui.component.listen.RenderListener; import me.zeroeightsix.kami.gui.rgui.component.listen.UpdateListener; import me.zeroeightsix.kami.gui.rgui.layout.Layout; import me.zeroeightsix.kami.gui.rgui.render.theme.Theme; -import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; +import org.lwjgl.opengl.Display; +import org.lwjgl.opengl.GL11; /** * Created by 086 on 27/06/2017. diff --git a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/use/InputField.java b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/use/InputField.java index 81f1e417..8323b2de 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/rgui/component/use/InputField.java +++ b/src/main/java/me/zeroeightsix/kami/gui/rgui/component/use/InputField.java @@ -1,5 +1,6 @@ package me.zeroeightsix.kami.gui.rgui.component.use; +import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; import me.zeroeightsix.kami.gui.rgui.GUI; import me.zeroeightsix.kami.gui.rgui.component.AbstractComponent; import me.zeroeightsix.kami.gui.rgui.component.listen.KeyListener; @@ -8,7 +9,6 @@ import me.zeroeightsix.kami.gui.rgui.component.listen.RenderListener; import me.zeroeightsix.kami.gui.rgui.poof.PoofInfo; import me.zeroeightsix.kami.gui.rgui.poof.use.Poof; import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; -import me.zeroeightsix.kami.gui.kami.DisplayGuiScreen; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/me/zeroeightsix/kami/gui/rgui/render/util/Shader.java b/src/main/java/me/zeroeightsix/kami/gui/rgui/render/util/Shader.java index 9a565e85..8319a3c7 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/rgui/render/util/Shader.java +++ b/src/main/java/me/zeroeightsix/kami/gui/rgui/render/util/Shader.java @@ -3,11 +3,11 @@ package me.zeroeightsix.kami.gui.rgui.render.util; import java.util.HashMap; import java.util.Map; +import static me.zeroeightsix.kami.gui.rgui.render.util.ShaderHelper.createProgram; +import static me.zeroeightsix.kami.gui.rgui.render.util.ShaderHelper.loadShader; import static org.lwjgl.opengl.ARBFragmentShader.GL_FRAGMENT_SHADER_ARB; import static org.lwjgl.opengl.ARBShaderObjects.*; import static org.lwjgl.opengl.ARBVertexShader.GL_VERTEX_SHADER_ARB; -import static me.zeroeightsix.kami.gui.rgui.render.util.ShaderHelper.createProgram; -import static me.zeroeightsix.kami.gui.rgui.render.util.ShaderHelper.loadShader; /** * Used to create ARB Shader Programs with OpenGL diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinEntityPlayerSP.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinEntityPlayerSP.java index e004f022..a6a66a2b 100644 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinEntityPlayerSP.java +++ b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinEntityPlayerSP.java @@ -1,7 +1,6 @@ package me.zeroeightsix.kami.mixin.client; import me.zeroeightsix.kami.KamiMod; -import me.zeroeightsix.kami.event.KamiEvent; import me.zeroeightsix.kami.event.events.PlayerMoveEvent; import me.zeroeightsix.kami.module.ModuleManager; import net.minecraft.client.Minecraft; diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinNetHandlerPlayClient.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinNetHandlerPlayClient.java index fe470a65..7546dc38 100644 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinNetHandlerPlayClient.java +++ b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinNetHandlerPlayClient.java @@ -2,7 +2,6 @@ package me.zeroeightsix.kami.mixin.client; import me.zeroeightsix.kami.KamiMod; import me.zeroeightsix.kami.event.events.ChunkEvent; -import me.zeroeightsix.kami.module.modules.render.ChunkFinder; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.network.play.server.SPacketChunkData; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinNetworkManager.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinNetworkManager.java index 08163d3a..f917881e 100644 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinNetworkManager.java +++ b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinNetworkManager.java @@ -6,15 +6,11 @@ import me.zeroeightsix.kami.event.events.PacketEvent; import me.zeroeightsix.kami.module.modules.misc.NoPacketKick; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.client.CPacketCustomPayload; -import net.minecraft.network.play.server.SPacketCustomPayload; -import net.minecraft.network.play.server.SPacketTimeUpdate; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.io.IOError; import java.io.IOException; /** diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinStateImplementation.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinStateImplementation.java index 22fda1f6..8f6a0f0e 100644 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinStateImplementation.java +++ b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinStateImplementation.java @@ -6,16 +6,13 @@ import net.minecraft.block.Block; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import javax.annotation.Nullable; diff --git a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java index 42620d7b..f51bafcc 100644 --- a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java +++ b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.java @@ -13,8 +13,10 @@ import net.minecraft.util.math.Vec3d; import net.minecraftforge.client.event.RenderWorldLastEvent; import org.lwjgl.opengl.GL11; -import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Set; /** * Created by 086 on 23/08/2017. 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 256e9577..d0af8e43 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 @@ -3,7 +3,6 @@ package me.zeroeightsix.kami.module.modules.combat; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.setting.Setting; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.init.Items; import net.minecraft.inventory.ClickType; import net.minecraft.item.ItemStack; 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 4cc953b5..8e466818 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 @@ -20,7 +20,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.network.Packet; -import net.minecraft.network.play.client.*; +import net.minecraft.network.play.client.CPacketPlayer; +import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock; import net.minecraft.potion.Potion; import net.minecraft.util.*; import net.minecraft.util.math.*; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/misc/NoPacketKick.java b/src/main/java/me/zeroeightsix/kami/module/modules/misc/NoPacketKick.java index 1137717a..9b06b308 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/misc/NoPacketKick.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/misc/NoPacketKick.java @@ -1,7 +1,6 @@ package me.zeroeightsix.kami.module.modules.misc; import me.zeroeightsix.kami.module.Module; -import net.minecraftforge.fml.common.Mod; /** * @author 086 diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/Blink.java b/src/main/java/me/zeroeightsix/kami/module/modules/player/Blink.java index 6930989c..77dfba88 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/player/Blink.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/player/Blink.java @@ -6,7 +6,6 @@ import me.zeroeightsix.kami.event.events.PacketEvent; import me.zeroeightsix.kami.module.Module; import net.minecraft.network.play.client.CPacketPlayer; -import java.util.ArrayList; import java.util.LinkedList; import java.util.Queue; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/Freecam.java b/src/main/java/me/zeroeightsix/kami/module/modules/player/Freecam.java index 912f1a14..af09e2f6 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/player/Freecam.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/player/Freecam.java @@ -2,8 +2,8 @@ package me.zeroeightsix.kami.module.modules.player; import me.zero.alpine.listener.EventHandler; import me.zero.alpine.listener.Listener; -import me.zero.alpine.type.Cancellable; -import me.zeroeightsix.kami.event.events.*; +import me.zeroeightsix.kami.event.events.PacketEvent; +import me.zeroeightsix.kami.event.events.PlayerMoveEvent; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.setting.Setting; import net.minecraft.client.entity.EntityOtherPlayerMP; @@ -11,7 +11,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.play.client.CPacketInput; import net.minecraft.network.play.client.CPacketPlayer; -import net.minecraft.network.play.server.SPacketPlayerPosLook; import net.minecraftforge.client.event.PlayerSPPushOutOfBlocksEvent; /** diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/NoFall.java b/src/main/java/me/zeroeightsix/kami/module/modules/player/NoFall.java index a5ba7674..140360f8 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/player/NoFall.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/player/NoFall.java @@ -1,20 +1,13 @@ package me.zeroeightsix.kami.module.modules.player; -import com.sun.javafx.geom.Vec2d; import me.zero.alpine.listener.EventHandler; import me.zero.alpine.listener.Listener; -import me.zeroeightsix.kami.KamiMod; import me.zeroeightsix.kami.event.events.PacketEvent; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.util.EntityUtil; -import me.zeroeightsix.kami.util.Wrapper; import net.minecraft.init.Items; -import net.minecraft.network.play.client.CPacketHeldItemChange; import net.minecraft.network.play.client.CPacketPlayer; -import net.minecraft.network.play.client.CPacketPlayerDigging; -import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock; -import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/TpsSync.java b/src/main/java/me/zeroeightsix/kami/module/modules/player/TpsSync.java index c645d63f..c6ca3e01 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/player/TpsSync.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/player/TpsSync.java @@ -1,10 +1,6 @@ package me.zeroeightsix.kami.module.modules.player; -import me.zero.alpine.listener.EventHandler; -import me.zero.alpine.listener.Listener; import me.zeroeightsix.kami.module.Module; -import me.zeroeightsix.kami.util.LagCompensator; -import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent; /** * Created by 086 on 9/04/2018. diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/Brightness.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/Brightness.java index 45ddf6d9..36435669 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/Brightness.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/render/Brightness.java @@ -1,7 +1,5 @@ package me.zeroeightsix.kami.module.modules.render; -import me.zero.alpine.listener.EventHandler; -import me.zero.alpine.listener.Listener; import me.zeroeightsix.kami.module.Module; /** diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/EyeFinder.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/EyeFinder.java index 616a4a2b..2cbe26ea 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/EyeFinder.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/render/EyeFinder.java @@ -6,7 +6,6 @@ import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.util.EntityUtil; import me.zeroeightsix.kami.util.GeometryMasks; import me.zeroeightsix.kami.util.KamiTessellator; -import net.minecraft.block.BlockPortal; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/Nametags.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/Nametags.java index 471bb7b1..f1ae0efd 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/Nametags.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/render/Nametags.java @@ -24,9 +24,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.stream.Collectors; -import static org.lwjgl.opengl.GL11.GL_LINE_LOOP; -import static org.lwjgl.opengl.GL11.GL_QUADS; -import static org.lwjgl.opengl.GL11.glTranslatef; +import static org.lwjgl.opengl.GL11.*; /** * Created by 086 on 19/12/2017. diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/PortalTracers.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/PortalTracers.java index efe1ccbd..e8114013 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/PortalTracers.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/render/PortalTracers.java @@ -6,9 +6,7 @@ import me.zeroeightsix.kami.event.events.ChunkEvent; import me.zeroeightsix.kami.event.events.RenderEvent; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.setting.Setting; -import net.minecraft.block.BlockAir; import net.minecraft.block.BlockPortal; -import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; diff --git a/src/main/java/me/zeroeightsix/kami/util/Friends.java b/src/main/java/me/zeroeightsix/kami/util/Friends.java index 8da76a03..8781a16c 100644 --- a/src/main/java/me/zeroeightsix/kami/util/Friends.java +++ b/src/main/java/me/zeroeightsix/kami/util/Friends.java @@ -1,6 +1,8 @@ package me.zeroeightsix.kami.util; -import com.google.gson.*; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import com.google.gson.JsonPrimitive; import me.zeroeightsix.kami.setting.FieldConverter; import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.setting.SettingsClass; diff --git a/src/main/java/me/zeroeightsix/kami/util/KamiTessellator.java b/src/main/java/me/zeroeightsix/kami/util/KamiTessellator.java index baa46415..1cb29ea5 100644 --- a/src/main/java/me/zeroeightsix/kami/util/KamiTessellator.java +++ b/src/main/java/me/zeroeightsix/kami/util/KamiTessellator.java @@ -6,9 +6,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.math.BlockPos; -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.glBlendFunc; +import static org.lwjgl.opengl.GL11.*; /** * Created by 086 on 9/07/2017. diff --git a/src/main/java/me/zeroeightsix/kami/util/Wrapper.java b/src/main/java/me/zeroeightsix/kami/util/Wrapper.java index 2dc77cbe..ba47c0f1 100644 --- a/src/main/java/me/zeroeightsix/kami/util/Wrapper.java +++ b/src/main/java/me/zeroeightsix/kami/util/Wrapper.java @@ -1,7 +1,7 @@ package me.zeroeightsix.kami.util; -import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import me.zeroeightsix.kami.gui.kami.KamiGUI; +import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.world.World;