From 3add1e694184471c0d788b6c04c8801d680eda11 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Tue, 26 Apr 2016 02:33:40 -0500 Subject: Removed Gimp Files folder and all xcf files. Wasn't supposed to be uploading those. Also added some stuff for a hidden feature. --- .../blocks/finishingAnvil/Gui_FinishingAnvil.java | 60 +++++++++----- .../finishingAnvil/utilities/Injector.java | 91 ++++++++++++++++++++++ 2 files changed, 133 insertions(+), 18 deletions(-) (limited to 'src/main/java/lance5057/tDefense/finishingAnvil') 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 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); + } + } -- cgit v1.2.3