aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-30 10:56:42 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-30 10:56:42 -0800
commit0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a (patch)
tree1e2c649f3a6ce3f6b2babd0098a5f4819e9cd0b6 /src/main/java/gregtech/loaders/preload
parentf8cc82edeb9810c45cba762d733a2c909a302faa (diff)
downloadGT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.gz
GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.bz2
GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java1
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java308
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java2368
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java15612
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java51
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java279
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java1
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_PreLoad.java773
8 files changed, 7542 insertions, 11851 deletions
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java b/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java
index 4b1ef8098c..b68ac34c44 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java
@@ -4,6 +4,7 @@ import gregtech.api.util.GT_Log;
import gregtech.common.redstonecircuits.*;
public class GT_Loader_CircuitBehaviors implements Runnable {
+
@Override
public void run() {
GT_Log.out.println("GT_Mod: Register Redstone Circuit behaviours.");
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 a8d29940b4..fc9f7d936d 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
@@ -2,6 +2,10 @@ package gregtech.loaders.preload;
import static gregtech.api.enums.GT_Values.MOD_ID_DC;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -11,11 +15,9 @@ import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
public class GT_Loader_ItemData implements Runnable {
+
@Override
public void run() {
GT_Log.out.println("GT_Mod: Loading Item Data Tags");
@@ -57,7 +59,8 @@ public class GT_Loader_ItemData implements Runnable {
GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 12),
new ItemData(Materials.Fluix, 1814400L));
GT_OreDictUnificator.addItemData(
- new ItemStack(Blocks.quartz_block, 1, 32767), new ItemData(Materials.NetherQuartz, 14515200L));
+ new ItemStack(Blocks.quartz_block, 1, 32767),
+ new ItemData(Materials.NetherQuartz, 14515200L));
GT_OreDictUnificator.addItemData(
GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartz", 1L, 32767),
new ItemData(Materials.CertusQuartz, 14515200L));
@@ -68,13 +71,13 @@ 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(
@@ -88,46 +91,49 @@ public class GT_Loader_ItemData implements Runnable {
14515200L,
new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L)));
GT_OreDictUnificator.addItemData(
- GT_ModHandler.getModItem("Forestry", "craftingMaterial", 1L, 5), new ItemData(Materials.Ice, 3628800L));
+ 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.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));
+ 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));
@@ -143,18 +149,21 @@ 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(MOD_ID_DC, "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(MOD_ID_DC, "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", "tile.railcraft.anvil", 1L, 0),
new ItemData(Materials.Steel, 108864000L));
@@ -179,16 +188,17 @@ 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(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.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)));
@@ -204,8 +214,8 @@ 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(
@@ -230,84 +240,87 @@ 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.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(
@@ -326,8 +339,8 @@ 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)));
@@ -352,28 +365,19 @@ public class GT_Loader_ItemData implements Runnable {
GT_OreDictUnificator.addItemData(
GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetFish", 1L, 32767),
new ItemData(Materials.MeatCooked, 403200L));
- for (ItemStack tItem : new ItemStack[] {
- GT_ModHandler.getModItem("TwilightForest", "item.meefRaw", 1L, 0),
- GT_ModHandler.getModItem("TwilightForest", "item.venisonRaw", 1L, 0),
- new ItemStack(Items.porkchop),
- new ItemStack(Items.beef),
- new ItemStack(Items.chicken),
- new ItemStack(Items.fish)
- }) {
+ for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem("TwilightForest", "item.meefRaw", 1L, 0),
+ GT_ModHandler.getModItem("TwilightForest", "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)));
}
}
- for (ItemStack tItem : new ItemStack[] {
- GT_ModHandler.getModItem("TwilightForest", "item.meefSteak", 1L, 0),
- GT_ModHandler.getModItem("TwilightForest", "item.venisonCooked", 1L, 0),
- new ItemStack(Items.cooked_porkchop),
- new ItemStack(Items.cooked_beef),
- new ItemStack(Items.cooked_chicken),
- new ItemStack(Items.cooked_fished)
- }) {
+ for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem("TwilightForest", "item.meefSteak", 1L, 0),
+ GT_ModHandler.getModItem("TwilightForest", "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),
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 37640192b1..59da1c074b 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
@@ -5,6 +5,16 @@ import static gregtech.api.enums.FluidState.LIQUID;
import static gregtech.api.enums.FluidState.MOLTEN;
import static gregtech.api.enums.FluidState.SLURRY;
+import java.util.Locale;
+
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidRegistry;
+
import codechicken.nei.api.API;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -41,20 +51,12 @@ import gregtech.common.items.GT_MetaGenerated_Item_99;
import gregtech.common.items.GT_MetaGenerated_Tool_01;
import gregtech.common.items.GT_NeutronReflector_Item;
import gregtech.common.items.GT_VolumetricFlask;
-import java.util.Locale;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidRegistry;
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.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.");
@@ -128,93 +130,109 @@ 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"
- });
+ Item tItem = (Item) GT_Utility.callConstructor(
+ "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)
+ "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.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)));
+ ItemList.GlowstoneCell.set(
+ 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 num
- ItemList.ThoriumCell_1.set(new GT_RadioactiveCellIC_Item(
- "Thoriumcell",
- "Fuel Rod (Thorium)",
- 1,
- 50000,
- 0.4F,
- 0,
- 0.25F,
- ItemList.Depleted_Thorium_1.get(1),
- false));
- ItemList.ThoriumCell_2.set(new GT_RadioactiveCellIC_Item(
- "Double_Thoriumcell",
- "Dual Fuel Rod (Thorium)",
- 2,
- 50000,
- 0.4F,
- 0,
- 0.25F,
- ItemList.Depleted_Thorium_2.get(1),
- false));
- ItemList.ThoriumCell_4.set(new GT_RadioactiveCellIC_Item(
- "Quad_Thoriumcell",
- "Quad Fuel Rod (Thorium)",
- 4,
- 50000,
- 0.4F,
- 0,
- 0.25F,
- ItemList.Depleted_Thorium_4.get(1),
- false));
+ ItemList.neutroniumHeatCapacitor.set(
+ GregTech_API.constructCoolantCellItem(
+ "neutroniumHeatCapacitor",
+ "1G Neutronium Heat Capacitor",
+ 1000000000));
+
+ ItemList.Depleted_Thorium_1
+ .set(new GT_Deplet