From d01b86cd71b4a805f273bd662a38aacafa803cf4 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Wed, 17 Feb 2016 00:57:15 -0600 Subject: Buncha updates, forgot to github --- .../blocks/finishingAnvil/Gui_FinishingAnvil.java | 12 +- .../finishingAnvil/utilities/Injector.java | 201 +++++++++++++++++++++ .../utilities/InjectorLocations.java | 112 +++++++++++- 3 files changed, 318 insertions(+), 7 deletions(-) create mode 100644 src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java (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 30b841f..e36aab8 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 @@ -63,16 +63,16 @@ public class Gui_FinishingAnvil extends GuiContainer public void initGui() { super.initGui(); - this.buttonList.add(new GuiButton(1 ,this.guiLeft+25, this.guiTop+10, 10, 10,"▲")); - this.buttonList.add(new GuiButton(2 ,this.guiLeft+25, this.guiTop+59, 10, 10,"▼")); - this.buttonList.add(new GuiButton(3 ,this.guiLeft+47, this.guiTop+49, 18, 18,"✓")); + this.buttonList.add(new GuiButton(1 ,this.guiLeft+25, this.guiTop+10, 10, 10,"")); + this.buttonList.add(new GuiButton(2 ,this.guiLeft+25, this.guiTop+59, 10, 10,"")); + this.buttonList.add(new GuiButton(3 ,this.guiLeft+47, this.guiTop+49, 18, 18,"")); this.buttonList.add(new GuiButton(4 ,this.guiLeft+5, this.guiTop+10, 20, 20,"")); this.buttonList.add(new GuiButton(5 ,this.guiLeft+5, this.guiTop+30, 20, 20,"")); this.buttonList.add(new GuiButton(6 ,this.guiLeft+5, this.guiTop+50, 20, 20,"")); - this.buttonList.add(new GuiButton(7 ,this.guiLeft+120, this.guiTop+10, 10, 10,"▲")); - this.buttonList.add(new GuiButton(8 ,this.guiLeft+120, this.guiTop+59, 10, 10,"▼")); + this.buttonList.add(new GuiButton(7 ,this.guiLeft+120, this.guiTop+10, 10, 10,"")); + this.buttonList.add(new GuiButton(8 ,this.guiLeft+120, this.guiTop+59, 10, 10,"")); this.buttonList.add(new GuiButton(9 ,this.guiLeft+130, this.guiTop+10, 20, 20,"")); this.buttonList.add(new GuiButton(10 ,this.guiLeft+130, this.guiTop+30, 20, 20,"")); @@ -87,7 +87,7 @@ public class Gui_FinishingAnvil extends GuiContainer switch(button.id) { case 1: if(this.leftButtonPosX > 0) this.leftButtonPosX--; break; - case 2: if(this.leftButtonPosX+2 < ((ToolCore)bigCopy.getItem()).getPartAmount() - 1) this.leftButtonPosX++; break; + case 2: if(this.leftButtonPosX+2 < ((ToolCore)bigCopy.getItem()).getPartAmount()) this.leftButtonPosX++; break; case 3: TinkersDefense.INSTANCE.sendToServer(new Message_FinishingAnvil(inventory.xCoord, inventory.yCoord, inventory.zCoord, this.bigCopy)); diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java new file mode 100644 index 0000000..61a4393 --- /dev/null +++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java @@ -0,0 +1,201 @@ +package lance5057.tDefense.finishingAnvil.utilities; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import lance5057.tDefense.TinkersDefense; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import tconstruct.library.crafting.PatternBuilder; +import tconstruct.library.crafting.PatternBuilder.MaterialSet; +import tconstruct.library.tools.ToolCore; + +public class Injector extends ToolCore +{ + + ToolCore tool; + + InjectorLocations injectLoc; + + List heads= new ArrayList(); + List accessorys= new ArrayList(); + List handles = new ArrayList(); + List extras = new ArrayList(); + + public Injector(int baseDamage, ToolCore tool, InjectorLocations injLoc) + { + super(0); + this.tool = tool; + + injectLoc = injLoc; + + List temp = injectLoc.getList(tool.getUnlocalizedName().substring(tool.getUnlocalizedName().lastIndexOf('.')+1, tool.getUnlocalizedName().length())); + + if(!temp.isEmpty()) + { + for(int i = 0; i entry : pb.materialSets.entrySet()) + { + String icon = "tinkersdefense:"; + icon += tool.getDefaultFolder() + "/" + entry.getKey().toLowerCase() + "/" + heads.get(i); + //toolIcons[i] = icon; + headStrings.put(entry.getValue().materialID+(TinkersDefense.config.MaterialIndex*(i+1)), icon); + } + + addIcons(tool.headStrings, headIcons, iconRegister, heads.get(i), false); + + for(int j = (i+1)*TinkersDefense.config.MaterialIndex; j entry : pb.materialSets.entrySet()) + { + String icon = "tinkersdefense:"; + icon += tool.getDefaultFolder() + "/" + entry.getKey().toLowerCase() + "/" + accessorys.get(i); + //toolIcons[i] = icon; + accessoryStrings.put(entry.getValue().materialID+(TinkersDefense.config.MaterialIndex*(i+1)), icon); + } + + addIcons(accessoryStrings, accessoryIcons, iconRegister, accessorys.get(i), false); + + for(int j = (i+1)*TinkersDefense.config.MaterialIndex; j entry : pb.materialSets.entrySet()) + { + String icon = "tinkersdefense:"; + icon += tool.getDefaultFolder() + "/" + entry.getKey().toLowerCase() + "/" + handles.get(i); + //toolIcons[i] = icon; + handleStrings.put(entry.getValue().materialID+(TinkersDefense.config.MaterialIndex*(i+1)), icon); + } + + addIcons(handleStrings, handleIcons, iconRegister, handles.get(i), false); + + for(int j = (i+1)*TinkersDefense.config.MaterialIndex; j list; + + public InjectorLocations() + { + list = new ArrayList(); + + //BroadSword + list.add("broadsword_dull_head"); + list.add("broadsword_elusive_head"); + list.add("broadsword_glass_head"); + list.add("broadsword_mace_head"); + list.add("broadsword_plumed_head"); + list.add("broadsword_repulsive_head"); + list.add("broadsword_spiked_head"); + list.add("broadsword_tapered_head"); + list.add("broadsword_widebase_head"); + list.add("broadsword_falchion_head"); + list.add("broadsword_big_head"); + list.add("broadsword_segmented_head"); + list.add("broadsword_nofuller_head"); + list.add("broadsword_hourglass_head"); + list.add("broadsword_flat_head"); + + list.add("broadsword_basket_accessory"); + list.add("broadsword_curved_accessory"); + list.add("broadsword_elusive_accessory"); + list.add("broadsword_extended_accessory"); + list.add("broadsword_legendary_accessory"); + list.add("broadsword_no_accessory"); + list.add("broadsword_basket_accessory"); + list.add("broadsword_repulsive_accessory"); + list.add("broadsword_square_accessory"); + list.add("broadsword_straight_accessory"); + list.add("broadsword_straight_accessory"); + list.add("broadsword_bulbous_accessory"); + list.add("broadsword_sun_accessory"); + list.add("broadsword_lamenting_accessory"); + list.add("broadsword_pixie_accessory"); + list.add("broadsword_forked_accessory"); + + list.add("broadsword_ornate_handle"); + list.add("broadsword_thick_handle"); + list.add("broadsword_short_handle"); + + //Arrow + list.add("arrow_broad_head"); + list.add("arrow_elven_head"); + list.add("arrow_horned_head"); + list.add("arrow_trident_head"); + list.add("arrow_winged_head"); + + list.add("arrow_bulbous_handle"); + list.add("arrow_natural_handle"); + + list.add("arrow_matted_accessory"); + list.add("arrow_magic_accessory"); + list.add("arrow_pixie_accessory"); + list.add("arrow_small_accessory"); + + //Axe + list.add("axe_bearded_head"); + list.add("axe_broad_head"); + list.add("axe_minecraft_head"); + list.add("axe_thin_head"); + + //Battleaxe + list.add("battleaxe_halbard_head"); + list.add("battleaxe_magic_head"); + list.add("battleaxe_scythe_head"); + + list.add("battleaxe_magic_extra"); + list.add("battleaxe_scythe_extra"); + list.add("battleaxe_halbard_extra"); + + list.add("battleaxe_magic_accessory"); + list.add("battleaxe_halbard_accessory"); + list.add("battleaxe_knob_accessory"); + + //Battlesign + list.add("battlesign_small_handle"); + list.add("battlesign_smalllong_handle"); + + list.add("battlesign_arrow_head"); + list.add("battlesign_caution_head"); + list.add("battlesign_noentry_head"); + list.add("battlesign_railroad_head"); + list.add("battlesign_stop_head"); + list.add("battlesign_X_head"); + } + + public List getList(String part) + { + List request = new ArrayList(); + + if(!list.isEmpty()) + { + for(int i = 0; i < list.size(); i++) + { + if(list.get(i).contains(part.toLowerCase())) + { + request.add(list.get(i).substring(part.length(), list.get(i).length())); + } + } + } + + return request; + } } -- cgit v1.2.3