aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-10-04 06:23:57 -0400
committerGitHub <noreply@github.com>2024-10-04 10:23:57 +0000
commit0634659830defc74ca5ce822e95e5c0babc54d91 (patch)
tree81d1cf7f3a8251023a704c55a0fbb527e9252dbe /src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
parentbb2f79ff04f86568eba657726fa4dcc828130dd0 (diff)
downloadGT5-Unofficial-0634659830defc74ca5ce822e95e5c0babc54d91.tar.gz
GT5-Unofficial-0634659830defc74ca5ce822e95e5c0babc54d91.tar.bz2
GT5-Unofficial-0634659830defc74ca5ce822e95e5c0babc54d91.zip
Remove collisions (#3324)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java19
1 files changed, 16 insertions, 3 deletions
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;
}
}
}