aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-09-25 06:48:46 -0400
committerGitHub <noreply@github.com>2024-09-25 12:48:46 +0200
commit683e0970aea98b5d59fb0de928d130cd8e44360e (patch)
tree40bad7e9bb301f56a4ae0f9b1d08b2175b066668 /src/main/java
parent00b6c43af283b0a7a33e039718a63826d635576e (diff)
downloadGT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.gz
GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.bz2
GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.zip
So, so, so many collisions (#3278)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/bartworks/system/material/Werkstoff.java21
-rw-r--r--src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java207
-rw-r--r--src/main/java/goodgenerator/items/GGMaterial.java4
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader.java10
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader2.java5
-rw-r--r--src/main/java/goodgenerator/util/MaterialFix.java8
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java2
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsGTNH.java23
-rw-r--r--src/main/java/gregtech/api/recipe/RecipeMaps.java5
-rw-r--r--src/main/java/gregtech/api/util/GTForestryCompat.java18
-rw-r--r--src/main/java/gregtech/loaders/materials/MaterialsInit1.java44
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java3
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java8
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java120
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java56
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java89
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java7
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java28
-rw-r--r--src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java14
-rw-r--r--src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java37
-rw-r--r--src/main/java/gtPlusPlus/core/item/ModItems.java4
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java15
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java4
-rw-r--r--src/main/java/gtnhlanth/loader/RecipeLoader.java110
-rw-r--r--src/main/java/tectech/loader/recipe/Assembler.java2
30 files changed, 183 insertions, 694 deletions
diff --git a/src/main/java/bartworks/system/material/Werkstoff.java b/src/main/java/bartworks/system/material/Werkstoff.java
index 1c29d52a92..d9b6b4503c 100644
--- a/src/main/java/bartworks/system/material/Werkstoff.java
+++ b/src/main/java/bartworks/system/material/Werkstoff.java
@@ -1089,8 +1089,29 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
private double ebfGasRecipeTimeMultiplier = -1.0;
private double ebfGasRecipeConsumedAmountMultiplier = 1.0;
+ private boolean autoGenerateBlastFurnaceRecipes = true;
+ private boolean autoGenerateVacuumFreezerRecipes = true;
+
float durMod = 1f;
+ public boolean autoGenerateBlastFurnaceRecipes() {
+ return autoGenerateBlastFurnaceRecipes;
+ }
+
+ public boolean autoGenerateVacuumFreezerRecipes() {
+ return autoGenerateVacuumFreezerRecipes;
+ }
+
+ public Werkstoff.Stats disableAutoGeneratedBlastFurnaceRecipes() {
+ autoGenerateBlastFurnaceRecipes = false;
+ return this;
+ }
+
+ public Werkstoff.Stats disableAutoGeneratedVacuumFreezerRecipes() {
+ autoGenerateVacuumFreezerRecipes = false;
+ return this;
+ }
+
public float getDurMod() {
return this.durMod;
}
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
index e83af7ad46..ab7a2167aa 100644
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
+++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
@@ -61,14 +61,14 @@ public class DustLoader implements IWerkstoffRunnable {
List<FluidStack> flOutputs = new ArrayList<>();
List<ItemStack> stOutputs = new ArrayList<>();
HashMap<ISubTagContainer, Pair<Integer, Integer>> tracker = new HashMap<>();
+
+ Werkstoff.Stats werkstoffStats = werkstoff.getStats();
+
int cells = 0;
if (werkstoff.getGenerationFeatures()
- .hasMixerRecipes()
- || werkstoff.getStats()
- .isElektrolysis()
- || werkstoff.getStats()
- .isCentrifuge()
+ .hasMixerRecipes() || werkstoffStats.isElektrolysis()
+ || werkstoffStats.isCentrifuge()
|| werkstoff.getGenerationFeatures()
.hasChemicalRecipes()) {
for (Pair<ISubTagContainer, Integer> container : werkstoff.getContents()
@@ -182,8 +182,7 @@ public class DustLoader implements IWerkstoffRunnable {
ItemStack input = werkstoff.get(dust);
input.stackSize = werkstoff.getContents()
.getKey();
- if (werkstoff.getStats()
- .isElektrolysis()) {
+ if (werkstoffStats.isElektrolysis()) {
GTRecipe tRecipe = new GTRecipe(
true,
new ItemStack[] { input, cells > 0 ? Materials.Empty.getCells(cells) : null },
@@ -195,11 +194,9 @@ public class DustLoader implements IWerkstoffRunnable {
(int) Math.max(
1L,
Math.abs(
- werkstoff.getStats()
- .getProtons()
- / werkstoff.getContents()
- .getValue()
- .size())),
+ werkstoffStats.getProtons() / werkstoff.getContents()
+ .getValue()
+ .size())),
Math.min(
4,
werkstoff.getContents()
@@ -210,8 +207,7 @@ public class DustLoader implements IWerkstoffRunnable {
RecipeMaps.electrolyzerRecipes.add(tRecipe);
RecipeMaps.electrolyzerNonCellRecipes.add(tRecipe);
}
- if (werkstoff.getStats()
- .isCentrifuge()) {
+ if (werkstoffStats.isCentrifuge()) {
RecipeMaps.centrifugeRecipes.add(
new GTRecipe(
true,
@@ -224,11 +220,9 @@ public class DustLoader implements IWerkstoffRunnable {
(int) Math.max(
1L,
Math.abs(
- werkstoff.getStats()
- .getMass()
- / werkstoff.getContents()
- .getValue()
- .size())),
+ werkstoffStats.getMass() / werkstoff.getContents()
+ .getValue()
+ .size())),
Math.min(
4,
werkstoff.getContents()
@@ -247,11 +241,9 @@ public class DustLoader implements IWerkstoffRunnable {
(int) Math.max(
1L,
Math.abs(
- werkstoff.getStats()
- .getProtons()
- / werkstoff.getContents()
- .getValue()
- .size())),
+ werkstoffStats.getProtons() / werkstoff.getContents()
+ .getValue()
+ .size())),
Math.min(
4,
werkstoff.getContents()
@@ -272,11 +264,9 @@ public class DustLoader implements IWerkstoffRunnable {
(int) Math.max(
1L,
Math.abs(
- werkstoff.getStats()
- .getProtons()
- / werkstoff.getContents()
- .getValue()
- .size())))
+ werkstoffStats.getProtons() / werkstoff.getContents()
+ .getValue()
+ .size())))
.eut(
Math.min(
4,
@@ -304,11 +294,9 @@ public class DustLoader implements IWerkstoffRunnable {
(int) Math.max(
1L,
Math.abs(
- werkstoff.getStats()
- .getMass()
- / werkstoff.getContents()
- .getValue()
- .size())),
+ werkstoffStats.getMass() / werkstoff.getContents()
+ .getValue()
+ .size())),
Math.min(
4,
werkstoff.getContents()
@@ -327,11 +315,9 @@ public class DustLoader implements IWerkstoffRunnable {
(int) Math.max(
1L,
Math.abs(
- werkstoff.getStats()
- .getProtons()
- / werkstoff.getContents()
- .getValue()
- .size())),
+ werkstoffStats.getProtons() / werkstoff.getContents()
+ .getValue()
+ .size())),
Math.min(
4,
werkstoff.getContents()
@@ -384,112 +370,67 @@ public class DustLoader implements IWerkstoffRunnable {
.eut(4)
.addTo(packagerRecipes);
- if (werkstoff.hasItemType(ingot) && !werkstoff.getStats()
- .isBlastFurnace()) {
+ if (werkstoff.hasItemType(ingot) && !werkstoffStats.isBlastFurnace()) {
GTModHandler.addSmeltingRecipe(werkstoff.get(dust), werkstoff.get(ingot));
GTModHandler.addSmeltingRecipe(werkstoff.get(dustTiny), werkstoff.get(nugget));
- } else if (werkstoff.hasItemType(ingot) && werkstoff.getStats()
- .isBlastFurnace()
- && werkstoff.getStats()
- .getMeltingPoint() != 0) {
- if (werkstoff.contains(WerkstoffLoader.ANAEROBE_SMELTING)) {
- GTValues.RA.stdBuilder()
- .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(11))
- .itemOutputs(
- werkstoff.getStats()
- .getMeltingPoint() < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot))
- .fluidInputs(Materials.Nitrogen.getGas(1000))
- .duration(
- Math.max(
- werkstoff.getStats()
- .getMass() / 40L,
- 1L)
- * werkstoff.getStats()
- .getMeltingPoint())
- .eut(
- werkstoff.getStats()
- .getMeltingVoltage())
- .metadata(
- COIL_HEAT,
- werkstoff.getStats()
- .getMeltingPoint())
- .addTo(blastFurnaceRecipes);
+ } else if (werkstoff.hasItemType(ingot) && werkstoffStats.isBlastFurnace()
+ && werkstoffStats.getMeltingPoint() != 0
+ && werkstoffStats.autoGenerateBlastFurnaceRecipes()) {
+ if (werkstoff.contains(WerkstoffLoader.ANAEROBE_SMELTING)) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(11))
+ .itemOutputs(
+ werkstoffStats.getMeltingPoint() < 1750 ? werkstoff.get(ingot)
+ : werkstoff.get(ingotHot))
+ .fluidInputs(Materials.Nitrogen.getGas(1000))
+ .duration(Math.max(werkstoffStats.getMass() / 40L, 1L) * werkstoffStats.getMeltingPoint())
+ .eut(werkstoffStats.getMeltingVoltage())
+ .metadata(COIL_HEAT, werkstoffStats.getMeltingPoint())
+ .addTo(blastFurnaceRecipes);
- } else if (werkstoff.contains(WerkstoffLoader.NOBLE_GAS_SMELTING)) {
- GTValues.RA.stdBuilder()
- .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(11))
- .itemOutputs(
- werkstoff.getStats()
- .getMeltingPoint() < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot))
- .fluidInputs(Materials.Argon.getGas(1000))
- .duration(
- Math.max(
- werkstoff.getStats()
- .getMass() / 40L,
- 1L)
- * werkstoff.getStats()
- .getMeltingPoint())
- .eut(
- werkstoff.getStats()
- .getMeltingVoltage())
- .metadata(
- COIL_HEAT,
- werkstoff.getStats()
- .getMeltingPoint())
- .addTo(blastFurnaceRecipes);
+ } else if (werkstoff.contains(WerkstoffLoader.NOBLE_GAS_SMELTING)) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(11))
+ .itemOutputs(
+ werkstoffStats.getMeltingPoint() < 1750 ? werkstoff.get(ingot)
+ : werkstoff.get(ingotHot))
+ .fluidInputs(Materials.Argon.getGas(1000))
+ .duration(Math.max(werkstoffStats.getMass() / 40L, 1L) * werkstoffStats.getMeltingPoint())
+ .eut(werkstoffStats.getMeltingVoltage())
+ .metadata(COIL_HEAT, werkstoffStats.getMeltingPoint())
+ .addTo(blastFurnaceRecipes);
- } else {
+ } else {
+ GTValues.RA.stdBuilder()
+ .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(1))
+ .itemOutputs(
+ werkstoffStats.getMeltingPoint() < 1750 ? werkstoff.get(ingot)
+ : werkstoff.get(ingotHot))
+ .duration(Math.max(werkstoffStats.getMass() / 40L, 1L) * werkstoffStats.getMeltingPoint())
+ .eut(werkstoffStats.getMeltingVoltage())
+ .metadata(COIL_HEAT, werkstoffStats.getMeltingPoint())
+ .addTo(blastFurnaceRecipes);
+
+ if (werkstoffStats.getMeltingPoint() <= 1000) {
GTValues.RA.stdBuilder()
- .itemInputs(werkstoff.get(dust), GTUtility.getIntegratedCircuit(1))
- .itemOutputs(
- werkstoff.getStats()
- .getMeltingPoint() < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot))
+ .itemInputs(werkstoff.get(dust))
+ .itemOutputs(werkstoff.get(ingot))
.duration(
- Math.max(
- werkstoff.getStats()
- .getMass() / 40L,
- 1L)
- * werkstoff.getStats()
- .getMeltingPoint())
- .eut(
- werkstoff.getStats()
- .getMeltingVoltage())
- .metadata(
- COIL_HEAT,
- werkstoff.getStats()
- .getMeltingPoint())
- .addTo(blastFurnaceRecipes);
-
- if (werkstoff.getStats()
- .getMeltingPoint() <= 1000) {
- GTValues.RA.stdBuilder()
- .itemInputs(werkstoff.get(dust))
- .itemOutputs(werkstoff.get(ingot))
- .duration(
- (int) Math.max(
- werkstoff.getStats()
- .getMass() / 40L,
- 1L) * werkstoff.getStats()
- .getMeltingPoint())
- .eut(0)
- .metadata(ADDITIVE_AMOUNT, 9)
- .addTo(primitiveBlastRecipes);
- }
+ (int) Math.max(werkstoffStats.getMass() / 40L, 1L)
+ * werkstoffStats.getMeltingPoint())
+ .eut(0)
+ .metadata(ADDITIVE_AMOUNT, 9)
+ .addTo(primitiveBlastRecipes);
}
}
+ }
- if (werkstoff.getStats()
- .isBlastFurnace()
- && werkstoff.getStats()
- .getMeltingPoint() > 1750) {
+ if (werkstoffStats.isBlastFurnace() && werkstoffStats.getMeltingPoint() > 1750
+ && werkstoffStats.autoGenerateVacuumFreezerRecipes()) {
GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(ingotHot))
.itemOutputs(werkstoff.get(ingot))
- .duration(
- (int) Math.max(
- werkstoff.getStats()
- .getMass() * 3L,
- 1L))
+ .duration((int) Math.max(werkstoffStats.getMass() * 3L, 1L))
.eut(TierEU.RECIPE_MV)
.addTo(vacuumFreezerRecipes);
}
diff --git a/src/main/java/goodgenerator/items/GGMaterial.java b/src/main/java/goodgenerator/items/GGMaterial.java
index f61aad5876..ca26cfe986 100644
--- a/src/main/java/goodgenerator/items/GGMaterial.java
+++ b/src/main/java/goodgenerator/items/GGMaterial.java
@@ -305,7 +305,9 @@ public class GGMaterial implements Runnable {
.setRadioactive(true)
.setDurOverride(180224)
.setSpeedOverride(100f)
- .setQualityOverride((byte) 11),
+ .setQualityOverride((byte) 11)
+ .disableAutoGeneratedBlastFurnaceRecipes()
+ .disableAutoGeneratedVacuumFreezerRecipes(),
Werkstoff.Types.ELEMENT,
new Werkstoff.GenerationFeatures().onlyDust()
.addMolten()
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
index c43ffb58c6..2b4d79c3f0 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -1272,16 +1272,6 @@ public class RecipeLoader {
.addTo(blastFurnaceRecipes);
GTValues.RA.stdBuilder()
- .itemInputs(
- GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 1),
- GTUtility.getIntegratedCircuit(1))
- .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot))
- .duration(6 * MINUTES + 40 * SECONDS)
- .eut(TierEU.RECIPE_ZPM)
- .metadata(COIL_HEAT, 7000)
- .addTo(blastFurnaceRecipes);
-
- GTValues.RA.stdBuilder()
.itemInputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot, 1))
.itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot, 1))
.duration(20 * SECONDS)
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java
index 707c6fc11a..1301ac97f5 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader2.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader2.java
@@ -104,14 +104,12 @@ public class RecipeLoader2 {
.eut(TierEU.RECIPE_UHV)
.addTo(assemblerRecipes);
+ CrackRecipeAdder.reAddBlastRecipe(GGMaterial.extremelyUnstableNaquadah, 8000, 122880, 7000, false);
CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 500, 480, 2800, true);
- CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 513, 480, 2800, false);
CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 500, 480, 2800, true);
- CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 513, 480, 2800, false);
CrackRecipeAdder.reAddBlastRecipe(GGMaterial.incoloy903, 1200, 1920, 3700, true);
CrackRecipeAdder.reAddBlastRecipe(GGMaterial.adamantiumAlloy, 2500, 1920, 5500, true);
CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 200, 7680, 5000, true);
- CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 220, 7680, 5000, false);
CrackRecipeAdder.reAddBlastRecipe(GGMaterial.signalium, 1600, 30720, 4000, true);
CrackRecipeAdder.reAddBlastRecipe(GGMaterial.lumiium, 1600, 30720, 4000, true);
CrackRecipeAdder.reAddBlastRecipe(GGMaterial.artheriumSn, 500, 122880, 6500, true);
@@ -1334,6 +1332,7 @@ public class RecipeLoader2 {
GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.Osmiridium, 2),
GGMaterial.marM200.get(OrePrefixes.plateDouble, 2),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1),
+
MaterialsElements.getInstance().RUTHENIUM.getBolt(32),
GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 8))
.fluidInputs(GGMaterial.zircaloy4.getMolten(576))
diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java
index 25c945f9fe..065a01b223 100644
--- a/src/main/java/goodgenerator/util/MaterialFix.java
+++ b/src/main/java/goodgenerator/util/MaterialFix.java
@@ -3,7 +3,6 @@ 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.recipe.RecipeMaps.hammerRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
@@ -317,12 +316,5 @@ public class MaterialFix {
.addTo(benderRecipes);
}
}
- Materials tUHV = Materials.Longasssuperconductornameforuhvwire;
- GTValues.RA.stdBuilder()
- .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, tUHV, 2))
- .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1))
- .duration(Math.max(tUHV.getMass(), 1L) * TICKS)
- .eut(TierEU.RECIPE_LV / 2)
- .addTo(hammerRecipes);
}
}
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 9b60b6846a..95463122f1 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -382,8 +382,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials Nano = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Nano" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 11)));
public static Materials Piko = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Piko" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 12)));
- public static Materials Quantum = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Quantum" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 13)));
-
/**
* Aliases for the old style of tiered circuits
diff --git a/src/main/java/gregtech/api/enums/MaterialsGTNH.java b/src/main/java/gregtech/api/enums/MaterialsGTNH.java
index 12a53f6b86..8a3b7f9660 100644
--- a/src/main/java/gregtech/api/enums/MaterialsGTNH.java
+++ b/src/main/java/gregtech/api/enums/MaterialsGTNH.java
@@ -199,29 +199,6 @@ public class MaterialsGTNH implements IMaterialHandler {
1,
1,
Dyes.dyeYellow);
- public static Materials Quantum = new Materials(
- -1,
- TextureSet.SET_NONE,
- 1.0F,
- 0,
- 0,
- 0,
- 255,
- 255,
- 255,
- 0,
- "Quantum",
- "Quantum",
- 0,
- 0,
- -1,
- 0,
- false,
- false,
- 1,
- 1,
- 1,
- Dyes.dyeWhite);
public static Materials Turquoise = new Materials(
-1,
TextureSet.SET_NONE,
diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java
index 77e49e37c7..197c15875d 100644
--- a/src/main/java/gregtech/api/recipe/RecipeMaps.java
+++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java
@@ -676,10 +676,6 @@ public final class RecipeMaps {
.setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount))
.setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount))
.setDuration(aDuration * 10);
- coll.derive()
- .setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount))
- .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount))
- .setDuration(aDuration * 10);
}
if (Railcraft.isModLoaded()) {
coll.derive()
@@ -794,7 +790,6 @@ public final class RecipeMaps {
public static final RecipeMap<RecipeMapBackend> chemicalReactorRecipes = RecipeMapBuilder
.of("gt.recipe.chemicalreactor")
.maxIO(2, 2, 1, 1)
- .minInputs(1, 0)
.slotOverlays((index, isFluid, isOutput, isSpecial) -> {
if (isFluid) {
if (isOutput) {
diff --git a/src/main/java/gregtech/api/util/GTForestryCompat.java b/src/main/java/gregtech/api/util/GTForestryCompat.java
index 379604205a..ca61c955c7 100644
--- a/src/main/java/gregtech/api/util/GTForestryCompat.java
+++ b/src/main/java/gregtech/api/util/GTForestryCompat.java
@@ -1,6 +1,5 @@
package gregtech.api.util;
-import static gregtech.api.recipe.RecipeMaps.centrifugeNonCellRecipes;
import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
import static gregtech.api.recipe.RecipeMaps.scannerFakeRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
@@ -16,6 +15,7 @@ import forestry.api.recipes.RecipeManagers;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
import gregtech.api.recipe.RecipeMaps;
public class GTForestryCompat {
@@ -132,8 +132,16 @@ public class GTForestryCompat {
}
public static void transferCentrifugeRecipes() {
+ ItemStack irradiatedComb = GTModHandler.getModItem(Mods.Forestry.ID, "beeCombs", 1, 9);
+
try {
for (ICentrifugeRecipe tRecipe : RecipeManagers.centrifugeManager.recipes()) {
+ ItemStack input = tRecipe.getInput();
+
+ // Don't transfer GT recipes to centrifuge, those recipes are made already by ItemComb
+ if (input.getUnlocalizedName()
+ .contains("gt.comb")) continue;
+ if (irradiatedComb != null && input.isItemEqual(irradiatedComb)) continue;
Map<ItemStack, Float> outputs = tRecipe.getAllProducts();
ItemStack[] tOutputs = new ItemStack[outputs.size()];
int[] tChances = new int[outputs.size()];
@@ -151,14 +159,6 @@ public class GTForestryCompat {
.duration(6 * SECONDS + 8 * TICKS)
.eut(5)
.addTo(centrifugeRecipes);
-
- GTValues.RA.stdBuilder()
- .itemInputs(tRecipe.getInput())
- .itemOutputs(tOutputs)
- .outputChances(tChances)
- .duration(6 * SECONDS + 8 * TICKS)
- .eut(5)
- .addTo(centrifugeNonCellRecipes);
}