diff options
Diffstat (limited to 'src/main/java/com/elisis')
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java | 97 |
1 files changed, 44 insertions, 53 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 3889a8ffad..19c258d429 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -3666,13 +3666,9 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if ((OreDictionary.getOreName(oreDictID) - .startsWith("ore") - || OreDictionary.getOreName(oreDictID) - .startsWith("rawOre") - || OreDictionary.getOreName(oreDictID) - .startsWith("crushed"))) { - GT_Log.out.print(OreDictionary.getOreName(oreDictID)); + final String oreName = OreDictionary.getOreName(oreDictID); + if ((oreName.startsWith("ore") || oreName.startsWith("rawOre") || oreName.startsWith("crushed"))) { + GT_Log.out.print(oreName); GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -3814,17 +3810,15 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID) - .startsWith("dust") - && (!OreDictionary.getOreName(oreDictID) - .contains( - "Dephosphated")) /* - * OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium") - * || OreDictionary.getOreName(oreDictID).startsWith( - * "dustImpureCerium") || - * OreDictionary.getOreName(oreDictID).startsWith("dustSpace") || - * OreDictionary.getOreName(oreDictID).startsWith("dustCerium") - */) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") + && (!oreName.contains("Dephosphated")) /* + * oreName.startsWith("dustPureCerium") + * || oreName.startsWith( + * "dustImpureCerium") || + * oreName.startsWith("dustSpace") || + * oreName.startsWith("dustCerium") + */) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -3899,10 +3893,8 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID) - .startsWith("dust") - && (!OreDictionary.getOreName(oreDictID) - .contains("Dephosphated"))) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") && (!oreName.contains("Dephosphated"))) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -3967,8 +3959,8 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID) - .startsWith("crushed") /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("crushed") /* && oreName.contains("Cerium") */) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -4014,13 +4006,14 @@ public class RecipeLoader { GT_Log.out.print(input.getDisplayName() + "\n"); int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - String oreName = OreDictionary.getOreName(oreDictID); - if (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe") - || oreName.equals("dustZirconolite") - || oreName.equals("dustYttrocerite") - || oreName.equals("dustXenotime") - || oreName.equals("dustBastnasite") - || oreName.equals("dustFlorencite")) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") + && (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe") + || oreName.equals("dustZirconolite") + || oreName.equals("dustYttrocerite") + || oreName.equals("dustXenotime") + || oreName.equals("dustBastnasite") + || oreName.equals("dustFlorencite"))) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -4068,13 +4061,14 @@ public class RecipeLoader { GT_Log.out.print(input.getDisplayName() + "\n"); int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - String oreName = OreDictionary.getOreName(oreDictID); - if (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe") - || oreName.equals("dustZirconolite") - || oreName.equals("dustYttrocerite") - || oreName.equals("dustXenotime") - || oreName.equals("dustBastnasite") - || oreName.equals("dustFlorencite")) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") + && (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe") + || oreName.equals("dustZirconolite") + || oreName.equals("dustYttrocerite") + || oreName.equals("dustXenotime") + || oreName.equals("dustBastnasite") + || oreName.equals("dustFlorencite"))) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -4121,14 +4115,10 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID) - .startsWith("dustImpureCerium") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustImpureSamarium") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustPureSamarium") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustPureCerium")) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dustImpureCerium") || oreName.startsWith("dustImpureSamarium") + || oreName.startsWith("dustPureSamarium") + || oreName.startsWith("dustPureCerium")) { GT_Recipe tRecipe = recipe.copy(); for (int i = 0; i < tRecipe.mOutputs.length; i++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; @@ -4174,13 +4164,14 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - String oreName = OreDictionary.getOreName(oreDictID); - if (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite") - || oreName.equals("dustZirkelite") - || oreName.equals("dustGadoliniteCe") - || oreName.equals("dustGadoliniteY") - || oreName.equals("dustPolycrase") - || oreName.equals("dustBastnasite")) { + final String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.startsWith("dust") + && (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite") + || oreName.equals("dustZirkelite") + || oreName.equals("dustGadoliniteCe") + || oreName.equals("dustGadoliniteY") + || oreName.equals("dustPolycrase") + || oreName.equals("dustBastnasite"))) { GT_Recipe tRecipe = recipe.copy(); for (int i = 0; i < tRecipe.mOutputs.length; i++) { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; |