diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
3 files changed, 21 insertions, 7 deletions
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"); |