From 06a0de038542d78a787c653bb586c9c681ed48e9 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sat, 21 Sep 2024 01:34:52 -0400 Subject: [PATCH 1/9] Fix carpet cleaning collisions --- .../gregtech/loaders/postload/recipes/ChemicalBathRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java index ee5e1d83168..5f3bf249545 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java @@ -104,7 +104,7 @@ public void run() { // carpet cleaning recipes GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.carpet, 1, 32767)) + .itemInputs(new ItemStack(Blocks.carpet, 1, i)) .itemOutputs(new ItemStack(Blocks.carpet, 1, 0)) .fluidInputs(Materials.Chlorine.getGas(25)) .duration(20 * SECONDS) From 46dd8f77f67e4e3a1a7d758b23e1a01379fb0153 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sat, 21 Sep 2024 01:50:32 -0400 Subject: [PATCH 2/9] Redundant bartworks gem macerating --- .../werkstoff_loaders/recipe/GemLoader.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java index db31c11f0f8..606eaa2e95c 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java @@ -89,41 +89,6 @@ public void run(Werkstoff werkstoff) { } - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemExquisite)) - .itemOutputs(werkstoff.get(dust, 4)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemFlawless)) - .itemOutputs(werkstoff.get(dust, 2)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gem)) - .itemOutputs(werkstoff.get(dust)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemFlawed)) - .itemOutputs(werkstoff.get(dustSmall, 2)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(gemChipped)) - .itemOutputs(werkstoff.get(dustSmall)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - GTModHandler.addCraftingRecipe( werkstoff.get(gemFlawless, 2), 0, From 4466175493302010e3ea47b3e6b81c08d57bec58 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sat, 21 Sep 2024 02:14:57 -0400 Subject: [PATCH 3/9] Remove the entire bw ore loader. All the ores are caught by gt already. Also some other redundant gem nonsense. --- .../system/material/WerkstoffLoader.java | 3 +- .../werkstoff_loaders/recipe/GemLoader.java | 15 ----- .../werkstoff_loaders/recipe/OreLoader.java | 65 ------------------- .../recipe/SimpleMetalLoader.java | 10 --- 4 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java index c12a3303c99..d99cc2a1974 100644 --- a/src/main/java/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/bartworks/system/material/WerkstoffLoader.java @@ -110,7 +110,6 @@ import bartworks.system.material.werkstoff_loaders.recipe.MetalLoader; import bartworks.system.material.werkstoff_loaders.recipe.MoltenCellLoader; import bartworks.system.material.werkstoff_loaders.recipe.MultipleMetalLoader; -import bartworks.system.material.werkstoff_loaders.recipe.OreLoader; import bartworks.system.material.werkstoff_loaders.recipe.RawOreLoader; import bartworks.system.material.werkstoff_loaders.recipe.SimpleMetalLoader; import bartworks.system.material.werkstoff_loaders.recipe.ToolLoader; @@ -1657,7 +1656,7 @@ public static void run() { } IWerkstoffRunnable[] werkstoffRunnables = { new ToolLoader(), new DustLoader(), new GemLoader(), - new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new OreLoader(), new RawOreLoader(), + new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new RawOreLoader(), new CrushedLoader(), new CraftingMaterialLoader(), new CellLoader(), new MoltenCellLoader(), new MultipleMetalLoader(), new MetalLoader(), new BlockLoader() }; diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java index 606eaa2e95c..1c313e71725 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java @@ -30,7 +30,6 @@ import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.sifterRecipes; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -66,13 +65,6 @@ public void run(Werkstoff werkstoff) { .eut(2) .addTo(compressorRecipes); - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(block)) - .itemOutputs(werkstoff.get(gem, 9)) - .duration(5 * SECONDS) - .eut(24) - .addTo(hammerRecipes); - GTValues.RA.stdBuilder() .itemInputs(werkstoff.get(crushedPurified)) .itemOutputs( @@ -167,13 +159,6 @@ public void run(Werkstoff werkstoff) { texture, new CoverLens(BWColorUtil.getDyeFromColor(werkstoff.getRGBA()).mIndex, texture)); - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(lens)) - .itemOutputs(werkstoff.get(dustSmall, 3)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - for (ItemStack is : OreDictionary .getOres("craftingLens" + BWColorUtil.getDyeFromColor(werkstoff.getRGBA()).mName.replace(" ", ""))) { is.stackSize = 0; diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java deleted file mode 100644 index cd5effd0f0a..00000000000 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package bartworks.system.material.werkstoff_loaders.recipe; - -import static gregtech.api.enums.GTValues.RA; -import static gregtech.api.enums.OrePrefixes.crushed; -import static gregtech.api.enums.OrePrefixes.dust; -import static gregtech.api.enums.OrePrefixes.gem; -import static gregtech.api.enums.OrePrefixes.ingot; -import static gregtech.api.enums.OrePrefixes.ore; -import static gregtech.api.recipe.RecipeMaps.hammerRecipes; -import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GTRecipeBuilder.SECONDS; -import static gregtech.api.util.GTRecipeBuilder.TICKS; - -import bartworks.system.material.Werkstoff; -import bartworks.system.material.WerkstoffLoader; -import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; -import gregtech.api.enums.Materials; -import gregtech.api.enums.SubTag; -import gregtech.api.util.GTModHandler; - -public class OreLoader implements IWerkstoffRunnable { - - @Override - public void run(Werkstoff werkstoff) { - if (werkstoff.hasItemType(ore) && werkstoff.hasItemType(ingot) - && !werkstoff.getStats() - .isBlastFurnace()) - GTModHandler - .addSmeltingRecipe(WerkstoffLoader.getCorrespondingItemStack(ore, werkstoff), werkstoff.get(ingot)); - - if (werkstoff.hasItemType(ore)) { - - RA.stdBuilder() - .itemInputs(werkstoff.get(ore)) - .itemOutputs(werkstoff.hasItemType(gem) ? werkstoff.get(gem) : werkstoff.get(crushed)) - .duration(16 * TICKS) - .eut(10) - .addTo(hammerRecipes); - - RA.stdBuilder() - .itemInputs(werkstoff.get(ore)) - .itemOutputs( - werkstoff.get(crushed, 2), - werkstoff.contains(SubTag.CRYSTAL) ? werkstoff.get(gem) : werkstoff.getOreByProduct(0, dust), - Materials.Stone.getDust(1)) - .outputChances(100_00, 10_00, 50_00) - .eut(2) - .duration(20 * SECONDS) - .addTo(maceratorRecipes); - } - } -} diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java index d0b501d157e..a9c1143e58f 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java @@ -14,7 +14,6 @@ package bartworks.system.material.werkstoff_loaders.recipe; import static gregtech.api.enums.OrePrefixes.block; -import static gregtech.api.enums.OrePrefixes.dust; import static gregtech.api.enums.OrePrefixes.dustSmall; import static gregtech.api.enums.OrePrefixes.foil; import static gregtech.api.enums.OrePrefixes.gem; @@ -26,8 +25,6 @@ import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GTRecipeBuilder.TICKS; import net.minecraft.item.ItemStack; @@ -91,13 +88,6 @@ public void run(Werkstoff werkstoff) { false) : TextureFactory.of(texSet.mTextures[block.mTextureIndex], werkstoff.getRGBA(), false); GregTechAPI.registerCover(werkstoff.get(plate), texture, null); - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(plate)) - .itemOutputs(werkstoff.get(dust)) - .duration(2 * TICKS) - .eut(8) - .addTo(maceratorRecipes); - return; } From 559bd6fdd8fa4e703e8c0a4a7288a5889db0d01f Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sat, 21 Sep 2024 10:57:55 -0400 Subject: [PATCH 4/9] Remove redundant canner recipes for tin cans --- .../gregtech/loaders/load/GTItemIterator.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/src/main/java/gregtech/loaders/load/GTItemIterator.java b/src/main/java/gregtech/loaders/load/GTItemIterator.java index 63ac59b7c24..dc0f951ebcc 100644 --- a/src/main/java/gregtech/loaders/load/GTItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GTItemIterator.java @@ -125,36 +125,12 @@ public void run() { GTLog.out.println( "GTMod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)"); - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Items.rotten_flesh, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L)) - .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) - .duration(10 * SECONDS) - .eut(1) - .addTo(cannerRecipes); - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Items.spider_eye, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L)) - .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) - .duration(5 * SECONDS) - .eut(1) - .addTo(cannerRecipes); - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L)) - .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) - .duration(5 * SECONDS) - .eut(1) - .addTo(cannerRecipes); GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Items.cake, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(12L)) .itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L)) .duration(30 * SECONDS) .eut(1) .addTo(cannerRecipes); - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Items.mushroom_stew, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(6L)) - .itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1)) - .duration(15 * SECONDS) - .eut(1) - .addTo(cannerRecipes); GTLog.out.println("GTMod: Scanning ItemList."); From b82f3eb77aedaeb14f220b31c4626c538b28615e Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sat, 21 Sep 2024 11:40:39 -0400 Subject: [PATCH 5/9] Remove various redundant gt++ recycling and packager recipes --- .../loaders/RecipeGenDustGeneration.java | 37 ------------------- .../loaders/RecipeGenMetalRecipe.java | 12 ------ .../xmod/gregtech/loaders/RecipeGenOre.java | 9 ----- 3 files changed, 58 deletions(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java index 4b7d94f1f43..6c03e8104a8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java @@ -116,28 +116,6 @@ private void generateRecipes(final Material material, final boolean disableOptio final ItemStack[] inputStacks = material.getMaterialComposites(); final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); - // Macerate blocks back to dusts. - final ItemStack materialBlock = material.getBlock(1); - final ItemStack materialFrameBox = material.getFrameBox(1); - - if (ItemUtils.checkForInvalidItems(materialBlock)) { - RA.stdBuilder() - .itemInputs(materialBlock) - .itemOutputs(material.getDust(9)) - .eut(2) - .duration(20 * SECONDS) - .addTo(maceratorRecipes); - } - - if (ItemUtils.checkForInvalidItems(materialFrameBox)) { - RA.stdBuilder() - .itemInputs(materialFrameBox) - .itemOutputs(material.getDust(2)) - .eut(2) - .duration(20 * SECONDS) - .addTo(maceratorRecipes); - } - if (ItemUtils.checkForInvalidItems(smallDust) && ItemUtils.checkForInvalidItems(tinyDust)) { generatePackagerRecipes(material); } @@ -145,7 +123,6 @@ private void generateRecipes(final Material material, final boolean disableOptio ItemStack ingot = material.getIngot(1); if (ItemUtils.checkForInvalidItems(normalDust) && ItemUtils.checkForInvalidItems(ingot)) { addFurnaceRecipe(material); - addMacerationRecipe(material); } // Is this a composite? @@ -400,20 +377,6 @@ public static boolean generatePackagerRecipes(Material aMatInfo) { return true; } - private void addMacerationRecipe(Material aMatInfo) { - try { - Logger.MATERIALS("Adding Maceration recipe for " + aMatInfo.getLocalizedName() + " Ingot -> Dusts"); - RA.stdBuilder() - .itemInputs(aMatInfo.getIngot(1)) - .itemOutputs(aMatInfo.getDust(1)) - .eut(2) - .duration(20 * SECONDS) - .addTo(maceratorRecipes); - } catch (Throwable t) { - t.printStackTrace(); - } - } - private void addFurnaceRecipe(Material aMatInfo) { ItemStack aDust = aMatInfo.getDust(1); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java index 634784952ac..eb960ae8b9f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java @@ -74,18 +74,6 @@ private void generateRecipes(final Material material) { Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Success"); } - if (ItemUtils.checkForInvalidItems(material.getIngot(1)) - && ItemUtils.checkForInvalidItems(material.getHotIngot(1))) { - - GTValues.RA.stdBuilder() - .itemInputs(material.getHotIngot(1)) - .itemOutputs(material.getIngot(1)) - .duration((int) Math.max(material.getMass() * 3L, 1L)) - .eut(material.vVoltageMultiplier) - .addTo(vacuumFreezerRecipes); - Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Success"); - } - if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getLongRod(1))) { GTValues.RA.stdBuilder() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java index ed8f446baba..c8c1d28547f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java @@ -193,15 +193,6 @@ private void generateRecipes(final Material material, final boolean disableOptio ItemStack matDustA = getDust(bonusA); ItemStack matDustB = getDust(bonusB); - /** - * Package - */ - // Allow ore dusts to be packaged - if (ItemUtils.checkForInvalidItems(material.getSmallDust(1)) - && ItemUtils.checkForInvalidItems(material.getTinyDust(1))) { - RecipeGenDustGeneration.generatePackagerRecipes(material); - } - /** * Macerate */ From 6c0c8d73bbd080ab1a1245224f2b347458ca2ed2 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sat, 21 Sep 2024 11:54:35 -0400 Subject: [PATCH 6/9] Use circuits for gt++ weird machine covers --- src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java | 2 +- .../xmod/gregtech/loaders/RecipeGenDustGeneration.java | 2 -- .../gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index a0f647198f5..c24b2fe2505 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -3294,7 +3294,7 @@ private static void fakeMachineCasingCovers() { // Add recipes for new ones for (int i = 0; i < aMaxTier; i++) { GTValues.RA.stdBuilder() - .itemInputs(CI.getTieredMachineCasing(i)) + .itemInputs(CI.getTieredMachineCasing(i), GTUtility.getIntegratedCircuit(i)) .itemOutputs(aTier[i]) .duration(i * 5 * SECONDS) .eut(GTValues.VP[i]) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java index 6c03e8104a8..2c380e6eba1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java @@ -1,8 +1,6 @@ package gtPlusPlus.xmod.gregtech.loaders; -import static gregtech.api.enums.GTValues.RA; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; -import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.packagerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java index eb960ae8b9f..2272df0e2af 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java @@ -4,7 +4,6 @@ import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; -import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.HashSet; From 52ceed38cb21c919bbcc31148ec79794306a0370 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sat, 21 Sep 2024 12:08:57 -0400 Subject: [PATCH 7/9] Use aMainOutput to prevent duplicate registry of autoclave crop recipes and maintain original function --- .../postload/recipes/CropProcessingRecipes.java | 16 +++++++++------- .../gtPlusPlus/core/recipe/RecipesMachines.java | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java index 7833b6fc5fa..1628d6dba57 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java @@ -142,13 +142,15 @@ public void addProcess(ItemStack tCrop, Materials aMaterial, Materials aMaterial .eut(24) .addTo(UniversalChemical); - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(16, tCrop)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1)) - .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10)))) - .duration((int) (aMaterial.getMass() * 128)) - .eut(384) - .addTo(autoclaveRecipes); + if (aMainOutput) { + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(16, tCrop)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1)) + .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10)))) + .duration((int) (aMaterial.getMass() * 128)) + .eut(384) + .addTo(autoclaveRecipes); + } } public void addProcess(ItemStack tCrop, Materials aMaterial, int chance) { diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index c24b2fe2505..23cc3f223e6 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -3292,7 +3292,7 @@ private static void fakeMachineCasingCovers() { aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7); } // Add recipes for new ones - for (int i = 0; i < aMaxTier; i++) { + for (int i = 0; i < aMaxTier - 1; i++) { GTValues.RA.stdBuilder() .itemInputs(CI.getTieredMachineCasing(i), GTUtility.getIntegratedCircuit(i)) .itemOutputs(aTier[i]) From a2a18c801cf5af4178f2c7e0cebb0bf57b3a1dea Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sat, 21 Sep 2024 12:28:01 -0400 Subject: [PATCH 8/9] Remove forestry recipes being re-registered in a railcraft recipe loader... --- .../recipes/CircuitAssemblerRecipes.java | 57 ------------------- 1 file changed, 57 deletions(-) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index b17eecc7487..90e9b15f56a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -137,63 +137,6 @@ public void registerRailcraftRecipes() { .duration(25 * SECONDS) .eut((int) TierEU.RECIPE_LV) .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), - GTOreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV) - .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2), - GTOreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV) - .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2), - GTOreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV) - .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2), - GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV) - .addTo(circuitAssemblerRecipes); - } } From 8ee8af844794a888e09b03c82bf3ce410985dd87 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sat, 21 Sep 2024 12:29:52 -0400 Subject: [PATCH 9/9] Fix mistaken main output for tin --- .../loaders/postload/recipes/CropProcessingRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java index 1628d6dba57..f998cf2f58d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java @@ -32,7 +32,7 @@ public void run() { tCrop = ItemList.Crop_Drop_Tine.get(1); this.addProcess(tCrop, Materials.Tin, 100, true); this.addProcess(tCrop, Materials.Cassiterite, 100, false); - this.addProcess(tCrop, Materials.CassiteriteSand, 100, true); + this.addProcess(tCrop, Materials.CassiteriteSand, 100, false); tCrop = ItemList.Crop_Drop_Plumbilia.get(1); this.addProcess(tCrop, Materials.Lead, 100, true); this.addProcess(tCrop, Materials.Galena, 100, false); //