Merge remote-tracking branch 'origin/hazmat-protecting-bound-armor' into dev

This commit is contained in:
Martin Robertz committed 2025-12-09 15:09:01 +01:00
commit 522ca71ef7
2 files changed
+14 -3

No files matched your search

+1
View File
@@ -25,6 +25,7 @@
dependencies {
api("com.github.GTNewHorizons:waila:1.9.2:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.8.15-GTNH:dev")
api("com.github.GTNewHorizons:GTNHLib:0.7.0:dev")
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.45:dev") {transitive = false }
@@ -33,6 +33,8 @@ import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.hazards.Hazard;
import gregtech.api.hazards.IHazardProtector;
import thaumcraft.api.IGoggles;
import thaumcraft.api.IRunicArmor;
import thaumcraft.api.nodes.IRevealer;
@@ -40,9 +42,10 @@ import thaumcraft.api.nodes.IRevealer;
@Optional.InterfaceList(
value = { @Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"),
@Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"),
@Interface(iface = "thaumcraft.api.IRunicArmor", modid = "Thaumcraft") })
public class BoundArmour extends ItemArmor
implements IAlchemyGoggles, ISpecialArmor, IBindable, IRevealer, IGoggles, IRunicArmor, ILPGauge {
@Interface(iface = "thaumcraft.api.IRunicArmor", modid = "Thaumcraft"),
@Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech_nh") })
public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialArmor, IBindable, IRevealer, IGoggles,
IRunicArmor, ILPGauge, IHazardProtector {
private static int invSize = 9;
@@ -751,4 +754,11 @@ public class BoundArmour extends ItemArmor
return false;
}
/// GT5 Hazmat protection
@Optional.Method(modid = "gregtech_nh")
@Override
public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) {
return true;
}
}