Added Robe variants

Added thaumium robe for midgame Added void robe variant with lighter colours for dye Fixed several incorrect repair resources Changed some internal things relating to special recipe registry Changed several internal research strings to standardise things. This will only affect any alternate lang files
KryptonCaptain · Nov 25, 2016 · ee9a235 · ee9a235
2 parents 10a5654 + 9683e07
commit ee9a235
Show file tree

Hide file tree

Showing 25 changed files with 1,002 additions and 115 deletions.
diff --git a/build.properties b/build.properties
@@ -1,9 +1,9 @@
 #
 #Sat Sep 26 08:25:20 EDT 2015
-version=1.3.5
+version=1.4.0
 dir_output=../Build Output/TD/
 mc_version=1.7.10
 forge_version=10.13.4.1614
 dir_repo=./
-build_number=2
+build_number=3
 mod_name=Thaumic-Dyes-[1.7.10]
diff --git a/src/main/java/thaumicdyes/common/DyeResearch.java b/src/main/java/thaumicdyes/common/DyeResearch.java
diff --git a/src/main/java/thaumicdyes/common/items/CultistRobes.java b/src/main/java/thaumicdyes/common/items/CultistRobes.java
@@ -2,14 +2,17 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+
 import java.util.List;
+
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemArmor;
@@ -53,17 +56,17 @@ public CultistRobes(ArmorMaterial enumarmormaterial, int j, int k) {
 
    @SideOnly(Side.CLIENT)
    public void registerIcons(IIconRegister ir) {
-      this.iconHelm = ir.registerIcon("thaumicdyes:icon/crimrobehelm");
+      this.iconHelm = ir.registerIcon("thaumicdyes:icon/crimrobehelm"); //
       this.iconHelmOver = ir.registerIcon("thaumicdyes:phelm");
       this.iconBlank = ir.registerIcon("thaumicdyes:blank");
       this.iconChest = ir.registerIcon("thaumicdyes:crimrobechestover");
       this.iconLegs = ir.registerIcon("thaumicdyes:crimrobelegsover");
-      this.iconChestOver = ir.registerIcon("thaumicdyes:icon/crimrobechest");
-      this.iconLegsOver = ir.registerIcon("thaumicdyes:icon/crimrobelegs");
+      this.iconChestOver = ir.registerIcon("thaumicdyes:icon/crimrobechest"); //
+      this.iconLegsOver = ir.registerIcon("thaumicdyes:icon/crimrobelegs"); //
    }
 
    public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
-      return type == null?"thaumicdyes:textures/models/armor/crim_robe_armor_overlay.png":"thaumicdyes:textures/models/armor/crim_robe_armor.png";
+      return type == null?"thaumicdyes:textures/models/armor/robe_armor_overlay.png":"thaumicdyes:textures/models/armor/crim_robe_armor.png";
    }
 
    public EnumRarity getRarity(ItemStack itemstack) {
@@ -76,7 +79,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool
    }
 
    public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-      return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 7))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
