From 0650072b85e485cdbc80666c5991b43a0d7fd81e Mon Sep 17 00:00:00 2001 From: __felix__ <134875831+felixfour@users.noreply.github.com> Date: Wed, 23 Apr 2025 15:48:01 -0400 Subject: [PATCH] Change optional decorator modid from `gregtech` to `gregtech_nh` for gt6 compat (#92) Co-authored-by: __felix__ <134875831+48a3efa65c881ef567345b17f3910e06@users.noreply.github.com> --- .../java/emt/item/armor/boots/ItemNanoBootsTraveller.java | 4 ++-- .../java/emt/item/armor/boots/ItemQuantumBootsTraveller.java | 4 ++-- .../item/armor/chestplate/ItemInfusedQuantumChestplate.java | 4 ++-- src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java | 4 ++-- src/main/java/emt/item/armor/wings/ItemNanoWing.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java index 208fa84..9f60426 100644 --- a/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java @@ -12,7 +12,7 @@ import emt.util.EMTConfigHandler; import gregtech.api.hazards.Hazard; import gregtech.api.hazards.IHazardProtector; -@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") +@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller implements IHazardProtector { public ItemNanoBootsTraveller(ArmorMaterial material, int par3, int par4) { @@ -57,7 +57,7 @@ public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller implement } @Override - @Optional.Method(modid = "gregtech") + @Optional.Method(modid = "gregtech_nh") public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { return true; } diff --git a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java index 4aa4263..6149537 100644 --- a/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java @@ -12,7 +12,7 @@ import emt.util.EMTConfigHandler; import gregtech.api.hazards.Hazard; import gregtech.api.hazards.IHazardProtector; -@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") +@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller implements IHazardProtector { public ItemQuantumBootsTraveller(ArmorMaterial material, int par3, int par4) { @@ -57,7 +57,7 @@ public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller implem } @Override - @Optional.Method(modid = "gregtech") + @Optional.Method(modid = "gregtech_nh") public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { return true; } diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 9f78616..ee8ca8b 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -41,7 +41,7 @@ import ic2.core.item.armor.ItemArmorElectric; import ic2.core.util.StackUtil; import thaumcraft.api.IRunicArmor; -@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") +@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements IRunicArmor, IHazardProtector { public static AudioSource audioSource; @@ -570,7 +570,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I } @Override - @Optional.Method(modid = "gregtech") + @Optional.Method(modid = "gregtech_nh") public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { return true; } diff --git a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java index 7bdcc70..6f4c98c 100644 --- a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java @@ -14,7 +14,7 @@ import gregtech.api.hazards.Hazard; import gregtech.api.hazards.IHazardProtector; import ic2.api.item.IC2Items; -@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") +@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") public class ItemNanoGoggles extends ItemElectricGoggles implements IHazardProtector { public ItemNanoGoggles(ArmorMaterial material, int renderIndex, int armorType) { @@ -56,7 +56,7 @@ public class ItemNanoGoggles extends ItemElectricGoggles implements IHazardProte } @Override - @Optional.Method(modid = "gregtech") + @Optional.Method(modid = "gregtech_nh") public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { return true; } diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 6d664f7..b4e5c72 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -25,7 +25,7 @@ import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IMetalArmor; -@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") +@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectricItem, ISpecialArmor, IMetalArmor, IHazardProtector { @@ -183,7 +183,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing } @Override - @Optional.Method(modid = "gregtech") + @Optional.Method(modid = "gregtech_nh") public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { return true; }