From 005e2da01e6ce535f4cd1eabaa6fd9f7a8bca851 Mon Sep 17 00:00:00 2001 From: noil755 Date: Fri, 29 Nov 2019 18:45:01 -0500 Subject: [PATCH] remove old values, whole project optimize imports, lots of errors --- .../seppuku/api/logging/SeppukuFormatter.java | 3 +- .../rigamortis/seppuku/api/module/Module.java | 2 +- .../seppuku/api/value/BooleanValue.java | 24 ---- .../seppuku/api/value/NumberValue.java | 74 ----------- .../seppuku/api/value/OptionalValue.java | 46 ------- .../seppuku/api/value/StringValue.java | 24 ---- .../rigamortis/seppuku/api/value/Value.java | 115 ++++++++++++------ .../impl/command/DisconnectCommand.java | 1 - .../seppuku/impl/command/FriendCommand.java | 1 - .../seppuku/impl/command/HClipCommand.java | 1 - .../seppuku/impl/command/PeekCommand.java | 1 - .../seppuku/impl/command/ToggleCommand.java | 2 +- .../seppuku/impl/command/VClipCommand.java | 1 - .../impl/command/WaypointsCommand.java | 1 - .../seppuku/impl/config/ValueConfig.java | 2 +- .../hud/component/TotemCountComponent.java | 5 +- .../impl/gui/menu/GuiSeppukuMainMenu.java | 1 - .../impl/management/CommandManager.java | 2 +- .../impl/management/ModuleManager.java | 2 +- .../impl/module/combat/AutoArmorModule.java | 26 ++-- .../module/combat/AutoDisconnectModule.java | 2 +- .../impl/module/combat/AutoTotemModule.java | 2 +- .../impl/module/combat/CriticalsModule.java | 3 +- .../impl/module/combat/CrystalAuraModule.java | 4 +- .../impl/module/combat/KillAuraModule.java | 4 +- .../impl/module/combat/NoCrystalModule.java | 3 +- .../impl/module/combat/RegenModule.java | 6 +- .../impl/module/combat/VelocityModule.java | 4 +- .../impl/module/hidden/CommandsModule.java | 2 +- .../impl/module/misc/AutoCraftModule.java | 6 +- .../impl/module/misc/AutoFishModule.java | 4 - .../impl/module/misc/AutoIgnoreModule.java | 2 +- .../impl/module/misc/AutoSignModule.java | 2 +- .../impl/module/misc/ChatFilterModule.java | 3 +- .../impl/module/misc/ChatMutatorModule.java | 2 +- .../module/misc/ChatTimeStampsModule.java | 2 +- .../impl/module/misc/ChestAlertModule.java | 2 +- .../impl/module/misc/CoordLoggerModule.java | 4 +- .../impl/module/misc/GreeterModule.java | 2 +- .../impl/module/misc/LaggerModule.java | 4 +- .../impl/module/misc/MoreInvModule.java | 1 - .../impl/module/misc/NoBiomeColorModule.java | 4 +- .../impl/module/misc/PacketLoggerModule.java | 2 +- .../impl/module/misc/PortalGuiModule.java | 1 - .../impl/module/misc/ReconnectModule.java | 2 +- .../impl/module/movement/AutoWalkModule.java | 2 - .../impl/module/movement/ElytraFlyModule.java | 6 +- .../impl/module/movement/FlightModule.java | 6 +- .../impl/module/movement/JesusModule.java | 6 +- .../module/movement/NoSlowDownModule.java | 4 +- .../impl/module/movement/NoVoidModule.java | 3 +- .../impl/module/movement/PullDownModule.java | 4 +- .../impl/module/movement/SafeWalkModule.java | 2 +- .../impl/module/movement/ScaffoldModule.java | 5 +- .../impl/module/movement/SneakModule.java | 3 +- .../impl/module/movement/SpeedModule.java | 4 +- .../impl/module/movement/SprintModule.java | 2 +- .../impl/module/movement/StepModule.java | 2 +- .../impl/module/movement/StrafeModule.java | 2 +- .../impl/module/player/FreeCamModule.java | 5 +- .../impl/module/player/GodModeModule.java | 4 +- .../impl/module/player/NoHungerModule.java | 3 +- .../impl/module/player/NoPushModule.java | 2 - .../impl/module/player/RotationLock.java | 4 +- .../impl/module/render/BrightnessModule.java | 4 +- .../impl/module/render/ChamsModule.java | 6 +- .../impl/module/render/HolesModule.java | 4 +- .../seppuku/impl/module/render/HudModule.java | 2 +- .../impl/module/render/LogoutSpotsModule.java | 2 +- .../impl/module/render/NoLagModule.java | 8 +- .../impl/module/render/NoOverlayModule.java | 2 +- .../module/render/PortalFinderModule.java | 6 +- .../impl/module/render/SmallShieldModule.java | 8 +- .../impl/module/render/StorageESPModule.java | 6 +- .../impl/module/render/TracersModule.java | 7 +- .../impl/module/render/WallHackModule.java | 4 +- .../impl/module/render/XrayModule.java | 2 - .../impl/module/world/AutoToolModule.java | 2 +- .../impl/module/world/NewChunksModule.java | 3 - .../impl/module/world/NukerModule.java | 4 +- .../impl/module/world/PhaseModule.java | 4 +- .../impl/module/world/SpeedMineModule.java | 9 +- .../impl/module/world/TimerModule.java | 2 +- .../impl/module/world/WaypointsModule.java | 4 +- .../impl/patch/ActiveRenderInfoPatch.java | 2 +- .../impl/patch/BlockFluidRendererPatch.java | 3 - .../seppuku/impl/patch/BlockPatch.java | 2 +- .../seppuku/impl/patch/BlockSlimePatch.java | 4 +- .../impl/patch/BlockSoulSandPatch.java | 4 +- .../seppuku/impl/patch/EntityPigPatch.java | 3 - .../seppuku/impl/patch/EntityPlayerPatch.java | 2 - .../impl/patch/EntityPlayerSPPatch.java | 1 - .../seppuku/impl/patch/KeyBindingPatch.java | 6 +- .../impl/patch/PlayerControllerMPPatch.java | 3 - .../impl/patch/RenderLivingBasePatch.java | 4 - 95 files changed, 210 insertions(+), 389 deletions(-) delete mode 100644 src/main/java/me/rigamortis/seppuku/api/value/BooleanValue.java delete mode 100644 src/main/java/me/rigamortis/seppuku/api/value/NumberValue.java delete mode 100644 src/main/java/me/rigamortis/seppuku/api/value/OptionalValue.java delete mode 100644 src/main/java/me/rigamortis/seppuku/api/value/StringValue.java diff --git a/src/main/java/me/rigamortis/seppuku/api/logging/SeppukuFormatter.java b/src/main/java/me/rigamortis/seppuku/api/logging/SeppukuFormatter.java index 859e06b..211cb8e 100644 --- a/src/main/java/me/rigamortis/seppuku/api/logging/SeppukuFormatter.java +++ b/src/main/java/me/rigamortis/seppuku/api/logging/SeppukuFormatter.java @@ -2,7 +2,8 @@ package me.rigamortis.seppuku.api.logging; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.logging.*; +import java.util.logging.Formatter; +import java.util.logging.LogRecord; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/api/module/Module.java b/src/main/java/me/rigamortis/seppuku/api/module/Module.java index 229d2c7..866c3de 100644 --- a/src/main/java/me/rigamortis/seppuku/api/module/Module.java +++ b/src/main/java/me/rigamortis/seppuku/api/module/Module.java @@ -1,7 +1,7 @@ package me.rigamortis.seppuku.api.module; import me.rigamortis.seppuku.Seppuku; -import me.rigamortis.seppuku.api.value.*; +import me.rigamortis.seppuku.api.value.old.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/me/rigamortis/seppuku/api/value/BooleanValue.java b/src/main/java/me/rigamortis/seppuku/api/value/BooleanValue.java deleted file mode 100644 index c5c41a8..0000000 --- a/src/main/java/me/rigamortis/seppuku/api/value/BooleanValue.java +++ /dev/null @@ -1,24 +0,0 @@ -package me.rigamortis.seppuku.api.value; - -/** - * Author Seth - * 4/17/2019 @ 5:59 AM. - */ -public class BooleanValue extends Value { - - public BooleanValue() { - } - - public BooleanValue(String displayName, String[] alias, Object value) { - super(displayName, alias, value); - } - - public boolean getBoolean() { - return (Boolean) this.getValue(); - } - - public void setBoolean(boolean val) { - this.setValue(val); - } - -} diff --git a/src/main/java/me/rigamortis/seppuku/api/value/NumberValue.java b/src/main/java/me/rigamortis/seppuku/api/value/NumberValue.java deleted file mode 100644 index 320f449..0000000 --- a/src/main/java/me/rigamortis/seppuku/api/value/NumberValue.java +++ /dev/null @@ -1,74 +0,0 @@ -package me.rigamortis.seppuku.api.value; - -/** - * Author Seth - * 4/17/2019 @ 5:59 AM. - */ -public class NumberValue extends Value { - - private T min; - private T max; - private T increment; - - public NumberValue() { - } - - public NumberValue(String displayName, String[] alias, Object value) { - super(displayName, alias, value); - } - - public NumberValue(String displayName, String[] alias, Object value, Object type, T min, T max, T increment) { - super(displayName, alias, value, type); - this.min = min; - this.max = max; - this.increment = increment; - } - - public float getFloat() { - return (Float) this.getValue(); - } - - public void setFloat(float val) { - this.setValue(val); - } - - public int getInt() { - return (Integer) this.getValue(); - } - - public void setInt(int val) { - this.setValue(val); - } - - public double getDouble() { - return (Double) this.getValue(); - } - - public void setDouble(double val) { - this.setValue(val); - } - - public T getMin() { - return min; - } - - public void setMin(T min) { - this.min = min; - } - - public T getMax() { - return max; - } - - public void setMax(T max) { - this.max = max; - } - - public T getIncrement() { - return increment; - } - - public void setIncrement(T increment) { - this.increment = increment; - } -} \ No newline at end of file diff --git a/src/main/java/me/rigamortis/seppuku/api/value/OptionalValue.java b/src/main/java/me/rigamortis/seppuku/api/value/OptionalValue.java deleted file mode 100644 index e847288..0000000 --- a/src/main/java/me/rigamortis/seppuku/api/value/OptionalValue.java +++ /dev/null @@ -1,46 +0,0 @@ -package me.rigamortis.seppuku.api.value; - -/** - * Author Seth - * 4/17/2019 @ 6:00 AM. - */ -public class OptionalValue extends NumberValue { - - private String[] options; - - public OptionalValue(String[] options) { - this.options = options; - } - - public OptionalValue(String displayName, String[] alias, Object value, String[] options) { - super(displayName, alias, value); - this.options = options; - } - - public OptionalValue(String displayName, String[] alias, Object value, Object type, Object min, Object max, Object increment, String[] options) { - super(displayName, alias, value, type, min, max, increment); - this.options = options; - } - - public int getOption(String input) { - for(int i = 0; i < this.getOptions().length; i++) { - final String s = this.getOptions()[i]; - if(input.equalsIgnoreCase(s)) { - return i; - } - } - return -1; - } - - public String getSelectedOption() { - return this.getOptions()[this.getInt()]; - } - - public String[] getOptions() { - return options; - } - - public void setOptions(String[] options) { - this.options = options; - } -} diff --git a/src/main/java/me/rigamortis/seppuku/api/value/StringValue.java b/src/main/java/me/rigamortis/seppuku/api/value/StringValue.java deleted file mode 100644 index 296da76..0000000 --- a/src/main/java/me/rigamortis/seppuku/api/value/StringValue.java +++ /dev/null @@ -1,24 +0,0 @@ -package me.rigamortis.seppuku.api.value; - -/** - * Author Seth - * 4/17/2019 @ 6:05 AM. - */ -public class StringValue extends Value { - - public StringValue() { - } - - public StringValue(String displayName, String[] alias, Object value) { - super(displayName, alias, value); - } - - public String getString() { - return (String) this.getValue(); - } - - public void setString(String val) { - this.setValue(val); - } - -} diff --git a/src/main/java/me/rigamortis/seppuku/api/value/Value.java b/src/main/java/me/rigamortis/seppuku/api/value/Value.java index e154228..b105dee 100644 --- a/src/main/java/me/rigamortis/seppuku/api/value/Value.java +++ b/src/main/java/me/rigamortis/seppuku/api/value/Value.java @@ -2,40 +2,100 @@ package me.rigamortis.seppuku.api.value; /** * Author Seth - * 4/17/2019 @ 5:58 AM. + * 11/18/2019 @ 8:56 PM. */ public class Value { - private String displayName; + private String name; private String[] alias; + private String desc; + private T value; - private T type; - private Value parent; - - public Value() { + private T min; + private T max; + private T inc; + public Value(String name, String[] alias, String desc) { + this.name = name; + this.alias = alias; + this.desc = desc; } - public Value(String displayName, String[] alias, T value) { - this.displayName = displayName; + public Value(String name, String[] alias, String desc, T value) { + this.name = name; this.alias = alias; + this.desc = desc; this.value = value; } - public Value(String displayName, String[] alias, T value, T type) { - this.displayName = displayName; + public Value(String name, String[] alias, String desc, T value, T min, T max, T inc) { + this.name = name; this.alias = alias; + this.desc = desc; this.value = value; - this.type = type; + this.min = min; + this.max = max; + this.inc = inc; } - public String getDisplayName() { - return displayName; + public T clamp(T value, T min, T max) { + return ((Comparable) value).compareTo(min) < 0 ? min : (((Comparable) value).compareTo(max) > 0 ? max : value); } - public void setDisplayName(String displayName) { - this.displayName = displayName; + public T getValue() { + return this.value; + } + + public void setValue(T value) { + if (min != null && max != null) { + final Number val = (Number) value; + final Number min = (Number) this.min; + final Number max = (Number) this.max; + this.value = (T) this.clamp(val, min, max); + } else { + this.value = value; + } + } + + public void setEnumValue(String value) { + for (Enum e : ((Enum) this.value).getClass().getEnumConstants()) { + if (e.name().equalsIgnoreCase(value)) { + this.value = (T) e; + } + } + } + + public T getMin() { + return min; + } + + public void setMin(T min) { + this.min = min; + } + + public T getMax() { + return max; + } + + public void setMax(T max) { + this.max = max; + } + + public T getInc() { + return inc; + } + + public void setInc(T inc) { + this.inc = inc; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; } public String[] getAlias() { @@ -46,27 +106,12 @@ public class Value { this.alias = alias; } - public T getValue() { - return value; + public String getDesc() { + return desc; } - public void setValue(T value) { - this.value = value; - } - - public T getType() { - return type; - } - - public void setType(T type) { - this.type = type; - } - - public Value getParent() { - return parent; - } - - public void setParent(Value parent) { - this.parent = parent; + public void setDesc(String desc) { + this.desc = desc; } } + diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/DisconnectCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/DisconnectCommand.java index 6cb08f8..235633f 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/command/DisconnectCommand.java +++ b/src/main/java/me/rigamortis/seppuku/impl/command/DisconnectCommand.java @@ -4,7 +4,6 @@ import me.rigamortis.seppuku.api.command.Command; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiMultiplayer; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.realms.RealmsBridge; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/FriendCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/FriendCommand.java index ecc1d9c..f71a6ef 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/command/FriendCommand.java +++ b/src/main/java/me/rigamortis/seppuku/impl/command/FriendCommand.java @@ -3,7 +3,6 @@ package me.rigamortis.seppuku.impl.command; import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.command.Command; import me.rigamortis.seppuku.api.friend.Friend; -import me.rigamortis.seppuku.api.macro.Macro; import net.minecraft.client.Minecraft; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentString; diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/HClipCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/HClipCommand.java index 6dfd5ac..1206458 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/command/HClipCommand.java +++ b/src/main/java/me/rigamortis/seppuku/impl/command/HClipCommand.java @@ -5,7 +5,6 @@ import me.rigamortis.seppuku.api.command.Command; import me.rigamortis.seppuku.api.util.MathUtil; import me.rigamortis.seppuku.api.util.StringUtil; import net.minecraft.client.Minecraft; -import net.minecraft.network.play.client.CPacketEntityAction; import net.minecraft.util.math.Vec3d; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/PeekCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/PeekCommand.java index a292b74..a07cdbf 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/command/PeekCommand.java +++ b/src/main/java/me/rigamortis/seppuku/impl/command/PeekCommand.java @@ -10,7 +10,6 @@ import net.minecraft.client.gui.inventory.GuiShulkerBox; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemShulkerBox; import net.minecraft.item.ItemStack; diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/ToggleCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/ToggleCommand.java index dadc491..711fe8a 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/command/ToggleCommand.java +++ b/src/main/java/me/rigamortis/seppuku/impl/command/ToggleCommand.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.command; import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.command.Command; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/VClipCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/VClipCommand.java index fae0b7b..4c58284 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/command/VClipCommand.java +++ b/src/main/java/me/rigamortis/seppuku/impl/command/VClipCommand.java @@ -4,7 +4,6 @@ import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.command.Command; import me.rigamortis.seppuku.api.util.StringUtil; import net.minecraft.client.Minecraft; -import net.minecraft.network.play.client.CPacketPlayer; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/command/WaypointsCommand.java b/src/main/java/me/rigamortis/seppuku/impl/command/WaypointsCommand.java index fbbf68a..d68681e 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/command/WaypointsCommand.java +++ b/src/main/java/me/rigamortis/seppuku/impl/command/WaypointsCommand.java @@ -2,7 +2,6 @@ package me.rigamortis.seppuku.impl.command; import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.command.Command; -import me.rigamortis.seppuku.api.macro.Macro; import me.rigamortis.seppuku.api.util.MathUtil; import me.rigamortis.seppuku.api.util.StringUtil; import me.rigamortis.seppuku.impl.module.world.WaypointsModule; diff --git a/src/main/java/me/rigamortis/seppuku/impl/config/ValueConfig.java b/src/main/java/me/rigamortis/seppuku/impl/config/ValueConfig.java index 5eac2fd..31e98b1 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/config/ValueConfig.java +++ b/src/main/java/me/rigamortis/seppuku/impl/config/ValueConfig.java @@ -4,7 +4,7 @@ import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.config.Configurable; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.StringUtil; -import me.rigamortis.seppuku.api.value.*; +import me.rigamortis.seppuku.api.value.old.*; import me.rigamortis.seppuku.impl.management.ConfigManager; import java.io.*; diff --git a/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/TotemCountComponent.java b/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/TotemCountComponent.java index 2b80b55..56b6f10 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/TotemCountComponent.java +++ b/src/main/java/me/rigamortis/seppuku/impl/gui/hud/component/TotemCountComponent.java @@ -1,11 +1,8 @@ package me.rigamortis.seppuku.impl.gui.hud.component; import me.rigamortis.seppuku.api.gui.hud.component.DraggableHudComponent; -import net.minecraft.init.Items; -import me.rigamortis.seppuku.impl.module.combat.AutoTotemModule; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/gui/menu/GuiSeppukuMainMenu.java b/src/main/java/me/rigamortis/seppuku/impl/gui/menu/GuiSeppukuMainMenu.java index 0250bf9..f1378d1 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/gui/menu/GuiSeppukuMainMenu.java +++ b/src/main/java/me/rigamortis/seppuku/impl/gui/menu/GuiSeppukuMainMenu.java @@ -1,6 +1,5 @@ package me.rigamortis.seppuku.impl.gui.menu; -import com.mojang.realmsclient.gui.ChatFormatting; import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.event.minecraft.EventDisplayGui; import me.rigamortis.seppuku.impl.fml.SeppukuMod; diff --git a/src/main/java/me/rigamortis/seppuku/impl/management/CommandManager.java b/src/main/java/me/rigamortis/seppuku/impl/management/CommandManager.java index 6e4e988..54bb560 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/management/CommandManager.java +++ b/src/main/java/me/rigamortis/seppuku/impl/management/CommandManager.java @@ -6,7 +6,7 @@ import me.rigamortis.seppuku.api.event.command.EventCommandLoad; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.ReflectionUtil; import me.rigamortis.seppuku.api.util.StringUtil; -import me.rigamortis.seppuku.api.value.*; +import me.rigamortis.seppuku.api.value.old.*; import me.rigamortis.seppuku.impl.command.*; import java.io.File; diff --git a/src/main/java/me/rigamortis/seppuku/impl/management/ModuleManager.java b/src/main/java/me/rigamortis/seppuku/impl/management/ModuleManager.java index c464790..0a34fdc 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/management/ModuleManager.java +++ b/src/main/java/me/rigamortis/seppuku/impl/management/ModuleManager.java @@ -6,7 +6,7 @@ import me.rigamortis.seppuku.api.event.module.EventModulePostLoaded; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.ReflectionUtil; import me.rigamortis.seppuku.api.util.StringUtil; -import me.rigamortis.seppuku.api.value.Value; +import me.rigamortis.seppuku.api.value.old.Value; import me.rigamortis.seppuku.impl.module.combat.*; import me.rigamortis.seppuku.impl.module.hidden.CommandsModule; import me.rigamortis.seppuku.impl.module.hidden.IgnoreModule; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoArmorModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoArmorModule.java index a4e03fc..ff814f6 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoArmorModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoArmorModule.java @@ -4,8 +4,8 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.Timer; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.enchantment.EnchantmentHelper; @@ -30,53 +30,53 @@ public final class AutoArmorModule extends Module { private Timer timer = new Timer(); public AutoArmorModule() { - super("AutoArmor", new String[] {"AutoArm", "AutoArmour"}, "Automatically equips armor", "NONE", -1, ModuleType.COMBAT); + super("AutoArmor", new String[]{"AutoArm", "AutoArmour"}, "Automatically equips armor", "NONE", -1, ModuleType.COMBAT); } @Listener public void onUpdate(EventPlayerUpdate event) { if (event.getStage() == EventStageable.EventStage.PRE) { final Minecraft mc = Minecraft.getMinecraft(); - if(mc.currentScreen instanceof GuiInventory) { + if (mc.currentScreen instanceof GuiInventory) { return; } final ItemStack helm = mc.player.inventoryContainer.getSlot(5).getStack(); - if(helm.getItem() == Items.AIR) { + if (helm.getItem() == Items.AIR) { final int slot = this.findArmorSlot(EntityEquipmentSlot.HEAD); - if(slot != -1) { + if (slot != -1) { this.clickSlot(slot, 0, ClickType.QUICK_MOVE); } } final ItemStack chest = mc.player.inventoryContainer.getSlot(6).getStack(); - if(chest.getItem() == Items.AIR) { + if (chest.getItem() == Items.AIR) { final int slot = this.findArmorSlot(EntityEquipmentSlot.CHEST); - if(slot != -1) { + if (slot != -1) { this.clickSlot(slot, 0, ClickType.QUICK_MOVE); } } final ItemStack legging = mc.player.inventoryContainer.getSlot(7).getStack(); - if(legging.getItem() == Items.AIR) { + if (legging.getItem() == Items.AIR) { final int slot = this.findArmorSlot(EntityEquipmentSlot.LEGS); - if(slot != -1) { + if (slot != -1) { this.clickSlot(slot, 0, ClickType.QUICK_MOVE); } } final ItemStack feet = mc.player.inventoryContainer.getSlot(8).getStack(); - if(feet.getItem() == Items.AIR) { + if (feet.getItem() == Items.AIR) { final int slot = this.findArmorSlot(EntityEquipmentSlot.FEET); - if(slot != -1) { + if (slot != -1) { this.clickSlot(slot, 0, ClickType.QUICK_MOVE); } } @@ -84,7 +84,7 @@ public final class AutoArmorModule extends Module { } private void clickSlot(int slot, int mouse, ClickType type) { - if(this.timer.passed(this.delay.getFloat())) { + if (this.timer.passed(this.delay.getFloat())) { Minecraft.getMinecraft().playerController.windowClick(Minecraft.getMinecraft().player.inventoryContainer.windowId, slot, mouse, type, Minecraft.getMinecraft().player); this.timer.reset(); } diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoDisconnectModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoDisconnectModule.java index bac69fc..cd6b1d6 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoDisconnectModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoDisconnectModule.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.module.combat; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import net.minecraft.network.play.client.CPacketHeldItemChange; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoTotemModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoTotemModule.java index b879cc5..c2a9c7c 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoTotemModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/AutoTotemModule.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.module.combat; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.init.Items; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/CriticalsModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/CriticalsModule.java index 31a7929..9eccf58 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/CriticalsModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/CriticalsModule.java @@ -3,12 +3,11 @@ package me.rigamortis.seppuku.impl.module.combat; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.network.play.client.CPacketPlayer; import net.minecraft.network.play.client.CPacketUseEntity; -import net.minecraft.util.EnumHand; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/CrystalAuraModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/CrystalAuraModule.java index 5b0285e..f481371 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/CrystalAuraModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/CrystalAuraModule.java @@ -10,8 +10,8 @@ import me.rigamortis.seppuku.api.util.ColorUtil; import me.rigamortis.seppuku.api.util.MathUtil; import me.rigamortis.seppuku.api.util.RenderUtil; import me.rigamortis.seppuku.api.util.Timer; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import me.rigamortis.seppuku.impl.module.player.GodModeModule; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/KillAuraModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/KillAuraModule.java index f325fa5..f113d78 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/KillAuraModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/KillAuraModule.java @@ -5,8 +5,8 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/NoCrystalModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/NoCrystalModule.java index 72d57d3..8835648 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/NoCrystalModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/NoCrystalModule.java @@ -5,7 +5,7 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import me.rigamortis.seppuku.impl.module.player.FreeCamModule; import net.minecraft.block.Block; import net.minecraft.block.BlockAir; @@ -15,7 +15,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.CPacketEntityAction; -import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/RegenModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/RegenModule.java index c0b937a..53225f9 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/RegenModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/RegenModule.java @@ -3,9 +3,9 @@ package me.rigamortis.seppuku.impl.module.combat; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; import net.minecraft.inventory.ClickType; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/VelocityModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/VelocityModule.java index ffedb55..44bb418 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/VelocityModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/VelocityModule.java @@ -3,8 +3,8 @@ package me.rigamortis.seppuku.impl.module.combat; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import net.minecraft.network.play.server.SPacketEntityVelocity; import net.minecraft.network.play.server.SPacketExplosion; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/hidden/CommandsModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/hidden/CommandsModule.java index 18975ae..31b8d3f 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/hidden/CommandsModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/hidden/CommandsModule.java @@ -5,7 +5,7 @@ import me.rigamortis.seppuku.api.command.Command; import me.rigamortis.seppuku.api.event.minecraft.EventKeyPress; import me.rigamortis.seppuku.api.event.player.EventSendChatMessage; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.StringValue; +import me.rigamortis.seppuku.api.value.old.StringValue; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiChat; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoCraftModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoCraftModule.java index 594c404..3fa447c 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoCraftModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoCraftModule.java @@ -4,9 +4,9 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.Timer; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.StringValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.StringValue; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiCrafting; import net.minecraft.client.gui.inventory.GuiInventory; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoFishModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoFishModule.java index f4b38fa..3fda766 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoFishModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoFishModule.java @@ -4,13 +4,9 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.module.Module; import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityFishHook; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemFishingRod; -import net.minecraft.network.play.client.CPacketAnimation; import net.minecraft.network.play.client.CPacketPlayerTryUseItem; -import net.minecraft.network.play.server.SPacketEntityVelocity; import net.minecraft.network.play.server.SPacketSoundEffect; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoIgnoreModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoIgnoreModule.java index 83a9102..892f8ae 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoIgnoreModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoIgnoreModule.java @@ -5,7 +5,7 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.ignore.Ignored; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.network.play.server.SPacketChat; import net.minecraft.util.StringUtils; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoSignModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoSignModule.java index 0e49bae..818cb73 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoSignModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/AutoSignModule.java @@ -5,7 +5,7 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.minecraft.EventDisplayGui; import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiEditSign; import net.minecraft.network.play.client.CPacketUpdateSign; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatFilterModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatFilterModule.java index 6685b0d..f8e55e2 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatFilterModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatFilterModule.java @@ -4,9 +4,8 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.StringUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import net.minecraft.network.play.server.SPacketChat; -import net.minecraft.util.StringUtils; import net.minecraft.util.text.TextComponentString; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatMutatorModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatMutatorModule.java index f1c763e..f6c8731 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatMutatorModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatMutatorModule.java @@ -4,7 +4,7 @@ import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import me.rigamortis.seppuku.impl.module.hidden.CommandsModule; import net.minecraft.network.play.client.CPacketChatMessage; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatTimeStampsModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatTimeStampsModule.java index 09d6368..6bd6a65 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatTimeStampsModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatTimeStampsModule.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.module.misc; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.network.play.server.SPacketChat; import net.minecraft.util.text.TextComponentString; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChestAlertModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChestAlertModule.java index fe1d696..4bcf941 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChestAlertModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChestAlertModule.java @@ -4,7 +4,7 @@ import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.SPacketChunkData; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/CoordLoggerModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/CoordLoggerModule.java index 5ad4388..e7ea5eb 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/CoordLoggerModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/CoordLoggerModule.java @@ -4,8 +4,8 @@ import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.init.SoundEvents; import net.minecraft.network.play.server.SPacketEffect; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/GreeterModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/GreeterModule.java index 9398eeb..c0d872a 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/GreeterModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/GreeterModule.java @@ -4,7 +4,7 @@ import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.event.player.EventPlayerJoin; import me.rigamortis.seppuku.api.event.player.EventPlayerLeave; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/LaggerModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/LaggerModule.java index cf8a973..46f3cf3 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/LaggerModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/LaggerModule.java @@ -3,8 +3,8 @@ package me.rigamortis.seppuku.impl.module.misc; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.init.Items; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/MoreInvModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/MoreInvModule.java index 478225c..10a1bc2 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/MoreInvModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/MoreInvModule.java @@ -4,7 +4,6 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.module.Module; import net.minecraft.client.Minecraft; -import net.minecraft.network.play.client.CPacketClickWindow; import net.minecraft.network.play.client.CPacketCloseWindow; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/NoBiomeColorModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/NoBiomeColorModule.java index 1114da1..c3fb989 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/NoBiomeColorModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/NoBiomeColorModule.java @@ -6,8 +6,8 @@ import me.rigamortis.seppuku.api.event.world.EventFoliageColor; import me.rigamortis.seppuku.api.event.world.EventGrassColor; import me.rigamortis.seppuku.api.event.world.EventWaterColor; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/PacketLoggerModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/PacketLoggerModule.java index 3fcbe48..48997e9 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/PacketLoggerModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/PacketLoggerModule.java @@ -5,7 +5,7 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import net.minecraft.network.Packet; import net.minecraft.util.StringUtils; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/PortalGuiModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/PortalGuiModule.java index be331f3..6e39ed6 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/PortalGuiModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/PortalGuiModule.java @@ -2,7 +2,6 @@ package me.rigamortis.seppuku.impl.module.misc; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; -import me.rigamortis.seppuku.api.event.render.EventRender2D; import me.rigamortis.seppuku.api.module.Module; import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ReconnectModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ReconnectModule.java index c358d76..7996d92 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ReconnectModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ReconnectModule.java @@ -6,7 +6,7 @@ import me.rigamortis.seppuku.api.event.minecraft.EventRunTick; import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.Timer; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiDisconnected; import net.minecraft.client.multiplayer.GuiConnecting; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/AutoWalkModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/AutoWalkModule.java index 18f2636..350ef9d 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/AutoWalkModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/AutoWalkModule.java @@ -1,11 +1,9 @@ package me.rigamortis.seppuku.impl.module.movement; -import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; import net.minecraft.client.Minecraft; -import net.minecraft.client.settings.KeyBinding; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/ElytraFlyModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/ElytraFlyModule.java index 450f5dd..bac0d81 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/ElytraFlyModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/ElytraFlyModule.java @@ -6,9 +6,9 @@ import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; import me.rigamortis.seppuku.api.util.Timer; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/FlightModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/FlightModule.java index d23adb6..7759760 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/FlightModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/FlightModule.java @@ -7,9 +7,9 @@ import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiDownloadTerrain; import net.minecraft.network.play.client.CPacketConfirmTeleport; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/JesusModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/JesusModule.java index 5b5cf00..8a8fba1 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/JesusModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/JesusModule.java @@ -5,19 +5,17 @@ import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.event.world.EventLiquidCollisionBB; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.block.BlockLiquid; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; import net.minecraft.network.play.client.CPacketPlayer; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.world.IBlockAccess; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/NoSlowDownModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/NoSlowDownModule.java index a820e61..0e9f65e 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/NoSlowDownModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/NoSlowDownModule.java @@ -3,16 +3,14 @@ package me.rigamortis.seppuku.impl.module.movement; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.event.player.EventUpdateInput; -import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.event.world.EventCollideSoulSand; import me.rigamortis.seppuku.api.event.world.EventLandOnSlime; import me.rigamortis.seppuku.api.event.world.EventWalkOnSlime; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; import net.minecraft.item.ItemShield; -import net.minecraft.network.play.client.CPacketEntityAction; import net.minecraft.network.play.client.CPacketPlayerDigging; import net.minecraft.util.math.BlockPos; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/NoVoidModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/NoVoidModule.java index 8239721..a715d0d 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/NoVoidModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/NoVoidModule.java @@ -1,10 +1,9 @@ package me.rigamortis.seppuku.impl.module.movement; import me.rigamortis.seppuku.api.event.EventStageable; -import me.rigamortis.seppuku.api.event.player.EventMove; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/PullDownModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/PullDownModule.java index ac92f1a..d770090 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/PullDownModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/PullDownModule.java @@ -3,8 +3,8 @@ package me.rigamortis.seppuku.impl.module.movement; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/SafeWalkModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/SafeWalkModule.java index 5d75592..9a2a0ea 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/SafeWalkModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/SafeWalkModule.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.module.movement; import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.event.player.EventMove; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import me.rigamortis.seppuku.impl.module.player.FreeCamModule; import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/ScaffoldModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/ScaffoldModule.java index 94d3ad1..63dbb56 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/ScaffoldModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/ScaffoldModule.java @@ -4,11 +4,9 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import net.minecraft.block.Block; -import net.minecraft.block.BlockAir; import net.minecraft.block.BlockLiquid; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; @@ -18,7 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.CPacketEntityAction; -import net.minecraft.network.play.client.CPacketPlayerDigging; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/SneakModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/SneakModule.java index 451d446..92f96da 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/SneakModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/SneakModule.java @@ -4,11 +4,10 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; import net.minecraft.network.play.client.CPacketEntityAction; -import net.minecraft.network.play.client.CPacketPlayerTryUseItem; import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/SpeedModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/SpeedModule.java index 1f47096..d7163a1 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/SpeedModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/SpeedModule.java @@ -6,8 +6,8 @@ import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.init.MobEffects; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/SprintModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/SprintModule.java index 8a020fb..2874871 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/SprintModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/SprintModule.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.module.movement; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/StepModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/StepModule.java index 49cab8a..5d49f48 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/StepModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/StepModule.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.module.movement; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.block.material.Material; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/movement/StrafeModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/movement/StrafeModule.java index 67c33f9..68b895a 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/movement/StrafeModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/movement/StrafeModule.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.module.movement; import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.event.player.EventMove; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import net.minecraft.client.Minecraft; import net.minecraft.init.MobEffects; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/player/FreeCamModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/player/FreeCamModule.java index 4e561ac..ff05b72 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/player/FreeCamModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/player/FreeCamModule.java @@ -11,8 +11,8 @@ import me.rigamortis.seppuku.api.event.world.EventLiquidCollisionBB; import me.rigamortis.seppuku.api.event.world.EventSetOpaqueCube; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityOtherPlayerMP; @@ -21,7 +21,6 @@ import net.minecraft.network.play.client.*; import net.minecraft.network.play.server.SPacketPlayerPosLook; import net.minecraft.network.play.server.SPacketSetPassengers; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.GameType; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/player/GodModeModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/player/GodModeModule.java index 3674ccd..951a05b 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/player/GodModeModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/player/GodModeModule.java @@ -6,8 +6,8 @@ import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGameOver; import net.minecraft.entity.Entity; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/player/NoHungerModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/player/NoHungerModule.java index ac437dd..0df45ea 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/player/NoHungerModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/player/NoHungerModule.java @@ -8,7 +8,8 @@ import net.minecraft.network.play.client.CPacketEntityAction; import net.minecraft.network.play.client.CPacketPlayer; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; -import static net.minecraft.network.play.client.CPacketEntityAction.Action.*; +import static net.minecraft.network.play.client.CPacketEntityAction.Action.START_SPRINTING; +import static net.minecraft.network.play.client.CPacketEntityAction.Action.STOP_SPRINTING; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/player/NoPushModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/player/NoPushModule.java index f9e0e90..93fbe17 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/player/NoPushModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/player/NoPushModule.java @@ -3,9 +3,7 @@ package me.rigamortis.seppuku.impl.module.player; import me.rigamortis.seppuku.api.event.player.EventApplyCollision; import me.rigamortis.seppuku.api.event.player.EventPushOutOfBlocks; import me.rigamortis.seppuku.api.event.player.EventPushedByWater; -import me.rigamortis.seppuku.api.event.world.EventAddCollisionBox; import me.rigamortis.seppuku.api.module.Module; -import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/player/RotationLock.java b/src/main/java/me/rigamortis/seppuku/impl/module/player/RotationLock.java index 352a3a0..4418c8a 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/player/RotationLock.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/player/RotationLock.java @@ -1,11 +1,9 @@ package me.rigamortis.seppuku.impl.module.player; import me.rigamortis.seppuku.Seppuku; -import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; -import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/BrightnessModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/BrightnessModule.java index f3abe9b..ad74d5a 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/BrightnessModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/BrightnessModule.java @@ -4,8 +4,8 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.init.MobEffects; import net.minecraft.network.play.server.SPacketEntityEffect; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/ChamsModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/ChamsModule.java index 2938e23..bcb9dcd 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/ChamsModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/ChamsModule.java @@ -1,11 +1,10 @@ package me.rigamortis.seppuku.impl.module.render; import me.rigamortis.seppuku.api.event.EventStageable; -import me.rigamortis.seppuku.api.event.render.EventRender3D; import me.rigamortis.seppuku.api.event.render.EventRenderEntity; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -21,7 +20,6 @@ import org.lwjgl.opengl.GL11; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; import static org.lwjgl.opengl.GL11.*; -import static org.lwjgl.opengl.GL11.GL_NICEST; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/HolesModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/HolesModule.java index 11bd562..9d360e0 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/HolesModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/HolesModule.java @@ -4,8 +4,8 @@ import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.event.render.EventRender3D; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/HudModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/HudModule.java index 1fde744..55cb7f0 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/HudModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/HudModule.java @@ -5,7 +5,7 @@ import me.rigamortis.seppuku.api.event.gui.EventRenderPotions; import me.rigamortis.seppuku.api.event.render.EventRender2D; import me.rigamortis.seppuku.api.gui.hud.component.HudComponent; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import me.rigamortis.seppuku.impl.gui.hud.GuiHudEditor; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/LogoutSpotsModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/LogoutSpotsModule.java index fe3f08f..c1880e2 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/LogoutSpotsModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/LogoutSpotsModule.java @@ -9,7 +9,7 @@ import me.rigamortis.seppuku.api.event.render.EventRender2D; import me.rigamortis.seppuku.api.event.render.EventRender3D; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.GLUProjection; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/NoLagModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/NoLagModule.java index 4142310..b1b8c3e 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/NoLagModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/NoLagModule.java @@ -6,17 +6,17 @@ import me.rigamortis.seppuku.api.event.render.EventRender3D; import me.rigamortis.seppuku.api.event.render.EventRenderBlockModel; import me.rigamortis.seppuku.api.event.world.EventLightUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; -import net.minecraft.block.*; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import net.minecraft.block.Block; +import net.minecraft.block.BlockPistonExtension; +import net.minecraft.block.BlockPistonMoving; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer; import net.minecraft.init.SoundEvents; import net.minecraft.network.play.server.SPacketSoundEffect; import net.minecraft.network.play.server.SPacketSpawnMob; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySign; import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/NoOverlayModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/NoOverlayModule.java index 609b879..86ade9b 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/NoOverlayModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/NoOverlayModule.java @@ -4,7 +4,7 @@ import me.rigamortis.seppuku.api.event.gui.EventRenderHelmet; import me.rigamortis.seppuku.api.event.gui.EventRenderPortal; import me.rigamortis.seppuku.api.event.render.EventRenderOverlay; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; /** diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/PortalFinderModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/PortalFinderModule.java index 937db0b..d9df963 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/PortalFinderModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/PortalFinderModule.java @@ -11,9 +11,9 @@ import me.rigamortis.seppuku.api.event.world.EventLoadWorld; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.GLUProjection; import me.rigamortis.seppuku.api.util.RenderUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/SmallShieldModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/SmallShieldModule.java index c24636e..754d56f 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/SmallShieldModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/SmallShieldModule.java @@ -1,10 +1,10 @@ package me.rigamortis.seppuku.impl.module.render; -import me.rigamortis.seppuku.api.module.Module; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.Minecraft; -import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; +import me.rigamortis.seppuku.api.module.Module; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; /** * Author fsck diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/StorageESPModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/StorageESPModule.java index 00d68e3..59d050e 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/StorageESPModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/StorageESPModule.java @@ -6,9 +6,9 @@ import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.ColorUtil; import me.rigamortis.seppuku.api.util.GLUProjection; import me.rigamortis.seppuku.api.util.RenderUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.culling.Frustum; import net.minecraft.client.renderer.culling.ICamera; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/TracersModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/TracersModule.java index 31e70f7..0c2ae3d 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/TracersModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/TracersModule.java @@ -7,9 +7,9 @@ import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.GLUProjection; import me.rigamortis.seppuku.api.util.MathUtil; import me.rigamortis.seppuku.api.util.RenderUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityBoat; @@ -19,7 +19,6 @@ import net.minecraft.entity.item.EntityMinecartContainer; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.IAnimals; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.Vec2f; import net.minecraft.util.math.Vec3d; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/WallHackModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/WallHackModule.java index 1c8e3ec..00a7741 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/WallHackModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/WallHackModule.java @@ -10,8 +10,8 @@ import me.rigamortis.seppuku.api.event.render.EventRenderName; import me.rigamortis.seppuku.api.friend.Friend; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.*; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/XrayModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/XrayModule.java index 73b3521..e2dae85 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/render/XrayModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/XrayModule.java @@ -2,11 +2,9 @@ package me.rigamortis.seppuku.impl.module.render; import me.rigamortis.seppuku.api.event.render.EventRenderBlockModel; import me.rigamortis.seppuku.api.event.render.EventRenderBlockSide; -import me.rigamortis.seppuku.api.event.render.EventRenderFluid; import me.rigamortis.seppuku.api.event.world.EventSetOpaqueCube; import me.rigamortis.seppuku.api.module.Module; import net.minecraft.block.Block; -import net.minecraft.block.BlockLiquid; import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/world/AutoToolModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/world/AutoToolModule.java index 2c74a48..e8add2b 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/world/AutoToolModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/world/AutoToolModule.java @@ -4,7 +4,7 @@ import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.event.player.EventPlayerDamageBlock; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/world/NewChunksModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/world/NewChunksModule.java index 3eff23e..d85f5f8 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/world/NewChunksModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/world/NewChunksModule.java @@ -5,14 +5,11 @@ import me.rigamortis.seppuku.api.event.network.EventReceivePacket; import me.rigamortis.seppuku.api.event.render.EventRender3D; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.RenderUtil; -import me.rigamortis.seppuku.api.value.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.culling.Frustum; import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.network.play.server.SPacketChunkData; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.chunk.Chunk; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; import java.util.ArrayList; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/world/NukerModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/world/NukerModule.java index 3fcef5b..2bab2ad 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/world/NukerModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/world/NukerModule.java @@ -6,8 +6,8 @@ import me.rigamortis.seppuku.api.event.player.EventRightClickBlock; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.NumberValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/world/PhaseModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/world/PhaseModule.java index 594f981..e744d2d 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/world/PhaseModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/world/PhaseModule.java @@ -9,8 +9,8 @@ import me.rigamortis.seppuku.api.event.world.EventAddCollisionBox; import me.rigamortis.seppuku.api.event.world.EventSetOpaqueCube; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityBoat; import net.minecraft.network.play.client.CPacketPlayer; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/world/SpeedMineModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/world/SpeedMineModule.java index 40cf6c3..6d15edf 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/world/SpeedMineModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/world/SpeedMineModule.java @@ -1,10 +1,13 @@ package me.rigamortis.seppuku.impl.module.world; import me.rigamortis.seppuku.api.event.EventStageable; -import me.rigamortis.seppuku.api.event.player.*; +import me.rigamortis.seppuku.api.event.player.EventClickBlock; +import me.rigamortis.seppuku.api.event.player.EventPlayerDamageBlock; +import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; +import me.rigamortis.seppuku.api.event.player.EventResetBlockRemoving; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.OptionalValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.OptionalValue; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/world/TimerModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/world/TimerModule.java index ae03bcf..2be5f43 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/world/TimerModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/world/TimerModule.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.module.world; import me.rigamortis.seppuku.api.event.EventStageable; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/world/WaypointsModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/world/WaypointsModule.java index 815454c..67480a4 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/world/WaypointsModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/world/WaypointsModule.java @@ -6,8 +6,8 @@ import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.ColorUtil; import me.rigamortis.seppuku.api.util.GLUProjection; import me.rigamortis.seppuku.api.util.RenderUtil; -import me.rigamortis.seppuku.api.value.BooleanValue; -import me.rigamortis.seppuku.api.value.NumberValue; +import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.old.NumberValue; import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/ActiveRenderInfoPatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/ActiveRenderInfoPatch.java index 037d32d..952908e 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/ActiveRenderInfoPatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/ActiveRenderInfoPatch.java @@ -9,7 +9,7 @@ import org.objectweb.asm.tree.InsnList; import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.INVOKESTATIC; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/BlockFluidRendererPatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/BlockFluidRendererPatch.java index 28a7d6f..d594267 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/BlockFluidRendererPatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/BlockFluidRendererPatch.java @@ -1,7 +1,6 @@ package me.rigamortis.seppuku.impl.patch; import me.rigamortis.seppuku.Seppuku; -import me.rigamortis.seppuku.api.event.render.EventRenderBlockModel; import me.rigamortis.seppuku.api.event.render.EventRenderFluid; import me.rigamortis.seppuku.api.patch.ClassPatch; import me.rigamortis.seppuku.api.patch.MethodPatch; @@ -11,8 +10,6 @@ import org.objectweb.asm.tree.*; import team.stiff.pomelo.EventManager; import static org.objectweb.asm.Opcodes.*; -import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; -import static org.objectweb.asm.Opcodes.IRETURN; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/BlockPatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/BlockPatch.java index 7903c0b..9677fe1 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/BlockPatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/BlockPatch.java @@ -1,9 +1,9 @@ package me.rigamortis.seppuku.impl.patch; import me.rigamortis.seppuku.Seppuku; +import me.rigamortis.seppuku.api.event.render.EventRenderBlockSide; import me.rigamortis.seppuku.api.event.world.EventAddCollisionBox; import me.rigamortis.seppuku.api.event.world.EventGetBlockLayer; -import me.rigamortis.seppuku.api.event.render.EventRenderBlockSide; import me.rigamortis.seppuku.api.patch.ClassPatch; import me.rigamortis.seppuku.api.patch.MethodPatch; import me.rigamortis.seppuku.impl.management.PatchManager; diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/BlockSlimePatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/BlockSlimePatch.java index 788865d..0f39c1e 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/BlockSlimePatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/BlockSlimePatch.java @@ -9,9 +9,7 @@ import me.rigamortis.seppuku.impl.management.PatchManager; import org.objectweb.asm.Type; import org.objectweb.asm.tree.*; -import static org.objectweb.asm.Opcodes.IFEQ; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; -import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.*; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/BlockSoulSandPatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/BlockSoulSandPatch.java index b81ca33..b1b4caa 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/BlockSoulSandPatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/BlockSoulSandPatch.java @@ -8,9 +8,7 @@ import me.rigamortis.seppuku.impl.management.PatchManager; import org.objectweb.asm.Type; import org.objectweb.asm.tree.*; -import static org.objectweb.asm.Opcodes.IFEQ; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; -import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.*; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPigPatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPigPatch.java index f9d7ab2..cbc8ec8 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPigPatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPigPatch.java @@ -7,9 +7,6 @@ import me.rigamortis.seppuku.api.patch.ClassPatch; import me.rigamortis.seppuku.api.patch.MethodPatch; import me.rigamortis.seppuku.api.util.ASMUtil; import me.rigamortis.seppuku.impl.management.PatchManager; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.entity.passive.EntityPig; import org.objectweb.asm.Type; import org.objectweb.asm.tree.*; diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPlayerPatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPlayerPatch.java index 578a946..cca8e84 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPlayerPatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPlayerPatch.java @@ -6,8 +6,6 @@ import me.rigamortis.seppuku.api.event.player.EventPushedByWater; import me.rigamortis.seppuku.api.patch.ClassPatch; import me.rigamortis.seppuku.api.patch.MethodPatch; import me.rigamortis.seppuku.impl.management.PatchManager; -import net.minecraft.client.Minecraft; -import net.minecraft.util.math.AxisAlignedBB; import org.objectweb.asm.Type; import org.objectweb.asm.tree.*; diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPlayerSPPatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPlayerSPPatch.java index f1d27bb..b38ba6e 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPlayerSPPatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/EntityPlayerSPPatch.java @@ -14,7 +14,6 @@ import org.objectweb.asm.tree.*; import team.stiff.pomelo.EventManager; import static org.objectweb.asm.Opcodes.*; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/KeyBindingPatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/KeyBindingPatch.java index 6f37347..b865507 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/KeyBindingPatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/KeyBindingPatch.java @@ -3,9 +3,11 @@ package me.rigamortis.seppuku.impl.patch; import me.rigamortis.seppuku.api.patch.ClassPatch; import me.rigamortis.seppuku.api.patch.MethodPatch; import me.rigamortis.seppuku.impl.management.PatchManager; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.MethodNode; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.IRETURN; /** * Author Seth diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/PlayerControllerMPPatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/PlayerControllerMPPatch.java index ecf9b6b..342e8d8 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/PlayerControllerMPPatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/PlayerControllerMPPatch.java @@ -5,9 +5,6 @@ import me.rigamortis.seppuku.api.event.player.*; import me.rigamortis.seppuku.api.patch.ClassPatch; import me.rigamortis.seppuku.api.patch.MethodPatch; import me.rigamortis.seppuku.impl.management.PatchManager; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.play.client.CPacketChatMessage; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import org.objectweb.asm.Type; diff --git a/src/main/java/me/rigamortis/seppuku/impl/patch/RenderLivingBasePatch.java b/src/main/java/me/rigamortis/seppuku/impl/patch/RenderLivingBasePatch.java index fd30946..f83650c 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/patch/RenderLivingBasePatch.java +++ b/src/main/java/me/rigamortis/seppuku/impl/patch/RenderLivingBasePatch.java @@ -1,14 +1,10 @@ package me.rigamortis.seppuku.impl.patch; import me.rigamortis.seppuku.Seppuku; -import me.rigamortis.seppuku.api.event.EventStageable; -import me.rigamortis.seppuku.api.event.render.EventRenderLivingEntity; import me.rigamortis.seppuku.api.event.render.EventRenderName; import me.rigamortis.seppuku.api.patch.ClassPatch; import me.rigamortis.seppuku.api.patch.MethodPatch; -import me.rigamortis.seppuku.api.util.ASMUtil; import me.rigamortis.seppuku.impl.management.PatchManager; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import org.objectweb.asm.Type; import org.objectweb.asm.tree.*;