diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
4 files changed, 30 insertions, 28 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java index 2045172eec..204d8f53a0 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java @@ -2,6 +2,7 @@ package gregtech.loaders.postload; import java.util.Set; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemAxe; @@ -13,6 +14,7 @@ import gregtech.api.util.GT_Utility; public class GT_BlockResistanceLoader implements Runnable { @Override + @SuppressWarnings("unchecked") public void run() { if (GT_Mod.gregtechproxy.mHardRock) { Blocks.stone.setHardness(16.0F); @@ -35,15 +37,15 @@ public class GT_BlockResistanceLoader implements Runnable { Blocks.sponge.setHarvestLevel("axe", 0); Blocks.monster_egg.setHarvestLevel("pickaxe", 0); - GT_Utility.callMethod(Material.tnt, "func_85158_p", true, false, false, new Object[0]); - GT_Utility.callMethod(Material.tnt, "setAdventureModeExempt", true, false, false, new Object[0]); + GT_Utility.callMethod(Material.tnt, "func_85158_p", true, false, false); + GT_Utility.callMethod(Material.tnt, "setAdventureModeExempt", true, false, false); - Set tSet = (Set) GT_Utility.getFieldContent(ItemAxe.class, "field_150917_c", true, true); + Set<Block> tSet = (Set<Block>) GT_Utility.getFieldContent(ItemAxe.class, "field_150917_c", true, true); tSet.add(Blocks.bed); tSet.add(Blocks.hay_block); tSet.add(Blocks.sponge); - tSet = (Set) GT_Utility.getFieldContent(ItemPickaxe.class, "field_150915_c", true, true); + tSet = (Set<Block>) GT_Utility.getFieldContent(ItemPickaxe.class, "field_150915_c", true, true); tSet.add(Blocks.monster_egg); tSet.add(Blocks.tnt); } diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index 32470a7e7a..c2af777700 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -490,7 +490,7 @@ public class GT_PostLoad { @SuppressWarnings("unchecked") // Overrides legacy method with raw types @Override - public void displayAllReleventItems(List aList) { + public void displayAllReleventItems(List<ItemStack> aList) { for (int i = 0; i < 32766; i += 2) { if (GT_MetaGenerated_Tool_01.INSTANCE.getToolStats( diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index cce0da00cd..8cbdc42301 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -80,7 +80,7 @@ public class GT_PCBFactoryRecipes { // Plastic Circuit Board for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(64)); amountOfBoards -= 64; @@ -107,7 +107,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 0.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(64)); amountOfBoards -= 64; @@ -135,7 +135,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(64)); amountOfBoards -= 64; @@ -165,7 +165,7 @@ public class GT_PCBFactoryRecipes { // Advanced Circuit Board for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(i)); amountOfBoards -= 64; @@ -192,7 +192,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(i)); amountOfBoards -= 64; @@ -220,7 +220,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(i)); amountOfBoards -= 64; @@ -250,7 +250,7 @@ public class GT_PCBFactoryRecipes { // More Advanced Circuit Board for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(i)); amountOfBoards -= 64; @@ -277,7 +277,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(i)); amountOfBoards -= 64; @@ -305,7 +305,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(i)); amountOfBoards -= 64; @@ -335,7 +335,7 @@ public class GT_PCBFactoryRecipes { // Elite Circuit Board for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(i)); amountOfBoards -= 64; @@ -362,7 +362,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(i)); amountOfBoards -= 64; @@ -390,7 +390,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(i)); amountOfBoards -= 64; @@ -420,7 +420,7 @@ public class GT_PCBFactoryRecipes { // Wetware Circuit Board for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(i)); amountOfBoards -= 64; @@ -448,7 +448,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(i)); amountOfBoards -= 64; @@ -477,7 +477,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(i)); amountOfBoards -= 64; @@ -508,7 +508,7 @@ public class GT_PCBFactoryRecipes { // Bioware Circuit Board for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(i)); amountOfBoards -= 64; @@ -536,7 +536,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(i)); amountOfBoards -= 64; @@ -565,7 +565,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(i)); amountOfBoards -= 64; @@ -597,7 +597,7 @@ public class GT_PCBFactoryRecipes { // Optical Circuit Board for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Optical.get(i)); amountOfBoards -= 64; @@ -630,7 +630,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Optical.get(i)); amountOfBoards -= 64; @@ -664,7 +664,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Optical.get(i)); amountOfBoards -= 64; diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java index a16edda7f0..10d9dee0f1 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java @@ -138,7 +138,7 @@ public class ElectrolyzerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1)) - .outputChances(new int[] { 10000, 10000, 917 }) + .outputChances(10000, 10000, 917) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -161,7 +161,7 @@ public class ElectrolyzerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(Materials.SodiumHydroxide.getDust(3), Materials.Empty.getCells(1)) .itemOutputs(Materials.Sodium.getDust(1), Materials.Hydrogen.getCells(1)) - .outputChances(new int[] { 10000, 10000 }) + .outputChances(10000, 10000) .noFluidInputs() .fluidOutputs(Materials.Oxygen.getGas(1000)) .duration(50 * SECONDS) |