diff options
Diffstat (limited to 'src/main')
23 files changed, 155 insertions, 262 deletions
diff --git a/src/main/java/bartworks/common/loaders/RadioHatchMaterialLoader.java b/src/main/java/bartworks/common/loaders/RadioHatchMaterialLoader.java index 79419c5649..193be473b3 100644 --- a/src/main/java/bartworks/common/loaders/RadioHatchMaterialLoader.java +++ b/src/main/java/bartworks/common/loaders/RadioHatchMaterialLoader.java @@ -22,7 +22,7 @@ public class RadioHatchMaterialLoader { for (Werkstoff material : Werkstoff.werkstoffHashSet) { if (material == null || !material.getStats() - .isRadioactive()) { + .isRadioactive() || material == WerkstoffLoader.Tiberium) { continue; } diff --git a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java index 1d0c6fa140..e6582dd7b1 100644 --- a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java @@ -191,7 +191,7 @@ public class PlatinumSludgeOverHaul { .fluidOutputs(FormicAcid.getFluidOrGas(2000)) .duration(15 * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + .addTo(chemicalReactorRecipes); // AquaRegia GTValues.RA.stdBuilder() @@ -251,7 +251,7 @@ public class PlatinumSludgeOverHaul { .fluidOutputs(AmmoniumChloride.getFluidOrGas(1000)) .duration(15 * TICKS) .eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + .addTo(chemicalReactorRecipes); GTValues.RA.stdBuilder() .itemInputs(GTUtility.getIntegratedCircuit(9)) diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index 057447746d..d0ef883a5a 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -574,11 +574,5 @@ public class CrackRecipeAdder { .duration(12 * SECONDS + 10 * TICKS) .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); } } diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index 065a01b223..cfcb9f6949 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -2,13 +2,11 @@ package goodgenerator.util; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; -import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; import bartworks.system.material.Werkstoff; import gregtech.api.enums.GTValues; -import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; @@ -250,35 +248,7 @@ public class MaterialFix { .addTo(benderRecipes); } } - if (tMaterial.hasItemType(OrePrefixes.stick)) { - if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Rod.get(0)) - .fluidInputs(tMaterial.getMolten(72)) - .itemOutputs(tMaterial.get(OrePrefixes.stick, 1)) - .duration( - Math.max( - tMaterial.getStats() - .getMass() >> 1, - 1L) * TICKS) - .eut(TierEU.RECIPE_HV) - .addTo(fluidSolidifierRecipes); - } - } if (tMaterial.hasItemType(OrePrefixes.stickLong)) { - if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Rod_Long.get(0)) - .fluidInputs(tMaterial.getMolten(144)) - .itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) - .duration( - Math.max( - tMaterial.getStats() - .getMass(), - 1L) * TICKS) - .eut(TierEU.RECIPE_HV) - .addTo(fluidSolidifierRecipes); - } if (tMaterial.hasItemType(OrePrefixes.stick)) { GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.stickLong, 1), diff --git a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java index 7ab2655b0c..1ddd6f2907 100644 --- a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java +++ b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java @@ -507,7 +507,7 @@ public class MaterialsInit1 { Materials.Andradite = new Materials( 821, TextureSet.SET_ROUGH , 1.0F, 0, 1, 1 |8 , 150, 120, 0, 0, "Andradite" , "Andradite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Iron, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12))); Materials.AnnealedCopper = new Materials( 345, TextureSet.SET_SHINY , 1.0F, 0, 2, 1|2 |128 , 255, 120, 20, 0, "AnnealedCopper" , "Annealed Copper" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange , 2, Collections.singletonList(new MaterialStack(Copper, 1))); Materials.Asbestos = new Materials( 946, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 230, 230, 230, 0, "Asbestos" , "Asbestos" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 9))); // Mg3Si2O5(OH)4 - Materials.Ash = new Materials( 815, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 150, 150, 150, 0, "Ash" , "Ashes" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , 2, Collections.singletonList(new MaterialStack(Carbon, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1))); + Materials.Ash = new Materials( 815, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 150, 150, 150, 0, "Ash" , "Ashes" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , 0, Collections.singletonList(new MaterialStack(Carbon, 1)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1))); Materials.BandedIron = new Materials( 917, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 145, 90, 90, 0, "BandedIron" , "Banded Iron" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown , 1, Arrays.asList(new MaterialStack(Iron, 2), new MaterialStack(Oxygen, 3))); Materials.BatteryAlloy = new Materials( 315, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 156, 124, 160, 0, "BatteryAlloy" , "Battery Alloy" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyePurple , 2, Arrays.asList(new MaterialStack(Lead, 4), new MaterialStack(Antimony, 1))); Materials.BlueTopaz = new Materials( 513, TextureSet.SET_GEM_HORIZONTAL , 7.0F, 256, 3, 1 |4|8 |64 , 0, 0, 255, 127, "BlueTopaz" , "Blue Topaz" , 0, 0, -1, 0, false, true, 3, 1, 1, Dyes.dyeBlue , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 1), new MaterialStack(Fluorine, 2), new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 6)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 6), new TCAspects.TC_AspectStack(TCAspects.VITREUS, 4))); @@ -530,7 +530,7 @@ public class MaterialsInit1 { Materials.Cooperite = new Materials( 828, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1 |8 , 255, 255, 200, 0, "Cooperite" , "Sheldonite" , 0, 0, -1, 0, false, false, 5, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Platinum, 3), new MaterialStack(Nickel, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Palladium, 1))); Materials.Cupronickel = new Materials( 310, TextureSet.SET_METALLIC , 6.0F, 64, 1, 1|2 |64 , 227, 150, 128, 0, "Cupronickel" , "Cupronickel" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Nickel, 1))); Materials.DarkAsh = new Materials( 816, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 50, 50, 50, 0, "DarkAsh" , "Dark Ashes" , 0, 0, -1, 0, false, false, 1, 2, 1, Dyes.dyeGray , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1), new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 1))); - Materials.DeepIron = new Materials( 829, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 150, 140, 140, 0, "DeepIron" , "Deep Iron" , 0, 0, 7500, 7500, true, false, 3, 1, 1, Dyes.dyePink , 2, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); + Materials.DeepIron = new Materials( 829, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 150, 140, 140, 0, "DeepIron" , "Deep Iron" , 0, 0, 7500, 7500, true, false, 3, 1, 1, Dyes.dyePink , 0, Collections.singletonList(new MaterialStack(Iron, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); Materials.Diamond = new Materials( 500, TextureSet.SET_DIAMOND , 8.0F, 1280, 4, 1 |4|8 |64|128 , 200, 255, 255, 127, "Diamond" , "Diamond" , 0, 0, -1, 0, false, true, 5, 64, 1, Dyes.dyeWhite , 1, Collections.singletonList(new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 4))); Materials.Electrum = new Materials( 303, TextureSet.SET_SHINY , 12.0F, 64, 2, 1|2 |8 |64|128 , 255, 255, 100, 0, "Electrum" , "Electrum" , 0, 0, -1, 0, false, false, 4, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Gold, 1))); Materials.Emerald = new Materials( 501, TextureSet.SET_EMERALD , 7.0F, 256, 4, 1 |4|8 |64 , 80, 255, 80, 127, "Emerald" , "Emerald" , 0, 0, -1, 0, false, true, 5, 1, 1, Dyes.dyeGreen , 0, Arrays.asList(new MaterialStack(Beryllium, 3), new MaterialStack(Aluminium, 2), new MaterialStack(Silicon, 6), new MaterialStack(Oxygen, 18)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 3), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 5))); @@ -710,7 +710,7 @@ public class MaterialsInit1 { Materials.GalliumArsenide = new Materials( 980, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 160, 160, 160, 0, "GalliumArsenide" , "Gallium Arsenide" , 0, 0, -1, 1200, true, false, 1, 1, 1, Dyes.dyeGray , 2, Arrays.asList(new MaterialStack(Arsenic, 1), new MaterialStack(Gallium, 1))); Materials.IndiumGalliumPhosphide = new Materials( 981, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 160, 140, 190, 0, "IndiumGalliumPhosphide" , "Indium Gallium Phosphide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , 2, Arrays.asList(new MaterialStack(Indium, 1), new MaterialStack(Gallium, 1), new MaterialStack(Phosphorus, 1))); Materials.Spessartine = new Materials( 838, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 255, 100, 100, 0, "Spessartine" , "Spessartine" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed , 0, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Manganese, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12))); - Materials.Sphalerite = new Materials( 839, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Sphalerite" , "Sphalerite" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Zinc, 1), new MaterialStack(Sulfur, 1))); + Materials.Sphalerite = new Materials( 839, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Sphalerite" , "Sphalerite" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeYellow , 0, Arrays.asList(new MaterialStack(Zinc, 1), new MaterialStack(Sulfur, 1))); Materials.StainlessSteel = new Materials( 306, TextureSet.SET_SHINY , 7.0F, 480, 4, 1|2 |64|128 , 200, 200, 220, 0, "StainlessSteel" , "Stainless Steel" , 0, 0, -1, 1700, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Iron, 6), new MaterialStack(Chrome, 1), new MaterialStack(Manganese, 1), new MaterialStack(Nickel, 1))).disableAutoGeneratedBlastFurnaceRecipes(); Materials.Steel = new Materials( 305, TextureSet.SET_METALLIC , 6.0F, 512, 3, 1|2 |64|128 , 128, 128, 128, 0, "Steel" , "Steel" , 0, 0, 1811, 1000, true, false, 4, 51, 50, Dyes.dyeGray , 1, Arrays.asList(new MaterialStack(Iron, 50), new MaterialStack(Carbon, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.ORDO, 1))); Materials.Stibnite = new Materials( 945, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1 |8 , 70, 70, 70, 0, "Stibnite" , "Stibnite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Antimony, 2), new MaterialStack(Sulfur, 3))); @@ -791,7 +791,7 @@ public class MaterialsInit1 { Materials.BasalticMineralSand = new Materials( 935, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 40, 50, 40, 0, "BasalticMineralSand" , "Basaltic Mineral Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(Basalt, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))); Materials.GraniticMineralSand = new Materials( 936, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 40, 60, 60, 0, "GraniticMineralSand" , "Granitic Mineral Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Magnetite, 1), new MaterialStack(GraniteBlack, 1)), Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.MAGNETO, 1))); Materials.GarnetSand = new Materials( 938, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 200, 100, 0, 0, "GarnetSand" , "Garnet Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(GarnetRed, 1), new MaterialStack(GarnetYellow, 1))); - Materials.QuartzSand = new Materials( 939, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 194, 178, 128, 0, "QuartzSand" , "Quartz Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(CertusQuartz, 1), new MaterialStack(Quartzite, 1))); + Materials.QuartzSand = new Materials( 939, TextureSet.SET_SAND , 1.0F, 0, 1, 1 |8 , 194, 178, 128, 0, "QuartzSand" , "Quartz Sand" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 0, Arrays.asList(new MaterialStack(CertusQuartz, 1), new MaterialStack(Quartzite, 1))); Materials.Bastnasite = new Materials( 905, TextureSet.SET_FINE , 1.0F, 0, 2, 1 |8 , 200, 110, 45, 0, "Bastnasite" , "Bastnasite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL , 1, Arrays.asList(new MaterialStack(Cerium, 1), new MaterialStack(Carbon, 1), new MaterialStack(Fluorine, 1), new MaterialStack(Oxygen, 3))); // (Ce, La, Y)CO3F Materials.Pentlandite = new Materials( 909, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 165, 150, 5, 0, "Pentlandite" , "Pentlandite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL , 1, Arrays.asList(new MaterialStack(Nickel, 9), new MaterialStack(Sulfur, 8))); // (Fe,Ni)9S8 Materials.Spodumene = new Materials( 920, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 190, 170, 170, 0, "Spodumene" , "Spodumene" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL , 0, Arrays.asList(new MaterialStack(Lithium, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 6))); // LiAl(SiO3)2 @@ -1026,7 +1026,7 @@ public class MaterialsInit1 { 0, 6203, 0, - true, + false, false, 1, 1, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 29516ad0a5..555341aa45 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -30,7 +30,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (aMaterial == Materials.Ichorium) { + if (aMaterial == Materials.Ichorium || aMaterial == Materials.NetherQuartz) { return; } @@ -159,9 +159,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .duration(5 * SECONDS) .eut(24) .addTo(hammerRecipes); - } - - if (tStack2 != null && aMaterial != Materials.NetherQuartz) { if (tStack3 != null) GTModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); GTModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) }); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index debf059884..2566d0ceec 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -75,9 +75,10 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR break; } - // Blacklist materials which are handled by Werkstoff loader - if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt || aMaterial == Materials.Spodumene) - return; + // Blacklist materials which are handled by Werkstoff loader and coal, which has an override + if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt + || aMaterial == Materials.Spodumene + || aMaterial == Materials.Coal) return; switch (aMaterial.mName) { case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GTValues.RA diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index 22a0964f34..1fc6cc15e7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -27,6 +27,9 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist OrePrefixes.dirtyGravel.add(this); } + private boolean didPersulfate = false; + private boolean didMercury = false; + @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, net.minecraft.item.ItemStack aStack) { @@ -110,18 +113,22 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .eut(48) .addTo(thermalCentrifugeRecipes); + didPersulfate = false; + didMercury = false; + addChemicalBathRecipes(aMaterial, aMaterial, aStack, aPrefix); for (Materials tMaterial : aMaterial.mOreByProducts) { addChemicalBathRecipes(aMaterial, tMaterial, aStack, aPrefix); } + } private void addChemicalBathRecipes(Materials material, Materials byproduct, ItemStack stack, OrePrefixes prefix) { OrePrefixes chemicalBathPrefix = prefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure; - if (byproduct.contains(SubTag.WASHING_MERCURY)) { + if (byproduct.contains(SubTag.WASHING_MERCURY) && !didMercury) { GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(1, stack)) .itemOutputs( @@ -133,8 +140,10 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .duration(40 * SECONDS) .eut(8) .addTo(chemicalBathRecipes); + + didMercury = true; } - if (byproduct.contains(SubTag.WASHING_MERCURY_99_PERCENT)) { + if (byproduct.contains(SubTag.WASHING_MERCURY_99_PERCENT) && !didMercury) { GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(1, stack)) .itemOutputs( @@ -146,8 +155,10 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .duration(40 * SECONDS) .eut(8) .addTo(chemicalBathRecipes); + + didMercury = true; } - if (byproduct.contains(SubTag.WASHING_SODIUMPERSULFATE)) { + if (byproduct.contains(SubTag.WASHING_SODIUMPERSULFATE) && !didPersulfate) { GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(1, stack)) .itemOutputs( @@ -159,6 +170,8 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist .duration(40 * SECONDS) .eut(8) .addTo(chemicalBathRecipes); + + didPersulfate = true; } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index ce92e38f7c..9a403c4b1d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -49,8 +49,10 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra boolean aSpecialRecipeReq = aMaterial.contains(SubTag.MORTAR_GRINDABLE); boolean aFuelPower = aMaterial.mFuelPower > 0; - // Blacklist materials which are handled by Werkstoff loader - if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt || aMaterial == Materials.Spodumene) return; + // Blacklist materials which are handled by Werkstoff loader and nether quartz due to its 4:1 ratio + if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt + || aMaterial == Materials.Spodumene + || aMaterial == Materials.NetherQuartz) return; switch (aPrefix) { case gem -> { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index 5bf1212faa..e6946c804a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -145,15 +145,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GTValues.RA.stdBuilder() .itemInputs(new ItemStack(aStack.getItem(), 1, i)) .itemOutputs( - GTUtility.copyOrNull(tPlanks), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) - .fluidInputs(Materials.Lubricant.getFluid(1L)) - .duration(10 * SECONDS) - .eut(8) - .addTo(cutterRecipes); - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(aStack.getItem(), 1, i)) - .itemOutputs( GTUtility.copyAmount( GTMod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, tStack), @@ -209,16 +200,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra if (tStack != null) { ItemStack tPlanks = GTUtility.copyOrNull(tStack); if (tPlanks != null) { - tPlanks.stackSize = (tPlanks.stackSize * 3 / 2); - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) - .itemOutputs( - GTUtility.copyOrNull(tPlanks), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) - .fluidInputs(Materials.Lubricant.getFluid(1L)) - .duration(10 * SECONDS) - .eut(8) - .addTo(cutterRecipes); GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 9823582212..b66bee9764 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -205,7 +205,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra Math.max(1, aMultiplier * aMaterial.mSmeltingMultiplier / 2))); } - if (tCrushed != null) { + if (tCrushed != null && aMaterial != Materials.Knightmetal) { GTValues.RA.stdBuilder() .itemInputs(aOreStack) .itemOutputs(GTUtility.copy(GTUtility.copyAmount(tCrushed.stackSize, tGem), tCrushed)) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 9f90cdbfff..0f4b3d28b6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -147,7 +147,9 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .addTo(extruderRecipes); } - if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { + if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron) + && !(aMaterial.contains(SubTag.NO_SMELTING)) + && aPrefix == OrePrefixes.ingot) { if (aMaterial.mStandardMoltenFluid != null) { if (GTOreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L) != null) { GTValues.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java index 178034b176..d3d85fd3f1 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java @@ -97,6 +97,23 @@ public class BreweryRecipes implements Runnable { if (IndustrialCraft2.isModLoaded()) { waterArray = new Fluid[] { FluidRegistry.WATER, GTModHandler.getDistilledWater(1L) .getFluid() }; + + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 0)) + .fluidInputs(new FluidStack(GTModHandler.getDistilledWater(1), 750)) + .fluidOutputs(getFluidStack("potion.poison", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(brewingRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Items.reeds, 1, 0)) + .fluidInputs(new FluidStack(GTModHandler.getDistilledWater(1), 750)) + .fluidOutputs(getFluidStack("potion.reedwater", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(brewingRecipes); + } else { waterArray = new Fluid[] { FluidRegistry.WATER }; } @@ -230,14 +247,6 @@ public class BreweryRecipes implements Runnable { .addTo(brewingRecipes); GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 0)) - .fluidInputs(new FluidStack(tFluid, 750)) - .fluidOutputs(getFluidStack("potion.poison", 750)) - .duration(6 * SECONDS + 8 * TICKS) - .eut(4) - .addTo(brewingRecipes); - - GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Items.fish, 1, 3)) .fluidInputs(new FluidStack(tFluid, 750)) .fluidOutputs(getFluidStack("potion.poison.strong", 750)) @@ -254,14 +263,6 @@ public class BreweryRecipes implements Runnable { .addTo(brewingRecipes); GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Items.reeds, 1, 0)) - .fluidInputs(new FluidStack(tFluid, 750)) - .fluidOutputs(getFluidStack("potion.reedwater", 750)) - .duration(6 * SECONDS + 8 * TICKS) - .eut(4) - .addTo(brewingRecipes); - - GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Items.apple, 1, 0)) .fluidInputs(new FluidStack(tFluid, 750)) .fluidOutputs(getFluidStack("potion.applejuice", 750)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index e16ad553fb..e8b349f203 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -338,13 +338,6 @@ public class CentrifugeRecipes implements Runnable { .addTo(centrifugeRecipes); GTValues.RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1), GTUtility.getIntegratedCircuit(1)) - .fluidOutputs(Materials.Methane.getGas(60)) - .duration(10 * SECONDS) - .eut(20) - .addTo(centrifugeRecipes); - - GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.sand, 1, 1)) .itemOutputs( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index 792a77d7c7..60fba5404a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/ |