diff options
Diffstat (limited to 'src/main/java/gtnhlanth/loader')
| -rw-r--r-- | src/main/java/gtnhlanth/loader/RecipeLoader.java | 32 | ||||
| -rw-r--r-- | src/main/java/gtnhlanth/loader/ZPMRubberChanges.java | 7 |
2 files changed, 24 insertions, 15 deletions
diff --git a/src/main/java/gtnhlanth/loader/RecipeLoader.java b/src/main/java/gtnhlanth/loader/RecipeLoader.java index 71d8eaa06c..bea4d231d8 100644 --- a/src/main/java/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/gtnhlanth/loader/RecipeLoader.java @@ -377,15 +377,30 @@ public class RecipeLoader { // Target Holder GameRegistry.addShapedRecipe( new ItemStack(LanthItemList.TARGET_HOLDER), - new Object[] { "MCM", "MHM", "MCM", 'M', WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), 'H', - ItemList.Hull_LuV.get(1), 'C', ItemList.Conveyor_Module_LuV.get(1) }); + "MCM", + "MHM", + "MCM", + 'M', + WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), + 'H', + ItemList.Hull_LuV.get(1), + 'C', + ItemList.Conveyor_Module_LuV.get(1)); GameRegistry.addShapedRecipe( new ItemStack(LanthItemList.FOCUS_HOLDER), - new Object[] { "MCM", "R R", "MHM", 'M', WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), 'C', - ItemList.Conveyor_Module_LuV.get(1), 'R', ItemList.Robot_Arm_LuV.get(1), 'H', - ItemList.Hull_LuV.get(1) }); + "MCM", + "R R", + "MHM", + 'M', + WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), + 'C', + ItemList.Conveyor_Module_LuV.get(1), + 'R', + ItemList.Robot_Arm_LuV.get(1), + 'H', + ItemList.Hull_LuV.get(1)); // Focus Input Bus GameRegistry.addShapedRecipe( @@ -3376,7 +3391,7 @@ public class RecipeLoader { /** * 1/9 Ce + 3 Lu + 5 Sapphire = 8 LuAG Blend 1/9 Ce + 3 Lu + 10 Green Sapphire = 8 LuAG Blend 2/9 Ce + 6 Lu + 25 * Alumina + 9 Oxygen = 12 LuAG Blend - * + * <p> * 1 Ce + 60 Lu + 100 Sapphire = 160 LuAG Blend 1 Ce + 60 Lu +200 Green Sapphire = 160 LuAG Blend * */ @@ -4094,7 +4109,6 @@ public class RecipeLoader { public static void removeCeriumChemicalBath() { HashSet<GTRecipe> remove = new HashSet<>(5000); - HashSet<GTRecipe> reAdd = new HashSet<>(5000); GTLog.out.println(Tags.MODID + ": marking recipes in chem bath for removal!"); for (GTRecipe recipe : chemicalBathRecipes.getAllRecipes()) { @@ -4122,13 +4136,9 @@ public class RecipeLoader { GTLog.out.println(Tags.MODID + ": regenerating chem bath recipes"); chemicalBathRecipes.getBackend() .removeRecipes(remove); - reAdd.forEach(chemicalBathRecipes::add); chemicalBathRecipes.getBackend() .reInit(); - remove.clear(); - reAdd.clear(); - GTLog.out.println("Chemical Bath done!"); } diff --git a/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java b/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java index a00b28ae9b..5d172421f9 100644 --- a/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java +++ b/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java @@ -40,7 +40,6 @@ import gtnhlanth.common.register.WerkstoffMaterialPool; public class ZPMRubberChanges implements Runnable { - @SuppressWarnings("unchecked") public void run() { HashSet<ItemStack> ZPMPlusComponents = new HashSet<>(); @@ -115,7 +114,7 @@ public class ZPMRubberChanges implements Runnable { || customItemList.toString() .contains("UEV")) && (boolean) hasnotBeenSet.invoke(customItemList)) - ZPMPlusComponents.add((ItemStack) get.invoke(customItemList, 1, new Object[0])); + ZPMPlusComponents.add(get.invoke(customItemList, 1, new Object[0])); } } catch (IllegalAccessException | ClassNotFoundException | InvocationTargetException e) { e.printStackTrace(); @@ -373,7 +372,7 @@ public class ZPMRubberChanges implements Runnable { boolean replaced = false; for (int i = 0; i < stacks.length; i++) { if (!GTUtility.isStackValid(stacks[i])) { - if (stacks[i] instanceof ArrayList && ((ArrayList) stacks[i]).size() > 0) { + if (stacks[i] instanceof ArrayList && !((ArrayList) stacks[i]).isEmpty()) { if (GTUtility.areStacksEqual(stack, (ItemStack) ((ArrayList) stacks[i]).get(0), true)) if (!replace) return true; else { @@ -385,7 +384,7 @@ public class ZPMRubberChanges implements Runnable { GTLog.out.print("Replaced recipe!: " + stack.getDisplayName() + " "); } - } else continue; + } } else if (GTUtility.areStacksEqual(stack, (ItemStack) stacks[i], true)) if (!replace) return true; else { int amount = ((ItemStack) stacks[i]).stackSize; |