Change stencils to be identified by actual IDs because DAMN was that other stuff a pain to use if you wanted to identify one.

This commit is contained in:
Bernhard Bonigl committed 2014-10-23 00:14:27 +02:00
1 parent 035cc454a5
commit b9efa7373f
4 files changed
+44 -42

No files matched your search

+24 -24
View File
@@ -897,36 +897,36 @@ public class TinkerTools
StencilBuilder.registerBlankStencil(new ItemStack(TinkerTools.blankPattern));
// we register this manually because we want that specific order
StencilBuilder.registerStencil(TinkerTools.woodPattern, 1); // tool rod
StencilBuilder.registerStencil(TinkerTools.woodPattern, 9); // binding
StencilBuilder.registerStencil(TinkerTools.woodPattern, 14); // large tool rod
StencilBuilder.registerStencil(TinkerTools.woodPattern, 15); // large binding
StencilBuilder.registerStencil(0, TinkerTools.woodPattern, 1); // tool rod
StencilBuilder.registerStencil(1, TinkerTools.woodPattern, 9); // binding
StencilBuilder.registerStencil(2, TinkerTools.woodPattern, 14); // large tool rod
StencilBuilder.registerStencil(3, TinkerTools.woodPattern, 15); // large binding
StencilBuilder.registerStencil(TinkerTools.woodPattern, 2); // pickaxe head
StencilBuilder.registerStencil(TinkerTools.woodPattern, 3); // shovel head
StencilBuilder.registerStencil(TinkerTools.woodPattern, 4); // hatchet head
StencilBuilder.registerStencil(TinkerTools.woodPattern, 18); // scythe
StencilBuilder.registerStencil(4, TinkerTools.woodPattern, 2); // pickaxe head
StencilBuilder.registerStencil(5, TinkerTools.woodPattern, 3); // shovel head
StencilBuilder.registerStencil(6, TinkerTools.woodPattern, 4); // hatchet head
StencilBuilder.registerStencil(7, TinkerTools.woodPattern, 18); // scythe
StencilBuilder.registerStencil(TinkerTools.woodPattern, 21); // hammer head
StencilBuilder.registerStencil(TinkerTools.woodPattern, 19); // excavator head
StencilBuilder.registerStencil(TinkerTools.woodPattern, 17); // lumberaxe head
StencilBuilder.registerStencil(TinkerTools.woodPattern, 16); // large plate
StencilBuilder.registerStencil(8, TinkerTools.woodPattern, 21); // hammer head
StencilBuilder.registerStencil(9, TinkerTools.woodPattern, 19); // excavator head
StencilBuilder.registerStencil(10, TinkerTools.woodPattern, 17); // lumberaxe head
StencilBuilder.registerStencil(11, TinkerTools.woodPattern, 16); // large plate
StencilBuilder.registerStencil(TinkerTools.woodPattern, 10); // frying pan
StencilBuilder.registerStencil(TinkerTools.woodPattern, 11); // battlesign
StencilBuilder.registerStencil(TinkerTools.woodPattern, 13); // chisel
StencilBuilder.registerStencil(12, TinkerTools.woodPattern, 10); // frying pan
StencilBuilder.registerStencil(13, TinkerTools.woodPattern, 11); // battlesign
StencilBuilder.registerStencil(14, TinkerTools.woodPattern, 13); // chisel
StencilBuilder.registerStencil(TinkerTools.woodPattern, 12); // knifeblade
StencilBuilder.registerStencil(TinkerTools.woodPattern, 5); // swordblade
StencilBuilder.registerStencil(TinkerTools.woodPattern, 20); // cleaver blade
StencilBuilder.registerStencil(15, TinkerTools.woodPattern, 12); // knifeblade
StencilBuilder.registerStencil(16, TinkerTools.woodPattern, 5); // swordblade
StencilBuilder.registerStencil(17, TinkerTools.woodPattern, 20); // cleaver blade
StencilBuilder.registerStencil(TinkerTools.woodPattern, 8); // crossbar
StencilBuilder.registerStencil(TinkerTools.woodPattern, 7); // small guard
StencilBuilder.registerStencil(TinkerTools.woodPattern, 6); // wide guard
StencilBuilder.registerStencil(18, TinkerTools.woodPattern, 8); // crossbar
StencilBuilder.registerStencil(19, TinkerTools.woodPattern, 7); // small guard
StencilBuilder.registerStencil(20, TinkerTools.woodPattern, 6); // wide guard
StencilBuilder.registerStencil(TinkerTools.woodPattern, 25); // arrow head
StencilBuilder.registerStencil(TinkerTools.woodPattern, 24); // fletchling
StencilBuilder.registerStencil(TinkerTools.woodPattern, 23); // bowstring
StencilBuilder.registerStencil(21, TinkerTools.woodPattern, 25); // arrow head
StencilBuilder.registerStencil(22, TinkerTools.woodPattern, 24); // fletchling
StencilBuilder.registerStencil(23, TinkerTools.woodPattern, 23); // bowstring
}
public static final class MaterialID
@@ -345,16 +345,15 @@ public class ToolProxyClient extends ToolProxyCommon
};
int i = 0;
for (ItemStack stack : StencilBuilder.getStencils())
for (int[] icon : icons)
{
// spacer
while (icons[i].length == 0)
if(icon.length == 0)
{
addStencilButton(0, 0, -1);
i++;
}
addStencilButton(icons[i][0], icons[i][1], StencilBuilder.getIndex(stack));
i++;
else
addStencilButton(icon[0], icon[1], i++);
}
}
@@ -92,7 +92,7 @@ public class StencilTableGui extends GuiContainer
ItemStack stack;
if (logic.getStackInSlot(1) != null)
{
activeButton = StencilBuilder.getIndex(logic.getStackInSlot(1));
activeButton = StencilBuilder.getId(logic.getStackInSlot(1));
setActiveButton(activeButton);
stack = StencilBuilder.getStencil(((GuiButtonStencil) this.buttonList.get(activeButton)).element.stencilIndex);
}