From 8c7481597d1503e39e769636631b5a44e28112f1 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:35:56 +0100 Subject: fix industry frame and plat block (#385) Former-commit-id: 7633e42f57b250d04876ac63a936dcc08fae5c31 --- .../GT_Enhancement/PlatinumSludgeOverHaul.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java index 15b83fb6ff..097e82f5e1 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java @@ -58,6 +58,7 @@ import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Sodiumsulfate; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.ZincSulfate; import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.OrePrefixes.cell; import static gregtech.api.enums.OrePrefixes.crateGtDust; @@ -940,9 +941,20 @@ public class PlatinumSludgeOverHaul { e.printStackTrace(); } } - - if (!BW_Util.checkStackAndPrefix(stack)) return false; - + if (GalaxySpace.isModLoaded()) { + if (stack.getItem() == GT_ModHandler.getModItem(GalaxySpace.ID, "metalsblock", 1L, 7).getItem()) { + return true; + } + } + if (NewHorizonsCoreMod.isModLoaded()) { + if (stack.getItem() + == GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IndustryFrame", 1L).getItem()) { + return true; + } + } + if (!BW_Util.checkStackAndPrefix(stack)) { + return false; + } return Arrays.asList(PlatinumSludgeOverHaul.BLACKLIST) .contains(GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial); } -- cgit