From 2615992e7d0d4ed3ac205800be71c831029b2dc5 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 18 Jun 2016 16:55:58 +1000 Subject: ~More Refactoring Does it ever end? --- src/Java/miscutil/core/handler/COMPAT_HANDLER.java | 10 +++++----- src/Java/miscutil/core/handler/InitGregtech.java | 7 ------- .../core/handler/registration/LateRegistrationHandler.java | 4 ++-- .../core/handler/registration/RegistrationHandler.java | 6 +++--- 4 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 src/Java/miscutil/core/handler/InitGregtech.java (limited to 'src/Java/miscutil/core/handler') diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 49b7121465..9035039cdf 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -1,7 +1,6 @@ package miscutil.core.handler; import static miscutil.core.lib.LoadedMods.Gregtech; -import static miscutil.core.util.UtilsItems.removeCraftingRecipe; import gregtech.api.util.GT_OreDictUnificator; import java.util.LinkedList; @@ -30,10 +29,11 @@ import miscutil.core.handler.registration.gregtech.GregtechSteamCondenser; import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; +import miscutil.core.recipe.RECIPES_GREGTECH; +import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; -import miscutil.core.util.recipe.RECIPES_GREGTECH; -import miscutil.core.util.recipe.ShapedRecipeObject; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -120,7 +120,7 @@ public class COMPAT_HANDLER { public static void RemoveRecipesFromOtherMods(){ //Removal of Recipes for(Object item : RemoveRecipeQueue){ - removeCraftingRecipe(item); + UtilsRecipe.removeCraftingRecipe(item); } } diff --git a/src/Java/miscutil/core/handler/InitGregtech.java b/src/Java/miscutil/core/handler/InitGregtech.java deleted file mode 100644 index 13321b2b7b..0000000000 --- a/src/Java/miscutil/core/handler/InitGregtech.java +++ /dev/null @@ -1,7 +0,0 @@ -package miscutil.core.handler; - - -public class InitGregtech { - - -} diff --git a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java b/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java index 207e3589c6..9fc339f512 100644 --- a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration; import miscutil.core.handler.COMPAT_HANDLER; +import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; -import miscutil.core.util.recipe.ShapedRecipeObject; public class LateRegistrationHandler { @@ -22,7 +22,7 @@ public class LateRegistrationHandler { } catch (InterruptedException e) { Utils.LOG_INFO(e.toString()); } - Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed); + Utils.LOG_INFO("Late Recipes Loaded: "+recipesSuccess+" Failed: "+recipesFailed); } } diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java index 5a5be61933..ce7f24c2aa 100644 --- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java @@ -1,10 +1,10 @@ package miscutil.core.handler.registration; import miscutil.core.handler.COMPAT_HANDLER; +import miscutil.core.recipe.RECIPES_Machines; +import miscutil.core.recipe.RECIPES_Shapeless; +import miscutil.core.recipe.RECIPES_Tools; import miscutil.core.util.Utils; -import miscutil.core.util.recipe.RECIPES_Machines; -import miscutil.core.util.recipe.RECIPES_Shapeless; -import miscutil.core.util.recipe.RECIPES_Tools; public class RegistrationHandler { -- cgit