diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
6 files changed, 32 insertions, 95 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index e9bb6e1bf6..04f22931c6 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -94,8 +94,6 @@ public final class ModItems { public static Item itemPlateBlutonium; public static Item itemPlateCyanite; public static Item itemPlateLudicrite; - // Thaumcraft - public static Item itemPlateVoidMetal; // Pneumaticraft public static Item itemPlateCompressedIron; // SimplyJetpacks @@ -534,8 +532,7 @@ public final class ModItems { // in radioisotope thermoelectric generators (RTGs) // and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power. MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false); - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null - || Utils.getGregtechVersionAsInt() < 50931) { + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null) { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM239, false); } @@ -544,10 +541,6 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false); - if (!CORE.GTNH) { - MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.getInstance().TRINIUM); - } - // Custom Materials that will have standalone refinery processes MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false); MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM); @@ -565,10 +558,6 @@ public final class ModItems { MISC_MATERIALS.run(); - // Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though - if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - MaterialGenerator.generate(ALLOY.TUNGSTEN_CARBIDE); - } MaterialGenerator.generate(ALLOY.SILICON_CARBIDE); MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE); MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE); @@ -656,10 +645,6 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.HG1223, false, false); // Generate Fictional Materials - if (!CORE.GTNH) { - MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false); - MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false); - } MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM); MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false); MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON); @@ -900,12 +885,9 @@ public final class ModItems { dustFertUN32 = ItemUtils .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0]; - ItemStack temp1 = null; + ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); ItemStack temp2 = null; - if (LoadedMods.IndustrialCraft2) { - temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); - } if (LoadedMods.Forestry) { temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1); } @@ -1264,20 +1246,6 @@ public final class ModItems { Logger.WARNING("BigReactors not Found - Skipping Resources."); } - // Thaumcraft - if ((LoadedMods.Thaumcraft || LOAD_ALL_CONTENT) && !CORE.GTNH) { - Logger.INFO("Thaumcraft Found - Loading Resources."); - // Item Init - try { - ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16); - itemPlateVoidMetal = ItemUtils.generateSpecialUsePlate("Void", "Void", new short[] { 82, 17, 82 }, 0); - GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); - } catch (final NullPointerException e) {} - - } else { - Logger.WARNING("Thaumcraft not Found - Skipping Resources."); - } - // Pneumaticraft if (LoadedMods.PneumaticCraft || LOAD_ALL_CONTENT) { Logger.INFO("PneumaticCraft Found - Loading Resources."); @@ -1311,22 +1279,18 @@ public final class ModItems { } // IC2 Exp - if (LoadedMods.IndustrialCraft2 || LOAD_ALL_CONTENT) { - Logger.INFO("IndustrialCraft2 Found - Loading Resources."); - - // Baubles Mod Test - try { - final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble"); - if (baublesTest != null) { - COMPAT_Baubles.run(); - } else { - Logger.INFO("Baubles Not Found - Skipping Resources."); - } - } catch (final Throwable T) { + Logger.INFO("IndustrialCraft2 Found - Loading Resources."); + + // Baubles Mod Test + try { + final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble"); + if (baublesTest != null) { + COMPAT_Baubles.run(); + } else { Logger.INFO("Baubles Not Found - Skipping Resources."); } - } else { - Logger.WARNING("IndustrialCraft2 not Found - Skipping Resources."); + } catch (final Throwable T) { + Logger.INFO("Baubles Not Found - Skipping Resources."); } // Special Item Handling Case diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index f60b1af543..ca0adc9676 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -558,18 +558,16 @@ public class AgriculturalChem extends ItemPackage { /** * IC2 Support */ - if (LoadedMods.IndustrialCraft2) { - aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1); - CORE.RA.addDehydratorRecipe( - new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, - null, - null, - new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, - aManureByprod }, - new int[] { 10000, 2000, 2000 }, - 20 * 20, - 240); - } + aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1); + CORE.RA.addDehydratorRecipe( + new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, + null, + null, + new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, + aManureByprod }, + new int[] { 10000, 2000, 2000 }, + 20 * 20, + 240); // Dirt Production CORE.RA.addCompressorRecipe( diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index dd27ca4e00..d335281fd9 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -38,7 +38,7 @@ public class CoalTar extends ItemPackage { FluidUtils.getFluidStack("nitrofuel", 7500), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11), 100, - CORE.GTNH ? 1000 : 500); + 1000); CORE.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellBioDiesel", 9), ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2), @@ -46,7 +46,7 @@ public class CoalTar extends ItemPackage { FluidUtils.getFluidStack("nitrofuel", 3000), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11), 300, - CORE.GTNH ? 1000 : 500); + 1000); } public static void recipeCreateEthylene() { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 5af0676af7..1bffc2f092 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -220,22 +220,6 @@ public class RocketFuels extends ItemPackage { } } - private static void createLOX() { - GT_Values.RA.addVacuumFreezerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidOxygen", 1), - 20 * 16); - CORE.RA.addAdvancedFreezerRecipe( - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack("oxygen", 3000) }, - new FluidStack[] { FluidUtils.getFluidStack(Liquid_Oxygen, 3000) }, - new ItemStack[] {}, - new int[] {}, - 20 * 16, - 240, - 0); - } - private static void createLOH() { GT_Values.RA.addVacuumFreezerRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), @@ -475,9 +459,6 @@ public class RocketFuels extends ItemPackage { createHydrazine(); createMonomethylhydrazine(); - if (!CORE.GTNH) { - createLOX(); - } createLOH(); createHydratedAmmoniumNitrateSlurry(); diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java index 6afb84765f..2cebe798c3 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java @@ -81,14 +81,10 @@ public class ItemGiantEgg extends BaseItemTickable { private static ItemStack getStemCellStack() { if (mCorrectStemCells == null) { - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() > 28) { - ItemStack xl = ItemUtils - .getValueOfItemList("Circuit_Chip_Stemcell", 1, ItemUtils.getSimpleStack(Items.egg, 2)); - if (xl != null) { - mCorrectStemCells = xl.copy(); - } - } else { - mCorrectStemCells = ItemUtils.getSimpleStack(Items.egg, 2); + ItemStack xl = ItemUtils + .getValueOfItemList("Circuit_Chip_Stemcell", 1, ItemUtils.getSimpleStack(Items.egg, 2)); + if (xl != null) { + mCorrectStemCells = xl.copy(); } } return mCorrectStemCells; diff --git a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java index 2a5fa9107d..e8e4807747 100644 --- a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java +++ b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java @@ -4,7 +4,6 @@ import gregtech.api.enums.Materials; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -18,13 +17,12 @@ public class ItemsMultiTools { private static void run() { // Load Multitools - final boolean gtStyleTools = LoadedMods.Gregtech; if (CORE.ConfigSwitches.enableMultiSizeTools) { // GT Materials final Materials[] rm = Materials.values(); for (final Materials m : rm) { - toolFactoryGT(m, gtStyleTools); + toolFactoryGT(m); } // GT++ Materials @@ -53,9 +51,9 @@ public class ItemsMultiTools { } } - private static boolean toolFactoryGT(final Materials m, final boolean b) { - ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(b, m); - ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(b, m); + private static boolean toolFactoryGT(final Materials m) { + ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(true, m); + ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(true, m); return true; } |