diff --git a/dependencies.gradle b/dependencies.gradle index f10989d3..62f304a3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -12,7 +12,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:waila:1.8.4:api') {transitive = false} compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-554-GTNH:api') {transitive = false} compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.189:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.227:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.6-1.7.10:dev") {transitive = false} compileOnly('com.github.GTNewHorizons:Railcraft:9.16.7:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.0-GTNH:api') {transitive = false} diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java index 620b87dc..9ce9b586 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java @@ -8,13 +8,17 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.EnumHelper; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; +import gregtech.api.hazards.Hazard; +import gregtech.api.hazards.IHazardProtector; -public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelItem { +@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") }) +public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelItem, IHazardProtector { public static final ArmorMaterial MATERIAL = EnumHelper .addArmorMaterial("endSteel", 50, new int[] { 4, 7, 10, 5 }, 25); @@ -77,4 +81,11 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt par3List.add(is); } + + /// GT5 Hazmat protection + @Optional.Method(modid = "gregtech") + @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 4ad1d9a2..cc36d3a9 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java @@ -8,13 +8,17 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.EnumHelper; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; +import gregtech.api.hazards.Hazard; +import gregtech.api.hazards.IHazardProtector; -public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem { +@Optional.InterfaceList({ @Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") }) +public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem, IHazardProtector { public static final ArmorMaterial MATERIAL = EnumHelper .addArmorMaterial("stellarAlloy", 75, new int[] { 8, 14, 18, 7 }, 25); @@ -78,4 +82,11 @@ public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem par3List.add(is); } + + /// GT5 Hazmat protection + @Optional.Method(modid = "gregtech") + @Override + public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { + return true; + } }