aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/load
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
committerRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
commit8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch)
tree0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/loaders/load
parentd795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff)
downloadGT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/loaders/load')
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java242
-rw-r--r--src/main/java/gregtech/loaders/load/GT_ItemIterator.java531
-rw-r--r--src/main/java/gregtech/loaders/load/GT_SonictronLoader.java4
3 files changed, 327 insertions, 450 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index e87538c831..554fecb6f9 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -23,157 +23,137 @@ public class GT_FuelLoader implements Runnable {
@Override
public void run() {
GT_Log.out.println("GT_Mod: Initializing various Fuels.");
- ItemList.sBlueVitriol = GT_Mod.gregtechproxy.addFluid(
- "solution.bluevitriol",
- "Blue Vitriol water solution",
- null,
- 1,
- 295);
- ItemList.sNickelSulfate = GT_Mod.gregtechproxy.addFluid(
- "solution.nickelsulfate",
- "Nickel sulfate water solution",
- null,
- 1,
- 295);
- ItemList.sGreenVitriol = GT_Mod.gregtechproxy.addFluid(
- "solution.greenvitriol",
- "Green Vitriol water solution",
- null,
- 1,
- 295);
- ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid(
- "indiumconcentrate",
- "Indium Concentrate",
- null,
- 1,
- 295); // TODO CHECK NEW x3
- ItemList.sLeadZincSolution = GT_Mod.gregtechproxy.addFluid(
- "leadzincsolution",
- "Lead-Zinc solution",
- null,
- 1,
- 295);
+ ItemList.sBlueVitriol = GT_Mod.gregtechproxy
+ .addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295);
+ ItemList.sNickelSulfate = GT_Mod.gregtechproxy
+ .addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295);
+ ItemList.sGreenVitriol = GT_Mod.gregtechproxy
+ .addFluid("solution.greenvitriol", "Green Vitriol water solution", null, 1, 295);
+ ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy
+ .addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3
+ ItemList.sLeadZincSolution = GT_Mod.gregtechproxy
+ .addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295);
ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295);
new GT_Recipe(
- new ItemStack(Items.lava_bucket),
- new ItemStack(Blocks.obsidian),
- GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
- GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
- GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L),
- 30,
- 2);
+ new ItemStack(Items.lava_bucket),
+ new ItemStack(Blocks.obsidian),
+ GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L),
+ 30,
+ 2);
GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(
- true,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L) },
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 50000);
+ true,
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L) },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 50000);
GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe(
- true,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L) },
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 250000);
+ true,
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L) },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 250000);
GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe(
- true,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L) },
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 500000);
+ true,
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L) },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 500000);
GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels.addRecipe(
- true,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L) },
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 250000);
+ true,
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L) },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 250000);
GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe(
- true,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L) },
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 1000000);
+ true,
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L) },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 1000000);
GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(
- true,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L) },
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 1400000);
+ true,
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L) },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 1400000);
// BloodMagic
GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
- true,
- new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) },
- new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 400);
+ true,
+ new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) },
+ new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 400);
GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
- true,
- new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) },
- new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 1000);
+ true,
+ new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) },
+ new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 1000);
GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
- true,
- new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) },
- new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 8000);
+ true,
+ new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) },
+ new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 8000);
GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe(
- true,
- new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27) },
- new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) },
- null,
- null,
- null,
- 0,
- 0,
- 20000);
+ true,
+ new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27) },
+ new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) },
+ null,
+ null,
+ null,
+ 0,
+ 0,
+ 20000);
GT_Values.RA.addFuel(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4), null, 4, 5);
GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5);
GT_Values.RA.addFuel(new ItemStack(Items.ghast_tear, 1), null, 50, 5);
GT_Values.RA.addFuel(
- new ItemStack(Blocks.beacon, 1),
- null,
- Materials.NetherStar.mFuelPower * 2,
- Materials.NetherStar.mFuelType);
+ new ItemStack(Blocks.beacon, 1),
+ null,
+ Materials.NetherStar.mFuelPower * 2,
+ Materials.NetherStar.mFuelType);
GT_Values.RA.addFuel(GT_ModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1), null, 250, 1);
}
}
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
index 8e6130eccb..fb70c2b395 100644
--- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
+++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
@@ -33,129 +33,122 @@ public class GT_ItemIterator implements Runnable {
ItemStack tStack2;
ItemStack tStack;
if (null != (tStack = GT_ModHandler.getRecipeOutput(
- tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L),
- tStack2,
- tStack2,
- tStack2,
- null,
- tStack2,
- tStack2,
- tStack2,
- tStack2))) {
+ tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L),
+ tStack2,
+ tStack2,
+ tStack2,
+ null,
+ tStack2,
+ tStack2,
+ tStack2,
+ tStack2))) {
GT_ModHandler.addPulverisationRecipe(
- tStack,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L),
- null,
- 0,
- false);
+ tStack,
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L),
+ null,
+ 0,
+ false);
GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
}
if (null != (tStack = GT_ModHandler.getRecipeOutput(
- tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L),
- tStack2,
- tStack2,
- tStack2,
- null,
- tStack2,
- tStack2,
- tStack2,
- tStack2))) {
+ tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L),
+ tStack2,
+ tStack2,
+ tStack2,
+ null,
+ tStack2,
+ tStack2,
+ tStack2,
+ tStack2))) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingRawMachineTier00, tStack);
GT_ModHandler.addPulverisationRecipe(
- tStack,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L),
- null,
- 0,
- false);
+ tStack,
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L),
+ null,
+ 0,
+ false);
GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
}
ItemStack tStack3;
if (null != (tStack = GT_ModHandler.getRecipeOutput(
- tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L),
- tStack3 = new ItemStack(Blocks.glass, 1, 0),
- tStack2,
- tStack3,
- GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
- tStack3,
- tStack2,
- tStack3,
- tStack2))) {
+ tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L),
+ tStack3 = new ItemStack(Blocks.glass, 1, 0),
+ tStack2,
+ tStack3,
+ GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
+ tStack3,
+ tStack2,
+ tStack3,
+ tStack2))) {
GT_ModHandler.addPulverisationRecipe(
- tStack,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L),
- 0,
- false);
+ tStack,
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L),
+ 0,
+ false);
}
if (null != (tStack = GT_ModHandler.getRecipeOutput(
- tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
- tStack3 = new ItemStack(Blocks.glass, 1, 0),
- tStack2,
- tStack3,
- GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
- tStack3,
- tStack2,
- tStack3,
- tStack2))) {
+ tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
+ tStack3 = new ItemStack(Blocks.glass, 1, 0),
+ tStack2,
+ tStack3,
+ GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
+ tStack3,
+ tStack2,
+ tStack3,
+ tStack2))) {
GT_ModHandler.addPulverisationRecipe(
- tStack,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L),
- 0,
- false);
+ tStack,
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L),
+ 0,
+ false);
}
GT_Log.out.println("GT_Mod: Registering various Tools to be usable on GregTech Machines");
GregTech_API.registerScrewdriver(
- GT_ModHandler.getRecipeOutput(
- null,
- new ItemStack(Items.iron_ingot, 1),
- null,
- new ItemStack(Items.stick, 1)));
+ GT_ModHandler
+ .getRecipeOutput(null, new ItemStack(Items.iron_ingot, 1), null, new ItemStack(Items.stick, 1)));
GregTech_API.registerScrewdriver(
- GT_ModHandler.getRecipeOutput(
- new ItemStack(Items.iron_ingot, 1),
- null,
- null,
- null,
- new ItemStack(Items.stick, 1)));
+ GT_ModHandler
+ .getRecipeOutput(new ItemStack(Items.iron_ingot, 1), null, null, null, new ItemStack(Items.stick, 1)));
GT_Log.out.println(
- "GT_Mod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)");
+ "GT_Mod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)");
GT_Values.RA.addCannerRecipe(
- new ItemStack(Items.rotten_flesh, 2, 32767),
- ItemList.IC2_Food_Can_Empty.get(1L),
- ItemList.IC2_Food_Can_Spoiled.get(1L),
- null,
- 200,
- 1);
+ new ItemStack(Items.rotten_flesh, 2, 32767),
+ ItemList.IC2_Food_Can_Empty.get(1L),
+ ItemList.IC2_Food_Can_Spoiled.get(1L),
+ null,
+ 200,
+ 1);
GT_Values.RA.addCannerRecipe(
- new ItemStack(Items.spider_eye, 2, 32767),
- ItemList.IC2_Food_Can_Empty.get(1L),
- ItemList.IC2_Food_Can_Spoiled.get(1L),
- null,
- 100,
- 1);
+ new ItemStack(Items.spider_eye, 2, 32767),
+ ItemList.IC2_Food_Can_Empty.get(1L),
+ ItemList.IC2_Food_Can_Spoiled.get(1L),
+ null,
+ 100,
+ 1);
GT_Values.RA.addCannerRecipe(
- ItemList.Food_Poisonous_Potato.get(2L),
- ItemList.IC2_Food_Can_Empty.get(1L),
- ItemList.IC2_Food_Can_Spoiled.get(1L),
- null,
- 100,
- 1);
+ ItemList.Food_Poisonous_Potato.get(2L),
+ ItemList.IC2_Food_Can_Empty.get(1L),
+ ItemList.IC2_Food_Can_Spoiled.get(1L),
+ null,
+ 100,
+ 1);
GT_Values.RA.addCannerRecipe(
- new ItemStack(Items.cake, 1, 32767),
- ItemList.IC2_Food_Can_Empty.get(12L),
- ItemList.IC2_Food_Can_Filled.get(12L),
- null,
- 600,
- 1);
+ new ItemStack(Items.cake, 1, 32767),
+ ItemList.IC2_Food_Can_Empty.get(12L),
+ ItemList.IC2_Food_Can_Filled.get(12L),
+ null,
+ 600,
+ 1);
GT_Values.RA.addCannerRecipe(
- new ItemStack(Items.mushroom_stew, 1, 32767),
- ItemList.IC2_Food_Can_Empty.get(6L),
- ItemList.IC2_Food_Can_Filled.get(6L),
- new ItemStack(Items.bowl, 1),
- 300,
- 1);
+ new ItemStack(Items.mushroom_stew, 1, 32767),
+ ItemList.IC2_Food_Can_Empty.get(6L),
+ ItemList.IC2_Food_Can_Filled.get(6L),
+ new ItemStack(Items.bowl, 1),
+ 300,
+ 1);
GT_Log.out.println("GT_Mod: Scanning ItemList.");
@@ -169,12 +162,11 @@ public class GT_ItemIterator implements Runnable {
if ((tName = tItem.getUnlocalizedName()) != null) {
if ((tItem instanceof IToolCrowbar)) {
if ((!tItem.isDamageable())
- && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
+ && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
if ((GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.disabledrecipes,
- "infiniteDurabilityRCCrowbars",
- false))
- && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) {
+ ConfigCategories.Recipes.disabledrecipes,
+ "infiniteDurabilityRCCrowbars",
+ false)) && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) {
GT_Log.out.println("GT_Mod: Removed infinite RC Crowbar: " + tName);
}
} else if (GregTech_API.registerCrowbar(new ItemStack(tItem, 1, 32767))) {
@@ -183,12 +175,11 @@ public class GT_ItemIterator implements Runnable {
}
if ((tItem instanceof IToolWrench)) {
if ((!tItem.isDamageable())
- && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
+ && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) {
if ((GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.disabledrecipes,
- "infiniteDurabilityBCWrenches",
- false))
- && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) {
+ ConfigCategories.Recipes.disabledrecipes,
+ "infiniteDurabilityBCWrenches",
+ false)) && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) {
GT_Log.out.println("GT_Mod: Removed infinite BC Wrench: " + tName);
}
} else if (GregTech_API.registerWrench(new ItemStack(tItem, 1, 32767))) {
@@ -202,25 +193,25 @@ public class GT_ItemIterator implements Runnable {
gregtech.common.tools.GT_Tool_Scoop.sBeeHiveMaterial = tBlock.getMaterial();
}
if (OrePrefixes.stone.mDefaultStackSize
- < tItem.getItemStackLimit(new ItemStack(tItem, 1, 0))) {
+ < tItem.getItemStackLimit(new ItemStack(tItem, 1, 0))) {
if ((tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.stone))
- || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.netherrack))
- || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.end_stone))) {
+ || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.netherrack))
+ || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.end_stone))) {
tItem.setMaxStackSize(OrePrefixes.stone.mDefaultStackSize);
}
}
}
if (((tItem instanceof ItemFood)) && (tItem != ItemList.IC2_Food_Can_Filled.getItem())
- && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) {
+ && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) {
int tFoodValue = ((ItemFood) tItem).func_150905_g(new ItemStack(tItem, 1, 0));
if (tFoodValue > 0) {
GT_Values.RA.addCannerRecipe(
- new ItemStack(tItem, 1, 32767),
- ItemList.IC2_Food_Can_Empty.get(tFoodValue),
- ItemList.IC2_Food_Can_Filled.get(tFoodValue),
- GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true),
- tFoodValue * 100,
- 1);
+ new ItemStack(tItem, 1, 32767),
+ ItemList.IC2_Food_Can_Empty.get(tFoodValue),
+ ItemList.IC2_Food_Can_Filled.get(tFoodValue),
+ GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true),
+ tFoodValue * 100,
+ 1);
}
}
if ((tItem instanceof IFluidContainerItem)) {
@@ -237,14 +228,14 @@ public class GT_ItemIterator implements Runnable {
}
if (tName.equals("tile.TFRoots")) {
GT_ModHandler.addPulverisationRecipe(
- new ItemStack(tItem, 1, 0),
- new ItemStack(Items.stick, 2),
- new ItemStack(Items.stick, 1),
- 30);
+ new ItemStack(tItem, 1, 0),
+ new ItemStack(Items.stick, 2),
+ new ItemStack(Items.stick, 1),
+ 30);
GT_ModHandler.addSawmillRecipe(
- new ItemStack(tItem, 1, 0),
- new ItemStack(Items.stick, 4),
- new ItemStack(Items.stick, 2));
+ new ItemStack(tItem, 1, 0),
+ new ItemStack(Items.stick, 4),
+ new ItemStack(Items.stick, 2));
GT_Values.RA.addFuel(new ItemStack(tItem, 1, 1), new ItemStack(Items.stick, 4), 32, 5);
}
if (tName.equals("item.tconstruct.manual")) {
@@ -298,215 +289,122 @@ public class GT_ItemIterator implements Runnable {
GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lignite, new ItemStack(tItem, 1, 0));
}
if ((tName.equals("tile.extrabiomes.redrock")) || (tName.equals("tile.bop.redRocks"))) {
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Redrock,
- new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Redrock,
- new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Redrock,
- new ItemStack(tItem, 1, 2));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2));
}
if (tName.equals("tile.rpstone")) {
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Marble,
- new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Basalt,
- new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Marble,
- new ItemStack(tItem, 1, 2));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Basalt,
- new ItemStack(tItem, 1, 3));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Basalt,
- new ItemStack(tItem, 1, 4));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Basalt,
- new ItemStack(tItem, 1, 5));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Basalt,
- new ItemStack(tItem, 1, 6));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6));
}
if (
/** (tName.equals("tile.sedimentaryStone")) || **/
((tName.equals("tile.igneousStone")) || (tName.equals("tile.igneousStoneBrick"))
- || (tName.equals("tile.igneousCobblestone")))) {
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.GraniteRed,
- new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.GraniteBlack,
- new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Rhyolite,
- new ItemStack(tItem, 1, 2));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Andesite,
- new ItemStack(tItem, 1, 3));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Gabbro,
- new ItemStack(tItem, 1, 4));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Basalt,
- new ItemStack(tItem, 1, 5));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Komatiite,
- new ItemStack(tItem, 1, 6));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Dacite,
- new ItemStack(tItem, 1, 7));
+ || (tName.equals("tile.igneousCobblestone")))) {
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 6));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 7));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.GraniteRed,
- new ItemStack(tItem, 1, 8));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.GraniteBlack,
- new ItemStack(tItem, 1, 9));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Rhyolite,
- new ItemStack(tItem, 1, 10));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Andesite,
- new ItemStack(tItem, 1, 11));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Gabbro,
- new ItemStack(tItem, 1, 12));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Basalt,
- new ItemStack(tItem, 1, 13));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Komatiite,
- new ItemStack(tItem, 1, 14));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Dacite,
- new ItemStack(tItem, 1, 15));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 8));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 9));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 10));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 11));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 12));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 13));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 14));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 15));
}
if ((tName.equals("tile.metamorphicStone")) || (tName.equals("tile.metamorphicStoneBrick"))
- || (tName.equals("tile.metamorphicCobblestone"))) {
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Gneiss,
- new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Eclogite,
- new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Marble,
- new ItemStack(tItem, 1, 2));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Quartzite,
- new ItemStack(tItem, 1, 3));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Blueschist,
- new ItemStack(tItem, 1, 4));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Greenschist,
- new ItemStack(tItem, 1, 5));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Soapstone,
- new ItemStack(tItem, 1, 6));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Migmatite,
- new ItemStack(tItem, 1, 7));
+ || (tName.equals("tile.metamorphicCobblestone"))) {
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 3));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 4));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 5));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 6));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 7));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Gneiss,
- new ItemStack(tItem, 1, 8));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Eclogite,
- new ItemStack(tItem, 1, 9));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Marble,
- new ItemStack(tItem, 1, 10));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Quartzite,
- new ItemStack(tItem, 1, 11));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Blueschist,
- new ItemStack(tItem, 1, 12));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Greenschist,
- new ItemStack(tItem, 1, 13));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Soapstone,
- new ItemStack(tItem, 1, 14));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Migmatite,
- new ItemStack(tItem, 1, 15));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 8));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 9));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 10));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 11));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 12));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 13));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 14));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 15));
}
if (tName.equals("tile.blockCosmeticSolid")) {
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Obsidian,
- new ItemStack(tItem, 1, 0));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.stone,
- Materials.Obsidian,
- new ItemStack(tItem, 1, 1));
- GT_OreDictUnificator.registerOre(
- OrePrefixes.block,
- Materials.Thaumium,
- new ItemStack(tItem, 1, 4));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1));
+ GT_OreDictUnificator
+ .registerOre(OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4));
}
if (tName.equals("tile.enderchest")) {
GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(tItem, 1, 32767));
}
if (tName.equals("tile.autoWorkbenchBlock")) {
- GT_OreDictUnificator.registerOre(
- OreDictNames.craftingWorkBench,
- new ItemStack(tItem, 1, 0));
+ GT_OreDictUnificator
+ .registerOre(OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0));
}
if (tName.equals("tile.pumpBlock")) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0));
- if (GregTech_API.sRecipeFile.get(
- ConfigCategories.Recipes.disabledrecipes,
- "BCPump",
- false)) {
+ if (GregTech_API.sRecipeFile
+ .get(ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) {
GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 0));
}
}
@@ -514,9 +412,8 @@ public class GT_ItemIterator implements Runnable {
GT_OreDictUnificator.registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0));
}
if (tName.equals("item.drawplateDiamond")) {
- GT_OreDictUnificator.registerOre(
- ToolDictNames.craftingToolDrawplate,
- new ItemStack(tItem, 1, 32767));
+ GT_OreDictUnificator
+ .registerOre(ToolDictNames.craftingToolDrawplate, new ItemStack(tItem, 1, 32767));
}
}
}
diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java
index 115e95a6d3..e5fb8042f7 100644
--- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java
@@ -112,8 +112,8 @@ public class GT_SonictronLoader implements Runnable {
GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1));
GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BURP.toString());
GT_Mod.gregtechproxy.mSoundCounts.add(1);
- GT_Mod.gregtechproxy.mSoundItems.add(
- new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1));
+ GT_Mod.gregtechproxy.mSoundItems
+ .add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1));
GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTOPEN.toString());
GT_Mod.gregtechproxy.mSoundCounts.add(1);
GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1));