diff options
4 files changed, 45 insertions, 31 deletions
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index 69ae896bae..eb8d8f546f 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -44,12 +44,12 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ public Recipe_GT(final ItemStack aInput1, final ItemStack aOutput1, final ItemStack aOutput2, final ItemStack aOutput3, final ItemStack aOutput4, final int aSpecialValue, final int aType) { this(true, new ItemStack[]{aInput1}, new ItemStack[]{aOutput1, aOutput2, aOutput3, aOutput4}, null, null, null, null, 0, 0, Math.max(1, aSpecialValue)); - Logger.INFO("Switch case method for adding fuels"); + Logger.WARNING("Switch case method for adding fuels"); if ((this.mInputs.length > 0) && (aSpecialValue > 0)) { switch (aType) { // Diesel Generator case 0: - Logger.INFO("Added fuel "+aInput1.getDisplayName()+" is ROCKET FUEL - continuing"); + Logger.WARNING("Added fuel "+aInput1.getDisplayName()+" is ROCKET FUEL - continuing"); Gregtech_Recipe_Map.sRocketFuels.addRecipe(this); break; // Gas Turbine @@ -385,23 +385,23 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ }*/ public Recipe_GT addRecipe(final Recipe_GT aRecipe) { - Logger.INFO("Adding Recipe Method 1"); + Logger.WARNING("Adding Recipe Method 1"); return this.addRecipe(aRecipe, true, false, false); } protected Recipe_GT addRecipe(final Recipe_GT aRecipe, final boolean aCheckForCollisions, final boolean aFakeRecipe, final boolean aHidden) { - Logger.INFO("Adding Recipe Method 2 - This Checks if hidden, fake or if duplicate recipes exists, I think."); + Logger.WARNING("Adding Recipe Method 2 - This Checks if hidden, fake or if duplicate recipes exists, I think."); aRecipe.mHidden = aHidden; aRecipe.mFakeRecipe = aFakeRecipe; - Logger.INFO("Logging some data about this method: GregtechRecipe["+aRecipe.toString()+"] | aCheckForCollisions["+aCheckForCollisions+"] | aFakeRecipe["+aFakeRecipe+"] | aHidden["+aHidden+"]"); - Logger.INFO("Logging some data about this method: mMinimalInputFluids["+this.mMinimalInputFluids+"] | mMinimalInputItems["+this.mMinimalInputItems+"] | aRecipe.mFluidInputs.length["+aRecipe.mFluidInputs.length+"] | aRecipe.mInputs.length["+aRecipe.mInputs.length+"]"); + Logger.WARNING("Logging some data about this method: GregtechRecipe["+aRecipe.toString()+"] | aCheckForCollisions["+aCheckForCollisions+"] | aFakeRecipe["+aFakeRecipe+"] | aHidden["+aHidden+"]"); + Logger.WARNING("Logging some data about this method: mMinimalInputFluids["+this.mMinimalInputFluids+"] | mMinimalInputItems["+this.mMinimalInputItems+"] | aRecipe.mFluidInputs.length["+aRecipe.mFluidInputs.length+"] | aRecipe.mInputs.length["+aRecipe.mInputs.length+"]"); if ((aRecipe.mFluidInputs.length < this.mMinimalInputFluids) && (aRecipe.mInputs.length < this.mMinimalInputItems)){ - Logger.INFO("Step 2 failed"); + Logger.WARNING("Step 2 failed"); return null;} - Logger.INFO("Logging some data about this method: aCheckForCollisions["+aCheckForCollisions+"] | findRecipe != null ["+(this.findRecipe(null, false, Long.MAX_VALUE, aRecipe.mFluidInputs, aRecipe.mInputs) != null)+"]"); + Logger.WARNING("Logging some data about this method: aCheckForCollisions["+aCheckForCollisions+"] | findRecipe != null ["+(this.findRecipe(null, false, Long.MAX_VALUE, aRecipe.mFluidInputs, aRecipe.mInputs) != null)+"]"); if (aCheckForCollisions && (this.findRecipe(null, false, Long.MAX_VALUE, aRecipe.mFluidInputs, aRecipe.mInputs) != null)){ - Logger.INFO("Step 2 failed - 2"); + Logger.WARNING("Step 2 failed - 2"); return null; } return this.add(aRecipe); @@ -431,11 +431,11 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ } public Recipe_GT add(final Recipe_GT aRecipe) { - Logger.INFO("Adding Recipe Method 3"); + Logger.WARNING("Adding Recipe Method 3"); this.mRecipeList.add(aRecipe); for (final FluidStack aFluid : aRecipe.mFluidInputs) { if (aFluid != null) { - Logger.INFO("Fluid is valid - getting some kind of fluid instance to add to the recipe hashmap."); + Logger.WARNING("Fluid is valid - getting some kind of fluid instance to add to the recipe hashmap."); Collection<Recipe_GT> tList = this.mRecipeFluidMap.get(aFluid.getFluid()); if (tList == null) { this.mRecipeFluidMap.put(aFluid.getFluid(), tList = new HashSet<>(1)); @@ -599,28 +599,28 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ } protected Recipe_GT addToItemMap(final Recipe_GT aRecipe) { - Logger.INFO("Adding Recipe Method 4"); + Logger.WARNING("Adding Recipe Method 4"); for (final ItemStack aStack : aRecipe.mInputs) { if (aStack != null) { - Logger.INFO("Method 4 - Manipulating "+aStack.getDisplayName()); + Logger.WARNING("Method 4 - Manipulating "+aStack.getDisplayName()); final GT_ItemStack tStack = new GT_ItemStack(aStack); - Logger.INFO("Method 4 - Made gt stack of item "+tStack.toStack().getDisplayName()); + Logger.WARNING("Method 4 - Made gt stack of item "+tStack.toStack().getDisplayName()); Collection<Recipe_GT> tList = this.mRecipeItemMap.get(tStack); if (tList != null){ - Logger.INFO("Method 4 - Gt Recipe Hashmap: "+tList.toString()); + Logger.WARNING("Method 4 - Gt Recipe Hashmap: "+tList.toString()); } if (tList == null){ - Logger.INFO("Method 4 - brrr list was NUll"); + Logger.WARNING("Method 4 - brrr list was NUll"); this.mRecipeItemMap.put(tStack, tList = new HashSet<>(1)); - Logger.INFO("Method 4 - Attemping backup method for Gt Recipe Hashmap:"); + Logger.WARNING("Method 4 - Attemping backup method for Gt Recipe Hashmap:"); while (tList.iterator().hasNext()){ - Logger.INFO(tList.iterator().next().toString()); + Logger.WARNING(tList.iterator().next().toString()); } } tList.add(aRecipe); - Logger.INFO("Method 4 - Added recipe to map? I think."); + Logger.WARNING("Method 4 - Added recipe to map? I think."); } } return aRecipe; @@ -807,27 +807,27 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ } public Recipe_GT addFuel(final ItemStack aInput, final ItemStack aOutput, final int aFuelValueInEU) { - Logger.INFO("Adding Fuel using method 1"); + Logger.WARNING("Adding Fuel using method 1"); return this.addFuel(aInput, aOutput, null, null, 10000, aFuelValueInEU); } public Recipe_GT addFuel(final ItemStack aInput, final ItemStack aOutput, final int aChance, final int aFuelValueInEU) { - Logger.INFO("Adding Fuel using method 2"); + Logger.WARNING("Adding Fuel using method 2"); return this.addFuel(aInput, aOutput, null, null, aChance, aFuelValueInEU); } public Recipe_GT addFuel(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aFuelValueInEU) { - Logger.INFO("Adding Fuel using method 3"); + Logger.WARNING("Adding Fuel using method 3"); return this.addFuel(null, null, aFluidInput, aFluidOutput, 10000, aFuelValueInEU); } public Recipe_GT addFuel(final ItemStack aInput, final ItemStack aOutput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aFuelValueInEU) { - Logger.INFO("Adding Fuel using method 4"); + Logger.WARNING("Adding Fuel using method 4"); return this.addFuel(aInput, aOutput, aFluidInput, aFluidOutput, 10000, aFuelValueInEU); } public Recipe_GT addFuel(final ItemStack aInput, final ItemStack aOutput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aChance, final int aFuelValueInEU) { - Logger.INFO("Adding Fuel using method 5"); + Logger.WARNING("Adding Fuel using method 5"); return this.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, 0, 0, aFuelValueInEU); } } diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index e15c326e34..657c8f25ee 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -672,6 +672,10 @@ public final class ModItems { //Special Sillyness if (true) { + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateSodium", 1) == null){ + new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium)); + } + Material meatRaw = MaterialUtils.generateMaterialFromGtENUM(Materials.MeatRaw); meatRaw.setTextureSet(TextureSet.SET_ROUGH); // A plate of Meat. diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java index 1ac33106e2..88b6914ad2 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java @@ -832,18 +832,27 @@ extends TemplateRecipeHandler { public static Map<GT_ItemStack, List<ItemStack>> sItemToDataTable; public static Field sFields[] = new Field[3]; public static Method sMethods[] = new Method[2]; + public static boolean hasLooked = false; @SuppressWarnings("unchecked") - private static final void setVars() { + private static synchronized final void setVars() { try { //Set Fields for (int u=0;u<3;u++) { if (sFields[u] == null) { - if (u==0) { - sFields[0] = ReflectionUtils.getField(GT_OreDictUnificator.class, "sUnificationTable"); + if (u==0) { + for (Field f : GT_OreDictUnificator.class.getDeclaredFields()) { + ReflectionUtils.makeAccessible(f); + if (f.getName().equalsIgnoreCase("sUnificationTable")) { + hasLooked = true; + } + } + if (sFields[0] == null && hasLooked) { + sFields[0] = ReflectionUtils.getField(GT_OreDictUnificator.class, "sUnificationTable"); + } if (sFields[0] == null) { - ReflectionUtils.getField(GregtechOreDictUnificator.class, "sUnificationTable"); - } + sFields[0] = ReflectionUtils.getField(GregtechOreDictUnificator.class, "sUnificationTable"); + } } else if (u==1) { sFields[1] = ReflectionUtils.getField(GT_OreDictUnificator.class, "sName2StackMap"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java index 80f4b984da..4e6e2bc35b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java @@ -45,8 +45,9 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_I public synchronized String[] getDescription() { try { if (F == null || S == null) { - if (ReflectionUtils.getField(this.getClass(), "mDescriptionArray") != null) { - F = ReflectionUtils.getField(this.getClass(), "mDescriptionArray"); + Field t = ReflectionUtils.getField(this.getClass(), "mDescriptionArray"); + if (t != null) { + F = t; } else { F = ReflectionUtils.getField(this.getClass(), "mDescription"); |