added Runic Armor for:

- The One Ring
- Inventory Charger/Decharger Ring
- Thaumic/Electric Armor
- Wings
This commit is contained in:
bartimaeusnek committed 2018-09-20 20:34:57 +02:00
1 parent 80cb4c94d6
commit 6ec2fe0d3d
7 files changed
+41 -6

No files matched your search

+7 -1
View File
@@ -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;
}
}
+6 -1
View File
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}