aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-09-14 18:04:43 -0400
committerGitHub <noreply@github.com>2024-09-14 22:04:43 +0000
commitb60ecbf21284a780b8730dc9276940bfd7f4a0b8 (patch)
tree13918d71810f2c22c6f3850e844f015a9f55cfd7 /src/main/java/gregtech/loaders
parent9c18caf7fc642a21efad6673e59db85f5b66ab88 (diff)
downloadGT5-Unofficial-b60ecbf21284a780b8730dc9276940bfd7f4a0b8.tar.gz
GT5-Unofficial-b60ecbf21284a780b8730dc9276940bfd7f4a0b8.tar.bz2
GT5-Unofficial-b60ecbf21284a780b8730dc9276940bfd7f4a0b8.zip
More collisions (#3191)
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java9
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java3
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java
index b4db15db42..68a237239a 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java
@@ -4,6 +4,7 @@ import static gregtech.api.enums.Mods.IndustrialCraft2;
import static gregtech.api.recipe.RecipeMaps.brewingRecipes;
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
+import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
import static gregtech.api.recipe.RecipeMaps.slicerRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
@@ -55,7 +56,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.tea"), 750))
.duration(6 * SECONDS + 8 * TICKS)
.eut(4)
- .addTo(brewingRecipes);
+ .addTo(mixerRecipes);
}
}
case "cropGrape" -> {
@@ -66,7 +67,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.grapejuice"), 750))
.duration(6 * SECONDS + 8 * TICKS)
.eut(4)
- .addTo(brewingRecipes);
+ .addTo(mixerRecipes);
}
}
case "cropChilipepper" -> GTValues.RA.stdBuilder()
@@ -103,7 +104,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.potatojuice"), 750))
.duration(6 * SECONDS + 8 * TICKS)
.eut(4)
- .addTo(brewingRecipes);
+ .addTo(mixerRecipes);
}
}
case "cropLemon" -> {
@@ -121,7 +122,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.lemonjuice"), 750))
.duration(6 * SECONDS + 8 * TICKS)
.eut(4)
- .addTo(brewingRecipes);
+ .addTo(mixerRecipes);
}
GTValues.RA.stdBuilder()
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
index 78a51727af..a8912411ea 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
@@ -120,6 +120,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
.addTo(compressorRecipes);
}
// This is so disgustingly bad.
+ // It really is.
if (((OrePrefixes.block.isIgnored(aMaterial))
|| (null == GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)))
&& (aMaterial != Materials.GraniteRed)
@@ -131,7 +132,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
&& (aMaterial != Materials.Glowstone)
&& (aMaterial != Materials.Paper)
&& (aMaterial != MaterialsUEVplus.TranscendentMetal)
- && (aMaterial != Materials.Clay)) {
+ && (aMaterial != Materials.Clay && (aMaterial != Materials.Wood))) {
// compressor recipe
{
if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
index 3fff4d57aa..05e6aaeeb3 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
@@ -45,7 +45,6 @@ import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTRecipeConstants;
-import gregtech.api.util.GTRecipeRegistrator;
import gregtech.api.util.GTUtility;
public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegistrator {
@@ -528,7 +527,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
.eut(calculateRecipeEU(aMaterial, 16))
.addTo(cutterRecipes);
}
- GTRecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null);
}
private void registerPlateAlloy(final String aOreDictName, final ItemStack aStack) {