diff --git a/build.properties b/build.properties
index 98567a3..fbe22bf 100644
--- a/build.properties
+++ b/build.properties
@@ -1,3 +1,3 @@
-mod_version=r7.2
+mod_version=r7.3
mod_name=Tainted-Magic
minecraft_version=1.7.10
\ No newline at end of file
diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java
new file mode 100644
index 0000000..2c4345a
--- /dev/null
+++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java
@@ -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);
+ }
+}
diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java b/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java
index 0e794a0..649d712 100644
--- a/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java
+++ b/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java
@@ -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);
+ }
}
diff --git a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java
index 0507550..c8b6bca 100644
--- a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java
+++ b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java
@@ -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)
diff --git a/src/main/java/taintedmagic/common/lib/LibRecipes.java b/src/main/java/taintedmagic/common/lib/LibRecipes.java
index 8963614..a97dbba 100644
--- a/src/main/java/taintedmagic/common/lib/LibRecipes.java
+++ b/src/main/java/taintedmagic/common/lib/LibRecipes.java
@@ -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 ()
diff --git a/src/main/java/taintedmagic/common/lib/LibStrings.java b/src/main/java/taintedmagic/common/lib/LibStrings.java
index d948759..e75e22e 100644
--- a/src/main/java/taintedmagic/common/lib/LibStrings.java
+++ b/src/main/java/taintedmagic/common/lib/LibStrings.java
@@ -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";
}
diff --git a/src/main/java/taintedmagic/common/lib/LibToolMaterials.java b/src/main/java/taintedmagic/common/lib/LibToolMaterials.java
index 4912cb4..6850aac 100644
--- a/src/main/java/taintedmagic/common/lib/LibToolMaterials.java
+++ b/src/main/java/taintedmagic/common/lib/LibToolMaterials.java
@@ -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,
diff --git a/src/main/java/taintedmagic/common/registry/ItemRegistry.java b/src/main/java/taintedmagic/common/registry/ItemRegistry.java
index 7e44973..0b98433 100644
--- a/src/main/java/taintedmagic/common/registry/ItemRegistry.java
+++ b/src/main/java/taintedmagic/common/registry/ItemRegistry.java
@@ -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;
diff --git a/src/main/java/taintedmagic/common/registry/ResearchRegistry.java b/src/main/java/taintedmagic/common/registry/ResearchRegistry.java
index 8b060c5..db3cd07 100644
--- a/src/main/java/taintedmagic/common/registry/ResearchRegistry.java
+++ b/src/main/java/taintedmagic/common/registry/ResearchRegistry.java
@@ -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);
}
}
diff --git a/src/main/resources/assets/taintedmagic/lang/en_US.lang b/src/main/resources/assets/taintedmagic/lang/en_US.lang
index 9c873ac..f0d9cdb 100644
--- a/src/main/resources/assets/taintedmagic/lang/en_US.lang
+++ b/src/main/resources/assets/taintedmagic/lang/en_US.lang
@@ -67,6 +67,7 @@ text.sash.mode=Speed boost:
item.ItemVoidwalkerBoots.name=Boots of the Voidwalker
item.ItemWarpedGoggles.name=Warped Goggles of Revealing
+item.ItemVoidmetalGoggles.name=Voidmetal Goggles of Revealing
item.ItemKatana.0.name=Thaumium Fortress Blade
item.ItemKatana.1.name=Voidmetal Fortress Blade
@@ -361,13 +362,13 @@ tm.text.THAUMIUMKATANA.1=Using a design similar to Thaumium Fortress Armor, you
tm.name.VOIDMETALKATANA=Voidmetal Fortress Blade
tm.tag.VOIDMETALKATANA=Void samurai
-tm.text.VOIDMETALKATANA.1=By using the same construction process as the Thaumium Fortress blade, but substituting the material for Voidmetal, you have created a Fortress Blade that is even more powerful.
The Voidmetal Fortress Blade is not only sharper and stronger than its Thaumium counterpart, but also possesses the Greater Sapping effect which will weaken anything you hit.
They do say that this much Voidmetal is not healthy for ones body, but you care not.
+tm.text.VOIDMETALKATANA.1=By using the same construction process as the Thaumium Fortress blade, but substituting the material for Voidmetal, you have created a Fortress Blade that is even more powerful.
The Voidmetal Fortress Blade is not only sharper and stronger than its Thaumium counterpart, but also possesses the Greater Sapping effect which will weaken anything you hit.
They do say that this much Voidmetal is not healthy for ones body, but you care not.
Like a Thaumium Fortress blade, this blade can be enhanced with various inscriptions.
#SHADOWMETALKATANA
tm.name.SHADOWMETALKATANA=Shadowmetal Fortress Blade
tm.tag.SHADOWMETALKATANA=Chakra blades
-tm.text.SHADOWMETALKATANA.1=After having discovered Shadowmetal Fortress Armor, you were certain that you could make a Fortress Blade from Shadowmetal as well.
The results were astounding. By following the same construction process as the Thaumium and Voidmetal Fortress Blades, you have created the strongest, and sharpest Fortress Blade you have ever laid eyes upon.
This blade is not only sharper and stronger than its counterparts, it will also inflict a slowing effect while simultaneously blurring the vision of whatever you hit.
+tm.text.SHADOWMETALKATANA.1=After having discovered Shadowmetal Fortress Armor, you were certain that you could make a Fortress Blade from Shadowmetal as well.
The results were astounding. By following the same construction process as the Thaumium and Voidmetal Fortress Blades, you have created the strongest, and sharpest Fortress Blade you have ever laid eyes upon.
The blade will also inflict a slowing effect while simultaneously blurring the vision of whatever you hit.
Like a Thaumium Fortress blade, this blade can be enhanced with various inscriptions.
#INSCRIPTIONFIRE
@@ -385,4 +386,10 @@ tm.text.INSCRIPTIONTAINT.1=You have upgraded your Fortress Blade by inscribing r
tm.name.INSCRIPTIONWIND=Stormbound Inscription
tm.tag.INSCRIPTIONWIND=Thaumium Fortress Blade upgrade
-tm.text.INSCRIPTIONWIND.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will allow you to deal wind damage, which bypasses armor. Your target will also gain a withering effect.
Incidentally, when releasing a fully charged strike, a burst of charged air will be shot in all directions, knocking back and damaging all nearby enemies. One would hold down shift to cancel this effect and release a normal strike.
\ No newline at end of file
+tm.text.INSCRIPTIONWIND.1=You have upgraded your Fortress Blade by inscribing runes upon it.
This inscription will allow you to deal wind damage, which bypasses armor. Your target will also gain a withering effect.
Incidentally, when releasing a fully charged strike, a burst of charged air will be shot in all directions, knocking back and damaging all nearby enemies. One would hold down shift to cancel this effect and release a normal strike.
+
+#VOIDGOGGLES
+
+tm.name.VOIDGOGGLES=Voidmetal Goggles of Revealing
+tm.tag.VOIDGOGGLES=Who needs 20/20 vision anyway?
+tm.text.VOIDGOGGLES.1=By infusing your Warped Goggles of Revealing with Voidmetal, you have created a pair of goggles that repair themselves, and have an extremely high vis discount.
Sadly, they offer inferior protection to the original Warped Goggles of Revealing.
Your vision might become distorted and warped while wearing these goggles, but that's okay...warp is not a bad thing, right?
\ No newline at end of file
diff --git a/src/main/resources/assets/taintedmagic/textures/items/ItemVoidmetalGoggles.png b/src/main/resources/assets/taintedmagic/textures/items/ItemVoidmetalGoggles.png
new file mode 100644
index 0000000..846ab94
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/items/ItemVoidmetalGoggles.png differ
diff --git a/src/main/resources/assets/taintedmagic/textures/models/ModelVoidmetalGoggles.png b/src/main/resources/assets/taintedmagic/textures/models/ModelVoidmetalGoggles.png
new file mode 100644
index 0000000..5619bec
Binary files /dev/null and b/src/main/resources/assets/taintedmagic/textures/models/ModelVoidmetalGoggles.png differ
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 14089e4..f9368de 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
"modid": "TaintedMagic",
"name": "Tainted Magic",
"description": "A TC4 addon that brings you to the dark side of Thaumaturgy...",
- "version": "r7.2",
+ "version": "r7.3",
"mcversion": "1.7.10",
"url": "http://bitly.com/1HV2VSK",
"updateUrl": "",
diff --git a/version.txt b/version.txt
index 1cf273a..f5d9023 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-r7.2
\ No newline at end of file
+r7.3
\ No newline at end of file