diff options
| author | BucketBrigade <138534411+CookieBrigade@users.noreply.github.com> | 2024-09-14 13:15:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-14 18:15:09 +0000 |
| commit | 4e00bae14864e7b026e5ae4e2a68c081469b62d3 (patch) | |
| tree | cefeddbd980ea3f49b5fdc9ee2f6a442979727ba /src | |
| parent | 0abe297bf83e9b955ae847f754c2523bd7087627 (diff) | |
| download | GT5-Unofficial-4e00bae14864e7b026e5ae4e2a68c081469b62d3.tar.gz GT5-Unofficial-4e00bae14864e7b026e5ae4e2a68c081469b62d3.tar.bz2 GT5-Unofficial-4e00bae14864e7b026e5ae4e2a68c081469b62d3.zip | |
Recipe conflicts gt++ (#3182)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java | 16 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java | 32 |
2 files changed, 16 insertions, 32 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 8f865445ac..1e05e123cb 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -373,6 +373,14 @@ public class AgriculturalChem extends ItemPackage { } if (!mFish.isEmpty()) { for (ItemStack g : mFish) { + boolean foundDupe = false; + for (ItemStack old : mList_Master_Meats) { + if (GTUtility.areStacksEqual(g, old)) { + foundDupe = true; + break; + } + } + if (foundDupe) continue; mList_Master_Meats.put(g); } } @@ -403,6 +411,14 @@ public class AgriculturalChem extends ItemPackage { } if (!mBones.isEmpty()) { for (ItemStack g : mBones) { + boolean foundDupe = false; + for (ItemStack old : mList_Master_Bones) { + if (GTUtility.areStacksEqual(g, old)) { + foundDupe = true; + break; + } + } + if (foundDupe) continue; mList_Master_Bones.put(g); } } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index f6d95952c6..263971cdc4 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -229,8 +229,6 @@ public class BioRecipes { recipeSodiumCarbonate(); recipePelletMold(); recipeAluminiumPellet(); - recipeAlumina(); - recipeAluminium(); recipeLithiumChloride(); recipeSulfuricAcid(); recipeUrea(); @@ -885,36 +883,6 @@ public class BioRecipes { .addTo(extruderRecipes); } - private static void recipeAlumina() { - // 2NaAlO2 + 2NaOH + 2CO2 = Al2O3 + 2Na2CO3 + H2O - GTValues.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumAluminate, 8), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 6)) - .itemOutputs( - ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 5), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 12)) - .fluidInputs(Materials.CarbonDioxide.getGas(2000L)) - .duration(40 * SECONDS) - .eut(TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200) - .addTo(blastFurnaceRecipes); - } - - private static void recipeAluminium() { - // 2Al2O3 + 3C = 4Al + 3CO2 - GTValues.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 10), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) - .fluidOutputs(Materials.CarbonDioxide.getGas(3000L)) - .duration(2 * MINUTES) - .eut(TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1600) - .addTo(blastFurnaceRecipes); - } - private static void recipeLithiumChloride() { GTValues.RA.stdBuilder() .itemInputs( |