Skip to content
This repository has been archived by the owner on Mar 8, 2024. It is now read-only.

Commit

Permalink
fix industry frame and plat block (#385)
Browse files Browse the repository at this point in the history
  • Loading branch information
chochem authored Dec 29, 2023
1 parent 73a9186 commit 7583256
Showing 1 changed file with 15 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
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;
Expand Down Expand Up @@ -940,9 +941,20 @@ private static boolean isInBlackList(ItemStack stack) {
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);
}
Expand Down

0 comments on commit 7583256

Please sign in to comment.