So, so, so many collisions (#3278)

4 files changed, 9 insertions, 39 deletions

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);
             }
         } catch (Throwable e) {
             if (GTValues.D1) {