diff options
Diffstat (limited to 'src/main/java')
33 files changed, 442 insertions, 266 deletions
diff --git a/src/main/java/lance5057/tDefense/TD_Config.java b/src/main/java/lance5057/tDefense/TD_Config.java index fb1280d..a235a4f 100644 --- a/src/main/java/lance5057/tDefense/TD_Config.java +++ b/src/main/java/lance5057/tDefense/TD_Config.java @@ -15,10 +15,12 @@ public class TD_Config public int SoulBoundID; public int DazeID; + public int RainbowID; public int CrestFeathersID; public int CrestMirrorsID; public int CrestLegendsID; public int CrestBladesID; + public int XPBoostID; public int ArmorProtectionID; public int ArmorFireProtectionID; @@ -78,11 +80,15 @@ public class TD_Config GreenMintMatID = config.get("Material Configs", "GreenMint Material ID", 205).getInt(); DazeID = config.get("Modifier Configs", "Daze ID", count++).getInt(); + SoulBoundID = config.get("Modifier Configs", "Soulbound ID", count++).getInt(); + RainbowID = config.get("Modifier Configs", "Rainbow ID", count++).getInt(); + XPBoostID = config.get("Modifier Configs", "XPBoost ID", count++).getInt(); + CrestFeathersID = config.get("Modifier Configs", "Crest of Feathers ID", count++).getInt(); CrestMirrorsID = config.get("Modifier Configs", "Crest of Mirrors ID", count++).getInt(); CrestLegendsID = config.get("Modifier Configs", "Crest of Legends ID", count++).getInt(); CrestLegendsID = config.get("Modifier Configs", "Crest of Legends ID", count++).getInt(); - SoulBoundID = config.get("Modifier Configs", "Soulbound ID", count++).getInt(); + ArmorProtectionID = config.get("Armor Modifier Configs", "Protection ID", count++).getInt(); ArmorFireProtectionID = config.get("Armor Modifier Configs", "Fire Protection ID", count++).getInt(); diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java index 3cc3732..e56535a 100644 --- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java +++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java @@ -186,9 +186,9 @@ public class ArmorCore extends ToolCore implements ISpecialArmor, IRunicArmor switch(pass) { case 0: - return this.getIconSuffix(0); - case 1: return this.getIconSuffix(2); + case 1: + return this.getIconSuffix(0); case 2: return this.getIconSuffix(3); case 3: diff --git a/src/main/java/lance5057/tDefense/armor/items/Sheath.java b/src/main/java/lance5057/tDefense/armor/items/Sheath.java index 1dc87ea..e9db2db 100644 --- a/src/main/java/lance5057/tDefense/armor/items/Sheath.java +++ b/src/main/java/lance5057/tDefense/armor/items/Sheath.java @@ -1,29 +1,25 @@ package lance5057.tDefense.armor.items; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.parts.ClothMaterial; -import lance5057.tDefense.armor.renderers.ModelSheath; import lance5057.tDefense.proxy.ClientProxy; import net.minecraft.client.model.ModelBiped; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IAccessory; -import tconstruct.library.accessory.IAccessoryModel; -import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class Sheath extends ToolCore implements IAccessory +public class Sheath extends ArmorCore implements IAccessory { public Sheath() { - super(0); + super(0,-1); } @Override @@ -45,9 +41,9 @@ public class Sheath extends ToolCore implements IAccessory color[3] = Integer.toHexString(TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class).color); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(4), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(4), this.getIconSuffix(3)}; - ClientProxy.sheath.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.sheath.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.sheath; } diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java index 61e5224..aba5909 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java @@ -134,7 +134,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, IVisD public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { String[] color = new String[10]; - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); @@ -148,7 +148,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, IVisD newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - ClientProxy.hood.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.hood.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.hood; } diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java index 741c554..311d971 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java @@ -123,7 +123,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { String[] color = new String[10]; - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); @@ -137,7 +137,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - ClientProxy.robe.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.robe.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.robe; } diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java index c483537..4fa23d0 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java @@ -133,7 +133,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { String[] color = new String[10]; - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); @@ -147,7 +147,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - ClientProxy.shawl.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.shawl.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.shawl; } diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java index 3c2feb0..95e6840 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java @@ -131,7 +131,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { String[] color = new String[10]; - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); @@ -141,7 +141,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear CustomMaterial newColor = TConstructRegistry.getCustomMaterial(HeadID, ClothMaterial.class); color[1] = Integer.toHexString(newColor.color); - ClientProxy.shoes.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.shoes.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.shoes; } diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java index 4a94f9e..312d200 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java @@ -19,11 +19,11 @@ import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class TinkersGauntlets extends ToolCore implements IAccessory +public class TinkersGauntlets extends ArmorCore implements IAccessory { public TinkersGauntlets() { - super(2); + super(0,-1); this.setUnlocalizedName("tinkersgauntlets"); } @@ -72,7 +72,7 @@ public class TinkersGauntlets extends ToolCore implements IAccessory @Override public float getDamageModifier() { - return 1.4f; + return 0f; } @Override @@ -140,9 +140,9 @@ public class TinkersGauntlets extends ToolCore implements IAccessory for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; - ClientProxy.gauntlets.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.gauntlets.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.gauntlets; } } diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java index b0913a1..6bfb8d1 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java @@ -142,8 +142,8 @@ public class TinkersGrieves extends ArmorCore for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; - ClientProxy.grieves.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; + ClientProxy.grieves.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.grieves; } } diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java index aa1998f..135e948 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java @@ -132,8 +132,8 @@ public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; - ClientProxy.helm.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; + ClientProxy.helm.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.helm; } diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java index 48845ce..64447b2 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java @@ -145,8 +145,13 @@ public class TinkersSabatons extends ArmorCore for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; - ClientProxy.sabatons.SetColors(color, this.getDefaultFolder(), textures); + int ExtraID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderExtra"); + + CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ExtraID, ClothMaterial.class); + color[3] = Integer.toHexString(newColor.color); + + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; + ClientProxy.sabatons.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.sabatons; } } diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java index acce2b6..ce81f83 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java @@ -141,8 +141,8 @@ public class TinkersBoots extends ArmorCore CustomMaterial newColor = TConstructRegistry.getCustomMaterial(AccessoryID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; - ClientProxy.boots.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + ClientProxy.boots.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.boots; } diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java index 8624bff..852f95f 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java @@ -127,8 +127,8 @@ public class TinkersChausses extends ArmorCore for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0)}; - ClientProxy.chausses.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0)}; + ClientProxy.chausses.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.chausses; } diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java index 2547a56..ba0db3d 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java @@ -142,8 +142,8 @@ public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles CustomMaterial newColor = TConstructRegistry.getCustomMaterial(AccessoryID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; - ClientProxy.coif.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + ClientProxy.coif.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.coif; } diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java index 061f7fe..9e071a7 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java @@ -128,8 +128,8 @@ public class TinkersHauberk extends ArmorCore for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; - ClientProxy.hauberk.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + ClientProxy.hauberk.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.hauberk; } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java index 2fdc674..9841c80 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -46,24 +47,22 @@ public class ModelSheath extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 4; i++) - { - GL11.glPushMatrix(); - - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, -0.0F, 0.0F); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + GL11.glPushMatrix(); - //setLivingAnimations((EntityLivingBase) entity, f,f1, f5); - super.render(entity, f, f1, f2, f3, f4, f5); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java index 59b058c..629d2c4 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.cloth; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -44,23 +45,22 @@ public class ModelTinkersHood extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 2.25f; - GL11.glScalef(1.5F / size, 1.5F / size, 1.5F / size); - GL11.glTranslatef(0.0F, 0F * f5, 0.0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - //setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java index a981f8f..80c32a8 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.cloth; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -89,23 +90,22 @@ public class ModelTinkersRobe extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 2; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0F, -0F * f5, -0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java index f9c6ad1..387463e 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.cloth; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -102,23 +103,22 @@ public class ModelTinkersShawl extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0F, -0F * f5, -0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java index e007127..a63b402 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java @@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; @@ -72,24 +73,22 @@ public class ModelTinkersGauntlets extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, -0.0F, 0.0F); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + GL11.glPushMatrix(); - //setLivingAnimations((EntityLivingBase) entity, f,f1, f5); - super.render(entity, f, f1, f2, f3, f4, f5); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java index c5f59ff..58cd8cf 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.heavy; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -84,23 +85,22 @@ public class ModelTinkersGrieves extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 4; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0F, -0F * f5, -0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java index 78a0c83..005b182 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.heavy; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -53,22 +54,22 @@ public class ModelTinkersHelm extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) + + for(int i = 0; i < 10; i++) { - GL11.glPushMatrix(); + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + GL11.glPushMatrix(); - float size = 2.5f; - GL11.glScalef(1.5F / size, 1.5F / size, 1.5F / size); - GL11.glTranslatef(0.0F, -0F * f5, 0.0F); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java index 1a948aa..ca24d32 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.heavy; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -114,25 +115,21 @@ public class ModelTinkersSabatons extends ArmorRenderer { GL11.glPushMatrix(); - for(int i = 0; i < 4; i++) + for(int i = 0; i < 10; i++) { - //TConstructRegistry.getCustomMaterial(arg0, arg1) - GL11.glPushMatrix(); - ResourceLocation texture = new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"); - //Boolean exists = new File(texture.getResourceDomain() + ":" + texture.getResourcePath()).exists(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture); - - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, -0F * f5, 0.0F); - - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); - - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { + + GL11.glPushMatrix(); + + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); + + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java index a55c825..41dff40 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.light; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -53,23 +54,22 @@ public class ModelTinkersBoots extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, -0F * f5, 0.0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java index 00f0d64..010e06b 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.light; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -86,22 +87,22 @@ public class ModelTinkersChausses extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 2; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0F, 0F * f5, -0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java index d59bcc2..da3f80b 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.light; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -41,23 +42,22 @@ public class ModelTinkersCoif extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, 0F * f5, 0.0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java index 455ac3b..9e3f192 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.light; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -93,22 +94,22 @@ public class ModelTinkersHauberk extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, 0F * f5, 0.0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java index 00f3707..ad70bfd 100644 --- a/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java +++ b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java @@ -91,13 +91,13 @@ public class HeaterShield extends Shield switch(partType) { case 0: - return "_shield_face"; + return "_shield_plate"; case 1: - return "_shield_face_broken"; + return "_shield_plate_broken"; case 2: return "_shield_edge"; case 3: - return "_shield_face_other"; + return "_shield_face"; case 4: return "_shield_binding"; default: diff --git a/src/main/java/lance5057/tDefense/core/tools/Shears.java b/src/main/java/lance5057/tDefense/core/tools/Shears.java index 8ba51b7..8870766 100644 --- a/src/main/java/lance5057/tDefense/core/tools/Shears.java +++ b/src/main/java/lance5057/tDefense/core/tools/Shears.java @@ -126,6 +126,17 @@ public class Shears extends ToolCore { ArrayList<ItemStack> drops = target.onSheared(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); + if(itemstack.getTagCompound().getCompoundTag("InfiTool").hasKey("Rainbow")) + { + for(int i = 0; i < drops.size(); i++) + { + if(drops.get(i).getItem() == Blocks.wool.getItem(entity.worldObj, 0, 0, 0)) + { + drops.get(i).setItemDamage(entity.worldObj.rand.nextInt(16)); + } + } + } + Random rand = new Random(); for(ItemStack stack : drops) { diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java index ab921dc..13c14d4 100644 --- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java @@ -11,57 +11,63 @@ import thaumcraft.common.items.wands.ItemWandCap; public class modifierRepairVis extends ModBoolean { - WandCap cap; - String color; - String tooltipName; - + WandCap cap; + String color; + String tooltipName; + public modifierRepairVis(ItemStack[] items, int effect, String tag, String c, String tip) { super(items, effect, tag, c, tip); color = c; tooltipName = tip; } - + @Override - public boolean matches (ItemStack[] recipe, ItemStack input) - { + public boolean matches(ItemStack[] recipe, ItemStack input) + { cap = null; - for(WandCap cp: WandCap.caps.values()) - { - ItemStack test = cp.getItem(); - if(recipe[0].getItem() == test.getItem() && recipe[0].getItemDamage() == test.getItemDamage()) - { - cap = cp; - break; - } - } - - if (!canModify(input, recipe)) - return false; - if (cap == null) - return false; - return true; - } - - @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key) && input[0].getItem() instanceof ItemWandCap; //Will fail if the modifier is false or the tag doesn't exist - } + for(int i = 0; i < recipe.length; i++) + { + if(recipe[i] != null) + { + for(WandCap cp : WandCap.caps.values()) + { + ItemStack test = cp.getItem(); + if(recipe[i].getItem() == test.getItem() && recipe[i].getItemDamage() == test.getItemDamage()) + { + cap = cp; + break; + } + } + } + } + + if(!canModify(input, recipe)) + return false; + if(cap == null) + return false; + return true; + } + + @Override + protected boolean canModify(ItemStack tool, ItemStack[] input) + { + NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key) && cap != null; //Will fail if the modifier is false or the tag doesn't exist + } @Override - public void modify (ItemStack[] input, ItemStack tool) - { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + public void modify(ItemStack[] input, ItemStack tool) + { + NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + + tags.setFloat(key, cap.getBaseCostModifier()); - tags.setFloat(key, cap.getBaseCostModifier()); - - int modifiers = tags.getInteger("Modifiers"); - modifiers -= 1; - tags.setInteger("Modifiers", modifiers); + int modifiers = tags.getInteger("Modifiers"); + modifiers -= 1; + tags.setInteger("Modifiers", modifiers); - String mat = cap.getTag().substring(0, 1).toUpperCase() + cap.getTag().substring(1) + " "; - addToolTip(tool, color + mat + tooltipName, color + mat + tooltipName + " ("+(int)(cap.getBaseCostModifier()*100)+"%)"); - } + String mat = cap.getTag().substring(0, 1).toUpperCase() + cap.getTag().substring(1) + " "; + addToolTip(tool, color + mat + tooltipName, color + mat + tooltipName + " (" + (int) (cap.getBaseCostModifier() * 100) + "%)"); + } } diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ToolMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ToolMods.java index 7280383..a610fee 100644 --- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ToolMods.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/ToolMods.java @@ -2,11 +2,11 @@ package lance5057.tDefense.core.tools.modifiers; import java.util.ArrayList; -import cpw.mods.fml.common.registry.GameRegistry; import lance5057.tDefense.Reference; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.modifiers.modifierBoolExclusive; +import lance5057.tDefense.armor.modifiers.modifierIntExclusive; import lance5057.tDefense.core.tools.modifiers.ActiveToolMods.TDefenseActiveToolMod; -import lance5057.tDefense.core.tools.modifiers.Botania.modifierCorpseIvy; import lance5057.tDefense.core.tools.modifiers.TDefense.modifierSoulBound; import lance5057.tDefense.core.tools.modifiers.TDefense.shields.modifierCrestofBlades; import lance5057.tDefense.core.tools.modifiers.TDefense.shields.modifierCrestofFeathers; @@ -16,35 +16,39 @@ import lance5057.tDefense.core.tools.modifiers.TDefense.weapons.modifierDaze; import mods.battlegear2.api.core.IBattlePlayer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityXPOrb; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFireball; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingDeathEvent; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.tools.ToolCore; -import tconstruct.tools.TinkerTools; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibOreDict; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; public class ToolMods { public static Item item_relic; public static Item itemSoulChain; + public static Item item_RainbowGem; + public static Item item_Textbook; + public ToolMods() { + MinecraftForge.EVENT_BUS.register(this); + LoadItems(); } @@ -54,8 +58,15 @@ public class ToolMods itemSoulChain = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("SoulChain").setTextureName(Reference.MOD_ID + ":SoulChain"); - GameRegistry.registerItem(item_relic, "Ancient Relic"); - GameRegistry.registerItem(itemSoulChain, "Soul Chain"); + item_Textbook = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("Textbook").setTextureName(Reference.MOD_ID + ":Textbook"); + + //Shears + item_RainbowGem = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("RainbowGem").setTextureName(Reference.MOD_ID + ":RainbowGem"); + + GameRegistry.registerItem(item_relic, "AncientRelic"); + GameRegistry.registerItem(itemSoulChain, "SoulChain"); + GameRegistry.registerItem(item_RainbowGem, "RainbowGem"); + GameRegistry.registerItem(item_Textbook, "Textbook"); } public void RegisterRecipes() @@ -64,19 +75,24 @@ public class ToolMods public void RegisterModifiers() { + //All + ModifyBuilder.registerModifier(new modifierSoulBound(new ItemStack[] {new ItemStack(itemSoulChain)}, TinkersDefense.config.SoulBoundID, "Soulbound", "\u00A7b", "Soulbound")); + + //Weapons + //TO-DO ModifyBuilder.registerModifier(new modifierDaze("Daze", TinkersDefense.config.DazeID, new ItemStack[] {new ItemStack(Blocks.light_weighted_pressure_plate), new ItemStack(Items.potionitem, 1, 8202)}, new int[] {1, 0})); + ModifyBuilder.registerModifier(new modifierIntExclusive(new ItemStack[] {new ItemStack(item_Textbook, 1, 0)}, TinkersDefense.config.XPBoostID, "XPBoost", 1, EnumChatFormatting.GREEN.toString(), "XP Boost", new String[] {"weapon"}, 1, null)); - //ModifyBuilder.registerModifier(new modifierTorchArrow(new ItemStack[] {new ItemStack(Blocks.glowstone)}, 12)); + //Shears + ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(item_RainbowGem, 1, 0)}, TinkersDefense.config.RainbowID, "Rainbow", EnumChatFormatting.WHITE.toString(), "Rainbow", new String[] {"shears"}, 1, null)); + //Shields ModifyBuilder.registerModifier(new modifierCrestofFeathers("Crest of Feathers", TinkersDefense.config.CrestFeathersID, new ItemStack[] {new ItemStack(Items.feather)}, new int[] {1})); - ModifyBuilder.registerModifier(new modifierCrestofMirrors("Crest of Mirrors", TinkersDefense.config.CrestMirrorsID, new ItemStack[] {new ItemStack(Blocks.glass_pane)}, new int[] {1})); - ModifyBuilder.registerModifier(new modifierCrestofLegends("Crest of Legends", TinkersDefense.config.CrestLegendsID, new ItemStack[] {new ItemStack(item_relic)}, new int[] {1})); - ModifyBuilder.registerModifier(new modifierCrestofBlades("Crest of Blades", TinkersDefense.config.CrestBladesID, new ItemStack[] {new ItemStack(Items.iron_sword)}, new int[] {1})); - ModifyBuilder.registerModifier(new modifierSoulBound(new ItemStack[] {new ItemStack(itemSoulChain)}, TinkersDefense.config.SoulBoundID, "Soulbound", "\u00A7b", "Soulbound")); + ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(item_RainbowGem, 1, 0)}, TinkersDefense.config.RainbowID, "Rainbow", EnumChatFormatting.WHITE.toString(), "Rainbow", new String[] {"shears"}, 1, null)); TConstructRegistry.registerActiveToolMod(new TDefenseActiveToolMod()); @@ -88,6 +104,9 @@ public class ToolMods TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestLegendsID, "tinker", "legends", true); TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestBladesID, "tinker", "blades", true); TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.SoulBoundID, "tinker", "soulbound", true); + TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.RainbowID, "tinker", "rainbow", true); + TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.XPBoostID, "tinker", "textbook", true); + } } @@ -129,4 +148,24 @@ public class ToolMods { //entity.worldObj.ent } + + @SubscribeEvent + public void XPBoost(LivingDeathEvent event) + { + if(!(event.entityLiving instanceof EntityPlayer) && event.source.getSourceOfDamage() instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) event.source.getSourceOfDamage(); + ItemStack itemstack = player.getCurrentEquippedItem(); + if(itemstack != null) + { + NBTTagCompound tags = itemstack.getTagCompound().getCompoundTag("InfiTool"); + + if(tags != null && tags.hasKey("XPBoost")) + { + player.worldObj.spawnEntityInWorld(new EntityXPOrb(player.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, (int)Math.pow(tags.getInteger("XPBoost"),2))); + + } + } + } + } } diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java index f97fdcc..b9fc7d2 100644 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java @@ -142,7 +142,7 @@ public class Gui_FinishingAnvil extends GuiContainer if(tags.hasKey("Render" + renders[leftSelect])) { tags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPosX + ((rightButtonPosY % 3) * 16)) * TinkersDefense.config.MaterialIndex)); - if(rightButtonPosX + (rightButtonPosY * 16) > 0) + if(rightButtonPosX > 0) tags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(tags.getInteger(renders[leftSelect])).primaryColor()); else tags.removeTag(renders[leftSelect] + "Color"); @@ -236,11 +236,16 @@ public class Gui_FinishingAnvil extends GuiContainer this.mc.getTextureManager().bindTexture(this.forGui); if(inventory.getStackInSlot(0) != null) - this.drawTexturedModalRect(7, 12 + (leftSelect * 20), 16, 0, 16, 16); + { +// int leftMax = leftSelect; +// if(leftMax > 2) +// leftMax = 2; + this.drawTexturedModalRect(7, 12 + ((leftSelect - leftButtonPosX) * 20), 16, 0, 16, 16); + } - this.drawTexturedModalRect(7, 12, this.xLIcon_one + (this.leftButtonPosX * 16), this.yLIcon_one + (this.leftButtonPosY * 16), 16, 16); - this.drawTexturedModalRect(7, 32, this.xLIcon_two + (this.leftButtonPosX * 16), this.yLIcon_two + (this.leftButtonPosY * 16), 16, 16); - this.drawTexturedModalRect(7, 52, this.xLIcon_three + (this.leftButtonPosX * 16), this.yLIcon_three + (this.leftButtonPosY * 16), 16, 16); + this.drawTexturedModalRect(7, 12, this.xLIcon_one + (this.leftButtonPosX * 16), this.yLIcon_one + 0, 16, 16); + this.drawTexturedModalRect(7, 32, this.xLIcon_two + (this.leftButtonPosX * 16), this.yLIcon_two + 0, 16, 16); + this.drawTexturedModalRect(7, 52, this.xLIcon_three + (this.leftButtonPosX * 16), this.yLIcon_three + 0, 16, 16); this.drawTexturedModalRect(132, 12, this.xRIcon_one + (this.rightButtonPosX * 16), this.yRIcon_one + (this.rightButtonPosY * 16), 16, 16); @@ -289,21 +294,40 @@ public class Gui_FinishingAnvil extends GuiContainer ToolCoreTip tt = ((Injector) TinkersDefense.tcInject).tools.get(tool.getToolName()); List<String> list = new ArrayList(); - switch(i) + if(tt != null) { - case 0: list.add(tt.getPart(1 + this.leftButtonPosX)); break; - case 1: list.add(tt.getPart(3 + this.leftButtonPosX)); break; - case 2: list.add(tt.getPart(2 + this.leftButtonPosX)); break; - - case 3: list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + ((rightButtonPosY % 3) * 16)))); break; - case 4: list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + 1 + ((rightButtonPosY % 3) * 16)))); break; - case 5: list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + 2 + ((rightButtonPosY % 3) * 16)))); break; + switch(i) + { + case 0: + list.add(tt.getPart(1 + this.leftButtonPosX)); + break; + case 1: + list.add(tt.getPart(3 + this.leftButtonPosX)); + break; + case 2: + list.add(tt.getPart(2 + this.leftButtonPosX)); + break; + + case 3: + list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + ((rightButtonPosY % 3) * 16)))); + break; + case 4: + list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + 1 + ((rightButtonPosY % 3) * 16)))); + break; + case 5: + list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + 2 + ((rightButtonPosY % 3) * 16)))); + break; + } + + if(list.get(0).contains("Metallurgy")) + list.add(" -by Shadowclaimer"); + func_146283_a(list, x, y); + } + else + { + list.add("Error - No name/desc!"); + func_146283_a(list, x, y); } - - if(list.get(0).contains("Metallurgy")) - list.add(" -by Shadowclaimer"); - func_146283_a(list, x, y); - } } } diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java index 84cd4de..a0125d9 100644 --- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java @@ -68,6 +68,8 @@ public class Injector extends ToolCore Mattock(); if(tool.getToolName().equals("Longbow")) Longbow(); + if(tool.getToolName().equals("HeaterShield")) + HeaterShield(); setupIcons(tool, iconRegister, heads, this.headStrings, this.headIcons); setupIcons(tool, iconRegister, accessories, this.accessoryStrings, this.accessoryIcons); setupIcons(tool, iconRegister, handles, this.handleStrings, this.handleIcons); @@ -464,4 +466,93 @@ public class Injector extends ToolCore handles.add("_m5copper_handle"); extras.add("_m5copper_extra"); } + + void HeaterShield() + { + ToolCoreTip tt = new ToolCoreTip(); + + tt.head = "Plate"; + tt.accessory = "Emblem"; + tt.handle = "Edge"; + tt.extra = "Binding"; + + tt.headTT.add("Standard Plate"); + heads.add("_glass_plate"); + tt.headTT.add("Glass Plate"); + + tt.accessoryTT.add("Standard Emblem"); + accessories.add("_test_face"); + tt.accessoryTT.add("Villager Emblem"); + accessories.add("_skeleton_face"); + tt.accessoryTT.add("Skeleton Emblem"); + accessories.add("_ender_face"); + tt.accessoryTT.add("Ender Emblem"); + accessories.add("_creeper_face"); + tt.accessoryTT.add("Creeper Emblem"); + accessories.add("_square_face"); + tt.accessoryTT.add("Block Emblem"); + accessories.add("_angel_face"); + tt.accessoryTT.add("Angel Emblem"); + accessories.add("_fancy_face"); + tt.accessoryTT.add("Fancy Emblem"); + accessories.add("_cross_face"); + tt.accessoryTT.add("Cross Emblem"); + accessories.add("_stripe_face"); + tt.accessoryTT.add("Vertical Stripe Emblem"); + accessories.add("_bar_face"); + tt.accessoryTT.add("Vertical Bars Emblem"); + accessories.add("_horbar_face"); + tt.accessoryTT.add("Horizontal Bars Emblem"); + accessories.add("_horstripe_face"); + tt.accessoryTT.add("Horizontal Stripe Emblem"); + accessories.add("_triangle_face"); + tt.accessoryTT.add("Triangles Emblem"); + accessories.add("_arrow_face"); + tt.accessoryTT.add("Arrow Emblem"); + accessories.add("_checker_face"); + tt.accessoryTT.add("Checkered Emblem"); + + tt.handleTT.add("Standard Edge"); + handles.add("_demon_edge"); + tt.handleTT.add("Demonic Edge"); + handles.add("_squared_edge"); + tt.handleTT.add("Squared Edge"); + handles.add("_heart_edge"); + tt.handleTT.add("Heart Edge"); + + tt.extraTT.add("Standard Binding"); + extras.add("_spider_binding"); + tt.extraTT.add("Spider Binding"); + extras.add("_love_binding"); + tt.extraTT.add("Heart Binding"); + extras.add("_enforced_binding"); + tt.extraTT.add("Enforced Binding"); + extras.add("_slime_binding"); + tt.extraTT.add("Slimey Binding"); + extras.add("_small_binding"); + tt.extraTT.add("Small Binding"); + extras.add("_demon_binding"); + tt.extraTT.add("Demon Binding"); + extras.add("_pig_binding"); + tt.extraTT.add("Pig Binding"); + extras.add("_wolf_binding"); + tt.extraTT.add("Wolf Binding"); + extras.add("_wide_binding"); + tt.extraTT.add("Wide Binding"); + extras.add("_reinforced_binding"); + tt.extraTT.add("Strong Binding"); + extras.add("_skull_binding"); + tt.extraTT.add("Skull Binding"); + extras.add("_hell_binding"); + tt.extraTT.add("Hell Binding"); + extras.add("_queen_binding"); + tt.extraTT.add("Queen's Binding"); + extras.add("_tri_binding"); + tt.extraTT.add("Tri Binding"); + extras.add("_fancy_binding"); + tt.extraTT.add("Fancy Binding"); + + tools.put("Heater Shield", tt); + } + } |