From 8ac58626bd4caa9e49f58acc6b97ac031f6c2107 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Mon, 10 Apr 2023 17:49:16 +0100 Subject: Update spotless config to 0.2.2 --- .../loaders/preload/GT_Loader_ItemData.java | 623 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 3349 ++-- .../preload/GT_Loader_MetaTileEntities.java | 19669 +++++++++---------- .../preload/GT_Loader_MultiTileEntities.java | 126 +- .../loaders/preload/GT_Loader_OreDictionary.java | 531 +- .../java/gregtech/loaders/preload/GT_PreLoad.java | 843 +- 6 files changed, 12092 insertions(+), 13049 deletions(-) (limited to 'src/main/java/gregtech/loaders/preload') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java index 2aad0220a2..3d7ec27d93 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java @@ -27,424 +27,359 @@ public class GT_Loader_ItemData implements Runnable { public void run() { GT_Log.out.println("GT_Mod: Loading Item Data Tags"); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.giantPick", 1L, 0), - new ItemData(Materials.Stone, 696729600L, new MaterialStack(Materials.Wood, 464486400L))); + GT_ModHandler.getModItem(TwilightForest.ID, "item.giantPick", 1L, 0), + new ItemData(Materials.Stone, 696729600L, new MaterialStack(Materials.Wood, 464486400L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.giantSword", 1L, 0), - new ItemData(Materials.Stone, 464486400L, new MaterialStack(Materials.Wood, 232243200L))); + GT_ModHandler.getModItem(TwilightForest.ID, "item.giantSword", 1L, 0), + new ItemData(Materials.Stone, 464486400L, new MaterialStack(Materials.Wood, 232243200L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantLog", 1L, 32767), - new ItemData(Materials.Wood, 232243200L)); + GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantLog", 1L, 32767), + new ItemData(Materials.Wood, 232243200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantCobble", 1L, 32767), - new ItemData(Materials.Stone, 232243200L)); + GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantCobble", 1L, 32767), + new ItemData(Materials.Stone, 232243200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantObsidian", 1L, 32767), - new ItemData(Materials.Obsidian, 232243200L)); + GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantObsidian", 1L, 32767), + new ItemData(Materials.Obsidian, 232243200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.minotaurAxe", 1L, 0), - new ItemData( - Materials.Diamond, - 14515200L, - new MaterialStack(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 2L))); + GT_ModHandler.getModItem(TwilightForest.ID, "item.minotaurAxe", 1L, 0), + new ItemData( + Materials.Diamond, + 14515200L, + new MaterialStack(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 2L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.armorShards", 1L, 0), - new ItemData(Materials.Knightmetal, 403200L)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.armorShards", 1L, 0), + new ItemData(Materials.Knightmetal, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.shardCluster", 1L, 0), - new ItemData(Materials.Knightmetal, 3628800L)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.shardCluster", 1L, 0), + new ItemData(Materials.Knightmetal, 3628800L)); GT_OreDictUnificator.addItemData(ItemList.TF_LiveRoot.get(1L), new ItemData(Materials.LiveRoot, 3628800L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10), - new ItemData(Materials.CertusQuartz, 1814400L)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10), + new ItemData(Materials.CertusQuartz, 1814400L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11), - new ItemData(Materials.NetherQuartz, 1814400L)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11), + new ItemData(Materials.NetherQuartz, 1814400L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12), - new ItemData(Materials.Fluix, 1814400L)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12), + new ItemData(Materials.Fluix, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.quartz_block, 1, 32767), new ItemData(Materials.NetherQuartz, 14515200L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.quartz_block, 1, 32767), - new ItemData(Materials.NetherQuartz, 14515200L)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L, 32767), + new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L, 32767), - new ItemData(Materials.CertusQuartz, 14515200L)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzPillar", 1L, 32767), + new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzPillar", 1L, 32767), - new ItemData(Materials.CertusQuartz, 14515200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L, 32767), - new ItemData(Materials.CertusQuartz, 14515200L)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L, 32767), + new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.hay_block, 1, 32767), - new ItemData(Materials.Wheat, 32659200L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.snowball, 1, 32767), - new ItemData(Materials.Snow, 907200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.hay_block, 1, 32767), new ItemData(Materials.Wheat, 32659200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.glowstone, 1, 32767), - new ItemData(Materials.Glowstone, 14515200L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.redstone_lamp, 1, 32767), - new ItemData( - Materials.Glowstone, - 14515200L, - new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.lit_redstone_lamp, 1, 32767), - new ItemData( - Materials.Glowstone, - 14515200L, - new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L))); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 5), - new ItemData(Materials.Ice, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.glowstone, 1, 32767), new ItemData(Materials.Glowstone, 14515200L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.redstone_lamp, 1, 32767), + new ItemData( + Materials.Glowstone, + 14515200L, + new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L))); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.lit_redstone_lamp, 1, 32767), + new ItemData( + Materials.Glowstone, + 14515200L, + new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L))); + GT_OreDictUnificator.addItemData( + GT_ModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 5), + new ItemData(Materials.Ice, 3628800L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.packed_ice, 1, 32767), - new ItemData(Materials.Ice, 7257600L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.clay_ball, 1, 32767), - new ItemData(Materials.Clay, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.clay_ball, 1, 32767), new ItemData(Materials.Clay, 1814400L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.clay, 1, 32767), new ItemData(Materials.Clay, 7257600L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.hardened_clay, 1, 32767), - new ItemData(Materials.Clay, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stained_hardened_clay, 1, 32767), - new ItemData(Materials.Clay, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.brick_block, 1, 32767), - new ItemData(Materials.Brick, 3628800L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("Uran238", 1L), - new ItemData(Materials.Uranium, 3628800L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("Uran235", 1L), - new ItemData(Materials.Uranium235, 3628800L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("Plutonium", 1L), - new ItemData(Materials.Plutonium, 3628800L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("smallUran235", 1L), - new ItemData(Materials.Uranium235, 403200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("smallPlutonium", 1L), - new ItemData(Materials.Plutonium, 403200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stained_hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.brick_block, 1, 32767), new ItemData(Materials.Brick, 3628800L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("Uran238", 1L), new ItemData(Materials.Uranium, 3628800L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("Uran235", 1L), new ItemData(Materials.Uranium235, 3628800L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("Plutonium", 1L), new ItemData(Materials.Plutonium, 3628800L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("smallUran235", 1L), new ItemData(Materials.Uranium235, 403200L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("smallPlutonium", 1L), new ItemData(Materials.Plutonium, 403200L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Iron.get(1L), new ItemData(Materials.Iron, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Gold.get(1L), new ItemData(Materials.Gold, 1814400L)); - GT_OreDictUnificator.addItemData( - ItemList.IC2_Item_Casing_Bronze.get(1L), - new ItemData(Materials.Bronze, 1814400L)); - GT_OreDictUnificator.addItemData( - ItemList.IC2_Item_Casing_Copper.get(1L), - new ItemData(Materials.Copper, 1814400L)); + GT_OreDictUnificator + .addItemData(ItemList.IC2_Item_Casing_Bronze.get(1L), new ItemData(Materials.Bronze, 1814400L)); + GT_OreDictUnificator + .addItemData(ItemList.IC2_Item_Casing_Copper.get(1L), new ItemData(Materials.Copper, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Tin.get(1L), new ItemData(Materials.Tin, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Lead.get(1L), new ItemData(Materials.Lead, 1814400L)); - GT_OreDictUnificator.addItemData( - ItemList.IC2_Item_Casing_Steel.get(1L), - new ItemData(Materials.Steel, 1814400L)); + GT_OreDictUnificator + .addItemData(ItemList.IC2_Item_Casing_Steel.get(1L), new ItemData(Materials.Steel, 1814400L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.written_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.writable_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.enchanted_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); GT_OreDictUnificator.addItemData( - new ItemStack(Items.written_book, 1, 32767), - new ItemData(Materials.Paper, 10886400L)); + new ItemStack(Items.golden_apple, 1, 1), + new ItemData(Materials.Gold, OrePrefixes.block.mMaterialAmount * 8L)); GT_OreDictUnificator.addItemData( - new ItemStack(Items.writable_book, 1, 32767), - new ItemData(Materials.Paper, 10886400L)); + new ItemStack(Items.golden_apple, 1, 0), + new ItemData(Materials.Gold, OrePrefixes.ingot.mMaterialAmount * 8L)); GT_OreDictUnificator.addItemData( - new ItemStack(Items.enchanted_book, 1, 32767), - new ItemData(Materials.Paper, 10886400L)); + new ItemStack(Items.golden_carrot, 1, 0), + new ItemData(Materials.Gold, OrePrefixes.nugget.mMaterialAmount * 8L)); GT_OreDictUnificator.addItemData( - new ItemStack(Items.golden_apple, 1, 1), - new ItemData(Materials.Gold, OrePrefixes.block.mMaterialAmount * 8L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.golden_apple, 1, 0), - new ItemData(Materials.Gold, OrePrefixes.ingot.mMaterialAmount * 8L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.golden_carrot, 1, 0), - new ItemData(Materials.Gold, OrePrefixes.nugget.mMaterialAmount * 8L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.speckled_melon, 1, 0), - new ItemData(Materials.Gold, OrePrefixes.nugget.mMaterialAmount * 8L)); + new ItemStack(Items.speckled_melon, 1, 0), + new ItemData(Materials.Gold, OrePrefixes.nugget.mMaterialAmount * 8L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.minecart, 1), new ItemData(Materials.Iron, 18144000L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.cauldron, 1), new ItemData(Materials.Iron, 25401600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.iron_bars, 8, 32767), new ItemData(Materials.Iron, 10886400L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.iron_bars, 8, 32767), - new ItemData(Materials.Iron, 10886400L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 8L, 0), - new ItemData(Materials.Steel, 10886400L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getIC2Item("ironFurnace", 1L), - new ItemData(Materials.Iron, 18144000L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 8L, 0), + new ItemData(Materials.Steel, 10886400L)); + GT_OreDictUnificator + .addItemData(GT_ModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Food_Can_Empty.get(1L), new ItemData(Materials.Tin, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Fuel_Rod_Empty.get(1L), new ItemData(Materials.Iron, 3628800L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), - new ItemData(Materials.Gold, 7257600L)); + new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), + new ItemData(Materials.Gold, 7257600L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), - new ItemData(Materials.Iron, 7257600L)); + new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), + new ItemData(Materials.Iron, 7257600L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 0), - new ItemData(Materials.Steel, 108864000L)); + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 0), + new ItemData(Materials.Steel, 108864000L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 1), - new ItemData(Materials.Steel, 72576000L)); + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 1), + new ItemData(Materials.Steel, 72576000L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 2), - new ItemData(Materials.Steel, 36288000L)); + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 2), + new ItemData(Materials.Steel, 36288000L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 0), new ItemData(Materials.Iron, 108864000L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 1), new ItemData(Materials.Iron, 72576000L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 2), new ItemData(Materials.Iron, 36288000L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.hopper, 1, 32767), - new ItemData(Materials.Iron, 18144000L, new MaterialStack(Materials.Wood, 29030400L))); + new ItemStack(Blocks.hopper, 1, 32767), + new ItemData(Materials.Iron, 18144000L, new MaterialStack(Materials.Wood, 29030400L))); GT_OreDictUnificator.addItemData(ItemList.Cell_Universal_Fluid.get(1L), new ItemData(Materials.Tin, 7257600L)); GT_OreDictUnificator.addItemData(ItemList.Cell_Empty.get(1L), new ItemData(Materials.Tin, 7257600L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.tripwire_hook, 1, 32767), - new ItemData( - Materials.Iron, - OrePrefixes.ring.mMaterialAmount * 2L, - new MaterialStack(Materials.Wood, 3628800L))); + new ItemStack(Blocks.tripwire_hook, 1, 32767), + new ItemData( + Materials.Iron, + OrePrefixes.ring.mMaterialAmount * 2L, + new MaterialStack(Materials.Wood, 3628800L))); GT_OreDictUnificator.addItemData(ItemList.Bottle_Empty.get(1L), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.potionitem, 1, 32767), - new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stained_glass, 1, 32767), - new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.glass, 1, 32767), - new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stained_glass_pane, 1, 32767), - new ItemData(Materials.Glass, 1360800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.glass_pane, 1, 32767), - new ItemData(Materials.Glass, 1360800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.clock, 1, 32767), - new ItemData(Materials.Gold, 14515200L, new MaterialStack(Materials.Redstone, 3628800L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.compass, 1, 32767), - new ItemData(Materials.Iron, 14515200L, new MaterialStack(Materials.Redstone, 3628800L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.iron_horse_armor, 1, 32767), - new ItemData(Materials.Iron, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.golden_horse_armor, 1, 32767), - new ItemData(Materials.Gold, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.diamond_horse_armor, 1, 32767), - new ItemData(Materials.Diamond, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.leather, 1, 32767), - new ItemData(Materials.Leather, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.beacon, 1, 32767), - new ItemData( - Materials.NetherStar, - 3628800L, - new MaterialStack(Materials.Obsidian, 10886400L), - new MaterialStack(Materials.Glass, 18144000L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.enchanting_table, 1, 32767), - new ItemData( - Materials.Diamond, - 7257600L, - new MaterialStack(Materials.Obsidian, 14515200L), - new MaterialStack(Materials.Paper, 10886400L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.ender_chest, 1, 32767), - new ItemData(Materials.EnderEye, 3628800L, new MaterialStack(Materials.Obsidian, 29030400L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.bookshelf, 1, 32767), - new ItemData(Materials.Paper, 32659200L, new MaterialStack(Materials.Wood, 21772800L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.lever, 1, 32767), - new ItemData(Materials.Stone, 3628800L, new MaterialStack(Materials.Wood, 1814400L))); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.potionitem, 1, 32767), new ItemData(Materials.Glass, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stained_glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stained_glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.clock, 1, 32767), + new ItemData(Materials.Gold, 14515200L, new MaterialStack(Materials.Redstone, 3628800L))); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.compass, 1, 32767), + new ItemData(Materials.Iron, 14515200L, new MaterialStack(Materials.Redstone, 3628800L))); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.iron_horse_armor, 1, 32767), + new ItemData(Materials.Iron, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.golden_horse_armor, 1, 32767), + new ItemData(Materials.Gold, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.diamond_horse_armor, 1, 32767), + new ItemData(Materials.Diamond, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.leather, 1, 32767), new ItemData(Materials.Leather, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.beacon, 1, 32767), + new ItemData( + Materials.NetherStar, + 3628800L, + new MaterialStack(Materials.Obsidian, 10886400L), + new MaterialStack(Materials.Glass, 18144000L))); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.enchanting_table, 1, 32767), + new ItemData( + Materials.Diamond, + 7257600L, + new MaterialStack(Materials.Obsidian, 14515200L), + new MaterialStack(Materials.Paper, 10886400L))); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.ender_chest, 1, 32767), + new ItemData(Materials.EnderEye, 3628800L, new MaterialStack(Materials.Obsidian, 29030400L))); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.bookshelf, 1, 32767), + new ItemData(Materials.Paper, 32659200L, new MaterialStack(Materials.Wood, 21772800L))); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.lever, 1, 32767), + new ItemData(Materials.Stone, 3628800L, new MaterialStack(Materials.Wood, 1814400L))); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.packed_ice, 1, 32767), - new ItemData(Materials.Ice, 7257600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Items.snowball, 1, 32767), - new ItemData(Materials.Snow, 907200L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow_layer, 1, 32767), new ItemData(Materials.Snow, -1L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.sand, 1, 32767), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.sandstone, 1, 32767), - new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 0), - new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 8), - new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 0), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 8), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 1), - new ItemData(Materials.Sand, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 9), - new ItemData(Materials.Sand, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 1), - new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 9), - new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 2), - new ItemData(Materials.Wood, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 10), - new ItemData(Materials.Wood, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 2), - new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 10), - new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 3), - new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 11), - new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 3), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 11), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 5), - new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_slab, 1, 13), - new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 5), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.double_stone_slab, 1, 13), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone, 1, 32767), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.furnace, 1, 32767), - new ItemData(Materials.Stone, 29030400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.lit_furnace, 1, 32767), - new ItemData(Materials.Stone, 29030400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stonebrick, 1, 32767), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.cobblestone, 1, 32767), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.mossy_cobblestone, 1, 32767), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_button, 1, 32767), - new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.stone_pressure_plate, 1, 32767), - new ItemData(Materials.Stone, 7257600L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.ladder, 1, 32767), - new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.wooden_button, 1, 32767), - new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.wooden_pressure_plate, 1, 32767), - new ItemData(Materials.Wood, 7257600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.sandstone, 1, 32767), new ItemData(Materials.Sand, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 0), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 8), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 0), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 8), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 1), new ItemData(Materials.Sand, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 9), new ItemData(Materials.Sand, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 1), new ItemData(Materials.Sand, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 9), new ItemData(Materials.Sand, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 2), new ItemData(Materials.Wood, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 10), new ItemData(Materials.Wood, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 2), new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 10), new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 3), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 11), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 3), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 11), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 5), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_slab, 1, 13), new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 5), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 13), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.lit_furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stonebrick, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.mossy_cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_button, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.stone_pressure_plate, 1, 32767), new ItemData(Materials.Stone, 7257600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.ladder, 1, 32767), new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.wooden_button, 1, 32767), new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.wooden_pressure_plate, 1, 32767), new ItemData(Materials.Wood, 7257600L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.fence, 1, 32767), new ItemData(Materials.Wood, 5443200L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.bowl, 1, 32767), new ItemData(Materials.Wood, 3628800L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.sign, 1, 32767), new ItemData(Materials.Wood, 7257600L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L)); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.chest, 1, 32767), new ItemData(Materials.Wood, 29030400L)); GT_OreDictUnificator.addItemData( - new ItemStack(Items.wooden_door, 1, 32767), - new ItemData(Materials.Wood, 21772800L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.chest, 1, 32767), - new ItemData(Materials.Wood, 29030400L)); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.trapped_chest, 1, 32767), - new ItemData( - Materials.Wood, - 32659200L, - new MaterialStack(Materials.Iron, OrePrefixes.ring.mMaterialAmount * 2L))); - GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.unlit_redstone_torch, 1, 32767), - new ItemData(Materials.Wood, 1814400L, new MaterialStack(Materials.Redstone, 3628800L))); + new ItemStack(Blocks.trapped_chest, 1, 32767), + new ItemData( + Materials.Wood, + 32659200L, + new MaterialStack(Materials.Iron, OrePrefixes.ring.mMaterialAmount * 2L))); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.redstone_torch, 1, 32767), - new ItemData(Materials.Wood, 1814400L, new MaterialStack(Materials.Redstone, 3628800L))); + new ItemStack(Blocks.unlit_redstone_torch, 1, 32767), + new ItemData(Materials.Wood, 1814400L, new MaterialStack(Materials.Redstone, 3628800L))); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.noteblock, 1, 32767), - new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Redstone, 3628800L))); + new ItemStack(Blocks.redstone_torch, 1, 32767), + new ItemData(Materials.Wood, 1814400L, new MaterialStack(Materials.Redstone, 3628800L))); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.jukebox, 1, 32767), - new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Diamond, 3628800L))); + new ItemStack(Blocks.noteblock, 1, 32767), + new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Redstone, 3628800L))); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.crafting_table, 1, 32767), - new ItemData(Materials.Wood, 14515200L)); + new ItemStack(Blocks.jukebox, 1, 32767), + new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Diamond, 3628800L))); + GT_OreDictUnificator + .addItemData(new ItemStack(Blocks.crafting_table, 1, 32767), new ItemData(Materials.Wood, 14515200L)); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.piston, 1, 32767), - new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L))); + new ItemStack(Blocks.piston, 1, 32767), + new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L))); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.sticky_piston, 1, 32767), - new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L))); + new ItemStack(Blocks.sticky_piston, 1, 32767), + new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L))); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.dispenser, 1, 32767), - new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L))); + new ItemStack(Blocks.dispenser, 1, 32767), + new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L))); GT_OreDictUnificator.addItemData( - new ItemStack(Blocks.dropper, 1, 32767), - new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L))); + new ItemStack(Blocks.dropper, 1, 32767), + new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetChicken", 1L, 32767), - new ItemData(Materials.MeatCooked, 403200L)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetChicken", 1L, 32767), + new ItemData(Materials.MeatCooked, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetBeef", 1L, 32767), - new ItemData(Materials.MeatCooked, 403200L)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetBeef", 1L, 32767), + new ItemData(Materials.MeatCooked, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetPork", 1L, 32767), - new ItemData(Materials.MeatCooked, 403200L)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetPork", 1L, 32767), + new ItemData(Materials.MeatCooked, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetFish", 1L, 32767), - new ItemData(Materials.MeatCooked, 403200L)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetFish", 1L, 32767), + new ItemData(Materials.MeatCooked, 403200L)); for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefRaw", 1L, 0), - GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0), new ItemStack(Items.porkchop), - new ItemStack(Items.beef), new ItemStack(Items.chicken), new ItemStack(Items.fish) }) { + GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0), new ItemStack(Items.porkchop), + new ItemStack(Items.beef), new ItemStack(Items.chicken), new ItemStack(Items.fish) }) { if (tItem != null) { GT_OreDictUnificator.addItemData( - GT_Utility.copyMetaData(32767L, tItem), - new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L))); + GT_Utility.copyMetaData(32767L, tItem), + new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } } for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefSteak", 1L, 0), - GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonCooked", 1L, 0), - new ItemStack(Items.cooked_porkchop), new ItemStack(Items.cooked_beef), - new ItemStack(Items.cooked_chicken), new ItemStack(Items.cooked_fished) }) { + GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonCooked", 1L, 0), + new ItemStack(Items.cooked_porkchop), new ItemStack(Items.cooked_beef), new ItemStack(Items.cooked_chicken), + new ItemStack(Items.cooked_fished) }) { if (tItem != null) { GT_OreDictUnificator.addItemData( - GT_Utility.copyMetaData(32767L, tItem), - new ItemData(Materials.MeatCooked, 3628800L, new MaterialStack(Materials.Bone, 403200L))); + GT_Utility.copyMetaData(32767L, tItem), + new ItemData(Materials.MeatCooked, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 780f2afeff..4180ad6e12 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -63,55 +63,55 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { @Override public void run() { Materials.Water.mFluid = (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L) - .getFluid()); + .getFluid()); Materials.Lava.mFluid = GT_ModHandler.getLava(1000L) - .getFluid(); + .getFluid(); GT_Log.out.println("GT_Mod: Register Books."); GT_Utility.getWrittenBook( - "Manual_Printer", - "Printer Manual V2.0", - "Gregorius Techneticies", - "This Manual explains the different Functionalities the GregTech Printing Factory has built in, which are not in NEI. Most got NEI Support now, but there is still some left without it.", - "1. Coloring Items and Blocks: You know those Crafting Recipes, which have a dye surrounded by 8 Item to dye them? Or the ones which have just one Item and one Dye in the Grid? Those two Recipe Types can be cheaply automated using the Printer.", - "The Colorization Functionality even optimizes the Recipes, which normally require 8 Items + 1 Dye to 1 Item and an 8th of the normally used Dye in Fluid Form, isn't that awesome?", - "2. Copying Books: This Task got slightly harder. The first Step is putting the written and signed Book inside the Scanner with a Data Stick ready to receive the Data.", - "Now insert the Stick into the Data Slot of the Printer and add 3 pieces of Paper together with 144 Liters of actual Ink Fluid. Water mixed and chemical Dyes won't work on Paper without messing things up!", - "You got a stack of Pages for your new Book, just put them into the Assembler with some Glue and a piece of Leather for the Binding, and you receive an identical copy of the Book, which would stack together with the original.", - "3. Renaming Items: This Functionality is no longer Part of the Printer. There is now a Name Mold for the Forming Press to imprint a Name into an Item, just rename the Mold in an Anvil and use it in the Forming Press on any Item.", - "4. Crafting of Books, Maps, Nametags etc etc etc: Those Recipes moved to other Machines, just look them up in NEI."); + "Manual_Printer", + "Printer Manual V2.0", + "Gregorius Techneticies", + "This Manual explains the different Functionalities the GregTech Printing Factory has built in, which are not in NEI. Most got NEI Support now, but there is still some left without it.", + "1. Coloring Items and Blocks: You know those Crafting Recipes, which have a dye surrounded by 8 Item to dye them? Or the ones which have just one Item and one Dye in the Grid? Those two Recipe Types can be cheaply automated using the Printer.", + "The Colorization Functionality even optimizes the Recipes, which normally require 8 Items + 1 Dye to 1 Item and an 8th of the normally used Dye in Fluid Form, isn't that awesome?", + "2. Copying Books: This Task got slightly harder. The first Step is putting the written and signed Book inside the Scanner with a Data Stick ready to receive the Data.", + "Now insert the Stick into the Data Slot of the Printer and add 3 pieces of Paper together with 144 Liters of actual Ink Fluid. Water mixed and chemical Dyes won't work on Paper without messing things up!", + "You got a stack of Pages for your new Book, just put them into the Assembler with some Glue and a piece of Leather for the Binding, and you receive an identical copy of the Book, which would stack together with the original.", + "3. Renaming Items: This Functionality is no longer Part of the Printer. There is now a Name Mold for the Forming Press to imprint a Name into an Item, just rename the Mold in an Anvil and use it in the Forming Press on any Item.", + "4. Crafting of Books, Maps, Nametags etc etc etc: Those Recipes moved to other Machines, just look them up in NEI."); GT_Utility.getWrittenBook( - "Manual_Punch_Cards", - "Punch Card Manual V0.0", - "Gregorius Techneticies", - "This Manual will explain the Functionality of the Punch Cards, once they are fully implemented. And no, they won't be like the IRL Punch Cards. This is just a current Idea Collection.", - "(i1&&i2)?o1=15:o1=0;=10", - "ignore all Whitespace Characters, use Long for saving the Numbers", - "&& || ^^ & | ^ ! ++ -- + - % / // * ** << >> >>> < > <= >= == != ~ ( ) ?: , ; ;= ;=X; = i0 i1 i2 i3 i4 i5 o0 o1 o2 o3 o4 o5 v0 v1 v2 v3 v4 v5 v6 v7 v8 v9 m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 A B C D E F", - "'0' = false, 'everything but 0' = true, '!' turns '0' into '1' and everything else into '0'", - "',' is just a separator for multiple executed Codes in a row.", - "';' means that the Program waits until the next tick before continuing. ';=10' and ';=10;' both mean that it will wait 10 Ticks instead of 1. And ';=0' or anything < 0 will default to 0.", - "If the '=' Operator is used within Brackets, it returns the value the variable has been set to.", - "The Program saves the Char Index of the current Task, the 10 Variables (which reset to 0 as soon as the Program Loop stops), the 10 Member Variables and the remaining waiting Time in its NBT.", - "A = 10, B = 11, C = 12, D = 13, E = 14, F = 15, just for Hexadecimal Space saving, since Redstone has only 4 Bits.", - "For implementing Loops you just need 1 Punch Card per Loop, these Cards can restart once they are finished, depending on how many other Cards there are in the Program Loop you inserted your Card into, since it will process them procedurally.", - "A Punch Card Processor can run up to four Loops, each with the length of seven Punch Cards, parallel.", - "Why does the Punch Card need Ink to be made, you ask? Because the empty one needs to have some lines on, and the for the punched one it prints the Code to execute in a human readable format on the Card."); + "Manual_Punch_Cards", + "Punch Card Manual V0.0", + "Gregorius Techneticies", + "This Manual will explain the Functionality of the Punch Cards, once they are fully implemented. And no, they won't be like the IRL Punch Cards. This is just a current Idea Collection.", + "(i1&&i2)?o1=15:o1=0;=10", + "ignore all Whitespace Characters, use Long for saving the Numbers", + "&& || ^^ & | ^ ! ++ -- + - % / // * ** << >> >>> < > <= >= == != ~ ( ) ?: , ; ;= ;=X; = i0 i1 i2 i3 i4 i5 o0 o1 o2 o3 o4 o5 v0 v1 v2 v3 v4 v5 v6 v7 v8 v9 m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 A B C D E F", + "'0' = false, 'everything but 0' = true, '!' turns '0' into '1' and everything else into '0'", + "',' is just a separator for multiple executed Codes in a row.", + "';' means that the Program waits until the next tick before continuing. ';=10' and ';=10;' both mean that it will wait 10 Ticks instead of 1. And ';=0' or anything < 0 will default to 0.", + "If the '=' Operator is used within Brackets, it returns the value the variable has been set to.", + "The Program saves the Char Index of the current Task, the 10 Variables (which reset to 0 as soon as the Program Loop stops), the 10 Member Variables and the remaining waiting Time in its NBT.", + "A = 10, B = 11, C = 12, D = 13, E = 14, F = 15, just for Hexadecimal Space saving, since Redstone has only 4 Bits.", + "For implementing Loops you just need 1 Punch Card per Loop, these Cards can restart once they are finished, depending on how many other Cards there are in the Program Loop you inserted your Card into, since it will process them procedurally.", + "A Punch Card Processor can run up to four Loops, each with the length of seven Punch Cards, parallel.", + "Why does the Punch Card need Ink to be made, you ask? Because the empty one needs to have some lines on, and the for the punched one it prints the Code to execute in a human readable format on the Card."); GT_Utility.getWrittenBook( - "Manual_Microwave", - "Microwave Oven Manual", - "Kitchen Industries", - "Congratulations, you inserted a random seemingly empty Book into the Microwave and these Letters appeared out of nowhere.", - "You just got a Microwave Oven and asked yourself 'why do I even need it?'. It's simple, the Microwave can cook for just 128 EU and at an insane speed. Not even a normal E-furnace can do it that fast and cheap!", - "This is the cheapest and fastest way to cook for you. That is why the Microwave Oven can be found in almost every Kitchen (see www.youwannabuyakitchen.ly).", - "Long time exposure to Microwaves can cause Cancer, but we doubt Steve lives long enough to die because of that.", - "Do not insert any Metals. It might result in an Explosion.", - "Do not dry Animals with it. It will result in a Hot Dog, no matter which Animal you put into it.", - "Do not insert inflammable Objects. The Oven will catch on Fire.", - "Do not insert Explosives such as Eggs. Just don't."); + "Manual_Microwave", + "Microwave Oven Manual", + "Kitchen Industries", + "Congratulations, you inserted a random seemingly empty Book into the Microwave and these Letters appeared out of nowhere.", + "You just got a Microwave Oven and asked yourself 'why do I even need it?'. It's simple, the Microwave can cook for just 128 EU and at an insane speed. Not even a normal E-furnace can do it that fast and cheap!", + "This is the cheapest and fastest way to cook for you. That is why the Microwave Oven can be found in almost every Kitchen (see www.youwannabuyakitchen.ly).", + "Long time exposure to Microwaves can cause Cancer, but we doubt Steve lives long enough to die because of that.", + "Do not insert any Metals. It might result in an Explosion.", + "Do not dry Animals with it. It will result in a Hot Dog, no matter which Animal you put into it.", + "Do not insert inflammable Objects. The Oven will catch on Fire.", + "Do not insert Explosives such as Eggs. Just don't."); GT_Log.out.println("GT_Mod: Register Items."); @@ -139,358 +139,352 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.VOLUMETRIC_FLASK.set(new GT_VolumetricFlask("Volumetric_Flask", "Volumetric flask", 1000)); Item tItem = (Item) GT_Utility.callConstructor( - "gregtech.common.items.GT_SensorCard_Item", - 0, - null, - false, - new Object[] { "sensorcard", "GregTech Sensor Card" }); + "gregtech.common.items.GT_SensorCard_Item", + 0, + null, + false, + new Object[] { "sensorcard", "GregTech Sensor Card" }); ItemList.NC_SensorCard.set( - tItem == null - ? new GT_Generic_Item( - "sensorcard", - "GregTech Sensor Card", - "Nuclear Control not installed", - false) - : tItem); - - ItemList.Neutron_Reflector.set( - new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0)); - ItemList.Reactor_Coolant_He_1.set( - GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); - ItemList.Reactor_Coolant_He_3.set( - GregTech_API.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); - ItemList.Reactor_Coolant_He_6.set( - GregTech_API.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); - ItemList.Reactor_Coolant_NaK_1.set( - GregTech_API.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); - ItemList.Reactor_Coolant_NaK_3.set( - GregTech_API.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); - ItemList.Reactor_Coolant_NaK_6.set( - GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); - - ItemList.Reactor_Coolant_Sp_1.set( - GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); - - ItemList.Reactor_Coolant_Sp_2.set( - GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); - - ItemList.Reactor_Coolant_Sp_3.set( - GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); - - ItemList.Reactor_Coolant_Sp_6.set( - GregTech_API.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); + tItem == null + ? new GT_Generic_Item("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed", false) + : tItem); + + ItemList.Neutron_Reflector + .set(new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0)); + ItemList.Reactor_Coolant_He_1 + .set(GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); + ItemList.Reactor_Coolant_He_3 + .set(GregTech_API.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); + ItemList.Reactor_Coolant_He_6 + .set(GregTech_API.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); + ItemList.Reactor_Coolant_NaK_1 + .set(GregTech_API.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); + ItemList.Reactor_Coolant_NaK_3 + .set(GregTech_API.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); + ItemList.Reactor_Coolant_NaK_6 + .set(GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); + + ItemList.Reactor_Coolant_Sp_1 + .set(GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); + + ItemList.Reactor_Coolant_Sp_2 + .set(GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); + + ItemList.Reactor_Coolant_Sp_3 + .set(GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); + + ItemList.Reactor_Coolant_Sp_6 + .set(GregTech_API.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); ItemList.GlowstoneCell.set( - new GT_BreederCell_Item( - "glowstoneCell", - "Glowstone Fuel Rod", - "Source of sunnarium", - 3000, - 1, - 10000, - () -> ItemList.SunnariumCell.get(1))); + new GT_BreederCell_Item( + "glowstoneCell", + "Glowstone Fuel Rod", + "Source of sunnarium", + 3000, + 1, + 10000, + () -> ItemList.SunnariumCell.get(1))); ItemList.SunnariumCell.set(new GT_DepletetCell_Item("sunnariumCell", "Sunnarium Fuel Rod", 1)); if (!GregTech_API.mIC2Classic) { ItemList.neutroniumHeatCapacitor.set( - GregTech_API.constructCoolantCellItem( - "neutroniumHeatCapacitor", - "1G Neutronium Heat Capacitor", - 1000000000)); - - ItemList.Depleted_Thorium_1.set( - new GT_DepletetCell_Item("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1)); - ItemList.Depleted_Thorium_2.set( - new GT_DepletetCell_Item("Double_ThoriumcellDep", "Dual Fuel Rod (Depleted Thorium)", 1)); // TODO - // CHECK - // num - ItemList.Depleted_Thorium_4.set( - new GT_DepletetCell_Item("Quad_ThoriumcellDep", "Quad Fuel Rod (Depleted Thorium)", 1)); // TODO - // CHECK - // nu