diff options
Diffstat (limited to 'src/main/java')
18 files changed, 54 insertions, 161 deletions
diff --git a/src/main/java/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java b/src/main/java/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java index ea4d222cac..b3c59f4288 100644 --- a/src/main/java/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java +++ b/src/main/java/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java @@ -13,13 +13,10 @@ package bartworks.system.material.CircuitGeneration; -import static gregtech.api.enums.ItemList.Circuit_Board_Advanced; -import static gregtech.api.enums.ItemList.Circuit_Board_Basic; import static gregtech.api.enums.ItemList.Circuit_Board_Bio; import static gregtech.api.enums.ItemList.Circuit_Board_Bio_Ultra; import static gregtech.api.enums.ItemList.Circuit_Board_Coated; import static gregtech.api.enums.ItemList.Circuit_Board_Coated_Basic; -import static gregtech.api.enums.ItemList.Circuit_Board_Elite; import static gregtech.api.enums.ItemList.Circuit_Board_Epoxy; import static gregtech.api.enums.ItemList.Circuit_Board_Epoxy_Advanced; import static gregtech.api.enums.ItemList.Circuit_Board_Fiberglass; @@ -149,6 +146,12 @@ public class CircuitPartLoader implements Runnable { } for (ItemList single : CIRCUIT_PARTS) { + // Skip placeholder values and maintain the ids + if (single == null) { + CircuitImprintLoader.reverseIDs--; + continue; + } + if (!single.hasBeenSet()) continue; ItemStack itemStack = single.get(1); if (!GTUtility.isStackValid(itemStack)) continue; @@ -194,9 +197,9 @@ public class CircuitPartLoader implements Runnable { */ private static final List<ItemList> CIRCUIT_PARTS = Collections.unmodifiableList( Arrays.asList( - Circuit_Board_Basic, - Circuit_Board_Advanced, - Circuit_Board_Elite, + null, + null, + null, Circuit_Parts_Crystal_Chip_Elite, Circuit_Parts_Crystal_Chip_Master, Circuit_Board_Coated, diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 855f3b9bbe..56b21238fd 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -178,14 +178,6 @@ public class NaquadahReworkRecipeLoader { .noOptimize() .addTo(neutronActivatorRecipes); - // Fix shit - GTValues.RA.stdBuilder() - .itemInputs(lowQualityNaquadriaSolution.get(OrePrefixes.cell, 1)) - .itemOutputs(Materials.Tin.getDust(2)) - .duration(16 * SECONDS + 14 * TICKS) - .eut(4) - .addTo(maceratorRecipes); - // Naquadah Rework Line GTValues.RA.stdBuilder() .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GTUtility.getIntegratedCircuit(1)) diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index 489732e068..14ebd378d6 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -521,12 +521,6 @@ public class CrackRecipeAdder { false).getStackForm(1L)); } GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(material.get(OrePrefixes.wireGt01, 2)) - .duration(5 * SECONDS) - .eut(4) - .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(2)) .itemOutputs(material.get(OrePrefixes.wireGt02, 1)) .duration(7 * SECONDS + 10 * TICKS) @@ -557,12 +551,6 @@ public class CrackRecipeAdder { .eut(4) .addTo(wiremillRecipes); GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(material.get(OrePrefixes.wireGt01, 1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(4) - .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stick, 2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(material.get(OrePrefixes.wireGt02, 1)) .duration(5 * SECONDS) @@ -587,37 +575,10 @@ public class CrackRecipeAdder { .eut(4) .addTo(wiremillRecipes); GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 16), GTUtility.getIntegratedCircuit(16)) - .itemOutputs(material.get(OrePrefixes.wireGt16, 1)) - .duration(15 * SECONDS) - .eut(4) - .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(3)) - .itemOutputs(material.get(OrePrefixes.wireFine, 8)) - .duration(5 * SECONDS) - .eut(4) - .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(material.get(OrePrefixes.wireFine, 4)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.wireGt01, 1), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(material.get(OrePrefixes.wireFine, 4)) - .duration(10 * SECONDS) - .eut(8) - .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Wire.get(0)) - .itemOutputs(material.get(OrePrefixes.wireGt01, 2)) - .duration( - material.getStats() - .getMass() * 8 - * TICKS) - .eut(TierEU.RECIPE_HV) - .addTo(extruderRecipes); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 0241b1593e..2407a48f70 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -110,7 +110,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } else if (!aMaterial.contains(SubTag.NO_WORKING)) { if ((!OrePrefixes.block.isIgnored(aMaterial)) && (null == GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) - && GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null) { + && GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L) != null + && (aMaterial != Materials.Clay)) { GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, aMaterial, 9)) @@ -133,7 +134,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && (aMaterial != Materials.Paper) && (aMaterial != MaterialsUEVplus.TranscendentMetal) && (aMaterial != Materials.Clay) - && (aMaterial != Materials.Wood)) { + && (aMaterial != Materials.Wood) + && (aMaterial != Materials.Carbon)) { // compressor recipe { if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java index 3839c38c66..7fc95ae117 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java @@ -23,6 +23,9 @@ public class ProcessingFoil implements IOreRecipeRegistrator { @Override public void registerOre(OrePrefixes prefix, Materials material, String oreDictName, String modName, ItemStack stack) { + // Blacklist materials which are handled by Werkstoff loader + if (material == Materials.Calcium || material == Materials.Magnesia) return; + registerBenderRecipe(material); registerCover(stack, material); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index 7d27c2ee16..6724a87798 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -40,6 +40,9 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + // Blacklist materials which are handled by Werkstoff loader + if (aMaterial == Materials.Calcium || aMaterial == Materials.Magnesia) return; + boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); boolean aStretchy = aMaterial.contains(SubTag.STRETCHY); boolean aNoSmelting = aMaterial.contains(SubTag.NO_SMELTING); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index 624730af3e..b4df540003 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -29,6 +29,8 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + // Blacklist materials which are handled by Werkstoff loader + if (aMaterial == Materials.Calcium || aMaterial == Materials.Magnesia) return; if (aMaterial.contains(SubTag.SMELTING_TO_GEM) && GTOreDictUnificator.get(OrePrefixes.gem, aMaterial.mSmeltInto, 1L) != null) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 6c45761da0..9f90cdbfff 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -34,6 +34,9 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + // Blacklist materials which are handled by Werkstoff loader + if (aMaterial == Materials.Calcium || aMaterial == Materials.Magnesia) return; + if (((aMaterial == Materials.Glass) || (GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null)) && (!aMaterial.contains(SubTag.NO_SMELTING))) { long aMaterialMass = aMaterial.getMass(); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index 3949b2f3af..7698e017d7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -30,7 +30,10 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { // Blacklist materials which are handled by Werkstoff loader - if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt || aMaterial == Materials.Spodumene) return; + if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt + || aMaterial == Materials.Spodumene + || aMaterial == Materials.Calcium + || aMaterial == Materials.Magnesia) return; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GTModHandler.addCraftingRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index ab3cd43dce..792a77d7c7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -11,7 +11,6 @@ import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gregtech.api.util.GTRecipeConstants.UniversalChemical; -import static gtPlusPlus.core.material.MaterialMisc.CALCIUM_CHLORIDE; import static gtPlusPlus.core.material.MaterialMisc.SODIUM_NITRATE; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; @@ -5847,7 +5846,7 @@ public class ChemicalRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(1), - CALCIUM_CHLORIDE.getDust(1), + WerkstoffLoader.CalciumChloride.get(OrePrefixes.dust, 1), GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9), GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9)) .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000)) @@ -5861,7 +5860,7 @@ public class ChemicalRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(9), - CALCIUM_CHLORIDE.getDust(7), + WerkstoffLoader.CalciumChloride.get(OrePrefixes.dust, 7), GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63), GTOreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63)) .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java index 5354067da3..e22cf2ef7e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java @@ -462,6 +462,19 @@ public class DistilleryRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs(GTUtility.getIntegratedCircuit(3)) + .fluidInputs(Materials.WoodTar.getFluid(1000)) + .fluidOutputs( + Materials.Creosote.getFluid(250), + Materials.Phenol.getFluid(100), + Materials.Benzene.getFluid(400), + Materials.Toluene.getFluid(100), + MaterialsKevlar.IVDimethylbenzene.getFluid(150)) + .duration(2 * SECONDS) + .eut(256) + .addTo(distillationTowerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3)) .itemOutputs(Materials.Charcoal.getDustSmall(1)) .fluidInputs(Materials.CharcoalByproducts.getGas(1000)) .fluidOutputs( @@ -608,16 +621,6 @@ public class DistilleryRecipes implements Runnable { public void universalDistillationTowerRecipes() { addUniversalDistillationRecipewithCircuit( - Materials.WoodTar.getFluid(1000), - new ItemStack[] { GTUtility.getIntegratedCircuit(3) }, - new FluidStack[] { Materials.Creosote.getFluid(250), Materials.Phenol.getFluid(100), - Materials.Benzene.getFluid(400), Materials.Toluene.getFluid(100), - MaterialsKevlar.IVDimethylbenzene.getFluid(150) }, - GTValues.NI, - 40, - 256); - - addUniversalDistillationRecipewithCircuit( Materials.CharcoalByproducts.getGas(1000), new ItemStack[] { GTUtility.getIntegratedCircuit(1) }, new FluidStack[] { Materials.WoodTar.getFluid(250), Materials.WoodVinegar.getFluid(400), diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index cfcfec8042..753e8c5143 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -4,7 +4,6 @@ import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Railcraft; -import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -137,13 +136,6 @@ public class FluidExtractorRecipes implements Runnable { .addTo(fluidExtractionRecipes); GTValues.RA.stdBuilder() - .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3)) - .fluidOutputs(Materials.Mercury.getFluid(1000L)) - .duration(6 * SECONDS + 8 * TICKS) - .eut(4) - .addTo(fluidExtractionRecipes); - - GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L)) .fluidOutputs(Materials.Mercury.getFluid(1000L)) .duration(6 * SECONDS + 8 * TICKS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java index 69a82711e9..b27911a4f8 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java @@ -2,7 +2,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.Railcraft; -import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.INGOTS; @@ -33,50 +32,17 @@ public class FluidSolidifierRecipes implements Runnable { @Override public void run() { - Materials[] materialArray = new Materials[] { Materials.Iron, Materials.WroughtIron, Materials.Gold, - Materials.Bronze, Materials.Copper, Materials.AnnealedCopper, Materials.Tin, Materials.Lead, - Materials.Steel }; - - ItemStack[] materialCasing = new ItemStack[] { ItemList.IC2_Item_Casing_Iron.get(1L), - ItemList.IC2_Item_Casing_Iron.get(1L), ItemList.IC2_Item_Casing_Gold.get(1L), - ItemList.IC2_Item_Casing_Bronze.get(1L), ItemList.IC2_Item_Casing_Copper.get(1L), - ItemList.IC2_Item_Casing_Copper.get(1L), ItemList.IC2_Item_Casing_Tin.get(1L), - ItemList.IC2_Item_Casing_Lead.get(1L), ItemList.IC2_Item_Casing_Steel.get(1L) }; - - for (int i = 0; i < materialArray.length; i++) { - if (materialArray[i].mStandardMoltenFluid == null) { - continue; - } - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(materialCasing[i]) - .fluidInputs(materialArray[i].getMolten(72L)) - .duration(16 * TICKS) - .eut(8) - .addTo(fluidSolidifierRecipes); - } - - { - ItemStack flask = ItemList.VOLUMETRIC_FLASK.get(1); - NBTTagCompound nbtFlask = new NBTTagCompound(); - nbtFlask.setInteger("Capacity", 1000); - flask.setTagCompound(nbtFlask); - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Ball.get(0)) - .itemOutputs(flask) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("molten.borosilicateglass"), 144)) - .duration(2 * SECONDS + 4 * TICKS) - .eut(TierEU.RECIPE_LV) - .addTo(fluidSolidifierRecipes); - } + ItemStack flask = ItemList.VOLUMETRIC_FLASK.get(1); + NBTTagCompound nbtFlask = new NBTTagCompound(); + nbtFlask.setInteger("Capacity", 1000); + flask.setTagCompound(nbtFlask); GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3)) - .fluidInputs(Materials.Mercury.getFluid(1000L)) - .duration(6 * SECONDS + 8 * TICKS) - .eut(4) + .itemInputs(ItemList.Shape_Mold_Ball.get(0)) + .itemOutputs(flask) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("molten.borosilicateglass"), 144)) + .duration(2 * SECONDS + 4 * TICKS) + .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); GTValues.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java index 05a3712979..bff8151be4 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java @@ -99,7 +99,6 @@ public class LoaderGTOreDictionary implements Runnable { GTOreDictUnificator.set(OrePrefixes.block, Materials.Coal, new ItemStack(Blocks.coal_block, 1, 0)); GTOreDictUnificator.set(OrePrefixes.block, Materials.Redstone, new ItemStack(Blocks.redstone_block, 1, 0)); GTOreDictUnificator.set(OrePrefixes.block, Materials.NetherQuartz, new ItemStack(Blocks.quartz_block, 1, 0)); - GTOreDictUnificator.set(OrePrefixes.block, Materials.Clay, new ItemStack(Blocks.clay, 1, 0)); if (Blocks.ender_chest != null) { GTOreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(Blocks.ender_chest, 1)); } diff --git a/src/main/java/gtPlusPlus/core/material/MaterialMisc.java b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java index d00529d044..19c9f53194 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialMisc.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialMisc.java @@ -21,7 +21,6 @@ public final class MaterialMisc { MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false); MaterialUtils.generateSpecialDustAndAssignToAMaterial(CYANOACETIC_ACID, false); MaterialUtils.generateSpecialDustAndAssignToAMaterial(SODIUM_CYANIDE, false); - MaterialUtils.generateSpecialDustAndAssignToAMaterial(CALCIUM_CHLORIDE, false); MaterialUtils.generateSpecialDustAndAssignToAMaterial(COPPER_SULFATE, false); MaterialUtils.generateSpecialDustAndAssignToAMaterial(COPPER_SULFATE_HYDRATED, false); WATER.registerComponentForMaterial(FluidUtils.getWater(1000)); @@ -447,21 +446,6 @@ public final class MaterialMisc { new MaterialStack(MaterialsElements.getInstance().CARBON, 1), new MaterialStack(MaterialsElements.getInstance().NITROGEN, 1)); - public static final Material CALCIUM_CHLORIDE = new Material( - "Calcium Chloride", - MaterialState.SOLID, // State - new short[] { 180, 190, 255 }, // Material Colour - 563, // Melting Point in C - 1496, // Boiling Point in C - -1, // Protons - -1, - false, // Uses Blast furnace? - "CaCl2", - 0, - false, - new MaterialStack(MaterialsElements.getInstance().CALCIUM, 1), - new MaterialStack(MaterialsElements.getInstance().CHLORINE, 2)); - public static final Material CYANOACETIC_ACID = new Material( "Cyanoacetic Acid", MaterialState.SOLID, // State diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java index 45329aac16..d110124086 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.recipe; import static gregtech.api.enums.Mods.EnderIO; -import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.util.GTRecipeBuilder.MINUTES; @@ -34,7 +33,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; public class RecipesGeneral { @@ -420,11 +418,6 @@ public class RecipesGeneral { generateWireRecipes(MaterialsElements.STANDALONE.HYPOGEN); generateWireRecipes(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS); - // No Material for void, natch. - if (Thaumcraft.isModLoaded()) { - generatePipeRecipes(GT_Materials.Void.mDefaultLocalName, GT_Materials.Void.getMass(), 15); - } - Material[] gtpp = new Material[] { MaterialsAlloy.STABALLOY, MaterialsAlloy.TANTALLOY_60, MaterialsAlloy.TANTALLOY_61, MaterialsAlloy.POTIN, MaterialsAlloy.MARAGING300, MaterialsAlloy.MARAGING350, MaterialsAlloy.INCONEL_690, MaterialsAlloy.INCONEL_792, MaterialsAlloy.HASTELLOY_X, @@ -435,8 +428,7 @@ public class RecipesGeneral { generatePipeRecipes(mat.getLocalizedName(), mat.getMass(), mat.vVoltageMultiplier / 8); } - Materials[] h = new Materials[] { Materials.Europium, Materials.Tungsten, Materials.DarkSteel, Materials.Clay, - Materials.Lead, }; + Materials[] h = new Materials[] { Materials.Clay }; for (Materials e : h) { if (e == Materials.DarkSteel) { diff --git a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java index 70bc2a1cf8..178c62d041 100644 --- a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -113,19 +113,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID + 6, TextureSet.SET_DULL); - public static final Werkstoff Zirconium = new Werkstoff( - new short[] { 225, 230, 225 }, - "Zirconium", - subscriptNumbers("Zr"), - new Werkstoff.Stats().setBlastFurnace(true), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable() - .onlyDust() - .addMetalItems(), - // .enforceUnification(), - offsetID + 7, - TextureSet.SET_METALLIC); - public static final Werkstoff Zirconia = new Werkstoff( new short[] { 177, 152, 101 }, "Zirconia", @@ -824,7 +811,6 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable() .onlyDust() - .addMolten() .addCells(), offsetID2 + 24, TextureSet.SET_DULL, diff --git a/src/main/java/gtnhlanth/loader/RecipeLoader.java b/src/main/java/gtnhlanth/loader/RecipeLoader.java index 28e88ef831..6eb4fc8c62 100644 --- a/src/main/java/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/gtnhlanth/loader/RecipeLoader.java @@ -828,7 +828,7 @@ public class RecipeLoader { GTUtility.getIntegratedCircuit(2), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) .itemOutputs( - WerkstoffMaterialPool.Zirconium.get(OrePrefixes.ingotHot, 1), + WerkstoffLoader.Zirconium.get(OrePrefixes.ingotHot, 1), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6)) .fluidInputs(WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000)) .duration(30 * SECONDS) |