diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders')
8 files changed, 43 insertions, 62 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java index c64c846541..37ef0edc66 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java @@ -223,8 +223,7 @@ public class RecipeGenBlastSmelter extends RecipeGenBase { M.getComposites() .get(irc) .getDustStack(r))) { - final int xr = r; - if ((xr > 0) && (xr <= 100)) { + if (r > 0 && r <= 100) { final int mathmatics = (r * 1000); componentsFluid = FluidUtils.getFluidStack( M.getComposites() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java index a78b517268..8e92843e18 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java @@ -24,8 +24,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGenBlastSmelterGTNH { - private static Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<>(); - private static Map<String, String> mCachedHotToColdRegistry = new HashMap<>(); + private static final Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<>(); + private static final Map<String, String> mCachedHotToColdRegistry = new HashMap<>(); private static synchronized void setIngotToFluid(final ItemStackData stack, final FluidStack fluid) { if (stack != null && fluid != null) { @@ -40,29 +40,25 @@ public class RecipeGenBlastSmelterGTNH { } private static synchronized FluidStack getFluidFromIngot(final ItemStackData ingot) { - ItemStackData h = ingot; - if (mCachedIngotToFluidRegistry.containsKey(h.getUniqueDataIdentifier())) { + if (mCachedIngotToFluidRegistry.containsKey(ingot.getUniqueDataIdentifier())) { Logger.MACHINE_INFO("[ABS] mCachedIngotToFluidRegistry contains Output Ingot."); - return mCachedIngotToFluidRegistry.get(h.getUniqueDataIdentifier()); + return mCachedIngotToFluidRegistry.get(ingot.getUniqueDataIdentifier()); } - if (mCachedHotToColdRegistry.containsKey(h.getUniqueDataIdentifier())) { + if (mCachedHotToColdRegistry.containsKey(ingot.getUniqueDataIdentifier())) { Logger.MACHINE_INFO("[ABS] mCachedHotToColdRegistry contains Output Ingot."); - return mCachedIngotToFluidRegistry.get(mCachedHotToColdRegistry.get(h.getUniqueDataIdentifier())); + return mCachedIngotToFluidRegistry.get(mCachedHotToColdRegistry.get(ingot.getUniqueDataIdentifier())); } Logger.MACHINE_INFO("[ABS] Neither Cache contains Output Ingot."); return null; } - private static boolean isValid(final ItemStack[] inputs, final ItemStack outputs[], final FluidStack[] fluidIn, + private static boolean isValid(final ItemStack[] inputs, final ItemStack[] outputs, final FluidStack[] fluidIn, final FluidStack fluidOut) { - if (inputs != null && outputs != null + return inputs != null && outputs != null && fluidIn != null && fluidOut != null && inputs.length > 0 - && outputs.length > 0) { - return true; - } - return false; + && outputs.length > 0; } public static synchronized boolean generateGTNHBlastSmelterRecipesFromEBFList() { @@ -152,7 +148,6 @@ public class RecipeGenBlastSmelterGTNH { // continue to next recipe if the Temp is too high. if (special > 3600) { Logger.MACHINE_INFO("[ABS] Skipping ABS addition for GTNH due to temp."); - continue; } else { FluidStack mMoltenStack = null; int mMoltenCount = 0; @@ -188,7 +183,7 @@ public class RecipeGenBlastSmelterGTNH { aTempList.add(recipeItem); } - inputs = aTempList.toArray(new ItemStack[aTempList.size()]); + inputs = aTempList.toArray(new ItemStack[0]); int inputLength = inputs.length; // If no circuit was found, increase array length by 1 to add circuit at newInput[0] if (!circuitFound) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java index a334fd7de4..58aeed46d7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java @@ -39,7 +39,7 @@ public class RecipeGenFluidCanning implements Runnable { private static boolean mHasRun = false; - private static HashSet<RecipeGenFluidCanning> mCache = new HashSet<>(); + private static final HashSet<RecipeGenFluidCanning> mCache = new HashSet<>(); private static void addRunnableToRecipeCache(RecipeGenFluidCanning r) { if (mHasRun) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java index 352217ff95..31d097ab71 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java @@ -76,9 +76,9 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { */ // Process Dust - if (componentMap.size() > 0 && componentMap.size() <= 6) { - ItemStack mInternalOutputs[] = new ItemStack[6]; - int mChances[] = new int[6]; + if (!componentMap.isEmpty() && componentMap.size() <= 6) { + ItemStack[] mInternalOutputs = new ItemStack[6]; + int[] mChances = new int[6]; int mCellCount = 0; int mTotalCount = 0; @@ -168,9 +168,7 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { internalOutputs.removeIf(Objects::isNull); int[] chances = new int[internalOutputs.size()]; - for (int i = 0; i < internalOutputs.size(); i++) { - chances[i] = mChances[i]; - } + System.arraycopy(mChances, 0, chances, 0, internalOutputs.size()); ItemStack[] inputs; if (emptyCell == null) { @@ -195,8 +193,8 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { "[Issue][Electrolyzer] " + material.getLocalizedName() + " is composed of over 6 materials, so an electrolyzer recipe for processing cannot be generated. Trying to create one for the Dehydrator instead."); - ItemStack mInternalOutputs[] = new ItemStack[9]; - int mChances[] = new int[9]; + ItemStack[] mInternalOutputs = new ItemStack[9]; + int[] mChances = new int[9]; int mCellCount = 0; int mTotalCount = 0; @@ -284,9 +282,7 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { List<ItemStack> internalOutputs = new ArrayList<>(Arrays.asList(mInternalOutputs)); internalOutputs.removeIf(Objects::isNull); int[] chances = new int[internalOutputs.size()]; - for (int i = 0; i < internalOutputs.size(); i++) { - chances[i] = mChances[i]; - } + System.arraycopy(mChances, 0, chances, 0, internalOutputs.size()); ItemStack[] inputs; if (emptyCell == null) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java index c8c1d28547..eb3d27e009 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java @@ -74,8 +74,8 @@ public class RecipeGenOre extends RecipeGenBase { Material bonusA = null; // Ni Material bonusB = null; // Tin - if (material.getComposites() - .size() >= 1 + if (!material.getComposites() + .isEmpty() && material.getComposites() .get(0) != null) { bonusA = material.getComposites() @@ -89,9 +89,7 @@ public class RecipeGenOre extends RecipeGenBase { // Setup Bonuses ArrayList<Material> aMatComp = new ArrayList<>(); - for (Material j : MaterialUtils.getCompoundMaterialsRecursively(material)) { - aMatComp.add(j); - } + aMatComp.addAll(MaterialUtils.getCompoundMaterialsRecursively(material)); if (aMatComp.size() < 3) { while (aMatComp.size() < 3) { @@ -374,10 +372,10 @@ public class RecipeGenOre extends RecipeGenBase { if (!disableOptional) { // Process Dust - if (componentMap.size() > 0 && componentMap.size() <= 6) { + if (!componentMap.isEmpty() && componentMap.size() <= 6) { - ItemStack mInternalOutputs[] = new ItemStack[6]; - int mChances[] = new int[6]; + ItemStack[] mInternalOutputs = new ItemStack[6]; + int[] mChances = new int[6]; int mCellCount = 0; int mTotalCount = 0; @@ -466,9 +464,7 @@ public class RecipeGenOre extends RecipeGenBase { List<ItemStack> internalOutputs = new ArrayList<>(Arrays.asList(mInternalOutputs)); internalOutputs.removeIf(Objects::isNull); int[] chances = new int[internalOutputs.size()]; - for (int i = 0; i < internalOutputs.size(); i++) { - chances[i] = mChances[i]; - } + System.arraycopy(mChances, 0, chances, 0, internalOutputs.size()); ItemStack[] inputs; if (emptyCell == null) { inputs = new ItemStack[] { mainDust }; @@ -490,8 +486,8 @@ public class RecipeGenOre extends RecipeGenBase { "[Issue][Electrolyzer] " + material.getLocalizedName() + " is composed of over 6 materials, so an electrolyzer recipe for processing cannot be generated. Trying to create one for the Dehydrator instead."); - ItemStack mInternalOutputs[] = new ItemStack[9]; - int mChances[] = new int[9]; + ItemStack[] mInternalOutputs = new ItemStack[9]; + int[] mChances = new int[9]; int mCellCount = 0; int mTotalCount = 0; @@ -582,9 +578,7 @@ public class RecipeGenOre extends RecipeGenBase { List<ItemStack> internalOutputs = new ArrayList<>(Arrays.asList(mInternalOutputs)); internalOutputs.removeIf(Objects::isNull); int[] chances = new int[internalOutputs.size()]; - for (int i = 0; i < internalOutputs.size(); i++) { - chances[i] = mChances[i]; - } + System.arraycopy(mChances, 0, chances, 0, internalOutputs.size()); ItemStack[] inputs; if (emptyCell == null) { @@ -607,8 +601,7 @@ public class RecipeGenOre extends RecipeGenBase { + " x" + mainDust.stackSize + ", " - + (emptyCell == null ? "No Cells" - : "" + emptyCell.getDisplayName() + " x" + emptyCell.stackSize)); + + (emptyCell == null ? "No Cells" : emptyCell.getDisplayName() + " x" + emptyCell.stackSize)); Logger.MATERIALS("Outputs " + ItemUtils.getArrayStackNames(mInternalOutputs)); Logger.MATERIALS("Time: " + ((int) Math.max(material.getMass() * 4L * 1, 1))); Logger.MATERIALS("EU: " + tVoltageMultiplier); @@ -654,7 +647,6 @@ public class RecipeGenOre extends RecipeGenBase { null, matDust); - final ItemStack normalDust = matDust; final ItemStack smallDust = material.getSmallDust(1); final ItemStack tinyDust = material.getTinyDust(1); @@ -668,28 +660,28 @@ public class RecipeGenOre extends RecipeGenBase { tinyDust, tinyDust, tinyDust, - normalDust)) { + matDust)) { Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils - .addShapedRecipe(normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) { + .addShapedRecipe(matDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) { Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils - .addShapedRecipe(smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)) { + .addShapedRecipe(smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, matDust)) { Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils - .addShapedRecipe(null, normalDust, null, null, null, null, null, null, null, material.getSmallDust(4))) { + .addShapedRecipe(null, matDust, null, null, null, null, null, null, null, material.getSmallDust(4))) { Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java index 63812e2e6e..68011ace71 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java @@ -86,7 +86,7 @@ public class RecipeGenRecycling implements Runnable { .getDisplayName()); validCounter++; } - Pair<OrePrefixes, ItemStack> temp3[] = new Pair[validCounter]; + Pair<OrePrefixes, ItemStack>[] temp3 = new Pair[validCounter]; int temp4 = 0; for (Pair<OrePrefixes, ItemStack> r : mValidPairs) { if (r == null) { @@ -250,8 +250,10 @@ public class RecipeGenRecycling implements Runnable { } return GTUtility.copyAmount( aAmount, - new Object[] { GTOreDictUnificator.getName2StackMap() - .get(aName.toString()), getFirstOre(aName, aAmount), aReplacement }); + GTOreDictUnificator.getName2StackMap() + .get(aName.toString()), + getFirstOre(aName, aAmount), + aReplacement); } public static ItemStack getFirstOre(final Object aName, final long aAmount) { @@ -320,7 +322,6 @@ public class RecipeGenRecycling implements Runnable { } public static ItemStack getItemStackOfAmountFromOreDict(String oredictName, final int amount) { - String mTemp = oredictName; // Banned Materials and replacements for GT5.8 compat. @@ -329,7 +330,7 @@ public class RecipeGenRecycling implements Runnable { return ItemUtils.getSimpleStack(Items.clay_ball, amount); } - final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(mTemp); + final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); if (!oreDictList.isEmpty()) { final ItemStack returnValue = oreDictList.get(0) .copy(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java index 97445915f2..3fd856e801 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java @@ -37,8 +37,7 @@ public class RecipeGenShapedCrafting extends RecipeGenBase { if (material.getPlate(1) != null && material.getIngot(1) != null) GTModHandler.addCraftingRecipe( material.getPlate(1), GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, - new Object[] { "h", "B", "I", Character.valueOf('I'), material.getIngot(1), Character.valueOf('B'), - material.getIngot(1) }); + new Object[] { "h", "B", "I", 'I', material.getIngot(1), 'B', material.getIngot(1) }); if (ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getIngot(1))) @@ -53,8 +52,7 @@ public class RecipeGenShapedCrafting extends RecipeGenBase { GTModHandler.addCraftingRecipe( material.getPlateDouble(1), GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, - new Object[] { "I", "B", "h", Character.valueOf('I'), material.getPlate(1), Character.valueOf('B'), - material.getPlate(1) }); + new Object[] { "I", "B", "h", 'I', material.getPlate(1), 'B', material.getPlate(1) }); if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1))) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java index 4689bb5042..0ec27e6cee 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java @@ -95,7 +95,7 @@ public class RecipeLoaderAlgaeFarm { false, aInputs, aOutputs, - (Object) null, + null, new int[] {}, new FluidStack[] { GTValues.NF }, new FluidStack[] { GTValues.NF }, |