Skip to content

Commit ee9a235

Browse files
KryptonCaptainKryptonCaptain
committed
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
2 parents 10a5654 + 9683e07 commit ee9a235

25 files changed

+1002
-115
lines changed

‎build.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#
22
#Sat Sep 26 08:25:20 EDT 2015
3-
version=1.3.5
3+
version=1.4.0
44
dir_output=../Build Output/TD/
55
mc_version=1.7.10
66
forge_version=10.13.4.1614
77
dir_repo=./
8-
build_number=2
8+
build_number=3
99
mod_name=Thaumic-Dyes-[1.7.10]

‎src/main/java/thaumicdyes/common/DyeResearch.java‎

Lines changed: 151 additions & 82 deletions
Large diffs are not rendered by default.

‎src/main/java/thaumicdyes/common/items/CultistRobes.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22

33
import cpw.mods.fml.relauncher.Side;
44
import cpw.mods.fml.relauncher.SideOnly;
5+
56
import java.util.List;
7+
68
import net.minecraft.client.model.ModelBiped;
79
import net.minecraft.client.renderer.texture.IIconRegister;
810
import net.minecraft.creativetab.CreativeTabs;
911
import net.minecraft.entity.Entity;
1012
import net.minecraft.entity.EntityLivingBase;
1113
import net.minecraft.entity.player.EntityPlayer;
1214
import net.minecraft.init.Blocks;
15+
import net.minecraft.init.Items;
1316
import net.minecraft.item.EnumAction;
1417
import net.minecraft.item.EnumRarity;
1518
import net.minecraft.item.ItemArmor;
@@ -53,17 +56,17 @@ public CultistRobes(ArmorMaterial enumarmormaterial, int j, int k) {
5356

5457
@SideOnly(Side.CLIENT)
5558
public void registerIcons(IIconRegister ir) {
56-
this.iconHelm = ir.registerIcon("thaumicdyes:icon/crimrobehelm");
59+
this.iconHelm = ir.registerIcon("thaumicdyes:icon/crimrobehelm"); //
5760
this.iconHelmOver = ir.registerIcon("thaumicdyes:phelm");
5861
this.iconBlank = ir.registerIcon("thaumicdyes:blank");
5962
this.iconChest = ir.registerIcon("thaumicdyes:crimrobechestover");
6063
this.iconLegs = ir.registerIcon("thaumicdyes:crimrobelegsover");
61-
this.iconChestOver = ir.registerIcon("thaumicdyes:icon/crimrobechest");
62-
this.iconLegsOver = ir.registerIcon("thaumicdyes:icon/crimrobelegs");
64+
this.iconChestOver = ir.registerIcon("thaumicdyes:icon/crimrobechest"); //
65+
this.iconLegsOver = ir.registerIcon("thaumicdyes:icon/crimrobelegs"); //
6366
}
6467

6568
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
66-
return type == null?"thaumicdyes:textures/models/armor/crim_robe_armor_overlay.png":"thaumicdyes:textures/models/armor/crim_robe_armor.png";
69+
return type == null?"thaumicdyes:textures/models/armor/robe_armor_overlay.png":"thaumicdyes:textures/models/armor/crim_robe_armor.png";
6770
}
6871

6972
public EnumRarity getRarity(ItemStack itemstack) {
@@ -76,7 +79,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool
7679
}
7780

7881
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
79-
return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 7))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
82+
return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
8083
}
8184

