From 84bed9b2b1f725a549453b0a63b898b9e37b65c1 Mon Sep 17 00:00:00 2001 From: Dashkal Date: Mon, 23 Jun 2014 22:43:08 -0700 Subject: [PATCH] Port to forge-10.12.2.1121 (was 10.12.1.1112) * Updated build.properties * Now using the new OreDictionary.getoreIDs() call to obtain oreDict names * No longer modifying OreDictionary collections in ChemicalInjectionRecipeHandler * No longer registering list redstone under oreRedstone (causes an NPE) --- build.properties | 2 +- .../client/nei/ChemicalInjectionChamberRecipeHandler.java | 6 ++++-- src/main/java/mekanism/common/OreDictCache.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index 5d630b540..7d4563088 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.2 -forge_version=10.12.2.1121 +forge_version=10.12.2.1147 FMP_version=1.1.0.288 CCLIB_version=1.1.1.87 NEI_version=1.0.1 diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 64279f95e..89443820b 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -51,7 +51,8 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe { if(gasType == GasRegistry.getGas("sulfuricAcid")) { - List fuels = OreDictionary.getOres("dustSulfur"); + List fuels = new ArrayList(); + fuels.addAll(OreDictionary.getOres("dustSulfur")); fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("sulfuricAcid"))); return fuels; } @@ -61,7 +62,8 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe } else if(gasType == GasRegistry.getGas("hydrogenChloride")) { - List fuels = OreDictionary.getOres("dustSalt"); + List fuels = new ArrayList(); + fuels.addAll(OreDictionary.getOres("dustSalt")); fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride"))); return fuels; } diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index 4f20f7771..c6017069c 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -31,7 +31,7 @@ public final class OreDictCache { return cachedKeys.get(info); } - +/* List idsFound = new ArrayList(); HashMap> oreStacks = (HashMap>)MekanismUtils.getPrivateValue(null, OreDictionary.class, new String[] {"oreStacks"}); oreStacks = (HashMap>)oreStacks.clone(); @@ -47,6 +47,8 @@ public final class OreDictCache } } } +*/ + int[] idsFound = OreDictionary.getOreIDs(check); List ret = new ArrayList();