Skip to content

Commit 725872e

Browse files
Move Primordial Armor to GT Hazard API (#69)
1 parent d6a6f12 commit 725872e

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
// we don't want the old Baubles Messing stuff up so lets disable that
1111
exclude module: "Baubles"
1212
}
13-
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.176:dev') {exclude module: "Baubles" }
13+
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.227:dev') {exclude module: "Baubles" }
1414
implementation('com.github.GTNewHorizons:ForbiddenMagic:0.8.0-GTNH:dev') {exclude module: "Baubles" }
1515
implementation('com.github.GTNewHorizons:twilightforest:2.7.5:dev')
1616
implementation('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}

src/main/java/witchinggadgets/common/items/armor/ItemPrimordialArmor.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
3636
import cpw.mods.fml.relauncher.Side;
3737
import cpw.mods.fml.relauncher.SideOnly;
38+
import gregtech.api.hazards.Hazard;
39+
import gregtech.api.hazards.IHazardProtector;
3840
import taintedmagic.common.items.equipment.ItemShadowFortressArmor;
3941
import thaumcraft.api.IRunicArmor;
4042
import thaumcraft.api.aspects.Aspect;
@@ -50,9 +52,10 @@
5052
import witchinggadgets.common.items.tools.IPrimordialGear;
5153
import witchinggadgets.common.util.Lib;
5254

53-
@Optional.Interface(iface = "thaumicboots.api.IBoots", modid = "thaumicboots")
55+
@Optional.InterfaceList({ @Optional.Interface(iface = "thaumicboots.api.IBoots", modid = "thaumicboots"),
56+
@Optional.Interface(iface = "gregtech.api.hazards.IHazardProtector", modid = "gregtech") })
5457
public class ItemPrimordialArmor extends ItemShadowFortressArmor
55-
implements IPrimordialCrafting, IPrimordialGear, IRunicArmor, IItemEvent, IBoots {
58+
implements IPrimordialCrafting, IPrimordialGear, IRunicArmor, IItemEvent, IBoots, IHazardProtector {
5659

5760
enum FlightStatus {
5861
ON,
@@ -597,4 +600,10 @@ public int getArmorDisplay(EntityPlayer p, ItemStack s, int slot) {
597600

598601
@Override
599602
public void onUserTargeted(LivingSetAttackTargetEvent event, ItemStack stack) {}
603+
604+
@Override
605+
@Optional.Method(modid = "gregtech")
606+
public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) {
607+
return true;
608+
}
600609
}

0 commit comments

Comments
 (0)