diff --git a/src/main/java/net/PeytonPlayz585/shadow/Config.java b/src/main/java/net/PeytonPlayz585/shadow/Config.java index 6f40d01..86594f4 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/Config.java +++ b/src/main/java/net/PeytonPlayz585/shadow/Config.java @@ -8,6 +8,7 @@ import java.util.Arrays; import java.util.List; import java.util.StringTokenizer; +import net.PeytonPlayz585.shadow.reflections.Reflector; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/PeytonPlayz585/shadow/ConnectedProperties.java b/src/main/java/net/PeytonPlayz585/shadow/ConnectedProperties.java index 9014254..cf012d4 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/ConnectedProperties.java +++ b/src/main/java/net/PeytonPlayz585/shadow/ConnectedProperties.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.List; import java.util.Properties; +import net.PeytonPlayz585.shadow.math.MathUtils; import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; import net.minecraft.block.properties.IProperty; import net.minecraft.client.Minecraft; diff --git a/src/main/java/net/PeytonPlayz585/shadow/GuiAnimations.java b/src/main/java/net/PeytonPlayz585/shadow/gui/GuiAnimations.java similarity index 99% rename from src/main/java/net/PeytonPlayz585/shadow/GuiAnimations.java rename to src/main/java/net/PeytonPlayz585/shadow/gui/GuiAnimations.java index e53b296..85a14d0 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/GuiAnimations.java +++ b/src/main/java/net/PeytonPlayz585/shadow/gui/GuiAnimations.java @@ -1,4 +1,4 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/net/PeytonPlayz585/shadow/GuiQuality.java b/src/main/java/net/PeytonPlayz585/shadow/gui/GuiQuality.java similarity index 98% rename from src/main/java/net/PeytonPlayz585/shadow/GuiQuality.java rename to src/main/java/net/PeytonPlayz585/shadow/gui/GuiQuality.java index 0dd4267..2204667 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/GuiQuality.java +++ b/src/main/java/net/PeytonPlayz585/shadow/gui/GuiQuality.java @@ -1,4 +1,4 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.*; diff --git a/src/main/java/net/PeytonPlayz585/shadow/GuiShaders.java b/src/main/java/net/PeytonPlayz585/shadow/gui/GuiShaders.java similarity index 99% rename from src/main/java/net/PeytonPlayz585/shadow/GuiShaders.java rename to src/main/java/net/PeytonPlayz585/shadow/gui/GuiShaders.java index fb79f66..7d0f4df 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/GuiShaders.java +++ b/src/main/java/net/PeytonPlayz585/shadow/gui/GuiShaders.java @@ -1,4 +1,4 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.gui; import java.io.IOException; diff --git a/src/main/java/net/PeytonPlayz585/shadow/MathUtils.java b/src/main/java/net/PeytonPlayz585/shadow/math/MathUtils.java similarity index 91% rename from src/main/java/net/PeytonPlayz585/shadow/MathUtils.java rename to src/main/java/net/PeytonPlayz585/shadow/math/MathUtils.java index 5e65ceb..9d539e1 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/MathUtils.java +++ b/src/main/java/net/PeytonPlayz585/shadow/math/MathUtils.java @@ -1,4 +1,4 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.math; public class MathUtils { public static int getAverage(int[] p_getAverage_0_) { diff --git a/src/main/java/net/PeytonPlayz585/shadow/FieldLocatorFixed.java b/src/main/java/net/PeytonPlayz585/shadow/reflections/FieldLocatorFixed.java similarity index 84% rename from src/main/java/net/PeytonPlayz585/shadow/FieldLocatorFixed.java rename to src/main/java/net/PeytonPlayz585/shadow/reflections/FieldLocatorFixed.java index 9f4bf06..5688dfc 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/FieldLocatorFixed.java +++ b/src/main/java/net/PeytonPlayz585/shadow/reflections/FieldLocatorFixed.java @@ -1,4 +1,4 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.reflections; import java.lang.reflect.Field; diff --git a/src/main/java/net/PeytonPlayz585/shadow/FieldLocatorName.java b/src/main/java/net/PeytonPlayz585/shadow/reflections/FieldLocatorName.java similarity index 91% rename from src/main/java/net/PeytonPlayz585/shadow/FieldLocatorName.java rename to src/main/java/net/PeytonPlayz585/shadow/reflections/FieldLocatorName.java index 93a3245..fcfe77a 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/FieldLocatorName.java +++ b/src/main/java/net/PeytonPlayz585/shadow/reflections/FieldLocatorName.java @@ -1,7 +1,9 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.reflections; import java.lang.reflect.Field; +import net.PeytonPlayz585.shadow.Config; + public class FieldLocatorName implements IFieldLocator { private ReflectorClass reflectorClass = null; private String targetFieldName = null; diff --git a/src/main/java/net/PeytonPlayz585/shadow/FieldLocatorType.java b/src/main/java/net/PeytonPlayz585/shadow/reflections/FieldLocatorType.java similarity index 94% rename from src/main/java/net/PeytonPlayz585/shadow/FieldLocatorType.java rename to src/main/java/net/PeytonPlayz585/shadow/reflections/FieldLocatorType.java index 398e1f2..13acc07 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/FieldLocatorType.java +++ b/src/main/java/net/PeytonPlayz585/shadow/reflections/FieldLocatorType.java @@ -1,7 +1,9 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.reflections; import java.lang.reflect.Field; +import net.PeytonPlayz585.shadow.Config; + public class FieldLocatorType implements IFieldLocator { private ReflectorClass reflectorClass; private Class targetFieldType; diff --git a/src/main/java/net/PeytonPlayz585/shadow/IFieldLocator.java b/src/main/java/net/PeytonPlayz585/shadow/reflections/IFieldLocator.java similarity index 65% rename from src/main/java/net/PeytonPlayz585/shadow/IFieldLocator.java rename to src/main/java/net/PeytonPlayz585/shadow/reflections/IFieldLocator.java index fab4183..9f88bc2 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/IFieldLocator.java +++ b/src/main/java/net/PeytonPlayz585/shadow/reflections/IFieldLocator.java @@ -1,4 +1,4 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.reflections; import java.lang.reflect.Field; diff --git a/src/main/java/net/PeytonPlayz585/shadow/Reflector.java b/src/main/java/net/PeytonPlayz585/shadow/reflections/Reflector.java similarity index 98% rename from src/main/java/net/PeytonPlayz585/shadow/Reflector.java rename to src/main/java/net/PeytonPlayz585/shadow/reflections/Reflector.java index 7322a3c..9577bf3 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/Reflector.java +++ b/src/main/java/net/PeytonPlayz585/shadow/reflections/Reflector.java @@ -1,4 +1,4 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.reflections; import java.lang.reflect.Field; import java.util.List; diff --git a/src/main/java/net/PeytonPlayz585/shadow/ReflectorClass.java b/src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorClass.java similarity index 95% rename from src/main/java/net/PeytonPlayz585/shadow/ReflectorClass.java rename to src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorClass.java index 5e8f1fd..6883f2e 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/ReflectorClass.java +++ b/src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorClass.java @@ -1,4 +1,6 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.reflections; + +import net.PeytonPlayz585.shadow.Config; public class ReflectorClass { private String targetClassName; diff --git a/src/main/java/net/PeytonPlayz585/shadow/ReflectorField.java b/src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorField.java similarity index 97% rename from src/main/java/net/PeytonPlayz585/shadow/ReflectorField.java rename to src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorField.java index d36771d..c5c3a71 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/ReflectorField.java +++ b/src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorField.java @@ -1,4 +1,4 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.reflections; import java.lang.reflect.Field; diff --git a/src/main/java/net/PeytonPlayz585/shadow/ReflectorFields.java b/src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorFields.java similarity index 95% rename from src/main/java/net/PeytonPlayz585/shadow/ReflectorFields.java rename to src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorFields.java index 0dae377..15cdc95 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/ReflectorFields.java +++ b/src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorFields.java @@ -1,4 +1,4 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.reflections; public class ReflectorFields { private ReflectorClass reflectorClass; diff --git a/src/main/java/net/PeytonPlayz585/shadow/ReflectorMethod.java b/src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorMethod.java similarity index 97% rename from src/main/java/net/PeytonPlayz585/shadow/ReflectorMethod.java rename to src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorMethod.java index 209da7b..70f6fed 100644 --- a/src/main/java/net/PeytonPlayz585/shadow/ReflectorMethod.java +++ b/src/main/java/net/PeytonPlayz585/shadow/reflections/ReflectorMethod.java @@ -1,9 +1,11 @@ -package net.PeytonPlayz585.shadow; +package net.PeytonPlayz585.shadow.reflections; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; +import net.PeytonPlayz585.shadow.Config; + public class ReflectorMethod { private ReflectorClass reflectorClass; private String targetMethodName; diff --git a/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java b/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java index 0e51251..d7788a8 100644 --- a/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java +++ b/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java @@ -1,9 +1,6 @@ package net.minecraft.client.gui; -import java.io.IOException; - -import net.PeytonPlayz585.shadow.*; -import net.minecraft.client.Minecraft; +import net.PeytonPlayz585.shadow.gui.*; import net.minecraft.client.resources.I18n; import net.minecraft.client.settings.GameSettings;