diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
90 files changed, 27116 insertions, 15350 deletions
diff --git a/src/main/java/gregtech/loaders/ExtraIcons.java b/src/main/java/gregtech/loaders/ExtraIcons.java index 42d5c1ec7c..bc90879e5f 100644 --- a/src/main/java/gregtech/loaders/ExtraIcons.java +++ b/src/main/java/gregtech/loaders/ExtraIcons.java @@ -26,10 +26,10 @@ public class ExtraIcons { if (reg.getTextureType() == 1) { // are for items steelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/steel_inner"); aluminiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/aluminium_inner"); - stainlesssteelLargeCellInner = reg - .registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); - tungstensteelLargeCellInner = reg - .registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); + stainlesssteelLargeCellInner = reg.registerIcon( + RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); + tungstensteelLargeCellInner = reg.registerIcon( + RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); titaniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/titanium_inner"); chromiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/chromium_inner"); iridiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/iridium_inner"); diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 470924053f..9a9837aae9 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -19,16 +19,36 @@ public class GT_FuelLoader implements Runnable { @Override public void run() { GT_Log.out.println("GT_Mod: Initializing various Fuels."); - ItemList.sBlueVitriol = GT_Mod.gregtechproxy - .addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); - ItemList.sNickelSulfate = GT_Mod.gregtechproxy - .addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); - ItemList.sGreenVitriol = GT_Mod.gregtechproxy - .addFluid("solution.greenvitriol", "Green Vitriol water solution", null, 1, 295); - ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy - .addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3 - ItemList.sLeadZincSolution = GT_Mod.gregtechproxy - .addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295); + ItemList.sBlueVitriol = GT_Mod.gregtechproxy.addFluid( + "solution.bluevitriol", + "Blue Vitriol water solution", + null, + 1, + 295); + ItemList.sNickelSulfate = GT_Mod.gregtechproxy.addFluid( + "solution.nickelsulfate", + "Nickel sulfate water solution", + null, + 1, + 295); + ItemList.sGreenVitriol = GT_Mod.gregtechproxy.addFluid( + "solution.greenvitriol", + "Green Vitriol water solution", + null, + 1, + 295); + ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid( + "indiumconcentrate", + "Indium Concentrate", + null, + 1, + 295); // TODO CHECK NEW x3 + ItemList.sLeadZincSolution = GT_Mod.gregtechproxy.addFluid( + "leadzincsolution", + "Lead-Zinc solution", + null, + 1, + 295); ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295); new GT_Recipe( new ItemStack(Items.lava_bucket), diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index e894acf4be..8e6130eccb 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -298,122 +298,215 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lignite, new ItemStack(tItem, 1, 0)); } if ((tName.equals("tile.extrabiomes.redrock")) || (tName.equals("tile.bop.redRocks"))) { - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Redrock, + new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Redrock, + new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Redrock, + new ItemStack(tItem, 1, 2)); } if (tName.equals("tile.rpstone")) { - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Marble, + new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Marble, + new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 6)); } if ( /** (tName.equals("tile.sedimentaryStone")) || **/ ((tName.equals("tile.igneousStone")) || (tName.equals("tile.igneousStoneBrick")) || (tName.equals("tile.igneousCobblestone")))) { - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4)); |