From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + New texture for the slow builders ring. + Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project. --- .../gregtech/recipehandlers/GregtechRecipe.java | 35 +++++++++++----------- 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'src/Java/gtPlusPlus/core/util/gregtech') diff --git a/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java index b10e643831..0c98751398 100644 --- a/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java +++ b/src/Java/gtPlusPlus/core/util/gregtech/recipehandlers/GregtechRecipe.java @@ -1,11 +1,10 @@ package gtPlusPlus.core.util.gregtech.recipehandlers; +import java.lang.reflect.Method; + import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; - -import java.lang.reflect.Method; - import net.minecraft.item.ItemStack; public final class GregtechRecipe { @@ -15,21 +14,21 @@ public final class GregtechRecipe { Utils.LOG_INFO("Initializing a recipe handler for different versions of Gregtech 5."); try { if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - this.ourProxy = new LibProxy1(); - Utils.LOG_INFO("Selecting GT 5.7/5.8 Recipe Set"); + this.ourProxy = new LibProxy1(); + Utils.LOG_INFO("Selecting GT 5.7/5.8 Recipe Set"); } if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - this.ourProxy = new LibProxy2(); - Utils.LOG_INFO("Selecting GT 5.9 Recipe Set"); + this.ourProxy = new LibProxy2(); + Utils.LOG_INFO("Selecting GT 5.9 Recipe Set"); } - } catch (NoSuchMethodException e) { + } catch (final NoSuchMethodException e) { this.ourProxy = null; } } - public boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aInput, ItemStack aOutput) { + public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) { Utils.LOG_WARNING("Adding a GT Furnace/Alloy Smelter Recipe"+"| Input:"+aInput.getDisplayName()+" | Output:"+aOutput.getDisplayName()+" |"); - return ourProxy.addSmeltingAndAlloySmeltingRecipe(aInput, aOutput); + return this.ourProxy.addSmeltingAndAlloySmeltingRecipe(aInput, aOutput); } } @@ -42,15 +41,15 @@ class LibProxy1 extends LibraryProxy { final Method m1; public LibProxy1() throws NoSuchMethodException { - m1 = GT_ModHandler.class.getDeclaredMethod("addSmeltingAndAlloySmeltingRecipe", ItemStack.class, ItemStack.class); + this.m1 = GT_ModHandler.class.getDeclaredMethod("addSmeltingAndAlloySmeltingRecipe", ItemStack.class, ItemStack.class); } @Override - public boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aInput, ItemStack aOutput) { + public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) { try { Utils.LOG_INFO("Trying with Gt 5.7/5.8 Method."); - return (boolean) m1.invoke(null, aInput, aOutput); - } catch (Exception e) { + return (boolean) this.m1.invoke(null, aInput, aOutput); + } catch (final Exception e) { throw new RuntimeException(e); } } @@ -60,15 +59,15 @@ class LibProxy2 extends LibraryProxy { final Method m2; public LibProxy2() throws NoSuchMethodException { - m2 = GT_ModHandler.class.getDeclaredMethod("addSmeltingAndAlloySmeltingRecipe", ItemStack.class, ItemStack.class, boolean.class); + this.m2 = GT_ModHandler.class.getDeclaredMethod("addSmeltingAndAlloySmeltingRecipe", ItemStack.class, ItemStack.class, boolean.class); } @Override - public boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aInput, ItemStack aOutput) { + public boolean addSmeltingAndAlloySmeltingRecipe(final ItemStack aInput, final ItemStack aOutput) { try { Utils.LOG_INFO("Trying with Gt 5.9 Method."); - return (boolean) m2.invoke(null, aInput, aOutput, true); - } catch (Exception e) { + return (boolean) this.m2.invoke(null, aInput, aOutput, true); + } catch (final Exception e) { throw new RuntimeException(e); } } -- cgit