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)
This commit is contained in:
parent
de6d418697
commit
9b3ee926e2
3 changed files with 8 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -51,7 +51,8 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe
|
|||
{
|
||||
if(gasType == GasRegistry.getGas("sulfuricAcid"))
|
||||
{
|
||||
List<ItemStack> fuels = OreDictionary.getOres("dustSulfur");
|
||||
List<ItemStack> fuels = new ArrayList<ItemStack>();
|
||||
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<ItemStack> fuels = OreDictionary.getOres("dustSalt");
|
||||
List<ItemStack> fuels = new ArrayList<ItemStack>();
|
||||
fuels.addAll(OreDictionary.getOres("dustSalt"));
|
||||
fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride")));
|
||||
return fuels;
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ public final class OreDictCache
|
|||
{
|
||||
return cachedKeys.get(info);
|
||||
}
|
||||
|
||||
/*
|
||||
List<Integer> idsFound = new ArrayList<Integer>();
|
||||
HashMap<Integer, ArrayList<ItemStack>> oreStacks = (HashMap<Integer, ArrayList<ItemStack>>)MekanismUtils.getPrivateValue(null, OreDictionary.class, new String[] {"oreStacks"});
|
||||
oreStacks = (HashMap<Integer, ArrayList<ItemStack>>)oreStacks.clone();
|
||||
|
@ -47,6 +47,8 @@ public final class OreDictCache
|
|||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
int[] idsFound = OreDictionary.getOreIDs(check);
|
||||
|
||||
List<String> ret = new ArrayList<String>();
|
||||
|
||||
|
|
Loading…
Reference in a new issue