diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
17 files changed, 64 insertions, 481 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index 0ec615ac3c..e8abb239f8 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -33,7 +33,6 @@ import gtPlusPlus.core.block.machine.VolumetricFlaskSetter; import gtPlusPlus.core.block.machine.bedrock.Mining_Head_Fake; import gtPlusPlus.core.block.machine.bedrock.Mining_Pipe_Fake; import gtPlusPlus.core.fluids.FluidRegistryHandler; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; public final class ModBlocks { @@ -167,9 +166,7 @@ public final class ModBlocks { blockRoundRobinator = new Machine_RoundRobinator(); - if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) { - blockVolumetricFlaskSetter = new VolumetricFlaskSetter(); - } + blockVolumetricFlaskSetter = new VolumetricFlaskSetter(); new BlockGenericRedstoneDetector(); new BlockGenericRedstoneTest(); diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 96ffaebbba..d83ab2bba9 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -97,8 +97,6 @@ public class ConfigHandler { "Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available."); // GT-Fixes - enableNitroFix = config - .getBoolean("enableNitroFix", "gregtech", false, "Restores the old Nitro-Diesel recipes."); enableSulfuricAcidFix = config.getBoolean( "enableSulfuricAcidFix", "gregtech", diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 04f22931c6..470ed64347 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -59,7 +59,6 @@ import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.xmod.cofh.HANDLER_COFH; import gtPlusPlus.xmod.eio.material.MaterialEIO; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; @@ -1051,14 +1050,11 @@ public final class ModItems { itemIonParticleBase = new IonParticles(); itemStandarParticleBase = new StandardBaseParticles(); - if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) { - Item a8kFlask = VolumetricFlaskHelper - .generateNewFlask("Volumetric_Flask_8k", "Large Volumetric Flask", 8000); - Item a64kFlask = VolumetricFlaskHelper - .generateNewFlask("Volumetric_Flask_32k", "Gigantic Volumetric Flask", 32000); - GregtechItemList.VOLUMETRIC_FLASK_8k.set(a8kFlask); - GregtechItemList.VOLUMETRIC_FLASK_32k.set(a64kFlask); - } + Item a8kFlask = VolumetricFlaskHelper.generateNewFlask("Volumetric_Flask_8k", "Large Volumetric Flask", 8000); + Item a64kFlask = VolumetricFlaskHelper + .generateNewFlask("Volumetric_Flask_32k", "Gigantic Volumetric Flask", 32000); + GregtechItemList.VOLUMETRIC_FLASK_8k.set(a8kFlask); + GregtechItemList.VOLUMETRIC_FLASK_32k.set(a64kFlask); itemBoilerChassis = new ItemBoilerChassis(); itemDehydratorCoilWire = new ItemDehydratorCoilWire(); diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 1765b387f3..ff49e11645 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -18,7 +18,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.plugin.agrichem.BioRecipes; import gtPlusPlus.plugin.agrichem.block.AgrichemFluids; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -31,7 +30,6 @@ public class GenericChem extends ItemPackage { private static boolean usingGregtechNitricOxide = false; private static boolean usingGregtechNitrogenDioxide = false; - private static boolean usingGregtechHydricSulfur = false; /** * Materials @@ -85,7 +83,6 @@ public class GenericChem extends ItemPackage { public static Fluid Nitric_Oxide; public static Fluid Nitrogen_Dioxide; public static Fluid Carbon_Disulfide; - public static Fluid Hydrogen_Sulfide; /** * Items @@ -339,31 +336,6 @@ public class GenericChem extends ItemPackage { Carbon_Disulfide = FluidUtils .generateFluidNoPrefix("CarbonDisulfide", "Carbon Disulfide", 350, new short[] { 175, 175, 175, 100 }); - - if (FluidRegistry.isFluidRegistered("fluid.liquid_hydricsulfur") - || MaterialUtils.doesMaterialExist("HydricSulfide")) { - usingGregtechHydricSulfur = true; - Fluid aFluid = null; - if (ItemUtils.doesItemListEntryExist("sHydricSulfur")) { - ItemStack aListItem = ItemUtils.getValueOfItemList("sHydricSulfur", 1, (ItemList) null); - if (aListItem != null) { - FluidStack aFluidStack = FluidContainerRegistry.getFluidForFilledItem(aListItem); - if (aFluidStack != null) { - aFluid = aFluidStack.getFluid(); - } - } - } - if (aFluid == null) { - aFluid = FluidUtils.getWildcardFluidStack("liquid_hydricsulfur", 1000).getFluid(); - } - Hydrogen_Sulfide = aFluid; - } else { - Hydrogen_Sulfide = FluidUtils.generateFluidNoPrefix( - "HydrogenSulfide", - "Hydrogen Sulfide", - 446, - new short[] { 240, 130, 30, 100 }); - } } @Override @@ -407,9 +379,6 @@ public class GenericChem extends ItemPackage { if (!usingGregtechNitrogenDioxide) { recipeNitrogenDioxide(); } - if (!usingGregtechHydricSulfur) { - recipeHydricSulfur(); - } // Add recipes if we are not using GT's fluid. if (!FluidRegistry.isFluidRegistered("hydrochloricacid_gt5u")) { @@ -478,29 +447,6 @@ public class GenericChem extends ItemPackage { 4); } - // The follow is using alk science, ignore them - private void recipeHydricSulfur() { - - ItemStack aCellHydricSulfide = ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenSulfide", 1); - GT_Values.RA.addChemicalRecipe( - ELEMENT.getInstance().SULFUR.getDust(1), - GT_Utility.getIntegratedCircuit(1), - ELEMENT.getInstance().HYDROGEN.getFluidStack(2000), - FluidUtils.getFluidStack(Hydrogen_Sulfide, 3000), - GT_Values.NI, - 60, - 8); - GT_Values.RA.addChemicalRecipeForBasicMachineOnly( - ELEMENT.getInstance().SULFUR.getDust(1), - CI.emptyCells(3), - ELEMENT.getInstance().HYDROGEN.getFluidStack(2000), - GT_Values.NF, - ItemUtils.getSimpleStack(aCellHydricSulfide, 3), - GT_Values.NI, - 60, - 8); - } - private void recipeCarbonDisulfide() { CORE.RA.addBlastRecipe( diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 1bffc2f092..5ce3b33cdb 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -27,7 +27,6 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.xmod.gregtech.common.StaticFields59; public class RocketFuels extends ItemPackage { @@ -666,110 +665,6 @@ public class RocketFuels extends ItemPackage { public boolean onLoadComplete(FMLLoadCompleteEvent event) { Logger.INFO("Trying to remove GT recipes for '1,1dimethylhydrazine' && 'rocket_fuel' if they exist."); - /* - * if (FluidRegistry.isFluidRegistered("1,1dimethylhydrazine")) { // Try Remove recipes for GT/EIO Rocket Fuel - * Cells if (FluidRegistry.isFluidRegistered("rocket_fuel")) { // Old Recipe if - * (MaterialUtils.doesMaterialExist("NitrogenDioxide")) { GT_Recipe aOldRecipe = getHalfBakedRecipe( new - * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellNitrogenDioxide", 1), - * ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3), }, new FluidStack[] { - * FluidUtils.getFluidStack("air", 500) }, 388); boolean aDidRemove = removeRecipe(aOldRecipe, - * GT_Recipe_Map.sChemicalRecipes); Logger.INFO("Removed Old Recipe for Rocket Fuel: "+aDidRemove); } // Simple - * Recipes if (MaterialUtils.doesMaterialExist("Ammonia") && MaterialUtils.doesMaterialExist("Methanol")) { - * GT_Recipe aSimpleRecipe1 = getHalfBakedRecipe( new ItemStack[] { - * ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 3), - * ItemUtils.getItemStackOfAmountFromOreDict("cellMethanol", 4), }, new FluidStack[] { - * FluidUtils.getFluidStack("chlorine", 1000) }, 480); GT_Recipe aSimpleRecipe2 = getHalfBakedRecipe( new - * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 1), - * ItemUtils.getItemStackOfAmountFromOreDict("cellMethanol", 4), }, new FluidStack[] { - * FluidUtils.getFluidStack("ammonia", 3000) }, 480); GT_Recipe aSimpleRecipe3 = getHalfBakedRecipe( new - * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 3), - * ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 1), }, new FluidStack[] { - * FluidUtils.getFluidStack("methanol", 4000) }, 480); boolean aDidRemove1 = removeRecipe(aSimpleRecipe1, - * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove2 = removeRecipe(aSimpleRecipe2, - * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove3 = removeRecipe(aSimpleRecipe3, - * GT_Recipe_Map.sChemicalRecipes); Logger.INFO("Removed Simple Recipe 1 for Rocket Fuel: "+aDidRemove1); - * Logger.INFO("Removed Simple Recipe 2 for Rocket Fuel: "+aDidRemove2); - * Logger.INFO("Removed Simple Recipe 3 for Rocket Fuel: "+aDidRemove3); } // Complex Recipes I if - * (MaterialUtils.doesMaterialExist("Dimethylhydrazine") && - * MaterialUtils.doesMaterialExist("DinitrogenTetroxide")) { GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new - * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylhydrazine", 1), }, new FluidStack[] { - * FluidUtils.getFluidStack("dinitrogentetroxide", 1000) }, 16); GT_Recipe aAdvRecipe2 = getHalfBakedRecipe( new - * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDinitrogenTetroxide", 1), }, new FluidStack[] { - * FluidUtils.getFluidStack("dimethylhydrazine", 1000) }, 16); GT_Recipe aAdvRecipe3 = getHalfBakedRecipe( new - * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylhydrazine", 2), }, new FluidStack[] { - * FluidUtils.getFluidStack("oxygen", 1000) }, 16); GT_Recipe aAdvRecipe4 = getHalfBakedRecipe( new ItemStack[] - * { ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), }, new FluidStack[] { - * FluidUtils.getFluidStack("dimethylhydrazine", 2000) }, 16); boolean aDidRemove1 = removeRecipe(aAdvRecipe1, - * GT_Recipe_Map.sMixerRecipes); boolean aDidRemove2 = removeRecipe(aAdvRecipe2, GT_Recipe_Map.sMixerRecipes); - * boolean aDidRemove3 = removeRecipe(aAdvRecipe3, GT_Recipe_Map.sMixerRecipes); boolean aDidRemove4 = - * removeRecipe(aAdvRecipe4, GT_Recipe_Map.sMixerRecipes); - * Logger.INFO("Removed Complex Recipe 1 for Rocket Fuel: "+aDidRemove1); - * Logger.INFO("Removed Complex Recipe 2 for Rocket Fuel: "+aDidRemove2); - * Logger.INFO("Removed Complex Recipe 3 for Rocket Fuel: "+aDidRemove3); - * Logger.INFO("Removed Complex Recipe 4 for Rocket Fuel: "+aDidRemove4); } } // Complex Recipes II if - * (MaterialUtils.doesMaterialExist("Dimethylhydrazine")) { GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new - * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylhydrazine", 2), }, new FluidStack[] { - * FluidUtils.getFluidStack("oxygen", 1000) }, 16); GT_Recipe aAdvRecipe2 = getHalfBakedRecipe( new ItemStack[] - * { ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), }, new FluidStack[] { - * FluidUtils.getFluidStack("dimethylhydrazine", 2000) }, 16); boolean aDidRemove1 = removeRecipe(aAdvRecipe1, - * GT_Recipe_Map.sMixerRecipes); boolean aDidRemove2 = removeRecipe(aAdvRecipe2, GT_Recipe_Map.sMixerRecipes); - * Logger.INFO("Removed Complex Recipe 5 for Rocket Fuel: "+aDidRemove1); - * Logger.INFO("Removed Complex Recipe 6 for Rocket Fuel: "+aDidRemove2); } if - * (MaterialUtils.doesMaterialExist("Chloramine") && MaterialUtils.doesMaterialExist("Dimethylamine")) { - * GT_Recipe aSimpleRecipe1 = getHalfBakedRecipe( new ItemStack[] { - * ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 2), GT_Utility.getIntegratedCircuit(1) }, new - * FluidStack[] { FluidUtils.getFluidStack("dimethylamine", 5000) }, 480); GT_Recipe aSimpleRecipe2 = - * getHalfBakedRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 5), - * GT_Utility.getIntegratedCircuit(1) }, new FluidStack[] { FluidUtils.getFluidStack("chloramine", 2000) }, 16); - * GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new ItemStack[] { - * ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 2), CI.emptyCells(4) }, new FluidStack[] { - * FluidUtils.getFluidStack("dimethylamine", 5000) }, 480); GT_Recipe aAdvRecipe2 = getHalfBakedRecipe( new - * ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 5), CI.emptyCells(1) }, new - * FluidStack[] { FluidUtils.getFluidStack("chloramine", 2000) }, 16); GT_Recipe aAdvRecipe3 = - * getHalfBakedRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 2), - * ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 5), }, new FluidStack[] { - * FluidUtils.getFluidStack("chloramine", 2000) }, 480); boolean aDidRemove1 = removeRecipe(aSimpleRecipe1, - * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove2 = removeRecipe(aSimpleRecipe2, - * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove3 = removeRecipe(aAdvRecipe1, - * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove4 = removeRecipe(aAdvRecipe2, - * GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove5 = removeRecipe(aAdvRecipe3, - * GT_Recipe_Map.sChemicalRecipes); - * Logger.INFO("Removed Complex Recipe 1 for 1,1dimethylhydrazine: "+aDidRemove1); - * Logger.INFO("Removed Complex Recipe 2 for 1,1dimethylhydrazine: "+aDidRemove2); - * Logger.INFO("Removed Complex Recipe 3 for 1,1dimethylhydrazine: "+aDidRemove3); - * Logger.INFO("Removed Complex Recipe 4 for 1,1dimethylhydrazine: "+aDidRemove4); - * Logger.INFO("Removed Complex Recipe 5 for 1,1dimethylhydrazine: "+aDidRemove5); } if - * (MaterialUtils.doesMaterialExist("Chloramine") && MaterialUtils.doesMaterialExist("Dimethylamine")) { - * GT_Recipe aSimpleRecipe1 = getHalfBakedRecipe( new ItemStack[] { - * ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 1), GT_Utility.getIntegratedCircuit(1) }, new - * FluidStack[] { FluidUtils.getFluidStack("dimethylamine", 1000) }, 480); GT_Recipe aSimpleRecipe2 = - * getHalfBakedRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 1), - * GT_Utility.getIntegratedCircuit(1) }, new FluidStack[] { FluidUtils.getFluidStack("chloramine", 1000) }, 16); - * GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new ItemStack[] { - * ItemUtils.getItemStackOfAmountFromOreDict("cellChloramine", 1), GT_Utility.getIntegratedCircuit(11) }, new - * FluidStack[] { FluidUtils.getFluidStack("dimethylamine", 1000) }, 480); GT_Recipe aAdvRecipe2 = - * getHalfBakedRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellDimethylamine", 1), - * GT_Utility.getIntegratedCircuit(11) }, new FluidStack[] { FluidUtils.getFluidStack("chloramine", 1000) }, - * 16); boolean aDidRemove1 = removeRecipe(aSimpleRecipe1, GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove2 - * = removeRecipe(aSimpleRecipe2, GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove3 = - * removeRecipe(aAdvRecipe1, GT_Recipe_Map.sChemicalRecipes); boolean aDidRemove4 = removeRecipe(aAdvRecipe2, - * GT_Recipe_Map.sChemicalRecipes); - * Logger.INFO("Removed Complex Recipe 5 for 1,1dimethylhydrazine: "+aDidRemove1); - * Logger.INFO("Removed Complex Recipe 6 for 1,1dimethylhydrazine: "+aDidRemove2); - * Logger.INFO("Removed Complex Recipe 7 for 1,1dimethylhydrazine: "+aDidRemove3); - * Logger.INFO("Removed Complex Recipe 8 for 1,1dimethylhydrazine: "+aDidRemove4); } if - * (MaterialUtils.doesMaterialExist("HypochlorousAcid") && MaterialUtils.doesMaterialExist("Ammonia") && - * MaterialUtils.doesMaterialExist("Methanol")) { GT_Recipe aAdvRecipe1 = getHalfBakedRecipe( new ItemStack[] { - * GT_Utility.getIntegratedCircuit(24), }, new FluidStack[] { FluidUtils.getFluidStack("hypochlorousacid", - * 3000), FluidUtils.getFluidStack("ammonia", 8000), FluidUtils.getFluidStack("methanol", 12000) }, 480); - * GT_Recipe aAdvRecipe2 = getHalfBakedRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(24), }, new - * FluidStack[] { FluidUtils.getFluidStack("hypochlorousacid", 1000), FluidUtils.getFluidStack("ammonia", 1000), - * FluidUtils.getFluidStack("methanol", 2000) }, 480); boolean aDidRemove1 = removeRecipe(aAdvRecipe1, - * StaticFields59.getLargeChemicalReactorRecipeMap()); boolean aDidRemove2 = removeRecipe(aAdvRecipe2, - * StaticFields59.getLargeChemicalReactorRecipeMap()); - * Logger.INFO("Removed Complex Recipe 9 for 1,1dimethylhydrazine: "+aDidRemove1); - * Logger.INFO("Removed Complex Recipe 10 for 1,1dimethylhydrazine: "+aDidRemove2); } } - */ // Try Butcher recipes manually @@ -803,7 +698,7 @@ public class RocketFuels extends ItemPackage { } // Handle Multi Also AutoMap<GT_Recipe> aToRemoveMulti = new AutoMap<GT_Recipe>(); - recipe: for (GT_Recipe aRecipeSingleBlock : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) { + recipe: for (GT_Recipe aRecipeSingleBlock : GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList) { if (aRecipeSingleBlock != null && aRecipeSingleBlock.mEnabled) { if (aRecipeSingleBlock.mOutputs != null && aRecipeSingleBlock.mOutputs.length > 0) { for (ItemStack aOutputItem : aRecipeSingleBlock.mOutputs) { @@ -834,7 +729,7 @@ public class RocketFuels extends ItemPackage { if (!aToRemoveMulti.isEmpty()) { Logger.INFO("Found " + aToRemoveSingle.size() + " multiblock recipes, removing by force."); for (GT_Recipe remove : aToRemoveMulti) { - StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList.remove(remove); + GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList.remove(remove); } } } @@ -878,7 +773,7 @@ public class RocketFuels extends ItemPackage { } // Handle Multi Also AutoMap<GT_Recipe> aToRemoveMulti = new AutoMap<GT_Recipe>(); - recipe: for (GT_Recipe aRecipeSingleBlock : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) { + recipe: for (GT_Recipe aRecipeSingleBlock : GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList) { if (aRecipeSingleBlock != null && aRecipeSingleBlock.mEnabled) { if (aRecipeSingleBlock.mFluidOutputs != null && aRecipeSingleBlock.mFluidOutputs.length > 0) { for (FluidStack aOutput : aRecipeSingleBlock.mFluidOutputs) { @@ -899,7 +794,7 @@ public class RocketFuels extends ItemPackage { if (!aToRemoveMulti.isEmpty()) { Logger.INFO("Found " + aToRemoveSingle.size() + " multiblock recipes, removing by force."); for (GT_Recipe remove : aToRemoveMulti) { - StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList.remove(remove); + GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList.remove(remove); } } } @@ -926,7 +821,7 @@ public class RocketFuels extends ItemPackage { } else { GT_Recipe aFoundRecipe = aMap .findRecipe(null, false, true, aRecipe.mEUt, aRecipe.mFluidInputs, aRecipe.mInputs); - GT_Recipe aFoundRecipe2 = StaticFields59.getLargeChemicalReactorRecipeMap() + GT_Recipe aFoundRecipe2 = GT_Recipe_Map.sMultiblockChemicalRecipes .findRecipe(null, false, true, aRecipe.mEUt, aRecipe.mFluidInputs, aRecipe.mInputs); boolean aSingle = false; boolean aMulti = false; @@ -937,7 +832,7 @@ public class RocketFuels extends ItemPackage { } if (aFoundRecipe2 != null) { Logger.INFO("Found Multiblock Recipe, removing."); - aMulti = StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList.remove(aFoundRecipe2); + aMulti = GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList.remove(aFoundRecipe2); Logger.INFO("Success? " + aSingle); } return aSingle && aMulti; diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java index 2cebe798c3..6876edf840 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java @@ -7,13 +7,13 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import gregtech.api.enums.ItemList; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.entity.item.ItemEntityGiantEgg; @@ -81,11 +81,7 @@ public class ItemGiantEgg extends BaseItemTickable { private static ItemStack getStemCellStack() { if (mCorrectStemCells == null) { - ItemStack xl = ItemUtils - .getValueOfItemList("Circuit_Chip_Stemcell", 1, ItemUtils.getSimpleStack(Items.egg, 2)); - if (xl != null) { - mCorrectStemCells = xl.copy(); - } + mCorrectStemCells = ItemList.Circuit_Chip_Stemcell.get(1); } return mCorrectStemCells; } diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index dc6e8cc7a3..e06a962545 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -153,7 +153,6 @@ public class CORE { public static boolean hideUniversalCells = true; // GT Fixes - public static boolean enableNitroFix = false; public static boolean enableSulfuricAcidFix = false; public static boolean enableHarderRecipesForHighTierCasings = true; diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index c98128dba6..95675b7ab3 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -43,7 +43,6 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; import gtPlusPlus.core.tileentities.general.TileEntityFirepit; import gtPlusPlus.core.util.minecraft.particles.EntityParticleFXMysterious; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.render.*; import ic2.core.item.ItemFluidCell; @@ -97,9 +96,7 @@ public class ClientProxy extends CommonProxy implements Runnable { new CustomItemBlockRenderer(); new GTPP_Render_MachineBlock(); - if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) { - new GTPP_FlaskRenderer(); - } + new GTPP_FlaskRenderer(); super.init(e); } diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java index aace371163..6741399289 100644 --- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java +++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java @@ -55,87 +55,11 @@ public class LOADER_Machine_Components { CI.sensor_HV = ItemList.Sensor_HV.get(1); CI.sensor_EV = ItemList.Sensor_EV.get(1); CI.sensor_IV = ItemList.Sensor_IV.get(1); - CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1); - CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1); - CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1); - CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1); - CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1); - } - - private static void registerGTExperimentalComponents() { - // GT++ Machine Components - CI.electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); - CI.electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1); - CI.electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1); - CI.electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1); - CI.electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1); - CI.electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1); - CI.electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1); - CI.electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1); - CI.electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1); - CI.robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1); - CI.robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1); - CI.robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1); - CI.conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1); - CI.conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1); - CI.conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1); - CI.emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1); - CI.emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1); - CI.emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1); - CI.fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1); - CI.fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1); - CI.fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1); - CI.sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); - CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); - CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); - - CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); - CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); - CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); - - registerComponentsULV(); - registerComponentsMAX(); - } - - private static void registerGTStandardComponents() { - CI.electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); - CI.electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); - CI.electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1); - CI.electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); - CI.electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1); - CI.electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1); - CI.electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1); - CI.electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); - CI.electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1); - CI.electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1); - CI.electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1); - CI.electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); - CI.robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1); - CI.robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1); - CI.robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1); - CI.robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); - CI.conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1); - CI.conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1); - CI.conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1); - CI.conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); - CI.emitter_LuV = GregtechItemList.Emitter_LuV.get(1); - CI.emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1); - CI.emitter_UV = GregtechItemList.Emitter_UV.get(1); - CI.emitter_MAX = GregtechItemList.Emitter_MAX.get(1); - CI.fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1); - CI.fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1); - CI.fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1); - CI.fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); - CI.sensor_LuV = GregtechItemList.Sensor_LuV.get(1); - CI.sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1); - CI.sensor_UV = GregtechItemList.Sensor_UV.get(1); - CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1); - - CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); - CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); - CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); - - registerComponentsULV(); + CI.fluidRegulator_LV = ItemList.FluidRegulator_LV.get(1); + CI.fluidRegulator_MV = ItemList.FluidRegulator_MV.get(1); + CI.fluidRegulator_HV = ItemList.FluidRegulator_HV.get(1); + CI.fluidRegulator_EV = ItemList.FluidRegulator_EV.get(1); + CI.fluidRegulator_IV = ItemList.FluidRegulator_IV.get(1); } private static void registerGTNHComponents() { @@ -202,18 +126,4 @@ public class LOADER_Machine_Components { return true; } - private static boolean registerComponentsMAX() { - - // Max Tier Components Blood Never added... Useless, lol. - CI.electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); - CI.electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); - CI.electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); - CI.robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); - CI.conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); - CI.emitter_MAX = GregtechItemList.Emitter_MAX.get(1); - CI.fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); - CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1); - - return true; - } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 6912d3508e..3467b0614a 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1232,13 +1232,9 @@ public class RECIPES_GREGTECH { 30 * 20, 500); - ItemStack aFluidReg1 = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1); - ItemStack aFluidReg2 = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1); - ItemStack aFluidReg3 = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1); - ItemStack aFluidReg4 = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1); - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { aFluidReg1, CI.electricMotor_LV, CI.getTieredComponent(OrePrefixes.bolt, 1, 8), + new ItemStack[] { CI.fluidRegulator_LV, CI.electricMotor_LV, + CI.getTieredComponent(OrePrefixes.bolt, 1, 8), ItemUtils.getItemStackOfAmountFromOreDict("ringBrass", 1), ItemUtils.getItemStackOfAmountFromOreDict("stickBrass", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 2) }, @@ -1247,7 +1243,8 @@ public class RECIPES_GREGTECH { 10 * 20, 30); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { aFluidReg2, CI.electricMotor_MV, CI.getTieredComponent(OrePrefixes.bolt, 2, 8), + new ItemStack[] { CI.fluidRegulator_MV, CI.electricMotor_MV, + CI.getTieredComponent(OrePrefixes.bolt, 2, 8), ItemUtils.getItemStackOfAmountFromOreDict("ringInvar", 1), ItemUtils.getItemStackOfAmountFromOreDict("stickInvar", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateAluminium", 2) }, @@ -1256,7 +1253,8 @@ public class RECIPES_GREGTECH { 10 * 20 * 2, 120); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { aFluidReg3, CI.electricMotor_HV, CI.getTieredComponent(OrePrefixes.bolt, 3, 8), + new ItemStack[] { CI.fluidRegulator_HV, CI.electricMotor_HV, + CI.getTieredComponent(OrePrefixes.bolt, 3, 8), ItemUtils.getItemStackOfAmountFromOreDict("ringChrome", 1), ItemUtils.getItemStackOfAmountFromOreDict("stickChrome", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 2) }, @@ -1266,7 +1264,8 @@ public class RECIPES_GREGTECH { 480); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { aFluidReg4, CI.electricMotor_EV, CI.getTieredComponent(OrePrefixes.bolt, 4, 8), + new ItemStack[] { CI.fluidRegulator_EV, CI.electricMotor_EV, + CI.getTieredComponent(OrePrefixes.bolt, 4, 8), |