+      return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
    }
 
    /*

diff --git a/src/main/java/thaumicdyes/common/items/InhabitedKnightArmor.java b/src/main/java/thaumicdyes/common/items/InhabitedKnightArmor.java
@@ -9,6 +9,7 @@
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemArmor;
@@ -60,7 +61,7 @@ public EnumRarity getRarity(ItemStack itemstack) {
    }
 
    public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-      return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 16))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
+      return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
    }
 
    public int getRunicCharge(ItemStack itemstack)

diff --git a/src/main/java/thaumicdyes/common/items/IronFortressArmor.java b/src/main/java/thaumicdyes/common/items/IronFortressArmor.java
@@ -118,7 +118,7 @@ public EnumRarity getRarity(ItemStack itemstack)
 
   public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
   {
-    return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot, 1, 0)) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+    return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot)) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
   }
 
   public int getRunicCharge(ItemStack itemstack)

diff --git a/src/main/java/thaumicdyes/common/items/ItemHandler.java b/src/main/java/thaumicdyes/common/items/ItemHandler.java
@@ -10,6 +10,7 @@
 import thaumicdyes.common.items.FortressArmor;
 import thaumicdyes.common.items.PraetorArmor;
 import thaumicdyes.common.items.KnightArmor;
+import thaumcraft.api.ThaumcraftApi;
 
 public class ItemHandler {
    public static ToolMaterial Robes;
@@ -47,6 +48,14 @@ public class ItemHandler {
    public static Item itemHelmetCultistRanger;
    public static Item itemChestCultistRanger;
    public static Item itemLegsCultistRanger;
+
+   public static Item itemHelmetVoidRobe;
+   public static Item itemChestVoidRobe;
+   public static Item itemLegsVoidRobe;
+
+   public static Item itemHelmetThaumiumRobe;
+   public static Item itemChestThaumiumRobe;
+   public static Item itemLegsThaumiumRobe;
 
 
    public static void registerItems() {
@@ -79,6 +88,14 @@ public static void registerItems() {
       GameRegistry.registerItem(itemChestCultistRanger, "CultistRangerChest");
       GameRegistry.registerItem(itemLegsCultistRanger, "CultistRangerLegs");
 
+      GameRegistry.registerItem(itemHelmetVoidRobe, "VoidRobeHelm");
+      GameRegistry.registerItem(itemChestVoidRobe, "VoidRobeChest");
+      GameRegistry.registerItem(itemLegsVoidRobe, "VoidRobeLegs");
+
+      GameRegistry.registerItem(itemHelmetThaumiumRobe, "ThaumiumRobeHelm");
+      GameRegistry.registerItem(itemChestThaumiumRobe, "ThaumiumRobeChest");
+      GameRegistry.registerItem(itemLegsThaumiumRobe, "ThaumiumRobeLegs");
+
    }
 
    public static void defineItems() {
@@ -111,6 +128,15 @@ public static void defineItems() {
 	   itemChestCultistRanger = (new RangerArmor(RobesArmor, 4, 1)).setUnlocalizedName("CultistRangerChest").setCreativeTab(TabTD.TabTD);
 	   itemLegsCultistRanger = (new RangerArmor(RobesArmor, 4, 2)).setUnlocalizedName("CultistRangerLegs").setCreativeTab(TabTD.TabTD);
 
+	   itemHelmetVoidRobe = (new VoidRobeArmor(ThaumcraftApi.armorMatVoid, 4, 0)).setUnlocalizedName("VoidRobeHelm").setCreativeTab(TabTD.TabTD);
+	   itemChestVoidRobe = (new VoidRobeArmor(ThaumcraftApi.armorMatVoid, 4, 1)).setUnlocalizedName("VoidRobeChest").setCreativeTab(TabTD.TabTD);
+	   itemLegsVoidRobe = (new VoidRobeArmor(ThaumcraftApi.armorMatVoid, 4, 2)).setUnlocalizedName("VoidRobeLegs").setCreativeTab(TabTD.TabTD);
+
+	   itemHelmetThaumiumRobe = (new ThaumiumRobeArmor(ThaumcraftApi.armorMatThaumium, 4, 0)).setUnlocalizedName("ThaumiumRobeHelm").setCreativeTab(TabTD.TabTD);
+	   itemChestThaumiumRobe = (new ThaumiumRobeArmor(ThaumcraftApi.armorMatThaumium, 4, 1)).setUnlocalizedName("ThaumiumRobeChest").setCreativeTab(TabTD.TabTD);
+	   itemLegsThaumiumRobe = (new ThaumiumRobeArmor(ThaumcraftApi.armorMatThaumium, 4, 2)).setUnlocalizedName("ThaumiumRobeLegs").setCreativeTab(TabTD.TabTD);
+
+
    }
 
    public static void registerToolMaterial() {

diff --git a/src/main/java/thaumicdyes/common/items/KnightArmor.java b/src/main/java/thaumicdyes/common/items/KnightArmor.java
@@ -9,6 +9,7 @@
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemArmor;
@@ -66,7 +67,7 @@ public EnumRarity getRarity(ItemStack itemstack) {
    }
 
    public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-      return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 2))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
+      return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
    }
 
    /*

diff --git a/src/main/java/thaumicdyes/common/items/PraetorArmor.java b/src/main/java/thaumicdyes/common/items/PraetorArmor.java
@@ -9,6 +9,7 @@
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemArmor;
@@ -66,7 +67,7 @@ public EnumRarity getRarity(ItemStack itemstack) {
    }
 
    public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-      return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 2))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
+      return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
    }
 
    /*

diff --git a/src/main/java/thaumicdyes/common/items/RangerArmor.java b/src/main/java/thaumicdyes/common/items/RangerArmor.java
@@ -11,6 +11,7 @@
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemArmor;
@@ -69,7 +70,7 @@ public EnumRarity getRarity(ItemStack itemstack) {
    }
 
    public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-      return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 2))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
+      return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
    }
 
    /*