diff --git a/libs/gregtech-5.09.32pre4-deobfs.jar b/libs/gregtech-5.09.32pre4-deobfs.jar new file mode 100644 index 0000000..0fa5f7c Binary files /dev/null and b/libs/gregtech-5.09.32pre4-deobfs.jar differ diff --git a/src/main/java/emt/item/ItemIC2Baubles.java b/src/main/java/emt/item/ItemIC2Baubles.java index f1faa77..7de1a73 100644 --- a/src/main/java/emt/item/ItemIC2Baubles.java +++ b/src/main/java/emt/item/ItemIC2Baubles.java @@ -15,11 +15,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import thaumcraft.api.IRunicArmor; import java.util.List; import java.util.Random; -public class ItemIC2Baubles extends ItemBase implements IBauble { +public class ItemIC2Baubles extends ItemBase implements IBauble, IRunicArmor { public IIcon[] icon = new IIcon[16]; public static int wornTick; @@ -133,4 +134,9 @@ public class ItemIC2Baubles extends ItemBase implements IBauble { public boolean canUnequip(ItemStack stack, EntityLivingBase player) { return true; } + + @Override + public int getRunicCharge(ItemStack itemStack) { + return 0; + } } diff --git a/src/main/java/emt/item/ItemOneRing.java b/src/main/java/emt/item/ItemOneRing.java index e9c9a17..8e4b8ec 100644 --- a/src/main/java/emt/item/ItemOneRing.java +++ b/src/main/java/emt/item/ItemOneRing.java @@ -17,12 +17,13 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; +import thaumcraft.api.IRunicArmor; import thaumcraft.api.IWarpingGear; import java.util.List; import java.util.Random; -public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear +public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRunicArmor { private static final String NBT_TAG_FORGE_DATA = "EMT"; private static final String NBT_TAG_MIND_CORRUPTION = "MindCorruption"; @@ -238,5 +239,9 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear return tRet; } + @Override + public int getRunicCharge(ItemStack itemStack) { + return 0; + } } diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index 5f4abab..30ddeb8 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -23,13 +23,14 @@ import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingFallEvent; +import thaumcraft.api.IRunicArmor; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.Thaumcraft; import java.util.List; -public class ItemElectricBootsTraveller extends ItemArmor implements IElectricItem, IVisDiscountGear, IMetalArmor, ISpecialArmor { +public class ItemElectricBootsTraveller extends ItemArmor implements IRunicArmor, IElectricItem, IVisDiscountGear, IMetalArmor, ISpecialArmor { public int maxCharge = 100000; public int energyPerDamage = 1000; @@ -253,4 +254,9 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IElectricIt public Item getEmptyItem(ItemStack itemStack) { return this; } + + @Override + public int getRunicCharge(ItemStack itemStack) { + return 0; + } } diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 8cd7ae2..bf75c01 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -36,8 +36,9 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingFallEvent; +import thaumcraft.api.IRunicArmor; -public class ItemInfusedQuantumChestplate extends ItemArmorElectric { +public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements IRunicArmor { public final byte NONE = 0; public final byte JETPACK = 1; @@ -540,4 +541,9 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric { player.fallDistance = 0; } } + + @Override + public int getRunicCharge(ItemStack itemStack) { + return 0; + } } \ No newline at end of file diff --git a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java index c2be109..bdd043d 100644 --- a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java @@ -20,13 +20,14 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import thaumcraft.api.IGoggles; +import thaumcraft.api.IRunicArmor; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.nodes.IRevealer; import java.util.List; -public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVisDiscountGear, IGoggles, IRevealer, IMetalArmor, ISpecialArmor { +public class ItemElectricGoggles extends ItemArmor implements IRunicArmor, IElectricItem, IVisDiscountGear, IGoggles, IRevealer, IMetalArmor, ISpecialArmor { public double maxCharge = 100000; public double transferLimit = 100; @@ -189,4 +190,9 @@ public class ItemElectricGoggles extends ItemArmor implements IElectricItem, IVi public Item getEmptyItem(ItemStack itemStack) { return this; } + + @Override + public int getRunicCharge(ItemStack itemStack) { + return 0; + } } diff --git a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java index 540f353..60bf82a 100644 --- a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -17,8 +17,9 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import thaumcraft.api.IRunicArmor; -public class ItemFeatherWing extends ItemArmor { +public class ItemFeatherWing extends ItemArmor implements IRunicArmor { public int visDiscount = 0; public ItemFeatherWing(ArmorMaterial material, int par3, int par4) { @@ -114,4 +115,9 @@ public class ItemFeatherWing extends ItemArmor { player.motionY *= 0.6; } } + + @Override + public int getRunicCharge(ItemStack itemStack) { + return 0; + } }