aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-01 18:11:43 +0200
committerGitHub <noreply@github.com>2023-04-01 18:11:43 +0200
commit5f50e4a36ec000657b0a1664784acf00275293c6 (patch)
tree5ef81441032735438c9fd9c620224ca58e46e537 /src/main/java/gregtech/loaders/preload
parent6b77557e0e87cf5afd9ebd3985323ff1249e615c (diff)
downloadGT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.gz
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.bz2
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.zip
update spotless formatting (#1827)
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java290
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java1996
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java1117
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java88
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java170
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_PreLoad.java808
6 files changed, 2832 insertions, 1637 deletions
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 4e9566c2d1..73ef51c411 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
@@ -71,13 +71,16 @@ public class GT_Loader_ItemData implements Runnable {
GT_ModHandler.getModItem("appliedenergistics2", "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.glowstone, 1, 32767),
+ new ItemData(Materials.Glowstone, 14515200L));
GT_OreDictUnificator.addItemData(
new ItemStack(Blocks.redstone_lamp, 1, 32767),
new ItemData(
@@ -94,46 +97,60 @@ public class GT_Loader_ItemData implements Runnable {
GT_ModHandler.getModItem("Forestry", "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.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(
+ 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));
+ 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.golden_apple, 1, 1),
new ItemData(Materials.Gold, OrePrefixes.block.mMaterialAmount * 8L));
@@ -149,13 +166,15 @@ public class GT_Loader_ItemData implements Runnable {
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.modID, "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(
+ 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(
@@ -188,17 +207,21 @@ public class GT_Loader_ItemData implements Runnable {
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(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(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)));
@@ -214,8 +237,9 @@ public class GT_Loader_ItemData implements Runnable {
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(Items.leather, 1, 32767),
+ new ItemData(Materials.Leather, 3628800L));
GT_OreDictUnificator.addItemData(
new ItemStack(Blocks.beacon, 1, 32767),
new ItemData(
@@ -240,87 +264,120 @@ public class GT_Loader_ItemData implements Runnable {
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.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_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.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(
@@ -339,8 +396,9 @@ public class GT_Loader_ItemData implements Runnable {
GT_OreDictUnificator.addItemData(
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.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)));
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 9fa931d4a9..a03bd1f9fe 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
@@ -56,8 +56,10 @@ 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());
- Materials.Lava.mFluid = GT_ModHandler.getLava(1000L).getFluid();
+ Materials.Water.mFluid = (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L)
+ .getFluid());
+ Materials.Lava.mFluid = GT_ModHandler.getLava(1000L)
+ .getFluid();
GT_Log.out.println("GT_Mod: Register Books.");
@@ -145,29 +147,29 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
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.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));
@@ -190,16 +192,16 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
"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
- // num
+ 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
+ // num
ItemList.ThoriumCell_1.set(
new GT_RadioactiveCellIC_Item(
"Thoriumcell",
@@ -253,12 +255,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 4L),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L));
- ItemList.Depleted_Naquadah_1
- .set(new GT_DepletetCell_Item("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1));
- ItemList.Depleted_Naquadah_2
- .set(new GT_DepletetCell_Item("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1));
- ItemList.Depleted_Naquadah_4
- .set(new GT_DepletetCell_Item("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1));
+ ItemList.Depleted_Naquadah_1.set(
+ new GT_DepletetCell_Item("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1));
+ ItemList.Depleted_Naquadah_2.set(
+ new GT_DepletetCell_Item("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1));
+ ItemList.Depleted_Naquadah_4.set(
+ new GT_DepletetCell_Item("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1));
ItemList.NaquadahCell_1.set(
new GT_RadioactiveCellIC_Item(
"Naquadahcell",
@@ -337,8 +339,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
2000);
ItemList.Depleted_MNq_1.set(new GT_DepletetCell_Item("MNqCellDep", "Fuel Rod (Depleted Nq*)", 1));
- ItemList.Depleted_MNq_2
- .set(new GT_DepletetCell_Item("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1));
+ ItemList.Depleted_MNq_2.set(
+ new GT_DepletetCell_Item("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1));
ItemList.Depleted_MNq_4.set(new GT_DepletetCell_Item("Quad_MNqCellDep", "Quad Fuel Rod (Depleted Nq*)", 1));
ItemList.MNqCell_1.set(
new GT_RadioactiveCellIC_Item(
@@ -623,8 +625,11 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
}
GT_Log.out.println("GT_Mod: Registering the BaseMetaTileEntity.");
GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity");
- FMLInterModComms
- .sendMessage("appliedenergistics2", "whitelist-spatial", tBaseMetaTileEntity.getClass().getName());
+ FMLInterModComms.sendMessage(
+ "appliedenergistics2",
+ "whitelist-spatial",
+ tBaseMetaTileEntity.getClass()
+ .getName());
GT_Log.out.println("GT_Mod: Registering the BaseMetaPipeEntity.");
GameRegistry.registerTileEntity(BaseMetaPipeEntity.class, "BaseMetaPipeEntity");
@@ -635,321 +640,583 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", GT_TileEntity_Ores.class.getName());
if (!GregTech_API.mIC2Classic) {
GT_Log.out.println("GT_Mod: Registering Fluids.");
- Materials.ConstructionFoam.mFluid = GT_Utility
- .getFluidForFilledItem(GT_ModHandler.getIC2Item("CFCell", 1L), true).getFluid();
- Materials.UUMatter.mFluid = GT_Utility
- .getFluidForFilledItem(GT_ModHandler.getIC2Item("uuMatterCell", 1L), true).getFluid();
+ Materials.ConstructionFoam.mFluid = GT_Utility.getFluidForFilledItem(
+ GT_ModHandler.getIC2Item("CFCell", 1L),
+ true)
+ .getFluid();
+ Materials.UUMatter.mFluid = GT_Utility.getFluidForFilledItem(
+ GT_ModHandler.getIC2Item("uuMatterCell", 1L),
+ true)
+ .getFluid();
}
- GT_FluidFactory.builder("Air").withLocalizedName("Air").withStateAndTemperature(GAS, 295).buildAndRegister()
- .configureMaterials(Materials.Air)
- .registerContainers(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L), 2000);
- GT_FluidFactory.builder("LiquidOxygen").withLocalizedName("Liquid Oxygen").withStateAndTemperature(GAS, 60)
- .buildAndRegister().configureMaterials(Materials.LiquidOxygen).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("LiquidNitrogen").withLocalizedName("Liquid Nitrogen").withStateAndTemperature(GAS, 77)
- .buildAndRegister().configureMaterials(Materials.LiquidNitrogen).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("LiquidAir").withLocalizedName("Liquid Air").withStateAndTemperature(LIQUID, 77)
- .buildAndRegister().configureMaterials(Materials.LiquidAir).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Oxygen").withLocalizedName("Oxygen").withStateAndTemperature(GAS, 295)
- .buildAndRegister().configureMaterials(Materials.Oxygen).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Hydrogen").withLocalizedName("Hydrogen").withStateAndTemperature(GAS, 295)
- .buildAndRegister().configureMaterials(Materials.Hydrogen).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Deuterium").withLocalizedName("Deuterium").withStateAndTemperature(GAS, 295)
- .buildAndRegister().configureMaterials(Materials.Deuterium).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Tritium").withLocalizedName("Tritium").withStateAndTemperature(GAS, 295)
- .buildAndRegister().configureMaterials(Materials.Tritium).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Helium").withLocalizedName("Helium").withStateAndTemperature(GAS, 295)
- .buildAndRegister().configureMaterials(Materials.Helium).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Argon").withLocalizedName("Argon").withStateAndTemperature(GAS, 295).buildAndRegister()
- .configureMaterials(Materials.Argon).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Radon").withLocalizedName("Radon").withStateAndTemperature(GAS, 295).buildAndRegister()
- .configureMaterials(Materials.Radon).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L),
- ItemList.Cell_Empty.get(1L));
-
- GT_FluidFactory.builder("Fluorine").withLocalizedName("Fluorine").withStateAndTemperature(GAS, 53)
- .buildAndRegister().configureMaterials(Materials.Fluorine).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Titaniumtetrachloride").withLocalizedName("Titaniumtetrachloride")
- .withStateAndTemperature(LIQUID, 295).buildAndRegister()
- .configureMaterials(Materials.Titaniumtetrachloride).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Helium-3").withLocalizedName("Helium-3").withStateAndTemperature(GAS, 295)
- .buildAndRegister().configureMaterials(Materials.Helium_3).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Methane").withLocalizedName("Methane").withStateAndTemperature(GAS, 295)
- .buildAndRegister().configureMaterials(Materials.Methane).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("Nitrogen").withLocalizedName("Nitrogen").withStateAndTemperature(GAS, 295)
- .buildAndRegister().configureMaterials(Materials.Nitrogen).registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L),
- ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder("NitrogenDioxide").withLocalizedName("Nitrogen Dioxide")
-