8285
/*

‎src/main/java/thaumicdyes/common/items/InhabitedKnightArmor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.minecraft.entity.EntityLivingBase;
1010
import net.minecraft.entity.player.EntityPlayer;
1111
import net.minecraft.init.Blocks;
12+
import net.minecraft.init.Items;
1213
import net.minecraft.item.EnumAction;
1314
import net.minecraft.item.EnumRarity;
1415
import net.minecraft.item.ItemArmor;
@@ -60,7 +61,7 @@ public EnumRarity getRarity(ItemStack itemstack) {
6061
}
6162

6263
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
63-
return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 16))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
64+
return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
6465
}
6566

6667
public int getRunicCharge(ItemStack itemstack)

‎src/main/java/thaumicdyes/common/items/IronFortressArmor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public EnumRarity getRarity(ItemStack itemstack)
118118

119119
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
120120
{
121-
return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot, 1, 0)) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
121+
return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot)) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
122122
}
123123

124124
public int getRunicCharge(ItemStack itemstack)

‎src/main/java/thaumicdyes/common/items/ItemHandler.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import thaumicdyes.common.items.FortressArmor;
1111
import thaumicdyes.common.items.PraetorArmor;
1212
import thaumicdyes.common.items.KnightArmor;
13+
import thaumcraft.api.ThaumcraftApi;
1314

1415
public class ItemHandler {
1516
public static ToolMaterial Robes;
@@ -47,6 +48,14 @@ public class ItemHandler {
4748
public static Item itemHelmetCultistRanger;
4849
public static Item itemChestCultistRanger;
4950
public static Item itemLegsCultistRanger;
51+
52+
public static Item itemHelmetVoidRobe;
53+
public static Item itemChestVoidRobe;
54+
public static Item itemLegsVoidRobe;
55+
56+
public static Item itemHelmetThaumiumRobe;
57+
public static Item itemChestThaumiumRobe;
58+
public static Item itemLegsThaumiumRobe;
5059

5160

5261
public static void registerItems() {
@@ -79,6 +88,14 @@ public static void registerItems() {
7988
GameRegistry.registerItem(itemChestCultistRanger, "CultistRangerChest");
8089
GameRegistry.registerItem(itemLegsCultistRanger, "CultistRangerLegs");
8190

91+
GameRegistry.registerItem(itemHelmetVoidRobe, "VoidRobeHelm");
92+
GameRegistry.registerItem(itemChestVoidRobe, "VoidRobeChest");
93+
GameRegistry.registerItem(itemLegsVoidRobe, "VoidRobeLegs");
94+
95+
GameRegistry.registerItem(itemHelmetThaumiumRobe, "ThaumiumRobeHelm");
96+
GameRegistry.registerItem(itemChestThaumiumRobe, "ThaumiumRobeChest");
97+
GameRegistry.registerItem(itemLegsThaumiumRobe, "ThaumiumRobeLegs");
98+
8299
}
83100

84101
public static void defineItems() {
@@ -111,6 +128,15 @@ public static void defineItems() {
111128
itemChestCultistRanger = (new RangerArmor(RobesArmor, 4, 1)).setUnlocalizedName("CultistRangerChest").setCreativeTab(TabTD.TabTD);
112129
itemLegsCultistRanger = (new RangerArmor(RobesArmor, 4, 2)).setUnlocalizedName("CultistRangerLegs").setCreativeTab(TabTD.TabTD);
113130

131+
itemHelmetVoidRobe = (new VoidRobeArmor(ThaumcraftApi.armorMatVoid, 4, 0)).setUnlocalizedName("VoidRobeHelm").setCreativeTab(TabTD.TabTD);
132+
itemChestVoidRobe = (new VoidRobeArmor(ThaumcraftApi.armorMatVoid, 4, 1)).setUnlocalizedName("VoidRobeChest").setCreativeTab(TabTD.TabTD);
133+
itemLegsVoidRobe = (new VoidRobeArmor(ThaumcraftApi.armorMatVoid, 4, 2)).setUnlocalizedName("VoidRobeLegs").setCreativeTab(TabTD.TabTD);
134+
135+
itemHelmetThaumiumRobe = (new ThaumiumRobeArmor(ThaumcraftApi.armorMatThaumium, 4, 0)).setUnlocalizedName("ThaumiumRobeHelm").setCreativeTab(TabTD.TabTD);
136+
itemChestThaumiumRobe = (new ThaumiumRobeArmor(ThaumcraftApi.armorMatThaumium, 4, 1)).setUnlocalizedName("ThaumiumRobeChest").setCreativeTab(TabTD.TabTD);
137+
itemLegsThaumiumRobe = (new ThaumiumRobeArmor(ThaumcraftApi.armorMatThaumium, 4, 2)).setUnlocalizedName("ThaumiumRobeLegs").setCreativeTab(TabTD.TabTD);
138+
139+
114140
}
115141

116142
public static void registerToolMaterial() {

‎src/main/java/thaumicdyes/common/items/KnightArmor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.minecraft.entity.EntityLivingBase;
1010
import net.minecraft.entity.player.EntityPlayer;
1111
import net.minecraft.init.Blocks;
12+
import net.minecraft.init.Items;
1213
import net.minecraft.item.EnumAction;
1314
import net.minecraft.item.EnumRarity;
1415
import net.minecraft.item.ItemArmor;
@@ -66,7 +67,7 @@ public EnumRarity getRarity(ItemStack itemstack) {
6667
}
6768

6869
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
69-
return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 2))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
70+
return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
7071
}
7172

7273
/*

‎src/main/java/thaumicdyes/common/items/PraetorArmor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.minecraft.entity.EntityLivingBase;
1010
import net.minecraft.entity.player.EntityPlayer;
1111
import net.minecraft.init.Blocks;
12+
import net.minecraft.init.Items;
1213
import net.minecraft.item.EnumAction;
1314
import net.minecraft.item.EnumRarity;
1415
import net.minecraft.item.ItemArmor;
@@ -66,7 +67,7 @@ public EnumRarity getRarity(ItemStack itemstack) {
6667
}
6768

6869
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
69-
return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 2))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
70+
return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
7071
}
7172

7273
/*

‎src/main/java/thaumicdyes/common/items/RangerArmor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.minecraft.entity.EntityLivingBase;
1212
import net.minecraft.entity.player.EntityPlayer;
1313
import net.minecraft.init.Blocks;
14+
import net.minecraft.init.Items;
1415
import net.minecraft.item.EnumAction;
1516
import net.minecraft.item.EnumRarity;
1617
import net.minecraft.item.ItemArmor;
@@ -69,7 +70,7 @@ public EnumRarity getRarity(ItemStack itemstack) {
6970
}
7071

7172
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
72-
return par2ItemStack.isItemEqual(ItemApi.getItem("itemResource", 2))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
73+
return par2ItemStack.isItemEqual(new ItemStack(Items.iron_ingot))?true:super.getIsRepairable(par1ItemStack, par2ItemStack);
7374
}
7475

7576
/*

0 commit comments

Comments
 (0)