From 09238b09eff8abdd6712ade20dcea596dbc29a85 Mon Sep 17 00:00:00 2001 From: __felix__ <134875831+felixfour@users.noreply.github.com> Date: Thu, 24 Apr 2025 18:19:59 -0400 Subject: [PATCH] Change hazmat Optional decorators' modid from `gregtech` to `gregtech_nh` to add gt6 compat (#191) Co-authored-by: __felix__ <134875831+48a3efa65c881ef567345b17f3910e06@users.noreply.github.com> --- src/main/java/crazypants/enderio/EnderIO.java | 2 +- .../crazypants/enderio/item/darksteel/ItemEndSteelArmor.java | 4 ++-- .../crazypants/enderio/item/darksteel/ItemStellarArmor.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 9531f51b..962489eb 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -208,7 +208,7 @@ public class EnderIO { public static final Lang lang = new Lang("enderio"); public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify"); - public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post"); + public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi"); // Materials public static ItemCapacitor itemBasicCapacitor; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java index 9ce9b586..312af06d 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java @@ -17,7 +17,7 @@ import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; import gregtech.api.hazards.Hazard; import gregtech.api.hazards.IHazardProtector; -@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") }) +@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") }) public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelItem, IHazardProtector { public static final ArmorMaterial MATERIAL = EnumHelper @@ -83,7 +83,7 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt } /// GT5 Hazmat protection - @Optional.Method(modid = "gregtech") + @Optional.Method(modid = "gregtech_nh") @Override public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { return true; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java index cc36d3a9..9e89db40 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java @@ -17,7 +17,7 @@ import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; import gregtech.api.hazards.Hazard; import gregtech.api.hazards.IHazardProtector; -@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") }) +@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") }) public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem, IHazardProtector { public static final ArmorMaterial MATERIAL = EnumHelper @@ -84,7 +84,7 @@ public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem } /// GT5 Hazmat protection - @Optional.Method(modid = "gregtech") + @Optional.Method(modid = "gregtech_nh") @Override public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { return true;