diff --git a/mods/tinker/tconstruct/PHConstruct.java b/mods/tinker/tconstruct/PHConstruct.java index 4d7a59da..866828cc 100644 --- a/mods/tinker/tconstruct/PHConstruct.java +++ b/mods/tinker/tconstruct/PHConstruct.java @@ -178,13 +178,6 @@ public class PHConstruct aluminumuMinY = config.get("Worldgen", "Aluminum Underground Min Y", 0).getInt(0); aluminumuMaxY = config.get("Worldgen", "Aluminum Underground Max Y", 64).getInt(64); - copperbMinY = config.get("Worldgen", "Copper Bush Min Y", 20).getInt(20); - copperbMaxY = config.get("Worldgen", "Copper Bush Max Y", 60).getInt(60); - tinbMinY = config.get("Worldgen", "Tin Bush Min Y", 0).getInt(0); - tinbMaxY = config.get("Worldgen", "Tin Bush Max Y", 40).getInt(40); - aluminumbMinY = config.get("Worldgen", "Aluminum Bush Min Y", 0).getInt(0); - aluminumbMaxY = config.get("Worldgen", "Aluminum Bush Max Y", 64).getInt(64); - ironsRarity = config.get("Worldgen", "Iron Surface Rarity", 50).getInt(50); goldsRarity = config.get("Worldgen", "Gold Surface Rarity", 150).getInt(150); coppersRarity = config.get("Worldgen", "Copper Surface Rarity", 32).getInt(32); @@ -192,12 +185,19 @@ public class PHConstruct aluminumsRarity = config.get("Worldgen", "Aluminum Surface Rarity", 32).getInt(32); cobaltsRarity = config.get("Worldgen", "Cobalt Surface Rarity", 400).getInt(400); - ironbDensity = config.get("Worldgen", "Iron Bush Density", 1).getInt(1); - goldbDensity = config.get("Worldgen", "Gold Bush Density", 1).getInt(1); - copperbDensity = config.get("Worldgen", "Copper Bush Density", 2).getInt(2); - tinbDensity = config.get("Worldgen", "Tin Bush Density", 2).getInt(2); + ironBushDensity = config.get("Worldgen", "Iron Bush Density", 1).getInt(1); + goldBushDensity = config.get("Worldgen", "Gold Bush Density", 1).getInt(1); + copperBushDensity = config.get("Worldgen", "Copper Bush Density", 2).getInt(2); + tinBushDensity = config.get("Worldgen", "Tin Bush Density", 2).getInt(2); aluminumbDensity = config.get("Worldgen", "Aluminum Bush Density", 2).getInt(2); - silverbDensity = config.get("Worldgen", "Silver Bush Density", 1).getInt(1); + silverBushDensity = config.get("Worldgen", "Silver Bush Density", 1).getInt(1); + + copperBushMinY = config.get("Worldgen", "Copper Bush Min Y", 20).getInt(20); + copperBushMaxY = config.get("Worldgen", "Copper Bush Max Y", 60).getInt(60); + tinBushMinY = config.get("Worldgen", "Tin Bush Min Y", 0).getInt(0); + tinBushMaxY = config.get("Worldgen", "Tin Bush Max Y", 40).getInt(40); + aluminumBushMinY = config.get("Worldgen", "Aluminum Bush Min Y", 0).getInt(0); + aluminumBushMaxY = config.get("Worldgen", "Aluminum Bush Max Y", 64).getInt(64); seaLevel = config.get("general", "Sea level", 64).getInt(64); @@ -323,12 +323,12 @@ public class PHConstruct public static int aluminumsRarity; public static int cobaltsRarity; - public static int ironbDensity; - public static int goldbDensity; - public static int copperbDensity; - public static int tinbDensity; + public static int ironBushDensity; + public static int goldBushDensity; + public static int copperBushDensity; + public static int tinBushDensity; public static int aluminumbDensity; - public static int silverbDensity; + public static int silverBushDensity; public static int copperuMinY; public static int copperuMaxY; @@ -337,12 +337,12 @@ public class PHConstruct public static int aluminumuMinY; public static int aluminumuMaxY; - public static int copperbMinY; - public static int copperbMaxY; - public static int tinbMinY; - public static int tinbMaxY; - public static int aluminumbMinY; - public static int aluminumbMaxY; + public static int copperBushMinY; + public static int copperBushMaxY; + public static int tinBushMinY; + public static int tinBushMaxY; + public static int aluminumBushMinY; + public static int aluminumBushMaxY; public static int seaLevel; diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index fa25c555..ca5fccd7 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -3,10 +3,10 @@ package mods.tinker.tconstruct; import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.TabTools; import mods.tinker.tconstruct.player.TPlayerHandler; -import mods.tinker.tconstruct.village.TVillageTrades; -import mods.tinker.tconstruct.village.VillageSmelteryHandler; -import mods.tinker.tconstruct.village.VillageToolStationHandler; import mods.tinker.tconstruct.worldgen.TBaseWorldGenerator; +import mods.tinker.tconstruct.worldgen.village.TVillageTrades; +import mods.tinker.tconstruct.worldgen.village.VillageSmelteryHandler; +import mods.tinker.tconstruct.worldgen.village.VillageToolStationHandler; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Instance; @@ -26,7 +26,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry; * @dependencies: IC2 API, EBXL API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3dev.16", dependencies = "required-after:Forge@[7.7.1.659,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3dev.19", dependencies = "required-after:Forge@[7.7.1.659,)") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.TPacketHandler.class) public class TConstruct { @@ -59,7 +59,7 @@ public class TConstruct proxy.registerTickHandler(); proxy.addNames(); proxy.readManuals(); - //proxy.registerKeys(); + proxy.registerKeys(); GameRegistry.registerWorldGenerator(new TBaseWorldGenerator()); GameRegistry.registerFuelHandler(content); diff --git a/mods/tinker/tconstruct/TContent.java b/mods/tinker/tconstruct/TContent.java index be28a61a..102ae013 100644 --- a/mods/tinker/tconstruct/TContent.java +++ b/mods/tinker/tconstruct/TContent.java @@ -718,9 +718,9 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(materials, 9, 16), "m", 'm', new ItemStack(metalBlock, 1, 9)); //Steel GameRegistry.addRecipe(new ItemStack(Item.ingotIron), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 19)); //Iron - GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 20)); //Copper - GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 21)); //Tin - GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 22)); //Aluminum + GameRegistry.addRecipe(new ItemStack(materials, 1, 9), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 20)); //Copper + GameRegistry.addRecipe(new ItemStack(materials, 1, 10), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 21)); //Tin + GameRegistry.addRecipe(new ItemStack(materials, 1, 12), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 22)); //Aluminum LiquidBlockCasting lbc = LiquidBlockCasting.instance; lbc.addBlockCastingRecipe(new ItemStack(Block.blockIron), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 0), null, true, 100); //Iron diff --git a/mods/tinker/tconstruct/TGuiHandler.java b/mods/tinker/tconstruct/TGuiHandler.java index 5f521fdf..e6ad85b8 100644 --- a/mods/tinker/tconstruct/TGuiHandler.java +++ b/mods/tinker/tconstruct/TGuiHandler.java @@ -3,7 +3,9 @@ package mods.tinker.tconstruct; import mods.tinker.common.InventoryLogic; import mods.tinker.tconstruct.client.*; import mods.tinker.tconstruct.client.gui.*; +import mods.tinker.tconstruct.container.*; import mods.tinker.tconstruct.logic.*; +import mods.tinker.tconstruct.player.TPlayerStats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -19,6 +21,7 @@ public class TGuiHandler implements IGuiHandler public static int frypanID = 4; public static int smeltery = 7; + public static int armor = 101; public static int manualGui = -1; @Override @@ -27,10 +30,22 @@ public class TGuiHandler implements IGuiHandler if (ID < 0) return null; - TileEntity tile = world.getBlockTileEntity(x, y, z); - if (tile != null && tile instanceof InventoryLogic) + else if (ID <= 100) { - return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); + TileEntity tile = world.getBlockTileEntity(x, y, z); + if (tile != null && tile instanceof InventoryLogic) + { + return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); + } + } + else + { + if (ID == armor) + { + System.out.println("Server Armor Gui: "+player.username); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + return new ArmorExtendedContainer(player.inventory, stats); + } } return null; } @@ -55,6 +70,12 @@ public class TGuiHandler implements IGuiHandler ItemStack stack = player.getCurrentEquippedItem(); return new GuiManual(stack, TProxyClient.getManualFromStack(stack)); } + if (ID == armor) + { + System.out.println("Client Armor Gui: "+player.username); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + return new ArmorExtendedGui(player.inventory, stats); + } return null; } diff --git a/mods/tinker/tconstruct/TPacketHandler.java b/mods/tinker/tconstruct/TPacketHandler.java index 3901d858..476baad3 100644 --- a/mods/tinker/tconstruct/TPacketHandler.java +++ b/mods/tinker/tconstruct/TPacketHandler.java @@ -101,18 +101,25 @@ public class TPacketHandler implements IPacketHandler } } + else if (packetID == 3) //Armor + { + String user = inputStream.readUTF(); + EntityPlayer player = TConstruct.playerTracker.getEntityPlayer(user); + player.openGui(TConstruct.instance, TGuiHandler.armor, player.worldObj, (int)player.posX, (int)player.posY, (int)player.posZ); + } + else if (packetID == 10) //Double jump { String user = inputStream.readUTF(); EntityPlayer player = TConstruct.playerTracker.getEntityPlayer(user); player.fallDistance = 0; } - else if (packetID == 11) + /*else if (packetID == 11) { String user = inputStream.readUTF(); float size = inputStream.readFloat(); TConstruct.playerTracker.updateSize(user, size); - } + }*/ } catch (IOException e) { diff --git a/mods/tinker/tconstruct/blocks/OreberryBush.java b/mods/tinker/tconstruct/blocks/OreberryBush.java index ebf12db4..4fb2326f 100644 --- a/mods/tinker/tconstruct/blocks/OreberryBush.java +++ b/mods/tinker/tconstruct/blocks/OreberryBush.java @@ -61,8 +61,8 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable for (int i = 0; i < this.fastIcons.length; i++) { - this.fastIcons[i] = iconRegister.registerIcon("tinker:berries/" + textureNames[i] + "_fast"); - this.fancyIcons[i] = iconRegister.registerIcon("tinker:berries/" + textureNames[i] + "_fancy"); + this.fastIcons[i] = iconRegister.registerIcon("tinker:crops/" + textureNames[i] + "_fast"); + this.fancyIcons[i] = iconRegister.registerIcon("tinker:crops/" + textureNames[i] + "_fancy"); } } diff --git a/mods/tinker/tconstruct/client/TControls.java b/mods/tinker/tconstruct/client/TControls.java index 24b975e8..dac02461 100644 --- a/mods/tinker/tconstruct/client/TControls.java +++ b/mods/tinker/tconstruct/client/TControls.java @@ -5,6 +5,7 @@ import java.io.DataOutputStream; import java.util.EnumSet; import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.TGuiHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.settings.KeyBinding; @@ -15,8 +16,9 @@ import cpw.mods.fml.common.network.PacketDispatcher; public class TControls extends TKeyHandler { - static KeyBinding grabKey = new KeyBinding("key.grab", 29); + //static KeyBinding grabKey = new KeyBinding("key.grab", 29); //static KeyBinding stiltsKey = new KeyBinding("key.stilts", 46); + static KeyBinding armorKey = new KeyBinding("key.armor", 23); static KeyBinding jumpKey; static Minecraft mc; boolean jumping; @@ -24,11 +26,13 @@ public class TControls extends TKeyHandler boolean climbing = false; boolean onGround = false; boolean onStilts = false; + + boolean armorGuiOpen = false; //boolean onStilts = false; public TControls() { - super(new KeyBinding[] { grabKey }, new boolean[] { false }, getVanillaKeyBindings(), new boolean[] { false }); + super(new KeyBinding[] { armorKey }, new boolean[] { false }, getVanillaKeyBindings(), new boolean[] { false }); //System.out.println("Controls registered"); } @@ -50,7 +54,12 @@ public class TControls extends TKeyHandler { if (tickEnd && mc.theWorld != null) { - if (kb == jumpKey) //Double jump + if (kb == armorKey && !armorGuiOpen) //Extended Armor + { + //mc.thePlayer.openGui(TConstruct.instance, TGuiHandler.armor, mc.theWorld, (int)mc.thePlayer.posX, (int)mc.thePlayer.posY, (int)mc.thePlayer.posZ); + openArmorGui(mc.thePlayer.username); + } + /*if (kb == jumpKey) //Double jump { if (jumping && !doubleJump) { @@ -71,7 +80,7 @@ public class TControls extends TKeyHandler if (!jumping) jumping = mc.thePlayer.isAirBorne; - } + }*/ } /*else if (kb == stiltsKey) //Stilts { @@ -154,6 +163,23 @@ public class TControls extends TKeyHandler updateServer(bos); } + void openArmorGui(String username) + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(8); + DataOutputStream outputStream = new DataOutputStream(bos); + try + { + outputStream.writeByte(3); + outputStream.writeUTF(username); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + + updateServer(bos); + } + void updateServer(ByteArrayOutputStream bos) { Packet250CustomPayload packet = new Packet250CustomPayload(); diff --git a/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java b/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java new file mode 100644 index 00000000..9c40a1df --- /dev/null +++ b/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java @@ -0,0 +1,105 @@ +package mods.tinker.tconstruct.client.gui; + +import mods.tinker.tconstruct.container.ArmorExtendedContainer; +import mods.tinker.tconstruct.player.TPlayerStats; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.InventoryEffectRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +public class ArmorExtendedGui extends InventoryEffectRenderer +{ + public InventoryPlayer inv; + public TPlayerStats stats; + + private float xSize_lo; + private float ySize_lo; + + + public ArmorExtendedGui(InventoryPlayer inventoryplayer, TPlayerStats holder) + { + super(new ArmorExtendedContainer(inventoryplayer, holder)); + inv = inventoryplayer; + stats = holder; + } + + protected void drawGuiContainerForegroundLayer(int par1, int par2) + { + //fontRenderer.drawString("This Gui is broken :D", 8, -10, 0x404040); + //fontRenderer.drawString(StatCollector.translateToLocal("inventory.armorextended"), 60, 6, 0x404040); + //fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); + } + + public void drawScreen(int par1, int par2, float par3) + { + super.drawScreen(par1, par2, par3); + this.xSize_lo = (float)par1; + this.ySize_lo = (float)par2; + } + + protected void drawGuiContainerBackgroundLayer(float f, int i, int j) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.bindTexture("/mods/tinker/textures/gui/armorextended.png"); + int cornerX = (width - xSize) / 2; + int cornerY = (height - ySize) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); + + if (!stats.isStackInSlot(0)) + drawTexturedModalRect(cornerX+79, cornerY+16, 176, 9, 18, 18); + if (!stats.isStackInSlot(1)) + drawTexturedModalRect(cornerX+79, cornerY+34, 176, 27, 18, 18); + if (!stats.isStackInSlot(2)) + drawTexturedModalRect(cornerX+115, cornerY+16, 212, 9, 18, 18); + if (!stats.isStackInSlot(3)) + drawTexturedModalRect(cornerX+115, cornerY+34, 212, 27, 18, 18); + if (!stats.isStackInSlot(4)) + drawTexturedModalRect(cornerX+151, cornerY+16, 230, 0, 18, 18); + if (!stats.isStackInSlot(5)) + drawTexturedModalRect(cornerX+151, cornerY+34, 230, 18, 18, 18); + if (!stats.isStackInSlot(6)) + drawTexturedModalRect(cornerX+151, cornerY+52, 230, 36, 18, 18); + + cornerX = this.guiLeft; + cornerY = this.guiTop; + drawPlayerOnGui(this.mc, cornerX + 33, cornerY + 75, 30, (float)(cornerX + 51) - this.xSize_lo, (float)(cornerY + 75 - 50) - this.ySize_lo); + } + + public static void drawPlayerOnGui(Minecraft par0Minecraft, int par1, int par2, int par3, float par4, float par5) + { + GL11.glEnable(GL11.GL_COLOR_MATERIAL); + GL11.glPushMatrix(); + GL11.glTranslatef((float)par1, (float)par2, 50.0F); + GL11.glScalef((float)(-par3), (float)par3, (float)par3); + GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + float f2 = par0Minecraft.thePlayer.renderYawOffset; + float f3 = par0Minecraft.thePlayer.rotationYaw; + float f4 = par0Minecraft.thePlayer.rotationPitch; + par4 -= 19; + GL11.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); + RenderHelper.enableStandardItemLighting(); + GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-((float)Math.atan((double)(par5 / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F); + par0Minecraft.thePlayer.renderYawOffset = (float)Math.atan((double)(par4 / 40.0F)) * 20.0F; + par0Minecraft.thePlayer.rotationYaw = (float)Math.atan((double)(par4 / 40.0F)) * 40.0F; + par0Minecraft.thePlayer.rotationPitch = -((float)Math.atan((double)(par5 / 40.0F))) * 20.0F; + par0Minecraft.thePlayer.rotationYawHead = par0Minecraft.thePlayer.rotationYaw; + GL11.glTranslatef(0.0F, par0Minecraft.thePlayer.yOffset, 0.0F); + RenderManager.instance.playerViewY = 180.0F; + RenderManager.instance.renderEntityWithPosYaw(par0Minecraft.thePlayer, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); + par0Minecraft.thePlayer.renderYawOffset = f2; + par0Minecraft.thePlayer.rotationYaw = f3; + par0Minecraft.thePlayer.rotationPitch = f4; + GL11.glPopMatrix(); + RenderHelper.disableStandardItemLighting(); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GL11.glDisable(GL11.GL_TEXTURE_2D); + OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + } +} diff --git a/mods/tinker/tconstruct/projectilerender/DaggerRender.java b/mods/tinker/tconstruct/client/projectilerender/DaggerRender.java similarity index 97% rename from mods/tinker/tconstruct/projectilerender/DaggerRender.java rename to mods/tinker/tconstruct/client/projectilerender/DaggerRender.java index 1f81ccaa..b5786be8 100644 --- a/mods/tinker/tconstruct/projectilerender/DaggerRender.java +++ b/mods/tinker/tconstruct/client/projectilerender/DaggerRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.projectilerender; +package mods.tinker.tconstruct.client.projectilerender; import java.util.Random; import mods.tinker.tconstruct.entity.projectile.DaggerEntity; diff --git a/mods/tinker/tconstruct/projectilerender/RangedRenderBase.java b/mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java similarity index 98% rename from mods/tinker/tconstruct/projectilerender/RangedRenderBase.java rename to mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java index b62c10b3..dc42a0a9 100644 --- a/mods/tinker/tconstruct/projectilerender/RangedRenderBase.java +++ b/mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.projectilerender; +package mods.tinker.tconstruct.client.projectilerender; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/mods/tinker/tconstruct/container/ArmorExtended.java b/mods/tinker/tconstruct/container/ArmorExtended.java deleted file mode 100644 index 05b7313e..00000000 --- a/mods/tinker/tconstruct/container/ArmorExtended.java +++ /dev/null @@ -1,90 +0,0 @@ -package mods.tinker.tconstruct.container; - -import mods.tinker.common.IPattern; -import mods.tinker.tconstruct.player.TPlayerStats; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class ArmorExtended extends ActiveContainer -{ - public InventoryPlayer invPlayer; - public TPlayerStats armor; - - public ArmorExtended(InventoryPlayer inventoryplayer, TPlayerStats partLogic) - { - invPlayer = inventoryplayer; - armor = partLogic; - - /*inventory = new Slot[] { new SlotPattern(partLogic, 0, 40, 27), new SlotPattern(partLogic, 1, 40, 45), new Slot(partLogic, 2, 58, 27), new Slot(partLogic, 3, 58, 45), - new SlotOnlyTake(partLogic, 4, 102, 27), new SlotOnlyTake(partLogic, 5, 120, 27), new SlotOnlyTake(partLogic, 6, 102, 45), new SlotOnlyTake(partLogic, 7, 120, 45) }; - for (int iter = 0; iter < inventory.length; iter ++) - this.addSlotToContainer(inventory[iter]);*/ - - /* Player inventory */ - /*for (int armor = 0; armor < 4; ++armor) - { - this.addSlotToContainer(new SlotArmor(this, par1InventoryPlayer, par1InventoryPlayer.getSizeInventory() - 1 - armor, 8, 8 + armor * 18, armor)); - }*/ - - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); - } - } - - for (int column = 0; column < 9; column++) - { - this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142)); - } - - } - - @Override - public boolean canInteractWith(EntityPlayer var1) - { - return true; - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotID) - { - ItemStack stack = null; - Slot slot = (Slot)this.inventorySlots.get(slotID); - - if (slot != null && slot.getHasStack()) - { - ItemStack slotStack = slot.getStack(); - stack = slotStack.copy(); - - if (slotID < armor.getSizeInventory()) - { - if (!this.mergeItemStack(slotStack, armor.getSizeInventory(), this.inventorySlots.size(), true)) - { - return null; - } - } - else - { - if (slotStack.getItem() instanceof IPattern) - { - if (!this.mergeItemStack(slotStack, 0, 2, false)) - return null; - } - else if (!this.mergeItemStack(slotStack, 2, 4, false)) - return null; - } - - /*if (slotStack.stackSize == 0) - { - slot.putStack((ItemStack)null); - armor.tryBuildPart(slotID); - }*/ - slot.onSlotChanged(); - } - return stack; - } -} diff --git a/mods/tinker/tconstruct/container/ArmorExtendedContainer.java b/mods/tinker/tconstruct/container/ArmorExtendedContainer.java new file mode 100644 index 00000000..1d777251 --- /dev/null +++ b/mods/tinker/tconstruct/container/ArmorExtendedContainer.java @@ -0,0 +1,60 @@ +package mods.tinker.tconstruct.container; + +import mods.tinker.common.IPattern; +import mods.tinker.tconstruct.player.TPlayerStats; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ArmorExtendedContainer extends ActiveContainer +{ + public InventoryPlayer invPlayer; + public TPlayerStats armor; + + public ArmorExtendedContainer(InventoryPlayer inventoryplayer, TPlayerStats stats) + { + invPlayer = inventoryplayer; + armor = stats; + + this.addSlotToContainer(new Slot(stats, 0, 80, 17)); + this.addSlotToContainer(new Slot(stats, 1, 80, 35)); + this.addSlotToContainer(new Slot(stats, 2, 116, 17)); + this.addSlotToContainer(new Slot(stats, 3, 116, 35)); + this.addSlotToContainer(new Slot(stats, 4, 152, 17)); + this.addSlotToContainer(new Slot(stats, 5, 152, 35)); + this.addSlotToContainer(new Slot(stats, 6, 152, 53)); + + /* Player inventory */ + for (int armor = 0; armor < 4; ++armor) + { + this.addSlotToContainer(new SlotArmorCopy(this, inventoryplayer, inventoryplayer.getSizeInventory() - 1 - armor, 98, 8 + armor * 18, armor)); + } + + for (int column = 0; column < 3; column++) + { + for (int row = 0; row < 9; row++) + { + this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); + } + } + + for (int column = 0; column < 9; column++) + { + this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142)); + } + + } + + @Override + public boolean canInteractWith(EntityPlayer var1) + { + return true; + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + return null; + } +} diff --git a/mods/tinker/tconstruct/container/SlotArmorCopy.java b/mods/tinker/tconstruct/container/SlotArmorCopy.java new file mode 100644 index 00000000..35aa3c10 --- /dev/null +++ b/mods/tinker/tconstruct/container/SlotArmorCopy.java @@ -0,0 +1,59 @@ +package mods.tinker.tconstruct.container; + +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SlotArmorCopy extends Slot +{ + /** + * The armor type that can be placed on that slot, it uses the same values of armorType field on ItemArmor. + */ + final int armorType; + + /** + * The parent class of this clot, ContainerPlayer, SlotArmor is a Anon inner class. + */ + final Container parent; + + public SlotArmorCopy(Container container, IInventory par2IInventory, int par3, int par4, int par5, int par6) + { + super(par2IInventory, par3, par4, par5); + this.parent = container; + this.armorType = par6; + } + + /** + * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case + * of armor slots) + */ + public int getSlotStackLimit() + { + return 1; + } + + /** + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. + */ + public boolean isItemValid(ItemStack par1ItemStack) + { + Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); + return item != null && item.isValidArmor(par1ItemStack, armorType); + } + + @SideOnly(Side.CLIENT) + + /** + * Returns the icon index on items.png that is used as background image of the slot. + */ + public Icon getBackgroundIconIndex() + { + return ItemArmor.func_94602_b(this.armorType); + } +} diff --git a/mods/tinker/tconstruct/player/TPlayerHandler.java b/mods/tinker/tconstruct/player/TPlayerHandler.java index 8794d92e..9ea1fcba 100644 --- a/mods/tinker/tconstruct/player/TPlayerHandler.java +++ b/mods/tinker/tconstruct/player/TPlayerHandler.java @@ -164,7 +164,7 @@ public class TPlayerHandler implements IPlayerTracker } /* Find the right player */ - TPlayerStats getPlayerStats (String username) + public TPlayerStats getPlayerStats (String username) { TPlayerStats stats = playerStats.get(username); if (stats == null) diff --git a/mods/tinker/tconstruct/player/TPlayerStats.java b/mods/tinker/tconstruct/player/TPlayerStats.java index 191e1b57..f11bf133 100644 --- a/mods/tinker/tconstruct/player/TPlayerStats.java +++ b/mods/tinker/tconstruct/player/TPlayerStats.java @@ -16,24 +16,48 @@ public class TPlayerStats implements IInventory public boolean materialManual; public boolean smelteryManual; - public ItemStack[] armor = new ItemStack[7]; + public ItemStack[] inventory = new ItemStack[7]; @Override public int getSizeInventory () { - return armor.length; + return inventory.length; + } + + public boolean isStackInSlot (int slot) + { + return inventory[slot] != null; } @Override public ItemStack getStackInSlot (int slot) { - return null; + return inventory[slot]; } @Override public ItemStack decrStackSize (int slot, int quantity) { - return null; + if (inventory[slot] != null) + { + System.out.println("Took something from slot "+slot); + if (inventory[slot].stackSize <= quantity) + { + ItemStack stack = inventory[slot]; + inventory[slot] = null; + return stack; + } + ItemStack split = inventory[slot].splitStack(quantity); + if (inventory[slot].stackSize == 0) + { + inventory[slot] = null; + } + return split; + } + else + { + return null; + } } @Override @@ -45,13 +69,18 @@ public class TPlayerStats implements IInventory @Override public void setInventorySlotContents (int slot, ItemStack itemstack) { - + inventory[slot] = itemstack; + //System.out.println("Changed slot "+slot); + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) + { + itemstack.stackSize = getInventoryStackLimit(); + } } @Override public String getInvName () { - return null; + return ""; } @Override @@ -63,13 +92,12 @@ public class TPlayerStats implements IInventory @Override public int getInventoryStackLimit () { - return 0; + return 64; } @Override public void onInventoryChanged () { - } @Override @@ -78,17 +106,8 @@ public class TPlayerStats implements IInventory return true; } - @Override - public void openChest () - { - - } - - @Override - public void closeChest () - { - - } + public void openChest () {} + public void closeChest () {} @Override public boolean isStackValidForSlot (int slot, ItemStack itemstack) diff --git a/mods/tinker/tconstruct/tools/Axe.java b/mods/tinker/tconstruct/tools/Axe.java index 8d747cde..d1e98220 100644 --- a/mods/tinker/tconstruct/tools/Axe.java +++ b/mods/tinker/tconstruct/tools/Axe.java @@ -48,7 +48,7 @@ public class Axe extends HarvestTool return AbilityHelper.onBlockChanged(itemstack, world, bID, x, y, z, player, random); } - static Material[] materials = { Material.wood, Material.leaves, Material.circuits, Material.cactus, Material.pumpkin }; + static Material[] materials = { Material.wood, Material.leaves, Material.circuits, Material.cactus, Material.pumpkin }; @Override protected Item getHeadItem () diff --git a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java index 92f4429a..e9fb814b 100644 --- a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java @@ -149,7 +149,7 @@ public class TBaseWorldGenerator implements IWorldGenerator int xPos, yPos, zPos; if (PHConstruct.generateIronBush) { - for (int i = 0; i < PHConstruct.ironbDensity; i++) + for (int i = 0; i < PHConstruct.ironBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = PHConstruct.seaLevel - 32; @@ -165,7 +165,7 @@ public class TBaseWorldGenerator implements IWorldGenerator } if (PHConstruct.generateGoldBush) { - for (int i = 0; i < PHConstruct.goldbDensity; i++) + for (int i = 0; i < PHConstruct.goldBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = 16; @@ -181,12 +181,12 @@ public class TBaseWorldGenerator implements IWorldGenerator } if (PHConstruct.generateCopperBush)// && random.nextInt(PHConstruct.copperbRarity) == 0) { - for (int i = 0; i < PHConstruct.copperbDensity; i++) + for (int i = 0; i < PHConstruct.copperBushDensity; i++) { xPos = xChunk + random.nextInt(16); - yPos = (PHConstruct.copperbMaxY + PHConstruct.copperbMinY) / 2; + yPos = (PHConstruct.copperBushMaxY + PHConstruct.copperBushMinY) / 2; zPos = zChunk + random.nextInt(16); - yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.copperbMaxY, PHConstruct.copperbMinY); + yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.copperBushMaxY, PHConstruct.copperBushMinY); if (yPos != -1) { /*CoordTuple coord = new CoordTuple(xPos, yPos, zPos); @@ -197,12 +197,12 @@ public class TBaseWorldGenerator implements IWorldGenerator } if (PHConstruct.generateTinBush)// && random.nextInt(PHConstruct.tinbRarity) == 0) { - for (int i = 0; i < PHConstruct.tinbDensity; i++) + for (int i = 0; i < PHConstruct.tinBushDensity; i++) { xPos = xChunk + random.nextInt(16); - yPos = (PHConstruct.tinuMaxY + PHConstruct.tinbMinY) / 2; + yPos = (PHConstruct.tinBushMaxY + PHConstruct.tinBushMinY) / 2; zPos = zChunk + random.nextInt(16); - yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.tinbMaxY, PHConstruct.tinbMinY); + yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.tinBushMaxY, PHConstruct.tinBushMinY); if (yPos != -1) { /*CoordTuple coord = new CoordTuple(xPos, yPos, zPos); @@ -216,9 +216,9 @@ public class TBaseWorldGenerator implements IWorldGenerator for (int i = 0; i < PHConstruct.aluminumbDensity; i++) { xPos = xChunk + random.nextInt(16); - yPos = (PHConstruct.aluminumuMaxY + PHConstruct.aluminumbMinY) / 2; + yPos = (PHConstruct.aluminumBushMaxY + PHConstruct.aluminumBushMinY) / 2; zPos = zChunk + random.nextInt(16); - yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.aluminumbMaxY, PHConstruct.aluminumbMinY); + yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.aluminumBushMaxY, PHConstruct.aluminumBushMinY); if (yPos != -1) { /*CoordTuple coord = new CoordTuple(xPos, yPos, zPos); @@ -227,9 +227,9 @@ public class TBaseWorldGenerator implements IWorldGenerator } } } - if (PHConstruct.generateSilverBush && random.nextInt(PHConstruct.silverbDensity) == 0) + if (PHConstruct.generateSilverBush && random.nextInt(PHConstruct.silverBushDensity) == 0) { - for (int i = 0; i < PHConstruct.silverbDensity; i++) + for (int i = 0; i < PHConstruct.silverBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = PHConstruct.seaLevel - 16; diff --git a/mods/tinker/tconstruct/village/ComponentSmeltery.java b/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java similarity index 99% rename from mods/tinker/tconstruct/village/ComponentSmeltery.java rename to mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java index 89faedc1..88317cd0 100644 --- a/mods/tinker/tconstruct/village/ComponentSmeltery.java +++ b/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; diff --git a/mods/tinker/tconstruct/village/ComponentToolWorkshop.java b/mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java similarity index 98% rename from mods/tinker/tconstruct/village/ComponentToolWorkshop.java rename to mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java index 363ebaa1..971523d0 100644 --- a/mods/tinker/tconstruct/village/ComponentToolWorkshop.java +++ b/mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; @@ -130,6 +130,7 @@ public class ComponentToolWorkshop extends ComponentVillage this.fillCurrentPositionBlocksDownwards(world, Block.cobblestone.blockID, 0, i1, -1, l, sbb); } } + this.spawnVillagers(world, sbb, 3, 1, 3, 1); return true; } diff --git a/mods/tinker/tconstruct/village/TVillageTrades.java b/mods/tinker/tconstruct/worldgen/village/TVillageTrades.java similarity index 93% rename from mods/tinker/tconstruct/village/TVillageTrades.java rename to mods/tinker/tconstruct/worldgen/village/TVillageTrades.java index 1301afcf..2958e422 100644 --- a/mods/tinker/tconstruct/village/TVillageTrades.java +++ b/mods/tinker/tconstruct/worldgen/village/TVillageTrades.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; diff --git a/mods/tinker/tconstruct/village/VillageSmelteryHandler.java b/mods/tinker/tconstruct/worldgen/village/VillageSmelteryHandler.java similarity index 93% rename from mods/tinker/tconstruct/village/VillageSmelteryHandler.java rename to mods/tinker/tconstruct/worldgen/village/VillageSmelteryHandler.java index 01d5d203..ce461ff4 100644 --- a/mods/tinker/tconstruct/village/VillageSmelteryHandler.java +++ b/mods/tinker/tconstruct/worldgen/village/VillageSmelteryHandler.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; @@ -13,7 +13,7 @@ public class VillageSmelteryHandler implements IVillageCreationHandler @Override public StructureVillagePieceWeight getVillagePieceWeight (Random random, int i) { - return new StructureVillagePieceWeight(ComponentSmeltery.class, 20, i+2); + return new StructureVillagePieceWeight(ComponentSmeltery.class, 18, i); } @Override diff --git a/mods/tinker/tconstruct/village/VillageToolStationHandler.java b/mods/tinker/tconstruct/worldgen/village/VillageToolStationHandler.java similarity index 95% rename from mods/tinker/tconstruct/village/VillageToolStationHandler.java rename to mods/tinker/tconstruct/worldgen/village/VillageToolStationHandler.java index 89cc0adb..20b88f30 100644 --- a/mods/tinker/tconstruct/village/VillageToolStationHandler.java +++ b/mods/tinker/tconstruct/worldgen/village/VillageToolStationHandler.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; diff --git a/mods/tinker/textures/GGE/ItemLBInnerSide.png b/mods/tinker/textures/GGE/ItemLBInnerSide.png deleted file mode 100644 index 4f86b2ee..00000000 Binary files a/mods/tinker/textures/GGE/ItemLBInnerSide.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/ItemLBOuterSide.png b/mods/tinker/textures/GGE/ItemLBOuterSide.png deleted file mode 100644 index 3af81220..00000000 Binary files a/mods/tinker/textures/GGE/ItemLBOuterSide.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/ItemLBPoleSide.png b/mods/tinker/textures/GGE/ItemLBPoleSide.png deleted file mode 100644 index 985c6007..00000000 Binary files a/mods/tinker/textures/GGE/ItemLBPoleSide.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/achievementsbg.png b/mods/tinker/textures/GGE/achievementsbg.png deleted file mode 100644 index 0778b53b..00000000 Binary files a/mods/tinker/textures/GGE/achievementsbg.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/b.png b/mods/tinker/textures/GGE/b.png deleted file mode 100644 index d7751bbe..00000000 Binary files a/mods/tinker/textures/GGE/b.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/core.png b/mods/tinker/textures/GGE/core.png deleted file mode 100644 index 7cbf9640..00000000 Binary files a/mods/tinker/textures/GGE/core.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/corestone.png b/mods/tinker/textures/GGE/corestone.png deleted file mode 100644 index 9435d961..00000000 Binary files a/mods/tinker/textures/GGE/corestone.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/face.png b/mods/tinker/textures/GGE/face.png deleted file mode 100644 index db168b01..00000000 Binary files a/mods/tinker/textures/GGE/face.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/glowlogside.png b/mods/tinker/textures/GGE/glowlogside.png deleted file mode 100644 index 2cc4326e..00000000 Binary files a/mods/tinker/textures/GGE/glowlogside.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/glowlogtop.png b/mods/tinker/textures/GGE/glowlogtop.png deleted file mode 100644 index a1e3fe27..00000000 Binary files a/mods/tinker/textures/GGE/glowlogtop.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/glowsapling.png b/mods/tinker/textures/GGE/glowsapling.png deleted file mode 100644 index 7c3db189..00000000 Binary files a/mods/tinker/textures/GGE/glowsapling.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/lifebench top.png b/mods/tinker/textures/GGE/lifebench top.png deleted file mode 100644 index d006eb15..00000000 Binary files a/mods/tinker/textures/GGE/lifebench top.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/lifebenchside.png b/mods/tinker/textures/GGE/lifebenchside.png deleted file mode 100644 index 5135e80b..00000000 Binary files a/mods/tinker/textures/GGE/lifebenchside.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/lifebenchtop.png b/mods/tinker/textures/GGE/lifebenchtop.png deleted file mode 100644 index 00fe69ff..00000000 Binary files a/mods/tinker/textures/GGE/lifebenchtop.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/notebook.png b/mods/tinker/textures/GGE/notebook.png deleted file mode 100644 index 3836208a..00000000 Binary files a/mods/tinker/textures/GGE/notebook.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/recharger.png b/mods/tinker/textures/GGE/recharger.png deleted file mode 100644 index 9051f69b..00000000 Binary files a/mods/tinker/textures/GGE/recharger.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/transparency.png b/mods/tinker/textures/GGE/transparency.png deleted file mode 100644 index 1c65debf..00000000 Binary files a/mods/tinker/textures/GGE/transparency.png and /dev/null differ diff --git a/mods/tinker/textures/GGE/wand.png b/mods/tinker/textures/GGE/wand.png deleted file mode 100644 index d8e63b7d..00000000 Binary files a/mods/tinker/textures/GGE/wand.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/berries/berry_aluminum_fancy.png b/mods/tinker/textures/blocks/crops/berry_aluminum_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_aluminum_fancy.png rename to mods/tinker/textures/blocks/crops/berry_aluminum_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_aluminum_fast.png b/mods/tinker/textures/blocks/crops/berry_aluminum_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_aluminum_fast.png rename to mods/tinker/textures/blocks/crops/berry_aluminum_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fancy.png b/mods/tinker/textures/blocks/crops/berry_aluminum_ripe_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fancy.png rename to mods/tinker/textures/blocks/crops/berry_aluminum_ripe_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fast.png b/mods/tinker/textures/blocks/crops/berry_aluminum_ripe_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fast.png rename to mods/tinker/textures/blocks/crops/berry_aluminum_ripe_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_copper_fancy.png b/mods/tinker/textures/blocks/crops/berry_copper_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_copper_fancy.png rename to mods/tinker/textures/blocks/crops/berry_copper_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_copper_fast.png b/mods/tinker/textures/blocks/crops/berry_copper_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_copper_fast.png rename to mods/tinker/textures/blocks/crops/berry_copper_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_copper_ripe_fancy.png b/mods/tinker/textures/blocks/crops/berry_copper_ripe_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_copper_ripe_fancy.png rename to mods/tinker/textures/blocks/crops/berry_copper_ripe_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_copper_ripe_fast.png b/mods/tinker/textures/blocks/crops/berry_copper_ripe_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_copper_ripe_fast.png rename to mods/tinker/textures/blocks/crops/berry_copper_ripe_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_gold_fancy.png b/mods/tinker/textures/blocks/crops/berry_gold_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_gold_fancy.png rename to mods/tinker/textures/blocks/crops/berry_gold_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_gold_fast.png b/mods/tinker/textures/blocks/crops/berry_gold_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_gold_fast.png rename to mods/tinker/textures/blocks/crops/berry_gold_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_gold_ripe_fancy.png b/mods/tinker/textures/blocks/crops/berry_gold_ripe_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_gold_ripe_fancy.png rename to mods/tinker/textures/blocks/crops/berry_gold_ripe_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_gold_ripe_fast.png b/mods/tinker/textures/blocks/crops/berry_gold_ripe_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_gold_ripe_fast.png rename to mods/tinker/textures/blocks/crops/berry_gold_ripe_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_iron_fancy.png b/mods/tinker/textures/blocks/crops/berry_iron_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_iron_fancy.png rename to mods/tinker/textures/blocks/crops/berry_iron_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_iron_fast.png b/mods/tinker/textures/blocks/crops/berry_iron_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_iron_fast.png rename to mods/tinker/textures/blocks/crops/berry_iron_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_iron_ripe_fancy.png b/mods/tinker/textures/blocks/crops/berry_iron_ripe_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_iron_ripe_fancy.png rename to mods/tinker/textures/blocks/crops/berry_iron_ripe_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_iron_ripe_fast.png b/mods/tinker/textures/blocks/crops/berry_iron_ripe_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_iron_ripe_fast.png rename to mods/tinker/textures/blocks/crops/berry_iron_ripe_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_redstone_fancy.png b/mods/tinker/textures/blocks/crops/berry_redstone_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_redstone_fancy.png rename to mods/tinker/textures/blocks/crops/berry_redstone_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_redstone_fast.png b/mods/tinker/textures/blocks/crops/berry_redstone_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_redstone_fast.png rename to mods/tinker/textures/blocks/crops/berry_redstone_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_redstone_ripe_fancy.png b/mods/tinker/textures/blocks/crops/berry_redstone_ripe_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_redstone_ripe_fancy.png rename to mods/tinker/textures/blocks/crops/berry_redstone_ripe_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_redstone_ripe_fast.png b/mods/tinker/textures/blocks/crops/berry_redstone_ripe_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_redstone_ripe_fast.png rename to mods/tinker/textures/blocks/crops/berry_redstone_ripe_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_silver_fancy.png b/mods/tinker/textures/blocks/crops/berry_silver_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_silver_fancy.png rename to mods/tinker/textures/blocks/crops/berry_silver_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_silver_fast.png b/mods/tinker/textures/blocks/crops/berry_silver_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_silver_fast.png rename to mods/tinker/textures/blocks/crops/berry_silver_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_silver_ripe_fancy.png b/mods/tinker/textures/blocks/crops/berry_silver_ripe_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_silver_ripe_fancy.png rename to mods/tinker/textures/blocks/crops/berry_silver_ripe_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_silver_ripe_fast.png b/mods/tinker/textures/blocks/crops/berry_silver_ripe_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_silver_ripe_fast.png rename to mods/tinker/textures/blocks/crops/berry_silver_ripe_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_tin_fancy.png b/mods/tinker/textures/blocks/crops/berry_tin_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_tin_fancy.png rename to mods/tinker/textures/blocks/crops/berry_tin_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_tin_fast.png b/mods/tinker/textures/blocks/crops/berry_tin_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_tin_fast.png rename to mods/tinker/textures/blocks/crops/berry_tin_fast.png diff --git a/mods/tinker/textures/blocks/berries/berry_tin_ripe_fancy.png b/mods/tinker/textures/blocks/crops/berry_tin_ripe_fancy.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_tin_ripe_fancy.png rename to mods/tinker/textures/blocks/crops/berry_tin_ripe_fancy.png diff --git a/mods/tinker/textures/blocks/berries/berry_tin_ripe_fast.png b/mods/tinker/textures/blocks/crops/berry_tin_ripe_fast.png similarity index 100% rename from mods/tinker/textures/blocks/berries/berry_tin_ripe_fast.png rename to mods/tinker/textures/blocks/crops/berry_tin_ripe_fast.png diff --git a/mods/tinker/textures/blocks/crops/herb_base_1.png b/mods/tinker/textures/blocks/crops/herb_base_1.png new file mode 100644 index 00000000..24adb23d Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_base_1.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_base_2.png b/mods/tinker/textures/blocks/crops/herb_base_2.png new file mode 100644 index 00000000..e81609e7 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_base_2.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_base_3.png b/mods/tinker/textures/blocks/crops/herb_base_3.png new file mode 100644 index 00000000..7ea42793 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_base_3.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_base_4.png b/mods/tinker/textures/blocks/crops/herb_base_4.png new file mode 100644 index 00000000..8a0b07de Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_base_4.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_bloody_1.png b/mods/tinker/textures/blocks/crops/herb_bloody_1.png new file mode 100644 index 00000000..24adb23d Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_bloody_1.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_bloody_2.png b/mods/tinker/textures/blocks/crops/herb_bloody_2.png new file mode 100644 index 00000000..53f0e547 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_bloody_2.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_bloody_3.png b/mods/tinker/textures/blocks/crops/herb_bloody_3.png new file mode 100644 index 00000000..d70f596c Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_bloody_3.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_bloody_4.png b/mods/tinker/textures/blocks/crops/herb_bloody_4.png new file mode 100644 index 00000000..903fd7f7 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_bloody_4.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mana_1.png b/mods/tinker/textures/blocks/crops/herb_mana_1.png new file mode 100644 index 00000000..24adb23d Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mana_1.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mana_2.png b/mods/tinker/textures/blocks/crops/herb_mana_2.png new file mode 100644 index 00000000..7040e057 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mana_2.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mana_3.png b/mods/tinker/textures/blocks/crops/herb_mana_3.png new file mode 100644 index 00000000..1cd5dd3a Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mana_3.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mana_4.png b/mods/tinker/textures/blocks/crops/herb_mana_4.png new file mode 100644 index 00000000..55ec7f76 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mana_4.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_1.png b/mods/tinker/textures/blocks/crops/herb_mandrake_1.png new file mode 100644 index 00000000..18af1493 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mandrake_1.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_2.png b/mods/tinker/textures/blocks/crops/herb_mandrake_2.png new file mode 100644 index 00000000..4ef2fe98 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mandrake_2.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_3.png b/mods/tinker/textures/blocks/crops/herb_mandrake_3.png new file mode 100644 index 00000000..31aa0746 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mandrake_3.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_3_1.png b/mods/tinker/textures/blocks/crops/herb_mandrake_3_1.png new file mode 100644 index 00000000..c12e3502 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mandrake_3_1.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_4.png b/mods/tinker/textures/blocks/crops/herb_mandrake_4.png new file mode 100644 index 00000000..0ec8febb Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mandrake_4.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_4_1.png b/mods/tinker/textures/blocks/crops/herb_mandrake_4_1.png new file mode 100644 index 00000000..88925b33 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_mandrake_4_1.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_poison_1.png b/mods/tinker/textures/blocks/crops/herb_poison_1.png new file mode 100644 index 00000000..f9f8916f Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_poison_1.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_poison_2.png b/mods/tinker/textures/blocks/crops/herb_poison_2.png new file mode 100644 index 00000000..e7a9c257 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_poison_2.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_poison_3.png b/mods/tinker/textures/blocks/crops/herb_poison_3.png new file mode 100644 index 00000000..4ab97763 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_poison_3.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_poison_4.png b/mods/tinker/textures/blocks/crops/herb_poison_4.png new file mode 100644 index 00000000..b70dd13f Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_poison_4.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_spring_1.png b/mods/tinker/textures/blocks/crops/herb_spring_1.png new file mode 100644 index 00000000..ad6547b1 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_spring_1.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_spring_2.png b/mods/tinker/textures/blocks/crops/herb_spring_2.png new file mode 100644 index 00000000..92012836 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_spring_2.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_spring_3.png b/mods/tinker/textures/blocks/crops/herb_spring_3.png new file mode 100644 index 00000000..510a1b91 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_spring_3.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_spring_4.png b/mods/tinker/textures/blocks/crops/herb_spring_4.png new file mode 100644 index 00000000..1deed76a Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_spring_4.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_white_1.png b/mods/tinker/textures/blocks/crops/herb_white_1.png new file mode 100644 index 00000000..24adb23d Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_white_1.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_white_2.png b/mods/tinker/textures/blocks/crops/herb_white_2.png new file mode 100644 index 00000000..708836ba Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_white_2.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_white_3.png b/mods/tinker/textures/blocks/crops/herb_white_3.png new file mode 100644 index 00000000..5b754322 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_white_3.png differ diff --git a/mods/tinker/textures/blocks/crops/herb_white_4.png b/mods/tinker/textures/blocks/crops/herb_white_4.png new file mode 100644 index 00000000..200983b9 Binary files /dev/null and b/mods/tinker/textures/blocks/crops/herb_white_4.png differ diff --git a/mods/tinker/textures/blocks/infiblocks/ancient_ice.png b/mods/tinker/textures/blocks/infiblocks/ancient_ice.png deleted file mode 100644 index dbf2bf7b..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/ancient_ice.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_bone.png b/mods/tinker/textures/blocks/infiblocks/brick_bone.png deleted file mode 100644 index cbb42d0e..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_bone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_diamond.png b/mods/tinker/textures/blocks/infiblocks/brick_diamond.png deleted file mode 100644 index 4f7bb0c7..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_diamond.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_gold.png b/mods/tinker/textures/blocks/infiblocks/brick_gold.png deleted file mode 100644 index 31cec3d4..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_gold.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_ice.png b/mods/tinker/textures/blocks/infiblocks/brick_ice.png deleted file mode 100644 index 267cf6fc..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_ice.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_iron.png b/mods/tinker/textures/blocks/infiblocks/brick_iron.png deleted file mode 100644 index 0cf176c8..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_iron.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_lapis.png b/mods/tinker/textures/blocks/infiblocks/brick_lapis.png deleted file mode 100644 index c5c78f4e..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_lapis.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_largeclay.png b/mods/tinker/textures/blocks/infiblocks/brick_largeclay.png deleted file mode 100644 index 05302802..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_largeclay.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_netherrack.png b/mods/tinker/textures/blocks/infiblocks/brick_netherrack.png deleted file mode 100644 index b83edb8a..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_netherrack.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_obsidian.png b/mods/tinker/textures/blocks/infiblocks/brick_obsidian.png deleted file mode 100644 index 355b2c2d..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_obsidian.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_redstone.png b/mods/tinker/textures/blocks/infiblocks/brick_redstone.png deleted file mode 100644 index 6e100436..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_redstone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_sandstone.png b/mods/tinker/textures/blocks/infiblocks/brick_sandstone.png deleted file mode 100644 index 5b4b96d4..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_sandstone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_slime.png b/mods/tinker/textures/blocks/infiblocks/brick_slime.png deleted file mode 100644 index 2680734a..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_slime.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_snow.png b/mods/tinker/textures/blocks/infiblocks/brick_snow.png deleted file mode 100644 index 64ffab45..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_snow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_stone_refined.png b/mods/tinker/textures/blocks/infiblocks/brick_stone_refined.png deleted file mode 100644 index 96aea220..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brick_stone_refined.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_road_rough.png b/mods/tinker/textures/blocks/infiblocks/brownstone_road_rough.png deleted file mode 100644 index df1a8aa2..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brownstone_road_rough.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_rough.png b/mods/tinker/textures/blocks/infiblocks/brownstone_rough.png deleted file mode 100644 index 2bf333f7..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brownstone_rough.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth.png b/mods/tinker/textures/blocks/infiblocks/brownstone_smooth.png deleted file mode 100644 index da521a16..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_brick.png b/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_brick.png deleted file mode 100644 index cb37438b..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_brick.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_fancybrick.png b/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_fancybrick.png deleted file mode 100644 index 2420291c..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_fancybrick.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_road.png b/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_road.png deleted file mode 100644 index 1b92dda4..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_road.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_squarebrick.png b/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_squarebrick.png deleted file mode 100644 index b59bc1f4..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_squarebrick.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_diamond.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_diamond.png deleted file mode 100644 index 0aeb4806..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_diamond.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_gold.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_gold.png deleted file mode 100644 index 3439f6e2..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_gold.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_ice.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_ice.png deleted file mode 100644 index 89b824c0..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_ice.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_iron.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_iron.png deleted file mode 100644 index 24cc45e5..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_iron.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_lapis.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_lapis.png deleted file mode 100644 index 19afd0ef..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_lapis.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_largeclay.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_largeclay.png deleted file mode 100644 index 2925dc3f..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_largeclay.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_netherrack.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_netherrack.png deleted file mode 100644 index 94853227..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_netherrack.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_obsidian.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_obsidian.png deleted file mode 100644 index cdd24f4f..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_obsidian.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_redstone.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_redstone.png deleted file mode 100644 index 968739b3..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_redstone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_sandstone.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_sandstone.png deleted file mode 100644 index a2269474..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_sandstone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_slime.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_slime.png deleted file mode 100644 index 3b4f7889..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_slime.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_snow.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_snow.png deleted file mode 100644 index 7ada7f39..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_snow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_stone.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_stone.png deleted file mode 100644 index f2699ad7..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_stone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_stone_refined.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_stone_refined.png deleted file mode 100644 index 4bd68094..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/fancybrick_stone_refined.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_black.png b/mods/tinker/textures/blocks/infiblocks/glass_black.png deleted file mode 100644 index dec24b76..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_black.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_black_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_black_pane.png deleted file mode 100644 index 2f87e863..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_black_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_blue.png b/mods/tinker/textures/blocks/infiblocks/glass_blue.png deleted file mode 100644 index 3c5a8a65..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_blue.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_blue_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_blue_pane.png deleted file mode 100644 index c2c5da28..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_blue_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_brown.png b/mods/tinker/textures/blocks/infiblocks/glass_brown.png deleted file mode 100644 index aff14855..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_brown.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_brown_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_brown_pane.png deleted file mode 100644 index 14cf009a..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_brown_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_cyan.png b/mods/tinker/textures/blocks/infiblocks/glass_cyan.png deleted file mode 100644 index 2951471c..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_cyan.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_cyan_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_cyan_pane.png deleted file mode 100644 index bb02b530..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_cyan_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_gray.png b/mods/tinker/textures/blocks/infiblocks/glass_gray.png deleted file mode 100644 index 51e5275e..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_gray.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_gray_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_gray_pane.png deleted file mode 100644 index 2cafcacd..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_gray_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_green.png b/mods/tinker/textures/blocks/infiblocks/glass_green.png deleted file mode 100644 index 6602743d..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_green.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_green_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_green_pane.png deleted file mode 100644 index 6082b46b..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_green_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightblue.png b/mods/tinker/textures/blocks/infiblocks/glass_lightblue.png deleted file mode 100644 index 895ed4c2..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_lightblue.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightblue_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_lightblue_pane.png deleted file mode 100644 index b35ff016..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_lightblue_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightgray.png b/mods/tinker/textures/blocks/infiblocks/glass_lightgray.png deleted file mode 100644 index bf8a4dc8..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_lightgray.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightgray_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_lightgray_pane.png deleted file mode 100644 index 94c55ebf..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_lightgray_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lime.png b/mods/tinker/textures/blocks/infiblocks/glass_lime.png deleted file mode 100644 index 820fc7fb..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_lime.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lime_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_lime_pane.png deleted file mode 100644 index b6ac0870..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_lime_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_magenta.png b/mods/tinker/textures/blocks/infiblocks/glass_magenta.png deleted file mode 100644 index b32c9247..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_magenta.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_magenta_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_magenta_pane.png deleted file mode 100644 index 90825866..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_magenta_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_orange.png b/mods/tinker/textures/blocks/infiblocks/glass_orange.png deleted file mode 100644 index 0842a65f..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_orange.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_orange_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_orange_pane.png deleted file mode 100644 index bd484ec1..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_orange_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pink.png b/mods/tinker/textures/blocks/infiblocks/glass_pink.png deleted file mode 100644 index 6f567d2a..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_pink.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pink_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_pink_pane.png deleted file mode 100644 index e37cc757..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_pink_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pure.png b/mods/tinker/textures/blocks/infiblocks/glass_pure.png deleted file mode 100644 index ff258cd8..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_pure.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pure_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_pure_pane.png deleted file mode 100644 index 04b03a18..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_pure_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_purple.png b/mods/tinker/textures/blocks/infiblocks/glass_purple.png deleted file mode 100644 index 43627b68..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_purple.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_purple_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_purple_pane.png deleted file mode 100644 index 717f1829..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_purple_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_red.png b/mods/tinker/textures/blocks/infiblocks/glass_red.png deleted file mode 100644 index 0a1ae896..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_red.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_red_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_red_pane.png deleted file mode 100644 index 85e7c64e..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_red_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_soul.png b/mods/tinker/textures/blocks/infiblocks/glass_soul.png deleted file mode 100644 index eb9c3794..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_soul.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_soul_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_soul_pane.png deleted file mode 100644 index 57a4c721..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_soul_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_soul_pure.png b/mods/tinker/textures/blocks/infiblocks/glass_soul_pure.png deleted file mode 100644 index 9a9fa19a..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_soul_pure.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_soul_pure_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_soul_pure_pane.png deleted file mode 100644 index b0088e51..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_soul_pure_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_white.png b/mods/tinker/textures/blocks/infiblocks/glass_white.png deleted file mode 100644 index a6bdb276..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_white.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_white_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_white_pane.png deleted file mode 100644 index 3be107e0..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_white_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_yellow.png b/mods/tinker/textures/blocks/infiblocks/glass_yellow.png deleted file mode 100644 index b96602ed..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_yellow.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_yellow_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_yellow_pane.png deleted file mode 100644 index 9c0c6c3b..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/glass_yellow_pane.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/paver_largeclay.png b/mods/tinker/textures/blocks/infiblocks/paver_largeclay.png deleted file mode 100644 index 64cc9c36..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/paver_largeclay.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/refined_largeclay.png b/mods/tinker/textures/blocks/infiblocks/refined_largeclay.png deleted file mode 100644 index f23fe9fd..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/refined_largeclay.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/refined_netherrack.png b/mods/tinker/textures/blocks/infiblocks/refined_netherrack.png deleted file mode 100644 index cf0bc0d2..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/refined_netherrack.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/refined_sandstone.png b/mods/tinker/textures/blocks/infiblocks/refined_sandstone.png deleted file mode 100644 index bb5b157d..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/refined_sandstone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/refined_stone.png b/mods/tinker/textures/blocks/infiblocks/refined_stone.png deleted file mode 100644 index 090657d3..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/refined_stone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/road_stone.png b/mods/tinker/textures/blocks/infiblocks/road_stone.png deleted file mode 100644 index 316b8fa0..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/road_stone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/road_stone_refined.png b/mods/tinker/textures/blocks/infiblocks/road_stone_refined.png deleted file mode 100644 index d18b193d..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/road_stone_refined.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/smallbrick_ice.png b/mods/tinker/textures/blocks/infiblocks/smallbrick_ice.png deleted file mode 100644 index 4bc1a998..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/smallbrick_ice.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/smallbrick_largeclay.png b/mods/tinker/textures/blocks/infiblocks/smallbrick_largeclay.png deleted file mode 100644 index bd11bf6a..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/smallbrick_largeclay.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/squarebrick_iron.png b/mods/tinker/textures/blocks/infiblocks/squarebrick_iron.png deleted file mode 100644 index df7eb514..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/squarebrick_iron.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/squarebrick_stone_refined.png b/mods/tinker/textures/blocks/infiblocks/squarebrick_stone_refined.png deleted file mode 100644 index a0db5780..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/squarebrick_stone_refined.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/storage_bone.png b/mods/tinker/textures/blocks/infiblocks/storage_bone.png deleted file mode 100644 index 6e29bf19..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/storage_bone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/storage_charcoal.png b/mods/tinker/textures/blocks/infiblocks/storage_charcoal.png deleted file mode 100644 index 8e2c5a3a..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/storage_charcoal.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/storage_coal.png b/mods/tinker/textures/blocks/infiblocks/storage_coal.png deleted file mode 100644 index 8e2c5a3a..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/storage_coal.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/storage_inert_redstone.png b/mods/tinker/textures/blocks/infiblocks/storage_inert_redstone.png deleted file mode 100644 index 198eb009..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/storage_inert_redstone.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/storage_slime.png b/mods/tinker/textures/blocks/infiblocks/storage_slime.png deleted file mode 100644 index 9f6e3244..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/storage_slime.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/storage_wheat.png b/mods/tinker/textures/blocks/infiblocks/storage_wheat.png deleted file mode 100644 index caf8b9b7..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/storage_wheat.png and /dev/null differ diff --git a/mods/tinker/textures/blocks/infiblocks/storage_wheat_dark.png b/mods/tinker/textures/blocks/infiblocks/storage_wheat_dark.png deleted file mode 100644 index 66a35b38..00000000 Binary files a/mods/tinker/textures/blocks/infiblocks/storage_wheat_dark.png and /dev/null differ diff --git a/mods/tinker/textures/gui/inventoryarmor.png b/mods/tinker/textures/gui/armorextended.png similarity index 93% rename from mods/tinker/textures/gui/inventoryarmor.png rename to mods/tinker/textures/gui/armorextended.png index 4229229a..c01b15a6 100644 Binary files a/mods/tinker/textures/gui/inventoryarmor.png and b/mods/tinker/textures/gui/armorextended.png differ