mirror of
https://github.com/GTNewHorizons/Tainted-Magic.git
synced 2026-11-19 19:49:35 +00:00
Cleanup, text fixes, and Voidmetal Goggles of Revealing
This commit is contained in:
1 parent
3d3326c5ec
commit
d0c9d9fd80
14 files changed
+113
-14
No files matched your search
@@ -0,0 +1,67 @@
|
||||
package taintedmagic.common.items.equipment;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.ItemArmor.ArmorMaterial;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import taintedmagic.common.TaintedMagic;
|
||||
import thaumcraft.api.IWarpingGear;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.common.items.armor.ItemGoggles;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemVoidmetalGoggles extends ItemGoggles implements IWarpingGear
|
||||
{
|
||||
public ItemVoidmetalGoggles (ArmorMaterial m, int j, int k)
|
||||
{
|
||||
super(m, j, k);
|
||||
this.setMaxDamage(250);
|
||||
this.setCreativeTab(TaintedMagic.tabTaintedMagic);
|
||||
this.setUnlocalizedName("ItemVoidmetalGoggles");
|
||||
}
|
||||
|
||||
@SideOnly (Side.CLIENT)
|
||||
public void registerIcons (IIconRegister ir)
|
||||
{
|
||||
this.icon = ir.registerIcon("taintedmagic:ItemVoidmetalGoggles");
|
||||
}
|
||||
|
||||
public String getArmorTexture (ItemStack s, Entity e, int slot, String type)
|
||||
{
|
||||
return "taintedmagic:textures/models/ModelVoidmetalGoggles.png";
|
||||
}
|
||||
|
||||
public EnumRarity getRarity (ItemStack s)
|
||||
{
|
||||
return EnumRarity.rare;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getWarp (ItemStack s, EntityPlayer p)
|
||||
{
|
||||
return 5;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getVisDiscount (ItemStack stack, EntityPlayer player, Aspect aspect)
|
||||
{
|
||||
return 10;
|
||||
}
|
||||
|
||||
public void onUpdate (ItemStack s, World w, Entity e, int j, boolean k)
|
||||
{
|
||||
super.onUpdate(s, w, e, j, k);
|
||||
if (!w.isRemote && s.isItemDamaged() && e.ticksExisted % 20 == 0 && e instanceof EntityLivingBase) s.damageItem(-1, (EntityLivingBase) e);
|
||||
}
|
||||
|
||||
public void onArmorTick (World w, EntityPlayer p, ItemStack s)
|
||||
{
|
||||
super.onArmorTick(w, p, s);
|
||||
if (!w.isRemote && s.getItemDamage() > 0 && p.ticksExisted % 20 == 0) s.damageItem(-1, p);
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
@@ -16,12 +17,14 @@ import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import taintedmagic.common.TaintedMagic;
|
||||
import taintedmagic.common.registry.ItemRegistry;
|
||||
import thaumcraft.api.IGoggles;
|
||||
import thaumcraft.api.IRepairable;
|
||||
import thaumcraft.api.IVisDiscountGear;
|
||||
import thaumcraft.api.IWarpingGear;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.nodes.IRevealer;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.items.armor.ItemGoggles;
|
||||
|
||||
public class ItemWarpedGoggles extends ItemGoggles implements IWarpingGear
|
||||
@@ -47,7 +50,7 @@ public class ItemWarpedGoggles extends ItemGoggles implements IWarpingGear
|
||||
|
||||
public EnumRarity getRarity (ItemStack s)
|
||||
{
|
||||
return EnumRarity.uncommon;
|
||||
return EnumRarity.rare;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -55,4 +58,9 @@ public class ItemWarpedGoggles extends ItemGoggles implements IWarpingGear
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
public boolean getIsRepairable (ItemStack s, ItemStack s2)
|
||||
{
|
||||
return (s2.isItemEqual(new ItemStack(ItemRegistry.ItemMaterial)) && s2.getItemDamage() == 0) ? true : super.getIsRepairable(s, s2);
|
||||
}
|
||||
}
|
||||
@@ -156,10 +156,10 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable
|
||||
}
|
||||
|
||||
@SideOnly (Side.CLIENT)
|
||||
public void getSubItems (Item item, CreativeTabs c, List l)
|
||||
public void getSubItems (Item i, CreativeTabs c, List l)
|
||||
{
|
||||
for (int i = 0; i < SUBTYPES; i++)
|
||||
l.add(new ItemStack(this, 1, i));
|
||||
for (int a = 0; a < SUBTYPES; a++)
|
||||
l.add(new ItemStack(this, 1, a));
|
||||
}
|
||||
|
||||
public String getUnlocalizedName (ItemStack s)
|
||||
|
||||
@@ -473,7 +473,7 @@ public class LibRecipes
|
||||
ItemApi.getItem("itemShard", 6),
|
||||
new ItemStack(Blocks.tnt),
|
||||
ItemApi.getItem("itemWispEssence", 0) }));
|
||||
|
||||
|
||||
ResearchRegistry.recipes.put("ItemKatana:inscription0", ThaumcraftApi.addInfusionCraftingRecipe("INSCRIPTIONFIRE", new Object[]{
|
||||
"inscription",
|
||||
new NBTTagInt(0) }, 8, new AspectList().add(Aspect.FIRE, 64).add(Aspect.LIGHT, 64).add(Aspect.METAL, 16), new ItemStack(ItemRegistry.ItemKatana, 1, 32767), new ItemStack[]{
|
||||
@@ -503,6 +503,13 @@ public class LibRecipes
|
||||
ItemApi.getItem("itemShard", 6),
|
||||
new ItemStack(Blocks.tnt),
|
||||
ItemApi.getItem("itemWispEssence", 0) }));
|
||||
|
||||
ResearchRegistry.recipes.put("ItemVoidmetalGoggles", ThaumcraftApi.addInfusionCraftingRecipe("VOIDGOGGLES", new ItemStack(ItemRegistry.ItemVoidmetalGoggles), 5, new AspectList().add(Aspect.VOID, 42).add(Aspect.SENSES, 38).add(Aspect.DARKNESS, 16).add(Aspect.CRYSTAL, 6).add(Aspect.ARMOR, 24), new ItemStack(ItemRegistry.ItemWarpedGoggles, 1, 32767), new ItemStack[]{
|
||||
new ItemStack(ConfigItems.itemResource, 1, 16),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 16),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 7),
|
||||
new ItemStack(ConfigItems.itemResource, 1, 7),
|
||||
new ItemStack(ConfigItems.itemShard, 1, 6) }));
|
||||
}
|
||||
|
||||
public static void initArcane ()
|
||||
|
||||
@@ -2,9 +2,8 @@ package taintedmagic.common.lib;
|
||||
|
||||
public class LibStrings
|
||||
{
|
||||
// LibStrings
|
||||
public static final String MODID = "TaintedMagic";
|
||||
public static final String NAME = "Tainted Magic";
|
||||
public static final String VERSION = "r7.2";
|
||||
public static final String VERSION = "r7.3";
|
||||
public static final String DEPENDENCIES = "required-after:Forge@[10.13.2.1291,);required-after:Thaumcraft@[4.2.3.5,);after:ThaumicTinkerer";
|
||||
}
|
||||
@@ -15,7 +15,7 @@ public class LibToolMaterials
|
||||
8,
|
||||
6,
|
||||
2 }, 25);
|
||||
public static ArmorMaterial armorMatSpecial = EnumHelper.addArmorMaterial("SPECIAL", 250, new int[]{
|
||||
public static ArmorMaterial armorMatSpecial = EnumHelper.addArmorMaterial("SPECIAL", 500, new int[]{
|
||||
4,
|
||||
6,
|
||||
6,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package taintedmagic.common.registry;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor.ArmorMaterial;
|
||||
import net.minecraft.item.ItemAxe;
|
||||
import net.minecraft.item.ItemHoe;
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
@@ -14,6 +15,7 @@ import taintedmagic.common.items.ItemMaterial;
|
||||
import taintedmagic.common.items.ItemVoidsentBlood;
|
||||
import taintedmagic.common.items.equipment.ItemShadowFortressArmor;
|
||||
import taintedmagic.common.items.equipment.ItemVoidFortressArmor;
|
||||
import taintedmagic.common.items.equipment.ItemVoidmetalGoggles;
|
||||
import taintedmagic.common.items.equipment.ItemVoidwalkerBoots;
|
||||
import taintedmagic.common.items.equipment.ItemVoidwalkerSash;
|
||||
import taintedmagic.common.items.equipment.ItemWarpedGoggles;
|
||||
@@ -81,6 +83,9 @@ public class ItemRegistry
|
||||
ItemShadowFortressLeggings = new ItemShadowFortressArmor(LibToolMaterials.armorMatShadowFortress, 4, 2).setUnlocalizedName("ItemShadowFortressLeggings");
|
||||
GameRegistry.registerItem(ItemShadowFortressLeggings, "ItemShadowFortressLeggings");
|
||||
|
||||
ItemVoidmetalGoggles = new ItemVoidmetalGoggles(ArmorMaterial.IRON, 4, 0);
|
||||
GameRegistry.registerItem(ItemVoidmetalGoggles, "ItemVoidmetalGoggles");
|
||||
|
||||
// Wands and Staves
|
||||
ItemWandRod = new ItemWandRod();
|
||||
GameRegistry.registerItem(ItemWandRod, "ItemWandRod");
|
||||
@@ -195,6 +200,7 @@ public class ItemRegistry
|
||||
|
||||
// Armor and Baubles
|
||||
public static Item ItemWarpedGoggles;
|
||||
public static Item ItemVoidmetalGoggles;
|
||||
|
||||
public static Item ItemVoidwalkerBoots;
|
||||
public static Item ItemVoidwalkerSash;
|
||||
|
||||
@@ -295,5 +295,10 @@ public class ResearchRegistry
|
||||
new TaintedMagicResearchItem("INSCRIPTIONWIND", TM, new AspectList().add(Aspect.AIR, 8).add(Aspect.MOTION, 4).add(Aspect.METAL, 6), 8, 3, 0, new ResourceLocation("taintedmagic:textures/misc/IconINSCRIPTIONWIND.png")).setParents("THAUMIUMKATANA").setConcealed().setPages(new ResearchPage[]{
|
||||
new ResearchPage("1"),
|
||||
new ResearchPage((InfusionRecipe) recipes.get("ItemKatanaThaumium:inscription2")) }).setSecondary().registerResearchItem();
|
||||
|
||||
new TaintedMagicResearchItem("VOIDGOGGLES", TM, new AspectList().add(Aspect.VOID, 8).add(Aspect.DARKNESS, 4).add(Aspect.MAGIC, 6).add(Aspect.SENSES, 12).add(Aspect.CRYSTAL, 2), 3, 5, 0, new ItemStack(ItemRegistry.ItemVoidmetalGoggles)).setParents("WARPEDGOGGLES").setParentsHidden("VOIDMETAL").setConcealed().setPages(new ResearchPage[]{
|
||||
new ResearchPage("1"),
|
||||
new ResearchPage((InfusionRecipe) recipes.get("ItemVoidmetalGoggles")) }).setSecondary().registerResearchItem();
|
||||
ThaumcraftApi.addWarpToResearch("VOIDGOGGLES", 2);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user