aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-10-19 15:05:23 -0400
committerGitHub <noreply@github.com>2024-10-19 21:05:23 +0200
commit5d0499bf2f9fbc4dd292e542ed546826d0375681 (patch)
treeadd4255adefbc2141a3551ae056dad93d09b4855 /src/main
parentc9727addbf5275c5847408ee26030126ace2ad9b (diff)
downloadGT5-Unofficial-5d0499bf2f9fbc4dd292e542ed546826d0375681.tar.gz
GT5-Unofficial-5d0499bf2f9fbc4dd292e542ed546826d0375681.tar.bz2
GT5-Unofficial-5d0499bf2f9fbc4dd292e542ed546826d0375681.zip
Fix DOB comb (#3388)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/util/GTForestryCompat.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GTForestryCompat.java b/src/main/java/gregtech/api/util/GTForestryCompat.java
index 58045596c4..a593410f81 100644
--- a/src/main/java/gregtech/api/util/GTForestryCompat.java
+++ b/src/main/java/gregtech/api/util/GTForestryCompat.java
@@ -19,6 +19,8 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Mods;
import gregtech.api.recipe.RecipeMaps;
+import gregtech.common.items.CombType;
+import gregtech.loaders.misc.GTBees;
public class GTForestryCompat {
@@ -134,7 +136,9 @@ public class GTForestryCompat {
}
public static void transferCentrifugeRecipes() {
+ // Dumb exceptions
ItemStack irradiatedComb = GTModHandler.getModItem(Mods.Forestry.ID, "beeCombs", 1, 9);
+ ItemStack DOBComb = GTBees.combs.getStackForType(CombType.DOB);
try {
for (ICentrifugeRecipe tRecipe : RecipeManagers.centrifugeManager.recipes()) {
@@ -142,7 +146,7 @@ public class GTForestryCompat {
// Don't transfer GT recipes to centrifuge, those recipes are made already by ItemComb
if (input.getUnlocalizedName()
- .contains("gt.comb")) continue;
+ .contains("gt.comb") && !input.isItemEqual(DOBComb)) continue;
if (irradiatedComb != null && input.isItemEqual(irradiatedComb)) continue;
Map<ItemStack, Float> outputs = tRecipe.getAllProducts();
ItemStack[] tOutputs = new ItemStack[outputs.size()];