diff --git a/README.md b/README.md index 886af39d..6ff74de5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -Tinker's Construct - 1.4.7 +Tinker's Construct - 1.5 Modify all the things, then do it again! \ No newline at end of file diff --git a/tinker/armory/Armory.java b/mods/tinker/armory/Armory.java similarity index 70% rename from tinker/armory/Armory.java rename to mods/tinker/armory/Armory.java index e9863d07..55ee5750 100644 --- a/tinker/armory/Armory.java +++ b/mods/tinker/armory/Armory.java @@ -1,12 +1,12 @@ -package tinker.armory; +package mods.tinker.armory; +import mods.tinker.armory.content.ArmorStandItem; +import mods.tinker.armory.content.DisplayBlock; +import mods.tinker.armory.content.Shelf; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import tinker.armory.content.ArmorStandItem; -import tinker.armory.content.DisplayBlock; -import tinker.armory.content.Shelf; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; @@ -32,7 +32,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; public class Armory { /* Proxies for sides, used for client-only processing */ - @SidedProxy(clientSide = "tinker.armory.client.ArmoryProxyClient", serverSide = "tinker.armory.ArmoryProxyCommon") + @SidedProxy(clientSide = "mods.tinker.armory.client.ArmoryProxyClient", serverSide = "mods.tinker.armory.ArmoryProxyCommon") public static ArmoryProxyCommon proxy; /* Instance of this mod, used for grabbing prototype fields */ @@ -42,24 +42,24 @@ public class Armory @PreInit public void preInit(FMLPreInitializationEvent evt) { - PHArmory.initProps(); + /*PHArmory.initProps(); toolrack = new DisplayBlock(PHArmory.toolrack, Material.rock); - GameRegistry.registerBlock(toolrack, tinker.armory.content.ToolrackItem.class, "ToolRack"); - GameRegistry.registerTileEntity(tinker.armory.content.ShieldrackLogic.class, "Display"); + GameRegistry.registerBlock(toolrack, mods.tinker.armory.content.ToolrackItem.class, "ToolRack"); + GameRegistry.registerTileEntity(mods.tinker.armory.content.ShieldrackLogic.class, "Display"); shelf = new Shelf(PHArmory.shieldrack, Material.rock); - GameRegistry.registerBlock(shelf, tinker.armory.content.ToolrackItem.class, "Shelf"); - GameRegistry.registerTileEntity(tinker.armory.content.ToolrackLogic.class, "aShelf"); + GameRegistry.registerBlock(shelf, mods.tinker.armory.content.ToolrackItem.class, "Shelf"); + GameRegistry.registerTileEntity(mods.tinker.armory.content.ToolrackLogic.class, "aShelf");*/ /*armorStand = new ArmorStand(1501, Material.rock); GameRegistry.registerBlock(armorStand, mDiyo.inficraft.armory.ArmorStandItem.class); GameRegistry.registerTileEntity(mDiyo.inficraft.armory.ArmorStandLogic.class, "InfiArmorStand");*/ - armorStandItem = new ArmorStandItem(PHArmory.armorItem).setItemName("armorstand"); + /*armorStandItem = new ArmorStandItem(PHArmory.armorItem).setUnlocalizedName("armorstand"); LanguageRegistry.instance().addName(armorStandItem, "Armor Stand"); - EntityRegistry.registerModEntity(tinker.armory.content.ArmorStandEntity.class, "Armor Stand", 0, this, 32, 5, true); + EntityRegistry.registerModEntity(mods.tinker.armory.content.ArmorStandEntity.class, "Armor Stand", 0, this, 32, 5, true); NetworkRegistry.instance().registerGuiHandler(instance, new ArmoryGuiHandler()); - GameRegistry.addRecipe(new ItemStack(Armory.instance.armorStandItem, 1, 0), " c ", "csc", " b ", 's', Item.stick, 'c', Block.cobblestone, 'b', Block.stoneSingleSlab); + GameRegistry.addRecipe(new ItemStack(Armory.instance.armorStandItem, 1, 0), " c ", "csc", " b ", 's', Item.stick, 'c', Block.cobblestone, 'b', Block.stoneSingleSlab);*/ } @Init diff --git a/tinker/armory/ArmoryGuiHandler.java b/mods/tinker/armory/ArmoryGuiHandler.java similarity index 88% rename from tinker/armory/ArmoryGuiHandler.java rename to mods/tinker/armory/ArmoryGuiHandler.java index f4c1992b..2c5f3c64 100644 --- a/tinker/armory/ArmoryGuiHandler.java +++ b/mods/tinker/armory/ArmoryGuiHandler.java @@ -1,10 +1,9 @@ -package tinker.armory; +package mods.tinker.armory; import java.util.List; -import tinker.armory.client.ArmorStandGui; -import tinker.armory.content.EntityEquipment; - +import mods.tinker.armory.client.ArmorStandGui; +import mods.tinker.armory.content.EntityEquipment; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/tinker/armory/ArmoryProxyCommon.java b/mods/tinker/armory/ArmoryProxyCommon.java similarity index 88% rename from tinker/armory/ArmoryProxyCommon.java rename to mods/tinker/armory/ArmoryProxyCommon.java index c6feb373..66404e8b 100644 --- a/tinker/armory/ArmoryProxyCommon.java +++ b/mods/tinker/armory/ArmoryProxyCommon.java @@ -1,4 +1,4 @@ -package tinker.armory; +package mods.tinker.armory; import java.io.File; diff --git a/tinker/armory/PHArmory.java b/mods/tinker/armory/PHArmory.java similarity index 99% rename from tinker/armory/PHArmory.java rename to mods/tinker/armory/PHArmory.java index 2bb7d119..53a7c6dd 100644 --- a/tinker/armory/PHArmory.java +++ b/mods/tinker/armory/PHArmory.java @@ -1,4 +1,4 @@ -package tinker.armory; +package mods.tinker.armory; import java.io.File; import java.io.IOException; diff --git a/tinker/armory/client/ArmorStandContainer.java b/mods/tinker/armory/client/ArmorStandContainer.java similarity index 95% rename from tinker/armory/client/ArmorStandContainer.java rename to mods/tinker/armory/client/ArmorStandContainer.java index 47cc8314..5d894eab 100644 --- a/tinker/armory/client/ArmorStandContainer.java +++ b/mods/tinker/armory/client/ArmorStandContainer.java @@ -1,6 +1,6 @@ -package tinker.armory.client; +package mods.tinker.armory.client; -import tinker.armory.content.EntityEquipment; +import mods.tinker.armory.content.EntityEquipment; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/tinker/armory/client/ArmorStandGui.java b/mods/tinker/armory/client/ArmorStandGui.java similarity index 76% rename from tinker/armory/client/ArmorStandGui.java rename to mods/tinker/armory/client/ArmorStandGui.java index 9f6ed52f..1fc29205 100644 --- a/tinker/armory/client/ArmorStandGui.java +++ b/mods/tinker/armory/client/ArmorStandGui.java @@ -1,12 +1,11 @@ -package tinker.armory.client; +package mods.tinker.armory.client; +import mods.tinker.armory.content.EntityEquipment; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import org.lwjgl.opengl.GL11; -import tinker.armory.content.EntityEquipment; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,9 +29,10 @@ public class ArmorStandGui extends GuiContainer @Override protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { - int var4 = this.mc.renderEngine.getTexture("/infitextures/gui/armorstand.png"); + //int var4 = this.mc.renderEngine.getTexture("/infitextures/gui/armorstand.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(var4); + //this.mc.renderEngine.bindTexture(var4); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/armorstand.png"); int var5 = this.guiLeft; int var6 = this.guiTop; this.drawTexturedModalRect(var5, var6, 0, 0, this.xSize, this.ySize); diff --git a/tinker/armory/client/ArmorStandModelStatue.java b/mods/tinker/armory/client/ArmorStandModelStatue.java similarity index 98% rename from tinker/armory/client/ArmorStandModelStatue.java rename to mods/tinker/armory/client/ArmorStandModelStatue.java index a628c363..e898694e 100644 --- a/tinker/armory/client/ArmorStandModelStatue.java +++ b/mods/tinker/armory/client/ArmorStandModelStatue.java @@ -1,7 +1,7 @@ /* * Armor stand model by Fudgy_Fetus */ -package tinker.armory.client; +package mods.tinker.armory.client; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/tinker/armory/client/ArmoryProxyClient.java b/mods/tinker/armory/client/ArmoryProxyClient.java similarity index 64% rename from tinker/armory/client/ArmoryProxyClient.java rename to mods/tinker/armory/client/ArmoryProxyClient.java index 63d48879..66885680 100644 --- a/tinker/armory/client/ArmoryProxyClient.java +++ b/mods/tinker/armory/client/ArmoryProxyClient.java @@ -1,11 +1,9 @@ -package tinker.armory.client; +package mods.tinker.armory.client; import java.io.File; -import tinker.armory.ArmoryProxyCommon; -import tinker.armory.content.ArmorStandEntity; -import tinker.armory.content.ToolrackLogic; - +import mods.tinker.armory.ArmoryProxyCommon; +import mods.tinker.armory.content.ToolrackLogic; import net.minecraft.client.Minecraft; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -18,7 +16,7 @@ public class ArmoryProxyClient extends ArmoryProxyCommon RenderingRegistry.registerBlockHandler(new RenderShelf()); RenderingRegistry.registerBlockHandler(new RenderDisplay()); ClientRegistry.bindTileEntitySpecialRenderer(ToolrackLogic.class, new ShelfSpecialRender()); - RenderingRegistry.registerEntityRenderingHandler(tinker.armory.content.ArmorStandEntity.class, new RenderArmorStandEntity(new ArmorStandModelStatue(), 0)); + RenderingRegistry.registerEntityRenderingHandler(mods.tinker.armory.content.ArmorStandEntity.class, new RenderArmorStandEntity(new ArmorStandModelStatue(), 0)); } @Override diff --git a/tinker/armory/client/RenderArmorStandEntity.java b/mods/tinker/armory/client/RenderArmorStandEntity.java similarity index 98% rename from tinker/armory/client/RenderArmorStandEntity.java rename to mods/tinker/armory/client/RenderArmorStandEntity.java index 3e95bf12..4817843d 100644 --- a/tinker/armory/client/RenderArmorStandEntity.java +++ b/mods/tinker/armory/client/RenderArmorStandEntity.java @@ -1,4 +1,4 @@ -package tinker.armory.client; +package mods.tinker.armory.client; import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; @@ -194,9 +194,11 @@ public class RenderArmorStandEntity extends RenderLiving GL11.glScalef(-1.0F, -1.0F, 1.0F); this.preRenderCallback(par1EntityLiving, par9); GL11.glTranslatef(0.0F, -24.0F * var14 - 0.0078125F - 0.25F, 0.0F); - float var15 = par1EntityLiving.prevLegYaw + (par1EntityLiving.legYaw - par1EntityLiving.prevLegYaw) * par9; - float var16 = par1EntityLiving.legSwing - par1EntityLiving.legYaw * (1.0F - par9); - + //float var15 = par1EntityLiving.prevLegYaw + (par1EntityLiving.legYaw - par1EntityLiving.prevLegYaw) * par9; + //float var16 = par1EntityLiving.legSwing - par1EntityLiving.legYaw * (1.0F - par9); + float var15 = 1f; + float var16 = 1f; + if (par1EntityLiving.isChild()) { var16 *= 3.0F; diff --git a/tinker/armory/client/RenderDisplay.java b/mods/tinker/armory/client/RenderDisplay.java similarity index 97% rename from tinker/armory/client/RenderDisplay.java rename to mods/tinker/armory/client/RenderDisplay.java index 59a76de7..7f98fce0 100644 --- a/tinker/armory/client/RenderDisplay.java +++ b/mods/tinker/armory/client/RenderDisplay.java @@ -1,5 +1,7 @@ -package tinker.armory.client; +package mods.tinker.armory.client; +import mods.tinker.armory.content.DisplayLogic; +import mods.tinker.common.BlockSkinRenderHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -9,8 +11,6 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import tinker.armory.content.DisplayLogic; -import tinker.common.BlockSkinRenderHelper; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/mods/tinker/armory/client/RenderPedestal.java b/mods/tinker/armory/client/RenderPedestal.java new file mode 100644 index 00000000..0e74f293 --- /dev/null +++ b/mods/tinker/armory/client/RenderPedestal.java @@ -0,0 +1,5 @@ +package mods.tinker.armory.client; + +public class RenderPedestal { + +} diff --git a/tinker/armory/client/RenderShelf.java b/mods/tinker/armory/client/RenderShelf.java similarity index 98% rename from tinker/armory/client/RenderShelf.java rename to mods/tinker/armory/client/RenderShelf.java index 1a72b311..812fb176 100644 --- a/tinker/armory/client/RenderShelf.java +++ b/mods/tinker/armory/client/RenderShelf.java @@ -1,4 +1,4 @@ -package tinker.armory.client; +package mods.tinker.armory.client; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -7,8 +7,6 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import tinker.armory.content.Shelf; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/tinker/armory/client/ShelfSpecialRender.java b/mods/tinker/armory/client/ShelfSpecialRender.java similarity index 96% rename from tinker/armory/client/ShelfSpecialRender.java rename to mods/tinker/armory/client/ShelfSpecialRender.java index d522f316..7a5ffed4 100644 --- a/tinker/armory/client/ShelfSpecialRender.java +++ b/mods/tinker/armory/client/ShelfSpecialRender.java @@ -1,5 +1,6 @@ -package tinker.armory.client; +package mods.tinker.armory.client; +import mods.tinker.armory.content.ToolrackLogic; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.Item; @@ -9,8 +10,6 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import tinker.armory.content.ToolrackLogic; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,10 +21,10 @@ public class ShelfSpecialRender extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileEntity logic, double var2, double var4, double var6, float var8) { - this.render((ToolrackLogic)logic, var2, var4, var6, var8); + //this.render((ToolrackLogic)logic, var2, var4, var6, var8); } - public void render(ToolrackLogic logic, double posX, double posY, double posZ, float var8) + /*public void render(ToolrackLogic logic, double posX, double posY, double posZ, float var8) { GL11.glPushMatrix(); GL11.glTranslatef((float)posX + 0.25F, (float)posY + 0.5F, (float)posZ + 0.094F); //Center on the block @@ -76,7 +75,7 @@ public class ShelfSpecialRender extends TileEntitySpecialRenderer GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); - } + }*/ void drawItem(int iconIndex) { diff --git a/tinker/armory/client/SlotArmorCopy.java b/mods/tinker/armory/client/SlotArmorCopy.java similarity index 93% rename from tinker/armory/client/SlotArmorCopy.java rename to mods/tinker/armory/client/SlotArmorCopy.java index 0d7e0517..53347560 100644 --- a/tinker/armory/client/SlotArmorCopy.java +++ b/mods/tinker/armory/client/SlotArmorCopy.java @@ -1,4 +1,4 @@ -package tinker.armory.client; +package mods.tinker.armory.client; import net.minecraft.block.Block; import net.minecraft.inventory.Container; @@ -46,13 +46,13 @@ public class SlotArmorCopy extends Slot return par1ItemStack == null ? false : (par1ItemStack.getItem() instanceof ItemArmor ? ((ItemArmor)par1ItemStack.getItem()).armorType == this.armorType : (par1ItemStack.getItem().itemID != Block.pumpkin.blockID && par1ItemStack.getItem().itemID != Item.skull.itemID ? false : this.armorType == 0)); } - @SideOnly(Side.CLIENT) + //@SideOnly(Side.CLIENT) /** * Returns the icon index on items.png that is used as background image of the slot. */ - public int getBackgroundIconIndex() + /*public int getBackgroundIconIndex() { return 15 + this.armorType * 16; - } + }*/ } diff --git a/mods/tinker/armory/content/ArmorStandBlock.java b/mods/tinker/armory/content/ArmorStandBlock.java new file mode 100644 index 00000000..ce117dc7 --- /dev/null +++ b/mods/tinker/armory/content/ArmorStandBlock.java @@ -0,0 +1,5 @@ +package mods.tinker.armory.content; + +public class ArmorStandBlock { + +} diff --git a/tinker/armory/content/ArmorStandEntity.java b/mods/tinker/armory/content/ArmorStandEntity.java similarity index 90% rename from tinker/armory/content/ArmorStandEntity.java rename to mods/tinker/armory/content/ArmorStandEntity.java index 1f12be7d..64c30999 100644 --- a/tinker/armory/content/ArmorStandEntity.java +++ b/mods/tinker/armory/content/ArmorStandEntity.java @@ -1,7 +1,7 @@ -package tinker.armory.content; +package mods.tinker.armory.content; -import tinker.armory.Armory; -import tinker.armory.client.ArmorStandContainer; +import mods.tinker.armory.Armory; +import mods.tinker.armory.client.ArmorStandContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; @@ -154,4 +154,18 @@ public class ArmorStandEntity extends EntityEquipment rotationYaw = tags.getFloat("rotationYaw"); rotationYawHead = tags.getFloat("rotationYawHead"); } + + @Override + public boolean func_94042_c () + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b (int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/tinker/armory/content/ArmorStandItem.java b/mods/tinker/armory/content/ArmorStandItem.java similarity index 96% rename from tinker/armory/content/ArmorStandItem.java rename to mods/tinker/armory/content/ArmorStandItem.java index 5b6b2f7f..da27eb09 100644 --- a/tinker/armory/content/ArmorStandItem.java +++ b/mods/tinker/armory/content/ArmorStandItem.java @@ -1,6 +1,6 @@ -package tinker.armory.content; +package mods.tinker.armory.content; -import tinker.armory.Armory; +import mods.tinker.armory.Armory; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; diff --git a/tinker/armory/content/DisplayBlock.java b/mods/tinker/armory/content/DisplayBlock.java similarity index 62% rename from tinker/armory/content/DisplayBlock.java rename to mods/tinker/armory/content/DisplayBlock.java index a983cc78..b15d97d3 100644 --- a/tinker/armory/content/DisplayBlock.java +++ b/mods/tinker/armory/content/DisplayBlock.java @@ -1,11 +1,13 @@ -package tinker.armory.content; +package mods.tinker.armory.content; +import mods.tinker.armory.client.RenderDisplay; +import mods.tinker.common.InventoryBlock; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tinker.armory.client.RenderDisplay; -import tinker.common.InventoryBlock; public class DisplayBlock extends InventoryBlock { @@ -50,4 +52,16 @@ public class DisplayBlock extends InventoryBlock { return false; } + + @Override + public String[] getTextureNames () + { + // TODO Auto-generated method stub + return new String[] { "toolstation_top" }; + } + + public void func_94332_a (IconRegister par1IconRegister) + { + this.field_94336_cN = par1IconRegister.func_94245_a(Block.blockSteel.getUnlocalizedName()); + } } diff --git a/tinker/armory/content/DisplayLogic.java b/mods/tinker/armory/content/DisplayLogic.java similarity index 89% rename from tinker/armory/content/DisplayLogic.java rename to mods/tinker/armory/content/DisplayLogic.java index 73b077fb..9e88a964 100644 --- a/tinker/armory/content/DisplayLogic.java +++ b/mods/tinker/armory/content/DisplayLogic.java @@ -1,9 +1,9 @@ -package tinker.armory.content; +package mods.tinker.armory.content; +import mods.tinker.common.InventoryLogic; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import tinker.common.InventoryLogic; public abstract class DisplayLogic extends InventoryLogic { diff --git a/tinker/armory/content/EntityEquipment.java b/mods/tinker/armory/content/EntityEquipment.java similarity index 98% rename from tinker/armory/content/EntityEquipment.java rename to mods/tinker/armory/content/EntityEquipment.java index 6d77b1b1..011587d8 100644 --- a/tinker/armory/content/EntityEquipment.java +++ b/mods/tinker/armory/content/EntityEquipment.java @@ -1,4 +1,4 @@ -package tinker.armory.content; +package mods.tinker.armory.content; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; diff --git a/tinker/armory/content/Shelf.java b/mods/tinker/armory/content/Shelf.java similarity index 97% rename from tinker/armory/content/Shelf.java rename to mods/tinker/armory/content/Shelf.java index 707498f0..540bc525 100644 --- a/tinker/armory/content/Shelf.java +++ b/mods/tinker/armory/content/Shelf.java @@ -1,9 +1,8 @@ -package tinker.armory.content; +package mods.tinker.armory.content; import java.util.List; -import tinker.armory.client.RenderShelf; - +import mods.tinker.armory.client.RenderShelf; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -45,7 +44,7 @@ public class Shelf extends BlockContainer return new ToolrackLogic(); } - public int getBlockTextureFromSideAndMetadata(int side, int meta) + /*public int getBlockTextureFromSideAndMetadata(int side, int meta) { return 6; } @@ -54,7 +53,7 @@ public class Shelf extends BlockContainer { this.setBounds(var1.getBlockMetadata(var2, var3, var4)); super.addCollidingBlockToList(var1, var2, var3, var4, var5, var6, var7); - } + }*/ public void setBlockBoundsBasedOnState(IBlockAccess var1, int var2, int var3, int var4) { diff --git a/tinker/armory/content/ShieldrackLogic.java b/mods/tinker/armory/content/ShieldrackLogic.java similarity index 85% rename from tinker/armory/content/ShieldrackLogic.java rename to mods/tinker/armory/content/ShieldrackLogic.java index 330abb05..aeccda44 100644 --- a/tinker/armory/content/ShieldrackLogic.java +++ b/mods/tinker/armory/content/ShieldrackLogic.java @@ -1,4 +1,4 @@ -package tinker.armory.content; +package mods.tinker.armory.content; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -13,7 +13,7 @@ public class ShieldrackLogic extends DisplayLogic } @Override - public String getInvName () + public String getDefaultName () { return "armory.shieldrack"; } diff --git a/tinker/armory/content/ToolrackItem.java b/mods/tinker/armory/content/ToolrackItem.java similarity index 86% rename from tinker/armory/content/ToolrackItem.java rename to mods/tinker/armory/content/ToolrackItem.java index d7b81760..0bb8c8a5 100644 --- a/tinker/armory/content/ToolrackItem.java +++ b/mods/tinker/armory/content/ToolrackItem.java @@ -1,4 +1,4 @@ -package tinker.armory.content; +package mods.tinker.armory.content; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -18,7 +18,7 @@ public class ToolrackItem extends ItemBlock return md; } - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { return (new StringBuilder()).append("block.").append(blockType[itemstack.getItemDamage()]).append("Toolrack").toString(); } diff --git a/tinker/armory/content/ToolrackLogic.java b/mods/tinker/armory/content/ToolrackLogic.java similarity index 94% rename from tinker/armory/content/ToolrackLogic.java rename to mods/tinker/armory/content/ToolrackLogic.java index 876aa1b6..4f052e73 100644 --- a/tinker/armory/content/ToolrackLogic.java +++ b/mods/tinker/armory/content/ToolrackLogic.java @@ -1,4 +1,4 @@ -package tinker.armory.content; +package mods.tinker.armory.content; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -198,4 +198,18 @@ public class ToolrackLogic extends TileEntity { readFromNBT(pkt.customParam1); } + + @Override + public boolean func_94042_c () + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b (int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/tinker/common/BlockSkinRenderHelper.java b/mods/tinker/common/BlockSkinRenderHelper.java similarity index 99% rename from tinker/common/BlockSkinRenderHelper.java rename to mods/tinker/common/BlockSkinRenderHelper.java index 95d2d6f7..b9651685 100644 --- a/tinker/common/BlockSkinRenderHelper.java +++ b/mods/tinker/common/BlockSkinRenderHelper.java @@ -1,10 +1,9 @@ -package tinker.common; +package mods.tinker.common; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; public class BlockSkinRenderHelper @@ -34,7 +33,7 @@ public class BlockSkinRenderHelper static boolean renderMetadataBlockWithAmbientOcclusion(Block block, int metadata, int xMin, int yMin, int zMin, float xMax, float yMax, float zMax, RenderBlocks render, IBlockAccess world) { - render.enableAO = true; + /*render.enableAO = true; boolean var8 = false; float var9 = render.lightValueOwn; float var10 = render.lightValueOwn; @@ -827,12 +826,13 @@ public class BlockSkinRenderHelper } render.enableAO = false; - return var8; + return var8;*/ + return false; } static boolean renderMetadataBlockWithColorMultiplier(Block block, int metadata, int minX, int minY, int minZ, float maxX, float maxY, float maxZ, RenderBlocks render, IBlockAccess world) { - render.enableAO = false; + /*render.enableAO = false; Tessellator var8 = Tessellator.instance; boolean var9 = false; float var10 = 0.5F; @@ -949,7 +949,8 @@ public class BlockSkinRenderHelper var9 = true; } - return var9; + return var9;*/ + return false; } public static boolean renderFakeBlock (int texturePos, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) @@ -978,7 +979,7 @@ public class BlockSkinRenderHelper static boolean renderFakeBlockWithAmbientOcclusion(int texturePos, int metadata, int xMin, int yMin, int zMin, float xMax, float yMax, float zMax, RenderBlocks render, IBlockAccess world) { - Block block = Block.stone; + /*Block block = Block.stone; render.enableAO = true; boolean var8 = false; float var9 = render.lightValueOwn; @@ -1699,12 +1700,13 @@ public class BlockSkinRenderHelper } render.enableAO = false; - return var8; + return var8;*/ + return false; } static boolean renderFakeBlockWithColorMultiplier(int texturePos, int metadata, int minX, int minY, int minZ, float maxX, float maxY, float maxZ, RenderBlocks render, IBlockAccess world) { - Block block = Block.stone; + /*Block block = Block.stone; render.enableAO = false; Tessellator var8 = Tessellator.instance; boolean var9 = false; @@ -1792,6 +1794,7 @@ public class BlockSkinRenderHelper var9 = true; } - return var9; + return var9;*/ + return false; } } diff --git a/tinker/common/CoordTuple.java b/mods/tinker/common/CoordTuple.java similarity index 95% rename from tinker/common/CoordTuple.java rename to mods/tinker/common/CoordTuple.java index 474d66b8..4f44f7d8 100644 --- a/tinker/common/CoordTuple.java +++ b/mods/tinker/common/CoordTuple.java @@ -1,4 +1,4 @@ -package tinker.common; +package mods.tinker.common; public class CoordTuple { diff --git a/tinker/common/IActiveLogic.java b/mods/tinker/common/IActiveLogic.java similarity index 78% rename from tinker/common/IActiveLogic.java rename to mods/tinker/common/IActiveLogic.java index 6c1e60d6..de38e2bd 100644 --- a/tinker/common/IActiveLogic.java +++ b/mods/tinker/common/IActiveLogic.java @@ -1,4 +1,4 @@ -package tinker.common; +package mods.tinker.common; public interface IActiveLogic { diff --git a/tinker/common/IFacingLogic.java b/mods/tinker/common/IFacingLogic.java similarity index 90% rename from tinker/common/IFacingLogic.java rename to mods/tinker/common/IFacingLogic.java index a6261c40..649e37f8 100644 --- a/tinker/common/IFacingLogic.java +++ b/mods/tinker/common/IFacingLogic.java @@ -1,4 +1,4 @@ -package tinker.common; +package mods.tinker.common; import net.minecraft.entity.EntityLiving; import net.minecraftforge.common.ForgeDirection; diff --git a/tinker/common/IPattern.java b/mods/tinker/common/IPattern.java similarity index 65% rename from tinker/common/IPattern.java rename to mods/tinker/common/IPattern.java index 2701b933..a8601450 100644 --- a/tinker/common/IPattern.java +++ b/mods/tinker/common/IPattern.java @@ -1,7 +1,7 @@ -package tinker.common; +package mods.tinker.common; +import mods.tinker.tconstruct.crafting.PatternBuilder.MaterialSet; import net.minecraft.item.ItemStack; -import tinker.tconstruct.crafting.PatternBuilder.MaterialSet; public interface IPattern { diff --git a/tinker/common/IToolPart.java b/mods/tinker/common/IToolPart.java similarity index 80% rename from tinker/common/IToolPart.java rename to mods/tinker/common/IToolPart.java index 27225973..f4694d46 100644 --- a/tinker/common/IToolPart.java +++ b/mods/tinker/common/IToolPart.java @@ -1,4 +1,4 @@ -package tinker.common; +package mods.tinker.common; import net.minecraft.item.ItemStack; diff --git a/tinker/common/InventoryBlock.java b/mods/tinker/common/InventoryBlock.java similarity index 82% rename from tinker/common/InventoryBlock.java rename to mods/tinker/common/InventoryBlock.java index b2fad8b0..3d4731f2 100644 --- a/tinker/common/InventoryBlock.java +++ b/mods/tinker/common/InventoryBlock.java @@ -1,17 +1,18 @@ -package tinker.common; +package mods.tinker.common; +import mods.tinker.tconstruct.TConstruct; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tinker.tconstruct.TConstruct; public abstract class InventoryBlock extends BlockContainer { @@ -79,7 +80,7 @@ public abstract class InventoryBlock extends BlockContainer if (stack.hasTagCompound()) { - entityitem.func_92014_d().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + entityitem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); } float offset = 0.05F; @@ -95,8 +96,10 @@ public abstract class InventoryBlock extends BlockContainer super.breakBlock(par1World, x, y, z, par5, par6); } + /* Placement */ + @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving, ItemStack stack) { TileEntity logic = world.getBlockTileEntity(x, y, z); if (logic instanceof IFacingLogic) @@ -127,4 +130,20 @@ public abstract class InventoryBlock extends BlockContainer { return meta; } + + /* Textures */ + public Icon[] icons; + public abstract String[] getTextureNames(); + + public void func_94332_a(IconRegister iconRegister) + { + String[] textureNames = getTextureNames(); + //System.out.println("TextureNames: :"+this.getClass().getSimpleName()); + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.func_94245_a("tinker:"+textureNames[i]); + } + } } diff --git a/tinker/common/InventoryLogic.java b/mods/tinker/common/InventoryLogic.java similarity index 89% rename from tinker/common/InventoryLogic.java rename to mods/tinker/common/InventoryLogic.java index 92ad922d..beadb35d 100644 --- a/tinker/common/InventoryLogic.java +++ b/mods/tinker/common/InventoryLogic.java @@ -1,4 +1,4 @@ -package tinker.common; +package mods.tinker.common; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -19,6 +19,7 @@ public abstract class InventoryLogic extends TileEntity implements IInventory { protected ItemStack[] inventory; + protected String invName; public InventoryLogic(int invSize) { @@ -145,4 +146,23 @@ public abstract class InventoryLogic extends TileEntity public ItemStack getStackInSlotOnClosing (int slot) { return null; } public void openChest () {} public void closeChest () {} + + protected abstract String getDefaultName(); + + public String getInvName() + { + return this.func_94042_c() ? this.invName : getDefaultName(); + } + + public boolean func_94042_c() + { + return this.invName != null && this.invName.length() > 0; + } + + @Override + public boolean func_94041_b (int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/tinker/common/ToolMod.java b/mods/tinker/common/ToolMod.java similarity index 99% rename from tinker/common/ToolMod.java rename to mods/tinker/common/ToolMod.java index b49fb83a..4ea5fd8a 100644 --- a/tinker/common/ToolMod.java +++ b/mods/tinker/common/ToolMod.java @@ -1,4 +1,4 @@ -package tinker.common; +package mods.tinker.common; import java.util.ArrayList; import java.util.Iterator; diff --git a/mods/tinker/common/fancyitem/FancyEntityItem.java b/mods/tinker/common/fancyitem/FancyEntityItem.java new file mode 100644 index 00000000..b1a9b617 --- /dev/null +++ b/mods/tinker/common/fancyitem/FancyEntityItem.java @@ -0,0 +1,25 @@ +package mods.tinker.common.fancyitem; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class FancyEntityItem extends EntityItem +{ + public FancyEntityItem(World par1World, double par2, double par4, double par6) + { + super(par1World, par2, par4, par6); + } + + public FancyEntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) + { + this(par1World, par2, par4, par6); + this.setEntityItemStack(par8ItemStack); + this.lifespan = (par8ItemStack.getItem() == null ? 6000 : par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World)); + } + + public FancyEntityItem(World par1World) + { + super(par1World); + } +} diff --git a/mods/tinker/common/fancyitem/FancyItemRender.java b/mods/tinker/common/fancyitem/FancyItemRender.java new file mode 100644 index 00000000..a4e4bbd2 --- /dev/null +++ b/mods/tinker/common/fancyitem/FancyItemRender.java @@ -0,0 +1,603 @@ +package mods.tinker.common.fancyitem; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.RenderEngine; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; +import net.minecraftforge.client.ForgeHooksClient; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class FancyItemRender extends Render +{ + private RenderBlocks itemRenderBlocks = new RenderBlocks(); + + /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ + private Random random = new Random(); + public boolean field_77024_a = true; + + /** Defines the zLevel of rendering of item on GUI. */ + public float zLevel = 0.0F; + public static boolean field_82407_g = false; + + public FancyItemRender() + { + this.shadowSize = 0.15F; + this.shadowOpaque = 0.75F; + } + + /** + * Renders the item + */ + public void doRenderItem (EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9) + { + this.random.setSeed(187L); + ItemStack itemstack = par1EntityItem.getEntityItem(); + + if (itemstack.getItem() != null) + { + GL11.glPushMatrix(); + float f2 = shouldBob() ? MathHelper.sin(((float) par1EntityItem.age + par9) / 10.0F + par1EntityItem.hoverStart) * 0.1F + 0.1F : 0F; + float f3 = (((float) par1EntityItem.age + par9) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI); + byte b0 = getMiniBlockCount(itemstack); + + GL11.glTranslatef((float) par2, (float) par4 + f2, (float) par6); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + int i; + float f4; + float f5; + float f6; + + Block block = null; + if (itemstack.itemID < Block.blocksList.length) + { + block = Block.blocksList[itemstack.itemID]; + } + + if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, renderBlocks)) + { + ; + } + else if (itemstack.func_94608_d() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) + { + GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); + + if (field_82407_g) + { + GL11.glScalef(1.25F, 1.25F, 1.25F); + GL11.glTranslatef(0.0F, 0.05F, 0.0F); + GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + } + + this.loadTexture("/terrain.png"); + float f7 = 0.25F; + int j = block.getRenderType(); + + if (j == 1 || j == 19 || j == 12 || j == 2) + { + f7 = 0.5F; + } + + GL11.glScalef(f7, f7, f7); + + for (i = 0; i < b0; ++i) + { + GL11.glPushMatrix(); + + if (i > 0) + { + f5 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; + f4 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; + f6 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / f7; + GL11.glTranslatef(f5, f4, f6); + } + + f5 = 1.0F; + this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); + GL11.glPopMatrix(); + } + } + else + { + float f8; + + if (itemstack.getItem().requiresMultipleRenderPasses()) + { + if (field_82407_g) + { + GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); + GL11.glTranslatef(0.0F, -0.05F, 0.0F); + } + else + { + GL11.glScalef(0.5F, 0.5F, 0.5F); + } + + this.loadTexture("/gui/items.png"); + + for (int k = 0; k <= itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) + { + this.random.setSeed(187L); + Icon icon = itemstack.getItem().getIcon(itemstack, k); + f8 = 1.0F; + + if (this.field_77024_a) + { + i = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, k); + f5 = (float) (i >> 16 & 255) / 255.0F; + f4 = (float) (i >> 8 & 255) / 255.0F; + f6 = (float) (i & 255) / 255.0F; + GL11.glColor4f(f5 * f8, f4 * f8, f6 * f8, 1.0F); + this.renderDroppedItem(par1EntityItem, icon, b0, par9, f5 * f8, f4 * f8, f6 * f8); + } + else + { + this.renderDroppedItem(par1EntityItem, icon, b0, par9, 1.0F, 1.0F, 1.0F); + } + } + } + else + { + if (field_82407_g) + { + GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); + GL11.glTranslatef(0.0F, -0.05F, 0.0F); + } + else + { + GL11.glScalef(0.5F, 0.5F, 0.5F); + } + + Icon icon1 = itemstack.getIconIndex(); + + if (itemstack.func_94608_d() == 0) + { + this.loadTexture("/terrain.png"); + } + else + { + this.loadTexture("/gui/items.png"); + } + + if (this.field_77024_a) + { + int l = Item.itemsList[itemstack.itemID].getColorFromItemStack(itemstack, 0); + f8 = (float) (l >> 16 & 255) / 255.0F; + float f9 = (float) (l >> 8 & 255) / 255.0F; + f5 = (float) (l & 255) / 255.0F; + f4 = 1.0F; + this.renderDroppedItem(par1EntityItem, icon1, b0, par9, f8 * f4, f9 * f4, f5 * f4); + } + else + { + this.renderDroppedItem(par1EntityItem, icon1, b0, par9, 1.0F, 1.0F, 1.0F); + } + } + } + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } + } + + /** + * Renders a dropped item + */ + private void renderDroppedItem (EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) + { + Tessellator tessellator = Tessellator.instance; + + if (par2Icon == null) + { + par2Icon = this.renderManager.renderEngine.func_96448_c(par1EntityItem.getEntityItem().func_94608_d()); + } + + float f4 = par2Icon.func_94209_e(); + float f5 = par2Icon.func_94212_f(); + float f6 = par2Icon.func_94206_g(); + float f7 = par2Icon.func_94210_h(); + float f8 = 1.0F; + float f9 = 0.5F; + float f10 = 0.25F; + float f11; + + GL11.glPushMatrix(); + + if (field_82407_g) + { + GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + } + else + { + GL11.glRotatef((((float) par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); + } + + float f12 = 0.0625F; + f11 = 0.021875F; + ItemStack itemstack = par1EntityItem.getEntityItem(); + int j = itemstack.stackSize; + byte b0 = getMiniItemCount(itemstack); + + GL11.glTranslatef(-f9, -f10, -((f12 + f11) * (float) b0 / 2.0F)); + + for (int k = 0; k < b0; ++k) + { + // Makes items offset when in 3D, like when in 2D, looks much better. Considered a vanilla bug... + if (k > 0 && shouldSpreadItems()) + { + float x = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; + float y = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; + float z = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; + GL11.glTranslatef(x, y, f12 + f11); + } + else + { + GL11.glTranslatef(0f, 0f, f12 + f11); + } + + if (itemstack.func_94608_d() == 0 && itemstack.itemID < Block.blocksList.length && Block.blocksList[itemstack.itemID] != null) + { + this.loadTexture("/terrain.png"); + } + else + { + this.loadTexture("/gui/items.png"); + } + + GL11.glColor4f(par5, par6, par7, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, par2Icon.func_94213_j(), par2Icon.func_94208_k(), f12); + + if (itemstack != null && itemstack.hasEffect()) + { + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + this.renderManager.renderEngine.func_98187_b("%blur%/misc/glint.png"); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float f13 = 0.76F; + GL11.glColor4f(0.5F * f13, 0.25F * f13, 0.8F * f13, 1.0F); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float f14 = 0.125F; + GL11.glScalef(f14, f14, f14); + float f15 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; + GL11.glTranslatef(f15, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(f14, f14, f14); + f15 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; + GL11.glTranslatef(-f15, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, f12); + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } + } + + GL11.glPopMatrix(); + + } + + /** + * Renders the item's icon or block into the UI at the specified position. + */ + public void renderItemIntoGUI (FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5) + { + int k = par3ItemStack.itemID; + int l = par3ItemStack.getItemDamage(); + Icon icon = par3ItemStack.getIconIndex(); + float f; + float f1; + float f2; + + Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null); + + if (par3ItemStack.func_94608_d() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType())) + { + par2RenderEngine.func_98187_b("/terrain.png"); + GL11.glPushMatrix(); + GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel); + GL11.glScalef(10.0F, 10.0F, 10.0F); + GL11.glTranslatef(1.0F, 0.5F, 1.0F); + GL11.glScalef(1.0F, 1.0F, -1.0F); + GL11.glRotatef(210.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + int i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); + f2 = (float) (i1 >> 16 & 255) / 255.0F; + f = (float) (i1 >> 8 & 255) / 255.0F; + f1 = (float) (i1 & 255) / 255.0F; + + if (this.field_77024_a) + { + GL11.glColor4f(f2, f, f1, 1.0F); + } + + GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + this.itemRenderBlocks.useInventoryTint = this.field_77024_a; + this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F); + this.itemRenderBlocks.useInventoryTint = true; + GL11.glPopMatrix(); + } + else + { + int j1; + + if (Item.itemsList[k].requiresMultipleRenderPasses()) + { + GL11.glDisable(GL11.GL_LIGHTING); + par2RenderEngine.func_98187_b("/gui/items.png"); + + for (j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) + { + Icon icon1 = Item.itemsList[k].getIcon(par3ItemStack, j1); + int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); + f = (float) (k1 >> 16 & 255) / 255.0F; + f1 = (float) (k1 >> 8 & 255) / 255.0F; + float f3 = (float) (k1 & 255) / 255.0F; + + if (this.field_77024_a) + { + GL11.glColor4f(f, f1, f3, 1.0F); + } + + this.func_94149_a(par4, par5, icon1, 16, 16); + } + + GL11.glEnable(GL11.GL_LIGHTING); + } + else + { + GL11.glDisable(GL11.GL_LIGHTING); + + if (par3ItemStack.func_94608_d() == 0) + { + par2RenderEngine.func_98187_b("/terrain.png"); + } + else + { + par2RenderEngine.func_98187_b("/gui/items.png"); + } + + if (icon == null) + { + icon = par2RenderEngine.func_96448_c(par3ItemStack.func_94608_d()); + } + + j1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0); + float f4 = (float) (j1 >> 16 & 255) / 255.0F; + f2 = (float) (j1 >> 8 & 255) / 255.0F; + f = (float) (j1 & 255) / 255.0F; + + if (this.field_77024_a) + { + GL11.glColor4f(f4, f2, f, 1.0F); + } + + this.func_94149_a(par4, par5, icon, 16, 16); + GL11.glEnable(GL11.GL_LIGHTING); + } + } + + GL11.glEnable(GL11.GL_CULL_FACE); + } + + /** + * Render the item's icon or block into the GUI, including the glint effect. + */ + public void renderItemAndEffectIntoGUI (FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5) + { + if (par3ItemStack != null) + { + if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2RenderEngine, par3ItemStack, field_77024_a, zLevel, (float) par4, (float) par5)) + { + this.renderItemIntoGUI(par1FontRenderer, par2RenderEngine, par3ItemStack, par4, par5); + } + + if (par3ItemStack.hasEffect()) + { + GL11.glDepthFunc(GL11.GL_GREATER); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDepthMask(false); + par2RenderEngine.func_98187_b("%blur%/misc/glint.png"); + this.zLevel -= 50.0F; + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); + GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); + this.func_77018_a(par4 * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + this.zLevel += 50.0F; + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } + } + } + + private void func_77018_a (int par1, int par2, int par3, int par4, int par5) + { + for (int j1 = 0; j1 < 2; ++j1) + { + if (j1 == 0) + { + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + } + + if (j1 == 1) + { + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + } + + float f = 0.00390625F; + float f1 = 0.00390625F; + float f2 = (float) (Minecraft.getSystemTime() % (long) (3000 + j1 * 1873)) / (3000.0F + (float) (j1 * 1873)) * 256.0F; + float f3 = 0.0F; + Tessellator tessellator = Tessellator.instance; + float f4 = 4.0F; + + if (j1 == 1) + { + f4 = -1.0F; + } + + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + (float) par4) * f), (double) ((f3 + 0.0F) * f1)); + tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) ((f3 + 0.0F) * f1)); + tessellator.draw(); + } + } + + /** + * Renders the item's overlay information. Examples being stack count or damage on top of the item's image at the + * specified position. + */ + public void renderItemOverlayIntoGUI (FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5) + { + this.func_94148_a(par1FontRenderer, par2RenderEngine, par3ItemStack, par4, par5, (String) null); + } + + public void func_94148_a (FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5, String par6Str) + { + if (par3ItemStack != null) + { + if (par3ItemStack.stackSize > 1 || par6Str != null) + { + String s1 = par6Str == null ? String.valueOf(par3ItemStack.stackSize) : par6Str; + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + par1FontRenderer.drawStringWithShadow(s1, par4 + 19 - 2 - par1FontRenderer.getStringWidth(s1), par5 + 6 + 3, 16777215); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + } + + if (par3ItemStack.isItemDamaged()) + { + int k = (int) Math.round(13.0D - (double) par3ItemStack.getItemDamageForDisplay() * 13.0D / (double) par3ItemStack.getMaxDamage()); + int l = (int) Math.round(255.0D - (double) par3ItemStack.getItemDamageForDisplay() * 255.0D / (double) par3ItemStack.getMaxDamage()); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_TEXTURE_2D); + Tessellator tessellator = Tessellator.instance; + int i1 = 255 - l << 16 | l << 8; + int j1 = (255 - l) / 4 << 16 | 16128; + this.renderQuad(tessellator, par4 + 2, par5 + 13, 13, 2, 0); + this.renderQuad(tessellator, par4 + 2, par5 + 13, 12, 1, j1); + this.renderQuad(tessellator, par4 + 2, par5 + 13, k, 1, i1); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } + } + } + + /** + * Adds a quad to the tesselator at the specified position with the set width and height and color. Args: + * tessellator, x, y, width, height, color + */ + private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) + { + par1Tessellator.startDrawingQuads(); + par1Tessellator.setColorOpaque_I(par6); + par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + 0), 0.0D); + par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + par5), 0.0D); + par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + par5), 0.0D); + par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + 0), 0.0D); + par1Tessellator.draw(); + } + + public void func_94149_a (int par1, int par2, Icon par3Icon, int par4, int par5) + { + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.func_94209_e(), (double) par3Icon.func_94210_h()); + tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.func_94212_f(), (double) par3Icon.func_94210_h()); + tessellator.addVertexWithUV((double) (par1 + par4), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.func_94212_f(), (double) par3Icon.func_94206_g()); + tessellator.addVertexWithUV((double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.func_94209_e(), (double) par3Icon.func_94206_g()); + tessellator.draw(); + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then + * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic + * (Render 1) + ret = 2; + if (stack.stackSize > 5) + ret = 3; + if (stack.stackSize > 20) + ret = 4; + if (stack.stackSize > 40) + ret = 5; + return ret; + } + + /** + * Allows for a subclass to override how many rendered items appear in a + * "mini item 3d stack" + * @param stack + * @return + */ + public byte getMiniItemCount (ItemStack stack) + { + byte ret = 1; + if (stack.stackSize > 1) + ret = 2; + if (stack.stackSize > 15) + ret = 3; + if (stack.stackSize > 31) + ret = 4; + return ret; + } +} diff --git a/resources/tinkertextures/armor/wood_1.png b/mods/tinker/resources/armor/wood_1.png similarity index 100% rename from resources/tinkertextures/armor/wood_1.png rename to mods/tinker/resources/armor/wood_1.png diff --git a/resources/tinkertextures/armor/wood_2.png b/mods/tinker/resources/armor/wood_2.png similarity index 100% rename from resources/tinkertextures/armor/wood_2.png rename to mods/tinker/resources/armor/wood_2.png diff --git a/resources/tinkertextures/entity/pullcart.png b/mods/tinker/resources/entity/pullcart.png similarity index 100% rename from resources/tinkertextures/entity/pullcart.png rename to mods/tinker/resources/entity/pullcart.png diff --git a/resources/tinkertextures/entity/wagon.png b/mods/tinker/resources/entity/wagon.png similarity index 100% rename from resources/tinkertextures/entity/wagon.png rename to mods/tinker/resources/entity/wagon.png diff --git a/resources/tinkertextures/entity/wagontexture.png b/mods/tinker/resources/entity/wagontexture.png similarity index 100% rename from resources/tinkertextures/entity/wagontexture.png rename to mods/tinker/resources/entity/wagontexture.png diff --git a/resources/tinkertextures/gui/book.png b/mods/tinker/resources/gui/book.png similarity index 100% rename from resources/tinkertextures/gui/book.png rename to mods/tinker/resources/gui/book.png diff --git a/resources/tinkertextures/gui/bookleft.png b/mods/tinker/resources/gui/bookleft.png similarity index 100% rename from resources/tinkertextures/gui/bookleft.png rename to mods/tinker/resources/gui/bookleft.png diff --git a/resources/tinkertextures/gui/bookright.png b/mods/tinker/resources/gui/bookright.png similarity index 100% rename from resources/tinkertextures/gui/bookright.png rename to mods/tinker/resources/gui/bookright.png diff --git a/resources/tinkertextures/gui/description.png b/mods/tinker/resources/gui/description.png similarity index 100% rename from resources/tinkertextures/gui/description.png rename to mods/tinker/resources/gui/description.png diff --git a/resources/tinkertextures/gui/display.png b/mods/tinker/resources/gui/display.png similarity index 100% rename from resources/tinkertextures/gui/display.png rename to mods/tinker/resources/gui/display.png diff --git a/resources/tinkertextures/gui/frypan.png b/mods/tinker/resources/gui/frypan.png similarity index 100% rename from resources/tinkertextures/gui/frypan.png rename to mods/tinker/resources/gui/frypan.png diff --git a/resources/tinkertextures/gui/icons.png b/mods/tinker/resources/gui/icons.png similarity index 100% rename from resources/tinkertextures/gui/icons.png rename to mods/tinker/resources/gui/icons.png diff --git a/resources/tinkertextures/gui/patternchest.png b/mods/tinker/resources/gui/patternchest.png similarity index 100% rename from resources/tinkertextures/gui/patternchest.png rename to mods/tinker/resources/gui/patternchest.png diff --git a/resources/tinkertextures/gui/patternchestmini.png b/mods/tinker/resources/gui/patternchestmini.png similarity index 100% rename from resources/tinkertextures/gui/patternchestmini.png rename to mods/tinker/resources/gui/patternchestmini.png diff --git a/resources/tinkertextures/gui/patternshaper.png b/mods/tinker/resources/gui/patternshaper.png similarity index 100% rename from resources/tinkertextures/gui/patternshaper.png rename to mods/tinker/resources/gui/patternshaper.png diff --git a/resources/tinkertextures/gui/smeltery.png b/mods/tinker/resources/gui/smeltery.png similarity index 100% rename from resources/tinkertextures/gui/smeltery.png rename to mods/tinker/resources/gui/smeltery.png diff --git a/resources/tinkertextures/gui/smelteryside.png b/mods/tinker/resources/gui/smelteryside.png similarity index 100% rename from resources/tinkertextures/gui/smelteryside.png rename to mods/tinker/resources/gui/smelteryside.png diff --git a/resources/tinkertextures/gui/toolparts.png b/mods/tinker/resources/gui/toolparts.png similarity index 100% rename from resources/tinkertextures/gui/toolparts.png rename to mods/tinker/resources/gui/toolparts.png diff --git a/resources/tinkertextures/gui/toolstation.png b/mods/tinker/resources/gui/toolstation.png similarity index 100% rename from resources/tinkertextures/gui/toolstation.png rename to mods/tinker/resources/gui/toolstation.png diff --git a/resources/tinkerlang/en_US.xml b/mods/tinker/resources/lang/en_US.xml similarity index 100% rename from resources/tinkerlang/en_US.xml rename to mods/tinker/resources/lang/en_US.xml diff --git a/resources/manuals/diary.xml b/mods/tinker/resources/manuals/diary.xml similarity index 100% rename from resources/manuals/diary.xml rename to mods/tinker/resources/manuals/diary.xml diff --git a/resources/manuals/materials.xml b/mods/tinker/resources/manuals/materials.xml similarity index 100% rename from resources/manuals/materials.xml rename to mods/tinker/resources/manuals/materials.xml diff --git a/resources/tinkertextures/materials.png b/mods/tinker/resources/materials.png similarity index 100% rename from resources/tinkertextures/materials.png rename to mods/tinker/resources/materials.png diff --git a/resources/tinkertextures/mob/armorstandtexture.png b/mods/tinker/resources/mob/armorstandtexture.png similarity index 100% rename from resources/tinkertextures/mob/armorstandtexture.png rename to mods/tinker/resources/mob/armorstandtexture.png diff --git a/resources/tinkertextures/mob/crystalwater.png b/mods/tinker/resources/mob/crystalwater.png similarity index 100% rename from resources/tinkertextures/mob/crystalwater.png rename to mods/tinker/resources/mob/crystalwater.png diff --git a/resources/tinkertextures/mob/skyla.png b/mods/tinker/resources/mob/skyla.png similarity index 100% rename from resources/tinkertextures/mob/skyla.png rename to mods/tinker/resources/mob/skyla.png diff --git a/resources/tinkertextures/patterns.png b/mods/tinker/resources/patterns.png similarity index 100% rename from resources/tinkertextures/patterns.png rename to mods/tinker/resources/patterns.png diff --git a/mods/tinker/resources/stonearmorstand.png b/mods/tinker/resources/stonearmorstand.png new file mode 100644 index 00000000..5d5297f1 Binary files /dev/null and b/mods/tinker/resources/stonearmorstand.png differ diff --git a/tinker/tconstruct/AbilityHelper.java b/mods/tinker/tconstruct/AbilityHelper.java similarity index 96% rename from tinker/tconstruct/AbilityHelper.java rename to mods/tinker/tconstruct/AbilityHelper.java index e1b0a1d5..b65f41e3 100644 --- a/tinker/tconstruct/AbilityHelper.java +++ b/mods/tinker/tconstruct/AbilityHelper.java @@ -1,6 +1,5 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; -import ic2.api.ElectricItem; import ic2.api.ICustomElectricItem; import ic2.api.IElectricItem; @@ -8,6 +7,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import mods.tinker.tconstruct.tools.ToolCore; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.enchantment.EnchantmentHelper; @@ -32,7 +32,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.entity.player.UseHoeEvent; -import tinker.tconstruct.tools.ToolCore; import cpw.mods.fml.client.FMLClientHandler; public class AbilityHelper @@ -168,7 +167,7 @@ public class AbilityHelper if (entity instanceof EntityLiving) { - EnchantmentThorns.func_92044_a(player, (EntityLiving)entity, random); + EnchantmentThorns.func_92096_a(player, (EntityLiving)entity, random); } } @@ -217,9 +216,9 @@ public class AbilityHelper } } - if (!(living instanceof EntityPlayer))// || player.isPVPEnabled()) //TODO: Find an alterntive for this + if (!(living instanceof EntityPlayer) || player.func_96122_a((EntityPlayer)living)) { - List var6 = player.worldObj.getEntitiesWithinAABB(EntityWolf.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D)); + List var6 = player.worldObj.getEntitiesWithinAABB(EntityWolf.class, AxisAlignedBB.getAABBPool().getAABB(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D)); Iterator var4 = var6.iterator(); while (var4.hasNext()) @@ -475,7 +474,7 @@ public class AbilityHelper } else { - world.setBlockWithNotify(x, y, z, block.blockID); + world.func_94575_c(x, y, z, block.blockID); onBlockChanged(stack, world, 0, x, y, z, player, random); return true; } diff --git a/tinker/tconstruct/PHConstruct.java b/mods/tinker/tconstruct/PHConstruct.java similarity index 98% rename from tinker/tconstruct/PHConstruct.java rename to mods/tinker/tconstruct/PHConstruct.java index 1fc9ebc4..a47228c4 100644 --- a/tinker/tconstruct/PHConstruct.java +++ b/mods/tinker/tconstruct/PHConstruct.java @@ -1,4 +1,4 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; import java.io.File; import java.io.IOException; @@ -96,6 +96,7 @@ public class PHConstruct { longbow = config.getItem("Tools", "Longbow", 14062).getInt(14062); buckets = config.getItem("Patterns and Misc", "Buckets", 14101).getInt(14101); + uselessItem = config.getItem("Patterns and Misc", "Title Icon", 14102).getInt(14102); boolean ic2 = true; boolean xycraft = true; @@ -162,6 +163,7 @@ public class PHConstruct { public static int manual; public static int buckets; + public static int uselessItem; //Tools public static int pickaxe; diff --git a/tinker/tconstruct/PiercingEntityDamage.java b/mods/tinker/tconstruct/PiercingEntityDamage.java similarity index 64% rename from tinker/tconstruct/PiercingEntityDamage.java rename to mods/tinker/tconstruct/PiercingEntityDamage.java index 92c7727b..ab8749b8 100644 --- a/tinker/tconstruct/PiercingEntityDamage.java +++ b/mods/tinker/tconstruct/PiercingEntityDamage.java @@ -1,10 +1,7 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EntityDamageSource; -import net.minecraft.util.StatCollector; public class PiercingEntityDamage extends EntityDamageSource { diff --git a/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java similarity index 87% rename from tinker/tconstruct/TConstruct.java rename to mods/tinker/tconstruct/TConstruct.java index c0a89b01..846284c2 100644 --- a/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -1,10 +1,10 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; import java.util.Random; +import mods.tinker.tconstruct.player.TPlayerHandler; +import mods.tinker.tconstruct.worldgen.TBaseWorldGenerator; import net.minecraftforge.common.MinecraftForge; -import tinker.tconstruct.player.TPlayerHandler; -import tinker.tconstruct.worldgen.TBaseWorldGenerator; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; @@ -24,7 +24,7 @@ import cpw.mods.fml.common.registry.GameRegistry; */ @Mod(modid = "TConstruct", name = "TConstruct", version = "1.4.7_1.1.14", dependencies = "before:*") -@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tinker.tconstruct.TPacketHandler.class) +@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.TPacketHandler.class) public class TConstruct { public static int ingotLiquidValue = 144; @@ -33,7 +33,7 @@ public class TConstruct @Instance("TConstruct") public static TConstruct instance; /* Proxies for sides, used for graphics processing */ - @SidedProxy(clientSide = "tinker.tconstruct.client.TProxyClient", serverSide = "tinker.tconstruct.TProxyCommon") + @SidedProxy(clientSide = "mods.tinker.tconstruct.client.TProxyClient", serverSide = "mods.tinker.tconstruct.TProxyCommon") public static TProxyCommon proxy; public TConstruct() @@ -52,6 +52,10 @@ public class TConstruct blockTab = new TabTools("TConstructBlocks"); content = new TContent(); + proxy.registerRenderer(); + proxy.addNames(); + proxy.readManuals(); + proxy.registerKeys(); } @Init @@ -62,10 +66,6 @@ public class TConstruct MinecraftForge.EVENT_BUS.register(playerTracker); GameRegistry.registerPlayerTracker(playerTracker); NetworkRegistry.instance().registerGuiHandler(instance, new TGuiHandler()); - proxy.addNames(); - proxy.registerRenderer(); - proxy.readManuals(); - proxy.registerKeys(); } @PostInit diff --git a/tinker/tconstruct/TConstructRegistry.java b/mods/tinker/tconstruct/TConstructRegistry.java similarity index 52% rename from tinker/tconstruct/TConstructRegistry.java rename to mods/tinker/tconstruct/TConstructRegistry.java index d9760e03..8a96aa93 100644 --- a/tinker/tconstruct/TConstructRegistry.java +++ b/mods/tinker/tconstruct/TConstructRegistry.java @@ -1,11 +1,15 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; import java.util.ArrayList; import java.util.HashMap; -import tinker.tconstruct.client.gui.*; -import tinker.tconstruct.crafting.*; -import tinker.tconstruct.tools.*; +import mods.tinker.tconstruct.client.gui.ToolGuiElement; +import mods.tinker.tconstruct.tools.ToolCore; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** A registry to store any relevant API work * @@ -14,24 +18,29 @@ import tinker.tconstruct.tools.*; public class TConstructRegistry { - public static TConstructRegistry instance = new TConstructRegistry(); + public static TConstructRegistry instance = new TConstructRegistry(); public static ArrayList tools = new ArrayList(20); public static ArrayList toolButtons = new ArrayList(20); public static HashMap toolMaterials = new HashMap(60); - + @SideOnly(Side.CLIENT) + //Tools - public static void addToolMapping(ToolCore tool) + public static void addToolMapping (ToolCore tool) { tools.add(tool); } - - public static ArrayList getToolMapping() + + public static ArrayList getToolMapping () { return tools; } - + //Rendering - public static void addMaterialRenderMapping(int materialID, String textureLocation) + + //itemMap.func_94245_a + + + /*public static void addMaterialRenderMapping(int materialID, String textureLocation) { for (ToolCore tool : TConstructRegistry.getToolMapping()) { @@ -45,11 +54,10 @@ public class TConstructRegistry { tool.effectTextures.put(materialID, textureLocation); } - } - + }*/ + //Materials - public static void addToolMaterial(int materialID, String materialName, int craftingTier, int harvestLevel, - int durability, int miningspeed, int attack, float handleModifier, int reinforced, float shoddy) + public static void addToolMaterial (int materialID, String materialName, int craftingTier, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float shoddy) { ToolMaterial mat = toolMaterials.get(materialID); if (mat == null) @@ -57,26 +65,26 @@ public class TConstructRegistry toolMaterials.put(materialID, new ToolMaterial(materialName, craftingTier, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, shoddy)); } else - throw new RuntimeException("TConstruct material ID "+materialID+" is already occupied by "+mat.materialName); + throw new RuntimeException("TConstruct material ID " + materialID + " is already occupied by " + mat.materialName); } - - public static ToolMaterial getMaterial(int key) + + public static ToolMaterial getMaterial (int key) { return (toolMaterials.get(key)); } - + //Gui - public static void addToolButton(ToolGuiElement element) + public static void addToolButton (ToolGuiElement element) { toolButtons.add(element); } - - public static void addToolButton(int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body, String texture) + + public static void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body, String texture) { toolButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, texture)); } - - public static ArrayList getToolButtons() + + public static ArrayList getToolButtons () { return toolButtons; } diff --git a/tinker/tconstruct/TContent.java b/mods/tinker/tconstruct/TContent.java similarity index 75% rename from tinker/tconstruct/TContent.java rename to mods/tinker/tconstruct/TContent.java index 44470425..06ec00a9 100644 --- a/tinker/tconstruct/TContent.java +++ b/mods/tinker/tconstruct/TContent.java @@ -1,7 +1,70 @@ -package tinker.tconstruct; - -import java.util.ArrayList; +package mods.tinker.tconstruct; +import mods.tinker.common.IPattern; +import mods.tinker.common.fancyitem.FancyEntityItem; +import mods.tinker.tconstruct.blocks.EquipBlock; +import mods.tinker.tconstruct.blocks.LavaTankBlock; +import mods.tinker.tconstruct.blocks.MetalOre; +import mods.tinker.tconstruct.blocks.SearedBlock; +import mods.tinker.tconstruct.blocks.SmelteryBlock; +import mods.tinker.tconstruct.blocks.TConstructBlock; +import mods.tinker.tconstruct.blocks.ToolStationBlock; +import mods.tinker.tconstruct.blocks.liquids.LiquidMetalFlowing; +import mods.tinker.tconstruct.blocks.liquids.LiquidMetalStill; +import mods.tinker.tconstruct.crafting.LiquidCasting; +import mods.tinker.tconstruct.crafting.PatternBuilder; +import mods.tinker.tconstruct.crafting.Smeltery; +import mods.tinker.tconstruct.crafting.ToolBuilder; +import mods.tinker.tconstruct.entity.CartEntity; +import mods.tinker.tconstruct.entity.Crystal; +import mods.tinker.tconstruct.entity.Skyla; +import mods.tinker.tconstruct.items.CraftedSoilItemBlock; +import mods.tinker.tconstruct.items.CraftingItem; +import mods.tinker.tconstruct.items.FilledBucket; +import mods.tinker.tconstruct.items.LavaTankItemBlock; +import mods.tinker.tconstruct.items.LiquidItemBlock; +import mods.tinker.tconstruct.items.MetalItemBlock; +import mods.tinker.tconstruct.items.MetalOreItemBlock; +import mods.tinker.tconstruct.items.MetalPattern; +import mods.tinker.tconstruct.items.Pattern; +import mods.tinker.tconstruct.items.PatternManual; +import mods.tinker.tconstruct.items.SearedTableItemBlock; +import mods.tinker.tconstruct.items.SmelteryItemBlock; +import mods.tinker.tconstruct.items.TitleIcon; +import mods.tinker.tconstruct.items.ToolPart; +import mods.tinker.tconstruct.items.ToolShard; +import mods.tinker.tconstruct.items.ToolStationItemBlock; +import mods.tinker.tconstruct.logic.CastingTableLogic; +import mods.tinker.tconstruct.logic.FaucetLogic; +import mods.tinker.tconstruct.logic.FrypanLogic; +import mods.tinker.tconstruct.logic.LavaTankLogic; +import mods.tinker.tconstruct.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.logic.MultiServantLogic; +import mods.tinker.tconstruct.logic.PartCrafterLogic; +import mods.tinker.tconstruct.logic.PatternChestLogic; +import mods.tinker.tconstruct.logic.PatternShaperLogic; +import mods.tinker.tconstruct.logic.SmelteryDrainLogic; +import mods.tinker.tconstruct.logic.SmelteryLogic; +import mods.tinker.tconstruct.logic.ToolStationLogic; +import mods.tinker.tconstruct.modifiers.ModBlaze; +import mods.tinker.tconstruct.modifiers.ModBoolean; +import mods.tinker.tconstruct.modifiers.ModDurability; +import mods.tinker.tconstruct.modifiers.ModElectric; +import mods.tinker.tconstruct.modifiers.ModInteger; +import mods.tinker.tconstruct.modifiers.ModLapisBase; +import mods.tinker.tconstruct.modifiers.ModLapisIncrease; +import mods.tinker.tconstruct.modifiers.ModRedstone; +import mods.tinker.tconstruct.modifiers.ModRepair; +import mods.tinker.tconstruct.tools.Axe; +import mods.tinker.tconstruct.tools.BattleSign; +import mods.tinker.tconstruct.tools.Broadsword; +import mods.tinker.tconstruct.tools.FryingPan; +import mods.tinker.tconstruct.tools.Longsword; +import mods.tinker.tconstruct.tools.Mattock; +import mods.tinker.tconstruct.tools.Pickaxe; +import mods.tinker.tconstruct.tools.Rapier; +import mods.tinker.tconstruct.tools.Shovel; +import mods.tinker.tconstruct.tools.ToolCore; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -17,17 +80,6 @@ import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; -import tinker.common.IPattern; -import tinker.common.fancyitem.FancyEntityItem; -import tinker.tconstruct.blocks.*; -import tinker.tconstruct.blocks.liquids.*; -import tinker.tconstruct.client.gui.ToolGuiElement; -import tinker.tconstruct.crafting.*; -import tinker.tconstruct.entity.*; -import tinker.tconstruct.items.*; -import tinker.tconstruct.logic.*; -import tinker.tconstruct.modifiers.*; -import tinker.tconstruct.tools.*; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; @@ -44,6 +96,7 @@ public class TContent implements IFuelHandler public static Item manualBook; public static Item buckets; + public static Item titleIcon; //public static Item stonePattern; //public static Item netherPattern; @@ -78,16 +131,16 @@ public class TContent implements IFuelHandler public static Item lumberHead; //Crafting blocks - public static Block woodCrafter; + public static Block woodCrafter; public static Block heldItemBlock; public static Block craftedSoil; - + public static Block smeltery; public static Block lavaTank; public static Block searedBlock; public static Block oreSlag; public static Block metalBlock; - + //Traps public static Block landmine; @@ -95,7 +148,7 @@ public class TContent implements IFuelHandler public static Block liquidMetalFlowing; public static Block liquidMetalStill; public static Material liquidMetal; - + //public static Block axle; //Tool modifiers @@ -112,7 +165,7 @@ public class TContent implements IFuelHandler addCraftingRecipes(); setupToolTabs(); GameRegistry.registerFuelHandler(this); - } + } void createEntities () { @@ -122,8 +175,8 @@ public class TContent implements IFuelHandler EntityRegistry.registerModEntity(Skyla.class, "Skyla", 10, TConstruct.instance, 32, 5, true); } - - void registerBlocks() + + void registerBlocks () { //Tool Station woodCrafter = new ToolStationBlock(PHConstruct.woodCrafter, Material.wood); @@ -135,50 +188,75 @@ public class TContent implements IFuelHandler heldItemBlock = new EquipBlock(PHConstruct.heldItemBlock, Material.wood); GameRegistry.registerBlock(heldItemBlock, "HeldItemBlock"); - GameRegistry.registerTileEntity(tinker.tconstruct.logic.FrypanLogic.class, "FrypanLogic"); - - craftedSoil = new TConstructBlock(PHConstruct.craftedSoil, 96, Material.sand, 3.0F, 2); + GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic"); + + String[] soilTypes = new String[] { + "slimesand", + "grout" + }; + craftedSoil = new TConstructBlock(PHConstruct.craftedSoil, Material.sand, 3.0F, soilTypes); craftedSoil.stepSound = Block.soundGravelFootstep; - GameRegistry.registerBlock(craftedSoil, tinker.tconstruct.items.CraftedSoilItemBlock.class, "CraftedSoil"); - - metalBlock = new TConstructBlock(PHConstruct.metalBlock, 128, Material.iron, 10.0F, 10); + GameRegistry.registerBlock(craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil"); + + String[] metalTypes = new String[] { + "compressed_cobalt", + "compressed_ardite", + "compressed_manyullyn", + "compressed_copper", + "compressed_bronze", + "compressed_tin", + "compressed_aluminum", + "compressed_alubrass", + "compressed_alumite", + "compressed_steel" + }; + metalBlock = new TConstructBlock(PHConstruct.metalBlock, Material.iron, 10.0F, metalTypes); metalBlock.stepSound = Block.soundMetalFootstep; - GameRegistry.registerBlock(metalBlock, tinker.tconstruct.items.MetalItemBlock.class, "MetalBlock"); + GameRegistry.registerBlock(metalBlock, MetalItemBlock.class, "MetalBlock"); //Smeltery - smeltery = new SmelteryBlock(PHConstruct.smeltery).setBlockName("Smeltery"); + smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery"); GameRegistry.registerBlock(smeltery, SmelteryItemBlock.class, "Smeltery"); GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery"); GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain"); GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants"); - - lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setBlockName("LavaTank"); + + lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank"); lavaTank.setStepSound(Block.soundGlassFootstep); GameRegistry.registerBlock(lavaTank, LavaTankItemBlock.class, "LavaTank"); - GameRegistry.registerTileEntity(tinker.tconstruct.logic.LavaTankLogic.class, "TConstruct.LavaTank"); - - searedBlock = new SearedBlock(PHConstruct.searedTable).setBlockName("SearedBlock"); + GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank"); + + searedBlock = new SearedBlock(PHConstruct.searedTable).setUnlocalizedName("SearedBlock"); GameRegistry.registerBlock(searedBlock, SearedTableItemBlock.class, "SearedBlock"); GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable"); GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet"); - oreSlag = new MetalOre(PHConstruct.oreSlag, 80, Material.iron, 10.0F, 6); - GameRegistry.registerBlock(oreSlag, tinker.tconstruct.items.MetalOreItemBlock.class, "SearedBrick"); + String[] oreTypes = new String[] { + "nether_slag", + "nether_cobalt", + "nether_ardite", + "ore_copper", + "ore_tin", + "ore_aluminum", + "ore_slag" + }; + oreSlag = new MetalOre(PHConstruct.oreSlag, Material.iron, 10.0F, oreTypes); + GameRegistry.registerBlock(oreSlag, MetalOreItemBlock.class, "SearedBrick"); MinecraftForge.setBlockHarvestLevel(oreSlag, 0, "pickaxe", 2); MinecraftForge.setBlockHarvestLevel(oreSlag, 1, "pickaxe", 4); MinecraftForge.setBlockHarvestLevel(oreSlag, 2, "pickaxe", 4); MinecraftForge.setBlockHarvestLevel(oreSlag, 3, "pickaxe", 1); MinecraftForge.setBlockHarvestLevel(oreSlag, 4, "pickaxe", 1); MinecraftForge.setBlockHarvestLevel(oreSlag, 5, "pickaxe", 1); - + //Traps - /*landmine = new Landmine(PHConstruct.landmine, 0, EnumMobType.mobs, Material.cactus).setBlockName("landmine"); + /*landmine = new Landmine(PHConstruct.landmine, 0, EnumMobType.mobs, Material.cactus).setUnlocalizedName("landmine"); GameRegistry.registerBlock(landmine, "landmine");*/ //Liquids liquidMetal = new MaterialLiquid(MapColor.tntColor); - liquidMetalFlowing = new LiquidMetalFlowing(PHConstruct.metalFlowing).setBlockName("liquid.metalFlow"); - liquidMetalStill = new LiquidMetalStill(PHConstruct.metalStill).setBlockName("liquid.metalStill"); + liquidMetalFlowing = new LiquidMetalFlowing(PHConstruct.metalFlowing).setUnlocalizedName("liquid.metalFlow"); + liquidMetalStill = new LiquidMetalStill(PHConstruct.metalStill).setUnlocalizedName("liquid.metalStill"); GameRegistry.registerBlock(liquidMetalFlowing, LiquidItemBlock.class, "metalFlow"); GameRegistry.registerBlock(liquidMetalStill, LiquidItemBlock.class, "metalStill"); GameRegistry.registerTileEntity(LiquidTextureLogic.class, "LiquidTexture"); @@ -186,14 +264,23 @@ public class TContent implements IFuelHandler void registerItems () { - blankPattern = new BlankPattern(PHConstruct.blankPattern, 96, craftingTexture).setItemName("tconstruct.blankpattern"); - materials = new Materials(PHConstruct.materials, 128, craftingTexture).setItemName("tconstruct.Materials"); - toolRod = new ToolPart(PHConstruct.toolRod, 0, craftingTexture).setItemName("tconstruct.ToolRod"); - toolShard = new ToolShard(PHConstruct.toolShard, 64, craftingTexture).setItemName("tconstruct.ToolShard"); - woodPattern = new Pattern(PHConstruct.woodPattern, 0, patternTexture).setItemName("tconstruct.Pattern"); - metalPattern = new MetalPattern(PHConstruct.metalPattern, 64, patternTexture).setItemName("tconstruct.MetalPattern"); - //stonePattern = new Pattern(PHTools.stonePattern, 64, patternTexture).setItemName("tconstruct.Pattern"); - //netherPattern = new Pattern(PHTools.netherPattern, 128, patternTexture).setItemName("tconstruct.Pattern"); + titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon"); + String[] blanks = new String[] {"blankpattern", "blankcast"}; + blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks).setUnlocalizedName("tconstruct.blankpattern"); + String[] craftingMaterials = new String[] { + "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", + "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot" }; + String[] craftingTextures = new String[] { + "material_paper_stack", "material_slime_crystal", "material_seared_brick", "material_cobalt_ingot", "material_ardite_ingot", "material_manyullyn_ingot", + "material_mossball", "material_lava_crystal", "material_necrotic_bone", "material_copper_ingot", "material_tin_ingot", "material_aluminum_ingot", + "material_raw_aluminum", "material_bronze_ingot", "material_alubrass_ingot", "material_alumite_ingot", "material_steel_ingot" }; + materials = new CraftingItem(PHConstruct.materials, craftingMaterials, craftingTextures).setUnlocalizedName("tconstruct.Materials"); + toolRod = new ToolPart(PHConstruct.toolRod, "ToolRod", "_rod").setUnlocalizedName("tconstruct.ToolRod"); + toolShard = new ToolShard(PHConstruct.toolShard, "ToolShard", "_shard").setUnlocalizedName("tconstruct.ToolShard"); + woodPattern = new Pattern(PHConstruct.woodPattern, "WoodPattern").setUnlocalizedName("tconstruct.Pattern"); + metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern").setUnlocalizedName("tconstruct.MetalPattern"); + //stonePattern = new Pattern(PHTools.stonePattern, 64, patternTexture).setUnlocalizedName("tconstruct.Pattern"); + //netherPattern = new Pattern(PHTools.netherPattern, 128, patternTexture).setUnlocalizedName("tconstruct.Pattern"); manualBook = new PatternManual(PHConstruct.manual); buckets = new FilledBucket(PHConstruct.buckets); @@ -211,23 +298,21 @@ public class TContent implements IFuelHandler mattock = new Mattock(PHConstruct.mattock, mattockTexture); //lumberaxe = new LumberAxe(PHConstruct.lumberaxe, lumberaxeTexture); - pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, 0, baseHeads).setItemName("tconstruct.PickaxeHead"); - shovelHead = new ToolPart(PHConstruct.shovelHead, 64, baseHeads).setItemName("tconstruct.ShovelHead"); - axeHead = new ToolPart(PHConstruct.axeHead, 128, baseHeads).setItemName("tconstruct.AxeHead"); - swordBlade = new ToolPart(PHConstruct.swordBlade, 0, swordparts).setItemName("tconstruct.SwordBlade"); - largeGuard = new ToolPart(PHConstruct.largeGuard, 64, swordparts).setItemName("tconstruct.LargeGuard"); - medGuard = new ToolPart(PHConstruct.medGuard, 128, swordparts).setItemName("tconstruct.MediumGuard"); - crossbar = new ToolPart(PHConstruct.crossbar, 192, swordparts).setItemName("tconstruct.Crossbar"); - binding = new ToolPart(PHConstruct.binding, 0, baseAccessories).setItemName("tconstruct.Binding"); + pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "PickaxeHead", "_pickaxe_head").setUnlocalizedName("tconstruct.PickaxeHead"); + shovelHead = new ToolPart(PHConstruct.shovelHead, "ShovelHead", "_shovel_head").setUnlocalizedName("tconstruct.ShovelHead"); + axeHead = new ToolPart(PHConstruct.axeHead, "AxeHead", "_axe_head").setUnlocalizedName("tconstruct.AxeHead"); + swordBlade = new ToolPart(PHConstruct.swordBlade, "SwordBlade", "_sword_blade").setUnlocalizedName("tconstruct.SwordBlade"); + largeGuard = new ToolPart(PHConstruct.largeGuard, "LargeGuard", "_large_guard").setUnlocalizedName("tconstruct.LargeGuard"); + medGuard = new ToolPart(PHConstruct.medGuard, "MediumGuard", "_medium_guard").setUnlocalizedName("tconstruct.MediumGuard"); + crossbar = new ToolPart(PHConstruct.crossbar, "Crossbar", "_crossbar").setUnlocalizedName("tconstruct.Crossbar"); + binding = new ToolPart(PHConstruct.binding, "Binding", "_binding").setUnlocalizedName("tconstruct.Binding"); - frypanHead = new ToolPart(PHConstruct.frypanHead, 0, jokeparts).setItemName("tconstruct.FrypanHead"); - signHead = new ToolPart(PHConstruct.signHead, 64, jokeparts).setItemName("tconstruct.SignHead"); + frypanHead = new ToolPart(PHConstruct.frypanHead, "FrypanHead", "_frypan_head").setUnlocalizedName("tconstruct.FrypanHead"); + signHead = new ToolPart(PHConstruct.signHead, "SignHead", "_battlesign_head").setUnlocalizedName("tconstruct.SignHead"); - //lumberHead = new ToolPart(PHConstruct.lumberHead, 0, broadheads).setItemName("tconstruct.LumberHead"); + //lumberHead = new ToolPart(PHConstruct.lumberHead, 0, broadheads).setUnlocalizedName("tconstruct.LumberHead"); } - - void registerMaterials () { TConstructRegistry.addToolMaterial(0, "Wood", 1, 0, 59, 200, 0, 1.0F, 0, 0f); @@ -247,14 +332,14 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(14, "Bronze", 1, 2, 250, 600, 2, 1.3F, 1, 0f); TConstructRegistry.addToolMaterial(15, "Alumite", 2, 4, 550, 800, 3, 1.3F, 2, 0f); TConstructRegistry.addToolMaterial(16, "Steel", 2, 3, 750, 800, 3, 1.3F, 2, 0f); - + //Thaumcraft TConstructRegistry.addToolMaterial(21, "Thaumium", 2, 2, 250, 600, 2, 1.3F, 1, 0f); //Metallurgy TConstructRegistry.addToolMaterial(22, "Heptazion", 2, 2, 300, 800, 1, 1.0F, 0, 0f); TConstructRegistry.addToolMaterial(23, "Damascus Steel", 2, 3, 500, 600, 2, 1.35F, 1, 0f); TConstructRegistry.addToolMaterial(24, "Angmallen", 2, 2, 300, 800, 2, 0.8F, 0, 0f); - + TConstructRegistry.addToolMaterial(25, "Promethium", 1, 1, 200, 400, 1, 1.0F, 0, 0.5f); TConstructRegistry.addToolMaterial(26, "Deep Iron", 1, 2, 250, 600, 2, 1.3F, 1, 0f); TConstructRegistry.addToolMaterial(27, "Oureclase", 2, 3, 750, 800, 2, 1.2F, 0, 0f); @@ -265,7 +350,7 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(32, "Orichalcum", 2, 5, 1350, 900, 3, 1.25F, 0, 0f); TConstructRegistry.addToolMaterial(33, "Adamantine", 3, 6, 1550, 1000, 4, 1.5F, 1, 0f); TConstructRegistry.addToolMaterial(34, "Atlarus", 3, 6, 1750, 1000, 4, 1.6F, 2, 0f); - + TConstructRegistry.addToolMaterial(35, "Black Steel", 2, 2, 500, 800, 2, 1.3F, 2, 0f); TConstructRegistry.addToolMaterial(36, "Quicksilver", 2, 4, 1100, 1400, 3, 1.0F, 1, 0f); TConstructRegistry.addToolMaterial(37, "Haderoth", 2, 4, 1250, 1200, 3, 1.0F, 2, 0f); @@ -333,13 +418,13 @@ public class TContent implements IFuelHandler tb.registerToolMod(new ModBlaze(new ItemStack[] { new ItemStack(Item.blazePowder), new ItemStack(Item.blazePowder) }, 7, 2)); tb.registerToolMod(new ModBoolean(new ItemStack[] { new ItemStack(materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt")); tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal")); - + ItemStack ingotcast = new ItemStack(metalPattern, 1, 0); - + LiquidCasting lc = LiquidCasting.instance; //Blank lc.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new LiquidStack(liquidMetalStill.blockID, 1, 8), 50); - + //Ingots lc.addCastingRecipe(new ItemStack(Item.ingotIron), new LiquidStack(liquidMetalStill.blockID, 1, 0), ingotcast, 50); //Iron lc.addCastingRecipe(new ItemStack(Item.ingotGold), new LiquidStack(liquidMetalStill.blockID, 1, 1), ingotcast, 50); //gold @@ -355,52 +440,40 @@ public class TContent implements IFuelHandler // obsidian lc.addCastingRecipe(new ItemStack(materials, 1, 16), new LiquidStack(liquidMetalStill.blockID, 1, 12), ingotcast, 50); //steel - liquids = new LiquidStack[] { - new LiquidStack(liquidMetalStill.blockID, 1, 0), - new LiquidStack(liquidMetalStill.blockID, 1, 2), - new LiquidStack(liquidMetalStill.blockID, 1, 5), - new LiquidStack(liquidMetalStill.blockID, 1, 6), - new LiquidStack(liquidMetalStill.blockID, 1, 9), - new LiquidStack(liquidMetalStill.blockID, 1, 7), - new LiquidStack(liquidMetalStill.blockID, 1, 10), - new LiquidStack(liquidMetalStill.blockID, 1, 12) - }; - int[] liquidDamage = new int[] { - 2, 13, 10, 11, 12, 14, 15, 16 - }; - + liquids = new LiquidStack[] { new LiquidStack(liquidMetalStill.blockID, 1, 0), new LiquidStack(liquidMetalStill.blockID, 1, 2), new LiquidStack(liquidMetalStill.blockID, 1, 5), new LiquidStack(liquidMetalStill.blockID, 1, 6), new LiquidStack(liquidMetalStill.blockID, 1, 9), new LiquidStack(liquidMetalStill.blockID, 1, 7), new LiquidStack(liquidMetalStill.blockID, 1, 10), new LiquidStack(liquidMetalStill.blockID, 1, 12) }; + int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 16 }; + for (int iter = 0; iter < patternOutputs.length; iter++) { - ItemStack cast = new ItemStack(metalPattern, 1, iter+1); + ItemStack cast = new ItemStack(metalPattern, 1, iter + 1); for (int iterTwo = 0; iterTwo < liquids.length; iterTwo++) { lc.addCastingRecipe(new ItemStack(patternOutputs[iter], 1, liquidDamage[iterTwo]), liquids[iterTwo], cast, 50); } } } - - void addSmelteryRecipes() + + void addSmelteryRecipes () { //Ore - Smeltery.addMelting(Block.oreIron, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*2, 0)); - Smeltery.addMelting(Block.oreGold, 0, 550, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*2, 1)); - + Smeltery.addMelting(Block.oreIron, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0)); + Smeltery.addMelting(Block.oreGold, 0, 550, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 1)); + //Items Smeltery.addMelting(new ItemStack(Item.ingotIron, 4), Block.blockSteel.blockID, 0, 500, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 0)); Smeltery.addMelting(new ItemStack(Item.ingotGold, 4), Block.blockGold.blockID, 0, 450, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 1)); - Smeltery.addMelting(new ItemStack(Item.goldNugget, 4), Block.blockGold.blockID, 0, 450, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 1)); - + Smeltery.addMelting(new ItemStack(Item.goldNugget, 4), Block.blockGold.blockID, 0, 450, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 1)); + //Blocks - Smeltery.addMelting(Block.blockSteel, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 0)); - Smeltery.addMelting(Block.blockGold, 0, 550, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 1)); + Smeltery.addMelting(Block.blockSteel, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 0)); + Smeltery.addMelting(Block.blockGold, 0, 550, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 1)); Smeltery.addMelting(Block.obsidian, 0, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 11)); - + //Alloys Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 4, 7), new LiquidStack(liquidMetalStill.blockID, 3, 2), new LiquidStack(liquidMetalStill.blockID, 1, 3)); //Bronze Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 4, 8), new LiquidStack(liquidMetalStill.blockID, 3, 4), new LiquidStack(liquidMetalStill.blockID, 1, 2)); //Aluminum Brass Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 2, 9), new LiquidStack(liquidMetalStill.blockID, 1, 5), new LiquidStack(liquidMetalStill.blockID, 1, 6)); //Manyullyn - Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 9, 10), new LiquidStack(liquidMetalStill.blockID, 5, 4), - new LiquidStack(liquidMetalStill.blockID, 2, 0), new LiquidStack(liquidMetalStill.blockID, 2, 11)); //Alumite + Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 9, 10), new LiquidStack(liquidMetalStill.blockID, 5, 4), new LiquidStack(liquidMetalStill.blockID, 2, 0), new LiquidStack(liquidMetalStill.blockID, 2, 11)); //Alumite } void addCraftingRecipes () @@ -433,13 +506,13 @@ public class TContent implements IFuelHandler FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 0, new ItemStack(materials, 1, 1), 2f); //Slime FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 1, new ItemStack(materials, 1, 2), 2f); //Seared brick item //GameRegistry.addRecipe(new ItemStack(oreSlag, 1, 0), "pp", "pp", 'p', new ItemStack(materials, 1, 2)); //Seared brick block - + FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 4, new ItemStack(materials, 1, 10), 0.5f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 12), 0.5f); - + //Smeltery ItemStack searedBrick = new ItemStack(materials, 1, 2); GameRegistry.addRecipe(new ItemStack(smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); @@ -449,14 +522,14 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 0), "bbb", "bgb", "bbb", 'b', searedBrick, 'g', Block.glass); GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', Block.glass); GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', Block.glass); - + GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); } void setupToolTabs () { - TConstruct.materialTab.init(new ItemStack(TContent.woodPattern, 1, 255)); + TConstruct.materialTab.init(new ItemStack(titleIcon)); TConstruct.blockTab.init(new ItemStack(woodCrafter)); ItemStack tool = new ItemStack(longsword, 1, 0); @@ -470,8 +543,6 @@ public class TContent implements IFuelHandler TConstruct.toolTab.init(tool); } - - public void oreRegistry () { OreDictionary.registerOre("oreCobalt", new ItemStack(oreSlag, 1, 1)); @@ -479,7 +550,7 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("oreCopper", new ItemStack(oreSlag, 1, 3)); OreDictionary.registerOre("oreTin", new ItemStack(oreSlag, 1, 4)); OreDictionary.registerOre("oreNaturalAluminum", new ItemStack(oreSlag, 1, 5)); - + OreDictionary.registerOre("ingotCobalt", new ItemStack(materials, 1, 3)); OreDictionary.registerOre("ingotArdite", new ItemStack(materials, 1, 4)); OreDictionary.registerOre("ingotManyullyn", new ItemStack(materials, 1, 5)); @@ -502,19 +573,18 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("blockAluminumBrass", new ItemStack(metalBlock, 1, 7)); OreDictionary.registerOre("blockAlumite", new ItemStack(metalBlock, 1, 8)); OreDictionary.registerOre("blockSteel", new ItemStack(metalBlock, 1, 9)); - String[] liquidNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "Brass", "Manyullyn", "Alumite", "Obsidian", "Steel" }; for (int iter = 0; iter < liquidNames.length; iter++) { LiquidStack liquidstack = new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, iter); - LiquidDictionary.getOrCreateLiquid("Molten "+liquidNames[iter], liquidstack); + LiquidDictionary.getOrCreateLiquid("Molten " + liquidNames[iter], liquidstack); LiquidContainerRegistry.registerLiquid(new LiquidContainerData(liquidstack, new ItemStack(buckets, 1, iter), new ItemStack(Item.bucketEmpty))); } } public void modIntegration () - { + { /* IC2 */ ItemStack reBattery = ic2.api.Items.getItem("reBattery"); if (reBattery != null) diff --git a/tinker/tconstruct/TControls.java b/mods/tinker/tconstruct/TControls.java similarity index 98% rename from tinker/tconstruct/TControls.java rename to mods/tinker/tconstruct/TControls.java index 9f2a4b14..d47e5918 100644 --- a/tinker/tconstruct/TControls.java +++ b/mods/tinker/tconstruct/TControls.java @@ -1,4 +1,4 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/tinker/tconstruct/TEventHandler.java b/mods/tinker/tconstruct/TEventHandler.java similarity index 95% rename from tinker/tconstruct/TEventHandler.java rename to mods/tinker/tconstruct/TEventHandler.java index d95eeddb..1fee9c52 100644 --- a/tinker/tconstruct/TEventHandler.java +++ b/mods/tinker/tconstruct/TEventHandler.java @@ -1,23 +1,16 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; -import java.util.HashMap; - -import net.minecraft.entity.player.EntityPlayer; +import mods.tinker.tconstruct.crafting.PatternBuilder; +import mods.tinker.tconstruct.crafting.Smeltery; +import mods.tinker.tconstruct.logic.LiquidTextureLogic; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumMovingObjectType; import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; -import tinker.tconstruct.crafting.PatternBuilder; -import tinker.tconstruct.crafting.Smeltery; -import tinker.tconstruct.logic.LiquidTextureLogic; -import tinker.tconstruct.player.TPlayerStats; -import cpw.mods.fml.common.IPlayerTracker; public class TEventHandler { @@ -255,7 +248,7 @@ public class TEventHandler if (meta != -1) { - evt.world.setBlockWithNotify(hitX, hitY, hitZ, 0); + evt.world.func_94571_i(hitX, hitY, hitZ); //Set air block evt.result = new ItemStack(TContent.buckets, 1, meta); evt.setResult(Result.ALLOW); } diff --git a/tinker/tconstruct/TGuiHandler.java b/mods/tinker/tconstruct/TGuiHandler.java similarity index 71% rename from tinker/tconstruct/TGuiHandler.java rename to mods/tinker/tconstruct/TGuiHandler.java index d0692f41..ab975dff 100644 --- a/tinker/tconstruct/TGuiHandler.java +++ b/mods/tinker/tconstruct/TGuiHandler.java @@ -1,28 +1,28 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; import java.util.WeakHashMap; +import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.client.TProxyClient; +import mods.tinker.tconstruct.client.gui.FrypanGui; +import mods.tinker.tconstruct.client.gui.GuiManual; +import mods.tinker.tconstruct.client.gui.PartCrafterGui; +import mods.tinker.tconstruct.client.gui.PatternChestGui; +import mods.tinker.tconstruct.client.gui.PatternShaperGui; +import mods.tinker.tconstruct.client.gui.SmelteryGui; +import mods.tinker.tconstruct.client.gui.ToolStationGui; +import mods.tinker.tconstruct.container.SmelteryContainer; +import mods.tinker.tconstruct.logic.FrypanLogic; +import mods.tinker.tconstruct.logic.PartCrafterLogic; +import mods.tinker.tconstruct.logic.PatternChestLogic; +import mods.tinker.tconstruct.logic.PatternShaperLogic; +import mods.tinker.tconstruct.logic.SmelteryLogic; +import mods.tinker.tconstruct.logic.ToolStationLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tinker.common.InventoryLogic; -import tinker.tconstruct.client.TProxyClient; -import tinker.tconstruct.client.gui.FrypanGui; -import tinker.tconstruct.client.gui.GuiManual; -import tinker.tconstruct.client.gui.PartCrafterGui; -import tinker.tconstruct.client.gui.PatternChestGui; -import tinker.tconstruct.client.gui.PatternShaperGui; -import tinker.tconstruct.client.gui.SmelteryGui; -import tinker.tconstruct.client.gui.ToolStationGui; -import tinker.tconstruct.container.SmelteryContainer; -import tinker.tconstruct.logic.FrypanLogic; -import tinker.tconstruct.logic.PartCrafterLogic; -import tinker.tconstruct.logic.PatternChestLogic; -import tinker.tconstruct.logic.PatternShaperLogic; -import tinker.tconstruct.logic.SmelteryLogic; -import tinker.tconstruct.logic.ToolStationLogic; import cpw.mods.fml.common.network.IGuiHandler; public class TGuiHandler implements IGuiHandler diff --git a/tinker/tconstruct/TPacketHandler.java b/mods/tinker/tconstruct/TPacketHandler.java similarity index 95% rename from tinker/tconstruct/TPacketHandler.java rename to mods/tinker/tconstruct/TPacketHandler.java index d8a29ff4..8ca60e5b 100644 --- a/tinker/tconstruct/TPacketHandler.java +++ b/mods/tinker/tconstruct/TPacketHandler.java @@ -1,9 +1,12 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; +import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.container.SmelteryContainer; +import mods.tinker.tconstruct.logic.ToolStationLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.network.INetworkManager; @@ -11,9 +14,6 @@ import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; -import tinker.common.InventoryLogic; -import tinker.tconstruct.container.SmelteryContainer; -import tinker.tconstruct.logic.ToolStationLogic; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; diff --git a/tinker/tconstruct/TProxyCommon.java b/mods/tinker/tconstruct/TProxyCommon.java similarity index 92% rename from tinker/tconstruct/TProxyCommon.java rename to mods/tinker/tconstruct/TProxyCommon.java index 81500d21..e3c4851c 100644 --- a/tinker/tconstruct/TProxyCommon.java +++ b/mods/tinker/tconstruct/TProxyCommon.java @@ -1,4 +1,4 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; import java.io.File; diff --git a/tinker/tconstruct/TabTools.java b/mods/tinker/tconstruct/TabTools.java similarity index 64% rename from tinker/tconstruct/TabTools.java rename to mods/tinker/tconstruct/TabTools.java index 5198b06a..feb47c65 100644 --- a/tinker/tconstruct/TabTools.java +++ b/mods/tinker/tconstruct/TabTools.java @@ -1,11 +1,7 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; -import tinker.tconstruct.crafting.ToolBuilder; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TabTools extends CreativeTabs { diff --git a/tinker/tconstruct/ToolMaterial.java b/mods/tinker/tconstruct/ToolMaterial.java similarity index 98% rename from tinker/tconstruct/ToolMaterial.java rename to mods/tinker/tconstruct/ToolMaterial.java index a9f50e4a..ba90d58a 100644 --- a/tinker/tconstruct/ToolMaterial.java +++ b/mods/tinker/tconstruct/ToolMaterial.java @@ -1,4 +1,4 @@ -package tinker.tconstruct; +package mods.tinker.tconstruct; /** * This class is temporary. A full material registry is planned */ diff --git a/tinker/tconstruct/blocks/EquipBlock.java b/mods/tinker/tconstruct/blocks/EquipBlock.java similarity index 70% rename from tinker/tconstruct/blocks/EquipBlock.java rename to mods/tinker/tconstruct/blocks/EquipBlock.java index f71175d0..d366571c 100644 --- a/tinker/tconstruct/blocks/EquipBlock.java +++ b/mods/tinker/tconstruct/blocks/EquipBlock.java @@ -1,17 +1,21 @@ -package tinker.tconstruct.blocks; +package mods.tinker.tconstruct.blocks; import java.util.Random; +import mods.tinker.common.InventoryBlock; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.TGuiHandler; +import mods.tinker.tconstruct.client.FrypanRender; +import mods.tinker.tconstruct.logic.FrypanLogic; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tinker.common.InventoryBlock; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.TGuiHandler; -import tinker.tconstruct.client.FrypanRender; -import tinker.tconstruct.logic.FrypanLogic; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EquipBlock extends InventoryBlock { @@ -24,17 +28,18 @@ public class EquipBlock extends InventoryBlock //this.setCreativeTab(ToolConstruct.materialTab); } - /*public String getTextureFile() + @Override + public String[] getTextureNames () { - return "/tinkertextures/ConstructBlocks.png"; - }*/ - - public int getBlockTextureFromSideAndMetadata (int side, int meta) - { - //return 22 + meta*6 + side; - return 22; + return new String[] { "toolstation_top" }; } - + + @SideOnly(Side.CLIENT) + public void func_94332_a (IconRegister par1IconRegister) + { + this.field_94336_cN = par1IconRegister.func_94245_a(Block.blockSteel.getUnlocalizedName()); + } + @Override public boolean renderAsNormalBlock () { @@ -46,7 +51,7 @@ public class EquipBlock extends InventoryBlock { return false; } - + @Override public int getRenderType () { @@ -63,7 +68,7 @@ public class EquipBlock extends InventoryBlock { return new FrypanLogic(); } - + public void randomDisplayTick (World world, int x, int y, int z, Random random) { if (isActive(world, x, y, z)) diff --git a/tinker/tconstruct/blocks/Landmine.java b/mods/tinker/tconstruct/blocks/Landmine.java similarity index 77% rename from tinker/tconstruct/blocks/Landmine.java rename to mods/tinker/tconstruct/blocks/Landmine.java index 4fcaaf88..a188184d 100644 --- a/tinker/tconstruct/blocks/Landmine.java +++ b/mods/tinker/tconstruct/blocks/Landmine.java @@ -1,16 +1,14 @@ -package tinker.tconstruct.blocks; +package mods.tinker.tconstruct.blocks; import java.util.Iterator; import java.util.List; import java.util.Random; -import tinker.tconstruct.TConstruct; - +import mods.tinker.tconstruct.TConstruct; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.EnumMobType; import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; @@ -23,9 +21,9 @@ public class Landmine extends Block /** The mob type that can trigger this pressure plate. */ private EnumMobType triggerMobType; - public Landmine(int par1, int par2, EnumMobType par3EnumMobType, Material par4Material) + public Landmine(int par1, EnumMobType par3EnumMobType, Material par4Material) { - super(par1, par2, par4Material); + super(par1, par4Material); this.triggerMobType = EnumMobType.mobs; this.setCreativeTab(TConstruct.blockTab); this.setTickRandomly(true); @@ -96,7 +94,7 @@ public class Landmine extends Block if (var6) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + //par1World.setBlockWithNotify(par2, par3, par4, 0); } } @@ -140,17 +138,17 @@ public class Landmine extends Block if (this.triggerMobType == EnumMobType.everything) { - var8 = world.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)posX + var7), (double)posY, (double)((float)posZ + var7), (double)((float)(posX + 1) - var7), (double)posY + 0.25D, (double)((float)(posZ + 1) - var7))); + var8 = world.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getAABBPool().getAABB((double)((float)posX + var7), (double)posY, (double)((float)posZ + var7), (double)((float)(posX + 1) - var7), (double)posY + 0.25D, (double)((float)(posZ + 1) - var7))); } if (this.triggerMobType == EnumMobType.mobs) { - var8 = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)posX + var7), (double)posY, (double)((float)posZ + var7), (double)((float)(posX + 1) - var7), (double)posY + 0.25D, (double)((float)(posZ + 1) - var7))); + var8 = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getAABBPool().getAABB((double)((float)posX + var7), (double)posY, (double)((float)posZ + var7), (double)((float)(posX + 1) - var7), (double)posY + 0.25D, (double)((float)(posZ + 1) - var7))); } if (this.triggerMobType == EnumMobType.players) { - var8 = world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)posX + var7), (double)posY, (double)((float)posZ + var7), (double)((float)(posX + 1) - var7), (double)posY + 0.25D, (double)((float)(posZ + 1) - var7))); + var8 = world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().getAABB((double)((float)posX + var7), (double)posY, (double)((float)posZ + var7), (double)((float)(posX + 1) - var7), (double)posY + 0.25D, (double)((float)(posZ + 1) - var7))); } if (!var8.isEmpty()) @@ -171,7 +169,7 @@ public class Landmine extends Block if (var6 && !var5) { - world.setBlockWithNotify(posX, posY, posZ, 0); + //world.setBlockWithNotify(posX, posY, posZ, 0); world.createExplosion((Entity)null, posX, posY, posZ, 2.0F, true); /*par1World.setBlockMetadataWithNotify(posX, posY, posZ, 1); par1World.notifyBlocksOfNeighborChange(posX, posY, posZ, this.blockID); @@ -227,33 +225,6 @@ public class Landmine extends Block } } - /** - * Returns true if the block is emitting indirect/weak redstone power on the specified side. If isBlockNormalCube - * returns true, standard redstone propagation rules will apply instead and this will not be called. Args: World, X, - * Y, Z, side. Note that the side is reversed - eg it is 1 (up) when checking the bottom of the block. - */ - public boolean isProvidingWeakPower(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { - return par1IBlockAccess.getBlockMetadata(par2, par3, par4) > 0; - } - - /** - * Returns true if the block is emitting direct/strong redstone power on the specified side. Args: World, X, Y, Z, - * side. Note that the side is reversed - eg it is 1 (up) when checking the bottom of the block. - */ - public boolean isProvidingStrongPower(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { - return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 0 ? false : par5 == 1; - } - - /** - * Can this block provide power. Only wire currently seems to have this change based on its state. - */ - public boolean canProvidePower() - { - return true; - } - /** * Sets the block's bounds for rendering it as an item */ diff --git a/tinker/tconstruct/blocks/LavaTankBlock.java b/mods/tinker/tconstruct/blocks/LavaTankBlock.java similarity index 62% rename from tinker/tconstruct/blocks/LavaTankBlock.java rename to mods/tinker/tconstruct/blocks/LavaTankBlock.java index 0769db02..1aef27ec 100644 --- a/tinker/tconstruct/blocks/LavaTankBlock.java +++ b/mods/tinker/tconstruct/blocks/LavaTankBlock.java @@ -1,33 +1,62 @@ -package tinker.tconstruct.blocks; +package mods.tinker.tconstruct.blocks; import java.util.List; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.client.TankRender; +import mods.tinker.tconstruct.logic.LavaTankLogic; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.TContent; -import tinker.tconstruct.client.TankRender; -import tinker.tconstruct.logic.LavaTankLogic; public class LavaTankBlock extends BlockContainer { + public Icon[] icons; public LavaTankBlock(int id) { - super(id, 38, Material.rock); + super(id, Material.rock); setHardness(12); setCreativeTab(TConstruct.blockTab); - setBlockName("TConstruct.LavaTank"); + setUnlocalizedName("TConstruct.LavaTank"); setStepSound(Block.soundGlassFootstep); } + + public String[] getTextureNames() + { + String[] textureNames = { + "lavatank_side", + "lavatank_top", + "searedgague_top", + "searedgague_side", + "searedgague_bottom", + "searedwindow_top", + "searedwindow_side", + "searedwindow_bottom" }; + + return textureNames; + } + + public void func_94332_a(IconRegister iconRegister) + { + String[] textureNames = getTextureNames(); + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.func_94245_a("tinker:"+textureNames[i]); + } + } @Override public boolean isOpaqueCube () @@ -63,38 +92,37 @@ public class LavaTankBlock extends BlockContainer return TankRender.tankModelID; } - public int getBlockTextureFromSideAndMetadata (int side, int meta) + public Icon getBlockTextureFromSideAndMetadata (int side, int meta) { if (meta == 0) { if (side == 0 || side == 1) { - return blockIndexInTexture + 1; + return icons[1]; } else { - return blockIndexInTexture; + return icons[0]; } } else { - if (side == 0) - { - return blockIndexInTexture + 1 + meta * 3; - } - else if (side == 1) - { - return blockIndexInTexture + meta * 3; - } - else - { - return blockIndexInTexture - 1 + meta * 3; - } + return icons[meta*3+getTextureIndex(side)-1]; } } + + public int getTextureIndex (int side) + { + if (side == 0) + return 2; + if (side == 1) + return 0; + + return 1; + } @Override - public TileEntity createNewTileEntity (World world, int metadata) + public TileEntity createTileEntity (World world, int metadata) { return new LavaTankLogic(); } @@ -122,7 +150,7 @@ public class LavaTankBlock extends BlockContainer @Override public TileEntity createNewTileEntity (World world) { - return createNewTileEntity(world, 0); + return createTileEntity(world, 0); } @Override diff --git a/tinker/tconstruct/blocks/MetalOre.java b/mods/tinker/tconstruct/blocks/MetalOre.java similarity index 68% rename from tinker/tconstruct/blocks/MetalOre.java rename to mods/tinker/tconstruct/blocks/MetalOre.java index f8dce84a..d5787e1b 100644 --- a/tinker/tconstruct/blocks/MetalOre.java +++ b/mods/tinker/tconstruct/blocks/MetalOre.java @@ -1,13 +1,13 @@ -package tinker.tconstruct.blocks; +package mods.tinker.tconstruct.blocks; import net.minecraft.block.material.Material; import net.minecraft.world.World; public class MetalOre extends TConstructBlock { - public MetalOre(int id, int tex, Material material, float hardness, int sub) + public MetalOre(int id, Material material, float hardness, String[] tex) { - super(id, tex, material, hardness, sub); + super(id, material, hardness, tex); } public float getBlockHardness (World world, int x, int y, int z) diff --git a/tinker/tconstruct/blocks/SearedBlock.java b/mods/tinker/tconstruct/blocks/SearedBlock.java similarity index 83% rename from tinker/tconstruct/blocks/SearedBlock.java rename to mods/tinker/tconstruct/blocks/SearedBlock.java index c91e3848..ef7e15d1 100644 --- a/tinker/tconstruct/blocks/SearedBlock.java +++ b/mods/tinker/tconstruct/blocks/SearedBlock.java @@ -1,7 +1,12 @@ -package tinker.tconstruct.blocks; +package mods.tinker.tconstruct.blocks; import java.util.List; +import mods.tinker.common.InventoryBlock; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.client.SearedRender; +import mods.tinker.tconstruct.logic.CastingTableLogic; +import mods.tinker.tconstruct.logic.FaucetLogic; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -9,22 +14,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tinker.common.InventoryBlock; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.TContent; -import tinker.tconstruct.client.SearedRender; -import tinker.tconstruct.logic.CastingTableLogic; -import tinker.tconstruct.logic.FaucetLogic; public class SearedBlock extends InventoryBlock { + public SearedBlock(int id) { super(id, Material.rock); this.setCreativeTab(TConstruct.blockTab); - blockIndexInTexture = 32; + //blockIndexInTexture = 32; setHardness(12); setStepSound(soundMetalFootstep); } @@ -140,26 +141,27 @@ public class SearedBlock extends InventoryBlock } @Override - public String getTextureFile () + public String[] getTextureNames() { - return TContent.blockTexture; + String[] textureNames = { + "castingtable_top", + "castingtable_side", + "castingtable_bottom", + "faucet"}; + + return textureNames; } - public int getBlockTextureFromSideAndMetadata (int side, int meta) + @Override + public Icon getBlockTextureFromSideAndMetadata (int side, int meta) { if (meta == 0) - return blockIndexInTexture + meta * 3 + getBlockTextureFromSide(side); - /*else if (meta == 1) - { - if (side == 0 || side == 1) - return blockIndexInTexture + meta + 3; - else - return blockIndexInTexture + meta + 2; - }*/ - return blockIndexInTexture + meta + 2; + return icons[getTextureIndex(side)]; + else + return icons[3]; } - public int getBlockTextureFromSide (int side) + public int getTextureIndex (int side) { if (side == 0) return 2; @@ -242,7 +244,7 @@ public class SearedBlock extends InventoryBlock int meta = world.getBlockMetadata(x, y, z); if (meta == 0) { - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool(x, y, z, x + 1, y + 1, z + 1); + return AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 1, z + 1); } if (meta == 1) { @@ -274,7 +276,7 @@ public class SearedBlock extends InventoryBlock break; } - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double) ((float) x + xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625, (double) ((float) z + zMax)); + return AxisAlignedBB.getAABBPool().getAABB((double) ((float) x + xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625, (double) ((float) z + zMax)); } } diff --git a/tinker/tconstruct/blocks/SmelteryBlock.java b/mods/tinker/tconstruct/blocks/SmelteryBlock.java similarity index 71% rename from tinker/tconstruct/blocks/SmelteryBlock.java rename to mods/tinker/tconstruct/blocks/SmelteryBlock.java index f180fc55..aa9c3688 100644 --- a/tinker/tconstruct/blocks/SmelteryBlock.java +++ b/mods/tinker/tconstruct/blocks/SmelteryBlock.java @@ -1,26 +1,25 @@ -package tinker.tconstruct.blocks; +package mods.tinker.tconstruct.blocks; import java.util.List; import java.util.Random; +import mods.tinker.common.IFacingLogic; +import mods.tinker.common.InventoryBlock; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.TGuiHandler; +import mods.tinker.tconstruct.client.SmelteryRender; +import mods.tinker.tconstruct.logic.MultiServantLogic; +import mods.tinker.tconstruct.logic.SmelteryDrainLogic; +import mods.tinker.tconstruct.logic.SmelteryLogic; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tinker.common.IFacingLogic; -import tinker.common.InventoryBlock; -import tinker.common.InventoryLogic; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.TContent; -import tinker.tconstruct.TGuiHandler; -import tinker.tconstruct.client.SmelteryRender; -import tinker.tconstruct.logic.MultiServantLogic; -import tinker.tconstruct.logic.SmelteryDrainLogic; -import tinker.tconstruct.logic.SmelteryLogic; public class SmelteryBlock extends InventoryBlock { @@ -29,102 +28,86 @@ public class SmelteryBlock extends InventoryBlock public SmelteryBlock(int id) { super(id, Material.rock); - blockIndexInTexture = 64; + //blockIndexInTexture = 64; setHardness(12F); setStepSound(soundMetalFootstep); rand = new Random(); this.setCreativeTab(TConstruct.blockTab); - this.setBlockName("tconstruct.Smeltery"); + this.setUnlocalizedName("tconstruct.Smeltery"); } + + /* Rendering */ @Override public int getRenderType () { return SmelteryRender.smelteryModel; } - + @Override - public String getTextureFile () + public String[] getTextureNames() { - return TContent.blockTexture; + String[] textureNames = { + "smeltery_side", + "smeltery_inactive", + "smeltery_active", + "drain_side", + "drain_out", + "drain_basin", + "searedbrick", + }; + + return textureNames; } - public int getBlockTextureFromSideAndMetadata (int side, int meta) + public Icon getBlockTextureFromSideAndMetadata (int side, int meta) { if (meta < 2) { - if (side == 3) - { - return blockIndexInTexture + 1 + meta * 3; - } - else - { - return blockIndexInTexture + meta * 3; - } - } - else if (meta < 4) - { - return blockIndexInTexture + meta + 4; + int sideTex = side == 3 ? 1 : 0; + return icons[sideTex + meta*3]; } else { - if (side == 0) - return blockIndexInTexture + meta*3 - 2; - else if (side == 1) - return blockIndexInTexture + meta*3 - 1; - else - return blockIndexInTexture + meta*3 - 3; + return icons[6]; } } - public int getBlockTexture (IBlockAccess world, int x, int y, int z, int side) + public Icon getBlockTexture (IBlockAccess world, int x, int y, int z, int side) { TileEntity logic = world.getBlockTileEntity(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; int meta = world.getBlockMetadata(x, y, z); if (meta == 0) //Smeltery { - /*if (side == 1) - { - return blockIndexInTexture + 3 + meta * 4; - }*/ if (side == direction) { if (isActive(world, x, y, z)) { - return blockIndexInTexture + 2; + return icons[2]; } else { - return blockIndexInTexture + 1; + return icons[1]; } } else { - return blockIndexInTexture + meta; + return icons[0]; } } - if (meta == 1) + if (meta == 1) //Drain { if (side == direction) - return blockIndexInTexture + 2 + 3; + return icons[5]; else if (side / 2 == direction / 2) - return blockIndexInTexture + 1 + 3; + return icons[4]; else - return blockIndexInTexture + 3; + return icons[3]; } - else if (meta < 4) + else //Brick { - return blockIndexInTexture + meta + 4; - } - else - { - if (side == 0) - return blockIndexInTexture + meta*3 - 2; - else if (side == 1) - return blockIndexInTexture + meta*3 - 1; - else - return blockIndexInTexture + meta*3 - 3; + return icons[6]; } } @@ -233,9 +216,9 @@ public class SmelteryBlock extends InventoryBlock } @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLiving entityliving) + public void onBlockPlacedBy (World world, int x, int y, int z, EntityLiving entityliving, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, entityliving); + super.onBlockPlacedBy(world, x, y, z, entityliving, stack); if (world.getBlockMetadata(x, y, z) == 0) onBlockPlacedElsewhere(world, x, y, z, entityliving); } diff --git a/mods/tinker/tconstruct/blocks/TConstructBlock.java b/mods/tinker/tconstruct/blocks/TConstructBlock.java new file mode 100644 index 00000000..747b2640 --- /dev/null +++ b/mods/tinker/tconstruct/blocks/TConstructBlock.java @@ -0,0 +1,55 @@ +package mods.tinker.tconstruct.blocks; + +import java.util.List; + +import mods.tinker.tconstruct.TConstruct; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; + +public class TConstructBlock extends Block +{ + public String[] textureNames; + public Icon[] icons; + public TConstructBlock(int id, Material material, float hardness, String[] tex) + { + super(id, material); + setHardness(hardness); + this.setCreativeTab(TConstruct.blockTab); + textureNames = tex; + } + + @Override + public int damageDropped (int meta) + { + return meta; + } + + public void func_94332_a(IconRegister iconRegister) + { + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.func_94245_a("tinker:"+textureNames[i]); + } + } + + @Override + public Icon getBlockTextureFromSideAndMetadata (int side, int meta) + { + return icons[meta]; + } + + @Override + public void getSubBlocks (int id, CreativeTabs tab, List list) + { + for (int iter = 0; iter < icons.length; iter++) + { + list.add(new ItemStack(id, 1, iter)); + } + } +} diff --git a/tinker/tconstruct/blocks/ToolStationBlock.java b/mods/tinker/tconstruct/blocks/ToolStationBlock.java similarity index 56% rename from tinker/tconstruct/blocks/ToolStationBlock.java rename to mods/tinker/tconstruct/blocks/ToolStationBlock.java index 887b665d..93684140 100644 --- a/tinker/tconstruct/blocks/ToolStationBlock.java +++ b/mods/tinker/tconstruct/blocks/ToolStationBlock.java @@ -1,28 +1,26 @@ -package tinker.tconstruct.blocks; +package mods.tinker.tconstruct.blocks; import java.util.List; +import mods.tinker.common.InventoryBlock; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.client.TableRender; +import mods.tinker.tconstruct.logic.PartCrafterLogic; +import mods.tinker.tconstruct.logic.PatternChestLogic; +import mods.tinker.tconstruct.logic.PatternShaperLogic; +import mods.tinker.tconstruct.logic.ToolStationLogic; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tinker.common.InventoryBlock; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.TContent; -import tinker.tconstruct.client.TableRender; -import tinker.tconstruct.logic.CastingTableLogic; -import tinker.tconstruct.logic.PartCrafterLogic; -import tinker.tconstruct.logic.PatternChestLogic; -import tinker.tconstruct.logic.PatternShaperLogic; -import tinker.tconstruct.logic.ToolStationLogic; public class ToolStationBlock extends InventoryBlock -{ - +{ public ToolStationBlock(int id, Material material) { super(id, material); @@ -31,39 +29,62 @@ public class ToolStationBlock extends InventoryBlock } /* Rendering */ - public String getTextureFile () + @Override + public String[] getTextureNames() { - return TContent.blockTexture; + String[] textureNames = { + "toolstation_top", + "toolstation_side", + "toolstation_bottom", + "partbuilder_oak_top", + "partbuilder_oak_side", + "partbuilder_oak_bottom", + "partbuilder_spruce_top", + "partbuilder_spruce_side", + "partbuilder_spruce_bottom", + "partbuilder_birch_top", + "partbuilder_birch_side", + "partbuilder_birch_bottom", + "partbuilder_jungle_top", + "partbuilder_jungle_side", + "partbuilder_jungle_bottom", + "patternchest_top", + "patternchest_side", + "patternchest_bottom", + "stenciltable_oak_top", + "stenciltable_oak_side", + "stenciltable_oak_bottom", + "stenciltable_spruce_top", + "stenciltable_spruce_side", + "stenciltable_spruce_bottom", + "stenciltable_birch_top", + "stenciltable_birch_side", + "stenciltable_birch_bottom", + "stenciltable_jungle_top", + "stenciltable_jungle_side", + "stenciltable_jungle_bottom"}; + + return textureNames; } - - public int getBlockTextureFromSideAndMetadata (int side, int meta) + + @Override + public Icon getBlockTextureFromSideAndMetadata (int side, int meta) { - if (meta == 0) + if (meta <= 4) { - if (side == 0) - return 3; - else if (side == 1) - return 0; - else if (side == 2 || side == 3) - return 1; - else - return 2; - } - else if (meta <= 4) - { - return 1 + meta * 3 + getBlockTextureFromSide(side); + return icons[meta*3+getTextureIndex(side)]; } else if (meta <= 9) { - return 16 + getBlockTextureFromSide(side); + return icons[15+getTextureIndex(side)]; } else { - return -10 + meta * 3 + getBlockTextureFromSide(side); + return icons[meta*3+getTextureIndex(side)-12]; } } - public int getBlockTextureFromSide (int side) + public int getTextureIndex (int side) { if (side == 0) return 2; @@ -101,8 +122,8 @@ public class ToolStationBlock extends InventoryBlock { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ); - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); + return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ); + return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); } public TileEntity createNewTileEntity (World world, int metadata) diff --git a/tinker/tconstruct/blocks/liquids/LiquidMetalBase.java b/mods/tinker/tconstruct/blocks/liquids/LiquidMetalBase.java similarity index 97% rename from tinker/tconstruct/blocks/liquids/LiquidMetalBase.java rename to mods/tinker/tconstruct/blocks/liquids/LiquidMetalBase.java index df7ffb0d..cb3369e2 100644 --- a/tinker/tconstruct/blocks/liquids/LiquidMetalBase.java +++ b/mods/tinker/tconstruct/blocks/liquids/LiquidMetalBase.java @@ -1,7 +1,10 @@ -package tinker.tconstruct.blocks.liquids; +package mods.tinker.tconstruct.blocks.liquids; import java.util.Random; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.client.FluidRender; +import mods.tinker.tconstruct.logic.LiquidTextureLogic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -10,9 +13,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tinker.tconstruct.TContent; -import tinker.tconstruct.client.FluidRender; -import tinker.tconstruct.logic.LiquidTextureLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,7 +24,7 @@ public abstract class LiquidMetalBase extends Block super(par1, par2Material); } - @Override + /*@Override public int getBlockTexture(IBlockAccess world, int x, int y, int z, int side) { TileEntity logic = world.getBlockTileEntity(x, y, z); @@ -44,7 +44,7 @@ public abstract class LiquidMetalBase extends Block return tex; else return tex+1; - } + }*/ @Override public int getRenderType () @@ -243,10 +243,10 @@ public abstract class LiquidMetalBase extends Block /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return par1 != 0 && par1 != 1 ? this.blockIndexInTexture + 1 : this.blockIndexInTexture; - } + }*/ /** * Returns the amount of fluid decay at the coordinates, or -1 if the block at the coordinates is not the same @@ -619,11 +619,11 @@ public abstract class LiquidMetalBase extends Block if (var6 == 0) { - par1World.setBlockWithNotify(par2, par3, par4, Block.obsidian.blockID); + par1World.func_94575_c(par2, par3, par4, Block.obsidian.blockID); } else if (var6 <= 4) { - par1World.setBlockWithNotify(par2, par3, par4, Block.cobblestone.blockID); + par1World.func_94575_c(par2, par3, par4, Block.cobblestone.blockID); } this.triggerLavaMixEffects(par1World, par2, par3, par4); diff --git a/tinker/tconstruct/blocks/liquids/LiquidMetalFlowing.java b/mods/tinker/tconstruct/blocks/liquids/LiquidMetalFlowing.java similarity index 93% rename from tinker/tconstruct/blocks/liquids/LiquidMetalFlowing.java rename to mods/tinker/tconstruct/blocks/liquids/LiquidMetalFlowing.java index fe11536f..dbabe62c 100644 --- a/tinker/tconstruct/blocks/liquids/LiquidMetalFlowing.java +++ b/mods/tinker/tconstruct/blocks/liquids/LiquidMetalFlowing.java @@ -1,15 +1,14 @@ -package tinker.tconstruct.blocks.liquids; +package mods.tinker.tconstruct.blocks.liquids; import java.util.Random; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.logic.LiquidTextureLogic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.liquids.ILiquid; -import tinker.tconstruct.TContent; -import tinker.tconstruct.logic.LiquidTextureLogic; public class LiquidMetalFlowing extends LiquidMetalBase implements ILiquid @@ -34,7 +33,7 @@ public class LiquidMetalFlowing extends LiquidMetalBase //System.out.println("x: "+x+", y: "+y+", z: "+z); int tex = ((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).getLiquidType(); int meta = world.getBlockMetadata(x, y, z); - world.setBlockAndMetadata(x, y, z, stillLiquidId(), meta); + world.setBlockAndMetadataWithNotify(x, y, z, stillLiquidId(), meta, 2); world.markBlockRangeForRenderUpdate(x, y, z, x, y, z); world.markBlockForUpdate(x, y, z); ((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).setTexturePos(tex); @@ -77,11 +76,11 @@ public class LiquidMetalFlowing extends LiquidMetalBase l = j1; if (l < 0) { - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); } else { - world.setBlockMetadataWithNotify(x, y, z, l); + world.setBlockMetadataWithNotify(x, y, z, l, 2); world.scheduleBlockUpdate(x, y, z, blockID, tickRate()); world.notifyBlocksOfNeighborChange(x, y, z, blockID); } @@ -99,11 +98,11 @@ public class LiquidMetalFlowing extends LiquidMetalBase { if (l >= 8) { - world.setBlockAndMetadataWithNotify(x, y - 1, z, blockID, l); + world.setBlockAndMetadataWithNotify(x, y - 1, z, blockID, l, 3); } else { - world.setBlockAndMetadataWithNotify(x, y - 1, z, blockID, l + 8); + world.setBlockAndMetadataWithNotify(x, y - 1, z, blockID, l + 8, 3); } ((LiquidTextureLogic) world.getBlockTileEntity(x, y - 1, z)).setTexturePos(tex); } @@ -145,7 +144,7 @@ public class LiquidMetalFlowing extends LiquidMetalBase { Block.blocksList[bID].dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); } - world.setBlockAndMetadataWithNotify(x, y, z, blockID, meta); + world.setBlockAndMetadataWithNotify(x, y, z, blockID, meta, 3); ((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).setTexturePos(tex); } diff --git a/tinker/tconstruct/blocks/liquids/LiquidMetalStill.java b/mods/tinker/tconstruct/blocks/liquids/LiquidMetalStill.java similarity index 90% rename from tinker/tconstruct/blocks/liquids/LiquidMetalStill.java rename to mods/tinker/tconstruct/blocks/liquids/LiquidMetalStill.java index 235124c8..226df7ce 100644 --- a/tinker/tconstruct/blocks/liquids/LiquidMetalStill.java +++ b/mods/tinker/tconstruct/blocks/liquids/LiquidMetalStill.java @@ -1,16 +1,15 @@ -package tinker.tconstruct.blocks.liquids; +package mods.tinker.tconstruct.blocks.liquids; import java.util.Random; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.logic.LiquidTextureLogic; import net.minecraft.block.Block; -import net.minecraft.block.BlockStationary; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.liquids.ILiquid; -import tinker.tconstruct.TContent; -import tinker.tconstruct.logic.LiquidTextureLogic; public class LiquidMetalStill extends LiquidMetalBase implements ILiquid { @@ -60,7 +59,7 @@ public class LiquidMetalStill extends LiquidMetalBase implements ILiquid { if (this.isFlammable(par1World, par2 - 1, par3, par4) || this.isFlammable(par1World, par2 + 1, par3, par4) || this.isFlammable(par1World, par2, par3, par4 - 1) || this.isFlammable(par1World, par2, par3, par4 + 1) || this.isFlammable(par1World, par2, par3 - 1, par4) || this.isFlammable(par1World, par2, par3 + 1, par4)) { - par1World.setBlockWithNotify(par2, par3, par4, Block.fire.blockID); + par1World.func_94575_c(par2, par3, par4, Block.fire.blockID); return; } } @@ -82,7 +81,7 @@ public class LiquidMetalStill extends LiquidMetalBase implements ILiquid if (par1World.isAirBlock(par2, par3 + 1, par4) && this.isFlammable(par1World, par2, par3, par4)) { - par1World.setBlockWithNotify(par2, par3 + 1, par4, Block.fire.blockID); + par1World.func_94575_c(par2, par3 + 1, par4, Block.fire.blockID); } } } @@ -174,13 +173,16 @@ public class LiquidMetalStill extends LiquidMetalBase implements ILiquid private void unsetStationary (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); + world.setBlockAndMetadataWithNotify(x, y, z, this.blockID - 1, meta, 2); + world.scheduleBlockUpdate(x, y, z, this.blockID - 1, this.tickRate(world)); + /*int meta = world.getBlockMetadata(x, y, z); int tex = ((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).getLiquidType(); world.editingBlocks = true; world.setBlockAndMetadata(x, y, z, flowingLiquidID(), meta); world.markBlockRangeForRenderUpdate(x, y, z, x, y, z); world.scheduleBlockUpdate(x, y, z, flowingLiquidID(), this.tickRate()); ((LiquidTextureLogic) world.getBlockTileEntity(x, y, z)).setTexturePos(tex); - world.editingBlocks = false; + world.editingBlocks = false;*/ } public boolean getBlocksMovement (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) diff --git a/tinker/tconstruct/client/AxleRender.java b/mods/tinker/tconstruct/client/AxleRender.java similarity index 98% rename from tinker/tconstruct/client/AxleRender.java rename to mods/tinker/tconstruct/client/AxleRender.java index 5f79be5a..c9c8b5ec 100644 --- a/tinker/tconstruct/client/AxleRender.java +++ b/mods/tinker/tconstruct/client/AxleRender.java @@ -1,11 +1,12 @@ -package tinker.tconstruct.client; - -import org.lwjgl.opengl.GL11; +package mods.tinker.tconstruct.client; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/tinker/tconstruct/client/CastingTableSpecialRenderer.java b/mods/tinker/tconstruct/client/CastingTableSpecialRenderer.java similarity index 91% rename from tinker/tconstruct/client/CastingTableSpecialRenderer.java rename to mods/tinker/tconstruct/client/CastingTableSpecialRenderer.java index 828d586a..c8deee52 100644 --- a/tinker/tconstruct/client/CastingTableSpecialRenderer.java +++ b/mods/tinker/tconstruct/client/CastingTableSpecialRenderer.java @@ -1,5 +1,7 @@ -package tinker.tconstruct.client; +package mods.tinker.tconstruct.client; +import mods.tinker.common.fancyitem.FancyEntityItem; +import mods.tinker.tconstruct.logic.CastingTableLogic; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -9,8 +11,6 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import tinker.common.fancyitem.FancyEntityItem; -import tinker.tconstruct.logic.CastingTableLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -53,7 +53,7 @@ public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer void renderItem(CastingTableLogic logic, ItemStack stack) { FancyEntityItem entityitem = new FancyEntityItem(logic.worldObj, 0.0D, 0.0D, 0.0D, stack); - entityitem.func_92014_d().stackSize = 1; + entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glPushMatrix(); GL11.glTranslatef(1F, 1.478F, 0.55F); diff --git a/tinker/tconstruct/client/FluidRender.java b/mods/tinker/tconstruct/client/FluidRender.java similarity index 52% rename from tinker/tconstruct/client/FluidRender.java rename to mods/tinker/tconstruct/client/FluidRender.java index f4624e08..472f9d4a 100644 --- a/tinker/tconstruct/client/FluidRender.java +++ b/mods/tinker/tconstruct/client/FluidRender.java @@ -1,12 +1,14 @@ -package tinker.tconstruct.client; +package mods.tinker.tconstruct.client; +import mods.tinker.tconstruct.blocks.liquids.LiquidMetalBase; import net.minecraft.block.Block; +import net.minecraft.block.BlockFluid; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; -import tinker.tconstruct.blocks.liquids.LiquidMetalBase; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -38,6 +40,212 @@ public class FluidRender implements ISimpleBlockRenderingHandler } public boolean renderBlockFluids(RenderBlocks renderer, IBlockAccess world, Block block, int x, int y, int z) + { + Tessellator tessellator = Tessellator.instance; + int l = block.colorMultiplier(world, x, y, z); + float f = (float)(l >> 16 & 255) / 255.0F; + float f1 = (float)(l >> 8 & 255) / 255.0F; + float f2 = (float)(l & 255) / 255.0F; + boolean flag = block.shouldSideBeRendered(world, x, y + 1, z, 1); + boolean flag1 = block.shouldSideBeRendered(world, x, y - 1, z, 0); + boolean[] aboolean = new boolean[] {block.shouldSideBeRendered(world, x, y, z - 1, 2), block.shouldSideBeRendered(world, x, y, z + 1, 3), block.shouldSideBeRendered(world, x - 1, y, z, 4), block.shouldSideBeRendered(world, x + 1, y, z, 5)}; + + if (!flag && !flag1 && !aboolean[0] && !aboolean[1] && !aboolean[2] && !aboolean[3]) + { + return false; + } + else + { + boolean flag2 = false; + float f3 = 0.5F; + float f4 = 1.0F; + float f5 = 0.8F; + float f6 = 0.6F; + double d0 = 0.0D; + double d1 = 1.0D; + Material material = block.blockMaterial; + int i1 = world.getBlockMetadata(x, y, z); + double d2 = (double)renderer.getFluidHeight(x, y, z, material); + double d3 = (double)renderer.getFluidHeight(x, y, z + 1, material); + double d4 = (double)renderer.getFluidHeight(x + 1, y, z + 1, material); + double d5 = (double)renderer.getFluidHeight(x + 1, y, z, material); + double d6 = 0.0010000000474974513D; + float f7; + + if (renderer.renderAllFaces || flag) + { + flag2 = true; + Icon icon = renderer.func_94165_a(block, 1, i1); + float f8 = (float)BlockFluid.getFlowDirection(world, x, y, z, material); + + if (f8 > -999.0F) + { + icon = renderer.func_94165_a(block, 2, i1); + } + + d2 -= d6; + d3 -= d6; + d4 -= d6; + d5 -= d6; + double d7; + double d8; + double d9; + double d10; + double d11; + double d12; + double d13; + double d14; + + if (f8 < -999.0F) + { + d8 = (double)icon.func_94214_a(0.0D); + d12 = (double)icon.func_94207_b(0.0D); + d7 = d8; + d11 = (double)icon.func_94207_b(16.0D); + d10 = (double)icon.func_94214_a(16.0D); + d14 = d11; + d9 = d10; + d13 = d12; + } + else + { + f7 = MathHelper.sin(f8) * 0.25F; + float f9 = MathHelper.cos(f8) * 0.25F; + d8 = (double)icon.func_94214_a((double)(8.0F + (-f9 - f7) * 16.0F)); + d12 = (double)icon.func_94207_b((double)(8.0F + (-f9 + f7) * 16.0F)); + d7 = (double)icon.func_94214_a((double)(8.0F + (-f9 + f7) * 16.0F)); + d11 = (double)icon.func_94207_b((double)(8.0F + (f9 + f7) * 16.0F)); + d10 = (double)icon.func_94214_a((double)(8.0F + (f9 + f7) * 16.0F)); + d14 = (double)icon.func_94207_b((double)(8.0F + (f9 - f7) * 16.0F)); + d9 = (double)icon.func_94214_a((double)(8.0F + (f9 - f7) * 16.0F)); + d13 = (double)icon.func_94207_b((double)(8.0F + (-f9 - f7) * 16.0F)); + } + + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); + f7 = 1.0F; + tessellator.setColorOpaque_F(f4 * f7 * f, f4 * f7 * f1, f4 * f7 * f2); + tessellator.addVertexWithUV((double)(x + 0), (double)y + d2, (double)(z + 0), d8, d12); + tessellator.addVertexWithUV((double)(x + 0), (double)y + d3, (double)(z + 1), d7, d11); + tessellator.addVertexWithUV((double)(x + 1), (double)y + d4, (double)(z + 1), d10, d14); + tessellator.addVertexWithUV((double)(x + 1), (double)y + d5, (double)(z + 0), d9, d13); + } + + if (renderer.renderAllFaces || flag1) + { + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y - 1, z)); + float f10 = 1.0F; + tessellator.setColorOpaque_F(f3 * f10, f3 * f10, f3 * f10); + renderer.renderBottomFace(block, (double)x, (double)y + d6, (double)z, renderer.func_94173_a(block, 0)); + flag2 = true; + } + + for (int j1 = 0; j1 < 4; ++j1) + { + int k1 = x; + int l1 = z; + + if (j1 == 0) + { + l1 = z - 1; + } + + if (j1 == 1) + { + ++l1; + } + + if (j1 == 2) + { + k1 = x - 1; + } + + if (j1 == 3) + { + ++k1; + } + + Icon icon1 = renderer.func_94165_a(block, j1 + 2, i1); + + if (renderer.renderAllFaces || aboolean[j1]) + { + double d15; + double d16; + double d17; + double d18; + double d19; + double d20; + + if (j1 == 0) + { + d15 = d2; + d17 = d5; + d16 = (double)x; + d18 = (double)(x + 1); + d19 = (double)z + d6; + d20 = (double)z + d6; + } + else if (j1 == 1) + { + d15 = d4; + d17 = d3; + d16 = (double)(x + 1); + d18 = (double)x; + d19 = (double)(z + 1) - d6; + d20 = (double)(z + 1) - d6; + } + else if (j1 == 2) + { + d15 = d3; + d17 = d2; + d16 = (double)x + d6; + d18 = (double)x + d6; + d19 = (double)(z + 1); + d20 = (double)z; + } + else + { + d15 = d5; + d17 = d4; + d16 = (double)(x + 1) - d6; + d18 = (double)(x + 1) - d6; + d19 = (double)z; + d20 = (double)(z + 1); + } + + flag2 = true; + float f11 = icon1.func_94214_a(0.0D); + f7 = icon1.func_94214_a(8.0D); + int i2 = icon1.func_94216_b(); + float f12 = icon1.func_94207_b((1.0D - d15) * 16.0D * 0.5D); + float f13 = icon1.func_94207_b((1.0D - d17) * 16.0D * 0.5D); + float f14 = icon1.func_94207_b(8.0D); + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, k1, y, l1)); + float f15 = 1.0F; + + if (j1 < 2) + { + f15 *= f5; + } + else + { + f15 *= f6; + } + + tessellator.setColorOpaque_F(f4 * f15 * f, f4 * f15 * f1, f4 * f15 * f2); + tessellator.addVertexWithUV(d16, (double)y + d15, d19, (double)f11, (double)f12); + tessellator.addVertexWithUV(d18, (double)y + d17, d20, (double)f7, (double)f13); + tessellator.addVertexWithUV(d18, (double)(y + 0), d20, (double)f7, (double)f14); + tessellator.addVertexWithUV(d16, (double)(y + 0), d19, (double)f11, (double)f14); + } + } + + renderer.renderMinY = d0; + renderer.renderMaxY = d1; + return flag2; + } + } + + /*public boolean renderBlockFluids(RenderBlocks renderer, IBlockAccess world, Block block, int x, int y, int z) { Tessellator tessellator = Tessellator.instance; int blockColor = block.colorMultiplier(world, x, y, z); @@ -227,5 +435,5 @@ public class FluidRender implements ISimpleBlockRenderingHandler renderer.renderMaxY = var20; return var13; } - } + }*/ } diff --git a/tinker/tconstruct/client/FrypanRender.java b/mods/tinker/tconstruct/client/FrypanRender.java similarity index 93% rename from tinker/tconstruct/client/FrypanRender.java rename to mods/tinker/tconstruct/client/FrypanRender.java index 677717ea..80ea146a 100644 --- a/tinker/tconstruct/client/FrypanRender.java +++ b/mods/tinker/tconstruct/client/FrypanRender.java @@ -1,10 +1,7 @@ -package tinker.tconstruct.client; - -import org.lwjgl.opengl.GL11; +package mods.tinker.tconstruct.client; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/tinker/tconstruct/client/SearedRender.java b/mods/tinker/tconstruct/client/SearedRender.java similarity index 96% rename from tinker/tconstruct/client/SearedRender.java rename to mods/tinker/tconstruct/client/SearedRender.java index b0da3294..c4e95bde 100644 --- a/tinker/tconstruct/client/SearedRender.java +++ b/mods/tinker/tconstruct/client/SearedRender.java @@ -1,5 +1,9 @@ -package tinker.tconstruct.client; +package mods.tinker.tconstruct.client; +import mods.tinker.common.BlockSkinRenderHelper; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.logic.CastingTableLogic; +import mods.tinker.tconstruct.logic.FaucetLogic; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -10,10 +14,6 @@ import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; -import tinker.common.BlockSkinRenderHelper; -import tinker.tconstruct.TContent; -import tinker.tconstruct.logic.CastingTableLogic; -import tinker.tconstruct.logic.FaucetLogic; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -97,7 +97,7 @@ public class SearedRender implements ISimpleBlockRenderingHandler renderer.setRenderBounds(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); renderer.renderStandardBlock(block, x, y, z); - CastingTableLogic logic = (CastingTableLogic) world.getBlockTileEntity(x, y, z); + /*CastingTableLogic logic = (CastingTableLogic) world.getBlockTileEntity(x, y, z); if (logic.liquid != null) { float height = logic.liquid.amount / (logic.getCapacity() * 1.03F) / 16F; @@ -121,7 +121,7 @@ public class SearedRender implements ISimpleBlockRenderingHandler BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(logic.liquid.itemMeta), logic.liquid.itemMeta, x, y, z, renderer, world); } } - } + }*/ } else if (metadata == 1) { @@ -183,7 +183,7 @@ public class SearedRender implements ISimpleBlockRenderingHandler { yMin = -1F; } - if (logic.liquid != null) + /*if (logic.liquid != null) { ItemStack blockToRender = new ItemStack(logic.liquid.itemID, 1, logic.liquid.itemMeta); if (blockToRender.itemID < 4096) //Block @@ -205,7 +205,7 @@ public class SearedRender implements ISimpleBlockRenderingHandler BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(meta), meta, x, y, z, renderer, world); } //renderer.renderStandardBlock(block, x, y, z); - } + }*/ } else diff --git a/tinker/tconstruct/client/SmallFontRenderer.java b/mods/tinker/tconstruct/client/SmallFontRenderer.java similarity index 99% rename from tinker/tconstruct/client/SmallFontRenderer.java rename to mods/tinker/tconstruct/client/SmallFontRenderer.java index 5641d75d..844f6262 100644 --- a/tinker/tconstruct/client/SmallFontRenderer.java +++ b/mods/tinker/tconstruct/client/SmallFontRenderer.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client; +package mods.tinker.tconstruct.client; import java.awt.image.BufferedImage; import java.io.IOException; diff --git a/tinker/tconstruct/client/SmelteryRender.java b/mods/tinker/tconstruct/client/SmelteryRender.java similarity index 93% rename from tinker/tconstruct/client/SmelteryRender.java rename to mods/tinker/tconstruct/client/SmelteryRender.java index f94a2057..dbb1b51e 100644 --- a/tinker/tconstruct/client/SmelteryRender.java +++ b/mods/tinker/tconstruct/client/SmelteryRender.java @@ -1,5 +1,8 @@ -package tinker.tconstruct.client; +package mods.tinker.tconstruct.client; +import mods.tinker.common.BlockSkinRenderHelper; +import mods.tinker.tconstruct.crafting.Smeltery; +import mods.tinker.tconstruct.logic.SmelteryLogic; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -12,9 +15,6 @@ import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; -import tinker.common.BlockSkinRenderHelper; -import tinker.tconstruct.crafting.Smeltery; -import tinker.tconstruct.logic.SmelteryLogic; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -47,7 +47,8 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { renderer.renderStandardBlock(block, x, y, z); - SmelteryLogic logic = (SmelteryLogic) world.getBlockTileEntity(x, y, z); + return true; + /*SmelteryLogic logic = (SmelteryLogic) world.getBlockTileEntity(x, y, z); if (logic.validStructure) { int posX = logic.centerPos.x - 1, posY = logic.centerPos.y, posZ = logic.centerPos.z - 1; @@ -56,7 +57,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler { renderLayer(logic, i*9, posX, posY+i, posZ, renderer, world); //System.out.println("layers:"+logic.layers); - /*ItemStack input = logic.getStackInSlot(i); + ItemStack input = logic.getStackInSlot(i); if (input != null && logic.getTempForSlot(i) > 20) { ItemStack blockToRender = Smeltery.getRenderIndex(input); @@ -77,7 +78,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler int metadata = blockToRender.getItemDamage(); BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(metadata), metadata, posX, posY + i / 9, posZ, renderer, world); } - }*/ + } } //Liquids @@ -124,10 +125,10 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler } } } - return false; + return false;*/ } - void renderLayer(SmelteryLogic logic, int start, int posX, int posY, int posZ, RenderBlocks renderer, IBlockAccess world) + /*void renderLayer(SmelteryLogic logic, int start, int posX, int posY, int posZ, RenderBlocks renderer, IBlockAccess world) { renderer.setRenderBounds(-0.001F, -0.001F, -0.001F, 1.001F, 1.001F, 1.001F); for (int i = 0; i < 9; i++) @@ -156,7 +157,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler } } } - } + }*/ @Override public boolean shouldRender3DInInventory () diff --git a/tinker/tconstruct/client/SuperCustomToolRenderer.java b/mods/tinker/tconstruct/client/SuperCustomToolRenderer.java similarity index 95% rename from tinker/tconstruct/client/SuperCustomToolRenderer.java rename to mods/tinker/tconstruct/client/SuperCustomToolRenderer.java index 7613c76f..1908f91b 100644 --- a/tinker/tconstruct/client/SuperCustomToolRenderer.java +++ b/mods/tinker/tconstruct/client/SuperCustomToolRenderer.java @@ -1,7 +1,8 @@ -package tinker.tconstruct.client; +package mods.tinker.tconstruct.client; import java.util.Random; +import mods.tinker.tconstruct.tools.ToolCore; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderBlocks; @@ -18,7 +19,6 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import tinker.tconstruct.tools.ToolCore; import cpw.mods.fml.client.TextureFXManager; public class SuperCustomToolRenderer implements IItemRenderer @@ -54,16 +54,16 @@ public class SuperCustomToolRenderer implements IItemRenderer @Override public void renderItem (ItemRenderType type, ItemStack item, Object... data) { - if (type == ItemRenderType.INVENTORY) + /*if (type == ItemRenderType.INVENTORY) renderInventoryItem(item, (RenderBlocks) data[0]); if (type == ItemRenderType.EQUIPPED) renderEquippedItem(item, (RenderBlocks) data[0], (EntityLiving) data[1]); if (type == ItemRenderType.ENTITY) - renderEntityItem(item, (RenderBlocks) data[0], (EntityItem) data[1]); + renderEntityItem(item, (RenderBlocks) data[0], (EntityItem) data[1]);*/ } /* Inventory */ - void renderInventoryItem (ItemStack stack, RenderBlocks renderer) + /*void renderInventoryItem (ItemStack stack, RenderBlocks renderer) { ToolCore tool = (ToolCore) stack.getItem(); //int itemID = stack.itemID; @@ -75,7 +75,7 @@ public class SuperCustomToolRenderer implements IItemRenderer for (int renderPass = 0; renderPass < tool.getRenderPasses(itemDamage); renderPass++) { String texturePath = tool.getIconLocation(stack, renderPass); - renderEngine.bindTexture(renderEngine.getTexture(texturePath)); + renderEngine.func_98187_b(texturePath); GL11.glScalef(0.0625F, 0.0625F, 1F); this.renderTexturedQuad(); @@ -85,7 +85,7 @@ public class SuperCustomToolRenderer implements IItemRenderer for (int renderPass = 0; renderPass < 3; renderPass++) { String texturePath = tool.getEffectLocation(stack, renderPass); - renderEngine.bindTexture(renderEngine.getTexture(texturePath)); + renderEngine.func_98187_b(texturePath); GL11.glScalef(0.0625F, 0.0625F, 1F); this.renderTexturedQuad(); @@ -102,7 +102,7 @@ public class SuperCustomToolRenderer implements IItemRenderer * Adds a textured quad to the tesselator at the specified position with the specified texture coords, width and * height. Args: x, y, u, v, width, height */ - public void renderTexturedQuad() + /*public void renderTexturedQuad() { int x = 0, y = 0, u = 0, v = 0, height = 256, width = 256; float var7 = 0.00390625F; @@ -122,7 +122,7 @@ public class SuperCustomToolRenderer implements IItemRenderer } /* Equipped */ - void renderEquippedItem (ItemStack stack, RenderBlocks renderer, EntityLiving living) + /*void renderEquippedItem (ItemStack stack, RenderBlocks renderer, EntityLiving living) { for (int x = 0; x < stack.getItem().getRenderPasses(stack.getItemDamage()); x++) { @@ -145,7 +145,7 @@ public class SuperCustomToolRenderer implements IItemRenderer texturePath = ((ToolCore)stack.getItem()).getIconLocation(stack, renderPass); else texturePath = ((ToolCore)stack.getItem()).getEffectLocation(stack, renderPass); - renderEngine.bindTexture(renderEngine.getTexture(texturePath)); + renderEngine.func_98187_b(texturePath); float var7 = 0; float var8 = 1; float var9 = 0; @@ -288,7 +288,7 @@ public class SuperCustomToolRenderer implements IItemRenderer } /* Entity */ - void renderEntityItem (ItemStack stack, RenderBlocks renderer, EntityItem entity) + /*void renderEntityItem (ItemStack stack, RenderBlocks renderer, EntityItem entity) { this.random.setSeed(187L); ItemStack var10 = entity.func_92014_d(); @@ -317,7 +317,7 @@ public class SuperCustomToolRenderer implements IItemRenderer var17 = 1.0F; String texturePath = tool.getIconLocation(var10, renderPass); - renderEngine.bindTexture(renderEngine.getTexture(texturePath)); + renderEngine.func_98187_b(texturePath); int var18 = Item.itemsList[tool.itemID].getColorFromItemStack(var10, renderPass); var19 = (float) (var18 >> 16 & 255) / 255.0F; @@ -333,7 +333,7 @@ public class SuperCustomToolRenderer implements IItemRenderer var17 = 1.0F; String texturePath = tool.getEffectLocation(var10, renderPass); - renderEngine.bindTexture(renderEngine.getTexture(texturePath)); + renderEngine.func_98187_b(texturePath); int var18 = Item.itemsList[tool.itemID].getColorFromItemStack(var10, renderPass); var19 = (float) (var18 >> 16 & 255) / 255.0F; @@ -427,7 +427,7 @@ public class SuperCustomToolRenderer implements IItemRenderer texturePath = ((ToolCore)stack.getItem()).getIconLocation(stack, renderPass); else texturePath = ((ToolCore)stack.getItem()).getEffectLocation(stack, renderPass); - renderEngine.bindTexture(renderEngine.getTexture(texturePath)); + renderEngine.func_98187_b(texturePath); GL11.glColor4f(par5, par6, par7, 1.0F); ItemRenderer.renderItemIn2D(var8, var10, var11, var9, var12, var16); @@ -496,5 +496,5 @@ public class SuperCustomToolRenderer implements IItemRenderer GL11.glPopMatrix(); } } - } + }*/ } diff --git a/mods/tinker/tconstruct/client/TConstructClientRegistry.java b/mods/tinker/tconstruct/client/TConstructClientRegistry.java new file mode 100644 index 00000000..635057b0 --- /dev/null +++ b/mods/tinker/tconstruct/client/TConstructClientRegistry.java @@ -0,0 +1,40 @@ +package mods.tinker.tconstruct.client; + +import mods.tinker.tconstruct.TConstructRegistry; +import mods.tinker.tconstruct.tools.ToolCore; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; + +public class TConstructClientRegistry +{ + public static TextureMap itemMap = Minecraft.getMinecraft().renderEngine.field_94155_m; + + public static void addMaterialRenderMapping (int materialID, String domain, String renderName, boolean useDefaultFolder) + { + for (ToolCore tool : TConstructRegistry.getToolMapping()) + { + String[] toolIcons = new String[tool.getPartAmount() + 1]; + for (int i = 0; i < tool.getPartAmount() + 1; i++) + { + String icon = domain + ":"; + if (useDefaultFolder) + icon += tool.getDefaultFolder()+"/"; + icon += renderName + tool.getIconSuffix(i); + toolIcons[i] = icon; + } + tool.registerPartPaths(materialID, toolIcons); + } + } + + public static void addEffectRenderMapping (int materialID, String domain, String renderName, boolean useDefaultFolder) + { + for (ToolCore tool : TConstructRegistry.getToolMapping()) + { + String icon = domain + ":"; + if (useDefaultFolder) + icon += tool.getDefaultFolder()+"/"; + icon += renderName + tool.getEffectSuffix(); + tool.registerEffectPath(materialID, icon); + } + } +} diff --git a/tinker/tconstruct/client/TKeyHandler.java b/mods/tinker/tconstruct/client/TKeyHandler.java similarity index 92% rename from tinker/tconstruct/client/TKeyHandler.java rename to mods/tinker/tconstruct/client/TKeyHandler.java index c85d81b2..30f1fc58 100644 --- a/tinker/tconstruct/client/TKeyHandler.java +++ b/mods/tinker/tconstruct/client/TKeyHandler.java @@ -1,19 +1,12 @@ -package tinker.tconstruct.client; +package mods.tinker.tconstruct.client; -import java.util.ArrayList; import java.util.EnumSet; -import java.util.Set; -import net.minecraft.client.settings.GameSettings; import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - -import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; diff --git a/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java similarity index 84% rename from tinker/tconstruct/client/TProxyClient.java rename to mods/tinker/tconstruct/client/TProxyClient.java index dd699ec6..d8150322 100644 --- a/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client; +package mods.tinker.tconstruct.client; import java.io.File; import java.io.InputStream; @@ -6,65 +6,27 @@ import java.io.InputStream; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import mods.tinker.common.fancyitem.FancyEntityItem; +import mods.tinker.common.fancyitem.FancyItemRender; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.TConstructRegistry; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.TControls; +import mods.tinker.tconstruct.TProxyCommon; +import mods.tinker.tconstruct.client.entityrender.CartRender; +import mods.tinker.tconstruct.client.entityrender.CrystalRender; +import mods.tinker.tconstruct.client.entityrender.SkylaRender; +import mods.tinker.tconstruct.client.gui.ToolGuiElement; +import mods.tinker.tconstruct.entity.CartEntity; +import mods.tinker.tconstruct.entity.Crystal; +import mods.tinker.tconstruct.entity.Skyla; +import mods.tinker.tconstruct.logic.CastingTableLogic; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderEngine; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraft.util.Icon; import org.w3c.dom.Document; -import tinker.common.fancyitem.FancyEntityItem; -import tinker.common.fancyitem.FancyItemRender; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.TConstructRegistry; -import tinker.tconstruct.TContent; -import tinker.tconstruct.TControls; -import tinker.tconstruct.TProxyCommon; -import tinker.tconstruct.client.entityrender.CartRender; -import tinker.tconstruct.client.entityrender.CrystalRender; -import tinker.tconstruct.client.entityrender.SkylaRender; -import tinker.tconstruct.client.gui.ToolGuiElement; -import tinker.tconstruct.client.liquidrender.LiquidAlBrassFX; -import tinker.tconstruct.client.liquidrender.LiquidAlBrassFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidAluminumFX; -import tinker.tconstruct.client.liquidrender.LiquidAluminumFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidAlumiteFX; -import tinker.tconstruct.client.liquidrender.LiquidAlumiteFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidAngmallenFX; -import tinker.tconstruct.client.liquidrender.LiquidAngmallenFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidArditeFX; -import tinker.tconstruct.client.liquidrender.LiquidArditeFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidBronzeFX; -import tinker.tconstruct.client.liquidrender.LiquidBronzeFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidCobaltFX; -import tinker.tconstruct.client.liquidrender.LiquidCobaltFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidCopperFX; -import tinker.tconstruct.client.liquidrender.LiquidCopperFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidDamascusSteelFX; -import tinker.tconstruct.client.liquidrender.LiquidDamascusSteelFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidGoldFX; -import tinker.tconstruct.client.liquidrender.LiquidGoldFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidHeptazionFX; -import tinker.tconstruct.client.liquidrender.LiquidHeptazionFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidIronFX; -import tinker.tconstruct.client.liquidrender.LiquidIronFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidManganeseFX; -import tinker.tconstruct.client.liquidrender.LiquidManganeseFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidManyullynFX; -import tinker.tconstruct.client.liquidrender.LiquidManyullynFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidObsidianFX; -import tinker.tconstruct.client.liquidrender.LiquidObsidianFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidSteelFX; -import tinker.tconstruct.client.liquidrender.LiquidSteelFlowFX; -import tinker.tconstruct.client.liquidrender.LiquidTinFX; -import tinker.tconstruct.client.liquidrender.LiquidTinFlowFX; -import tinker.tconstruct.entity.CartEntity; -import tinker.tconstruct.entity.Crystal; -import tinker.tconstruct.entity.Skyla; -import tinker.tconstruct.logic.CastingTableLogic; -import tinker.tconstruct.tools.ToolCore; -import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -73,6 +35,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; public class TProxyClient extends TProxyCommon { public static SmallFontRenderer smallFontRenderer; + public static Icon blankSprite; /* Registers any rendering code. */ public void registerRenderer () @@ -87,7 +50,7 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerBlockHandler(new FluidRender()); //RenderingRegistry.registerBlockHandler(new AxleRender()); - RenderEngine renderEngine = FMLClientHandler.instance().getClient().renderEngine; + /*RenderEngine renderEngine = FMLClientHandler.instance().getClient().renderEngine; renderEngine.registerTextureFX(new LiquidIronFX()); renderEngine.registerTextureFX(new LiquidIronFlowFX()); renderEngine.registerTextureFX(new LiquidGoldFX()); @@ -123,15 +86,15 @@ public class TProxyClient extends TProxyCommon renderEngine.registerTextureFX(new LiquidDamascusSteelFX()); renderEngine.registerTextureFX(new LiquidDamascusSteelFlowFX()); renderEngine.registerTextureFX(new LiquidAngmallenFX()); - renderEngine.registerTextureFX(new LiquidAngmallenFlowFX()); + renderEngine.registerTextureFX(new LiquidAngmallenFlowFX());*/ //Tools - MinecraftForgeClient.preloadTexture(TContent.blockTexture); - IItemRenderer render = new SuperCustomToolRenderer(); + //MinecraftForgeClient.preloadTexture(TContent.blockTexture); + /*IItemRenderer render = new SuperCustomToolRenderer(); for (ToolCore tool : TConstructRegistry.tools) { MinecraftForgeClient.registerItemRenderer(tool.itemID, render); - } + }*/ //Special Renderers ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer()); @@ -154,7 +117,7 @@ public class TProxyClient extends TProxyCommon LanguageRegistry.instance().addStringLocalization("itemGroup.TConstructMaterials", "TConstruct Materials"); LanguageRegistry.instance().addStringLocalization("itemGroup.TConstructBlocks", "TConstruct Blocks");*/ - String langDir = "/tinkerlang/"; + String langDir = "/mods/tinker/resources/lang/"; String[] langFiles = { "en_US.xml" }; for (String langFile : langFiles) @@ -403,15 +366,17 @@ public class TProxyClient extends TProxyCommon String[] effectTypes = { "diamond", "emerald", "redstone", "glowstone", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis" }; for (int partIter = 0; partIter < partTypes.length; partIter++) { - materialRenderMap(partIter, partTypes[partIter]); + TConstructClientRegistry.addMaterialRenderMapping(partIter, "tinker", partTypes[partIter], true); + //materialRenderMap(partIter, partTypes[partIter]); } for (int effectIter = 0; effectIter < effectTypes.length; effectIter++) { - effectRenderMap(effectIter, effectTypes[effectIter]); + TConstructClientRegistry.addEffectRenderMapping(effectIter, "tinker", effectTypes[effectIter], true); + //effectRenderMap(effectIter, effectTypes[effectIter]); } } - void materialRenderMap (int materialID, String partialLocation) + /*void materialRenderMap (int materialID, String partialLocation) { for (ToolCore tool : TConstructRegistry.getToolMapping()) { @@ -425,7 +390,7 @@ public class TProxyClient extends TProxyCommon { tool.effectTextures.put(materialID, tool.getToolTextureFile() + partialLocation); } - } + }*/ /* Keybindings */ public static TControls controlInstance; diff --git a/tinker/tconstruct/client/TableRender.java b/mods/tinker/tconstruct/client/TableRender.java similarity index 98% rename from tinker/tconstruct/client/TableRender.java rename to mods/tinker/tconstruct/client/TableRender.java index c21be9c1..7a6b953c 100644 --- a/tinker/tconstruct/client/TableRender.java +++ b/mods/tinker/tconstruct/client/TableRender.java @@ -1,11 +1,12 @@ -package tinker.tconstruct.client; - -import org.lwjgl.opengl.GL11; +package mods.tinker.tconstruct.client; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/tinker/tconstruct/client/TankRender.java b/mods/tinker/tconstruct/client/TankRender.java similarity index 95% rename from tinker/tconstruct/client/TankRender.java rename to mods/tinker/tconstruct/client/TankRender.java index 703b4302..3cd29215 100644 --- a/tinker/tconstruct/client/TankRender.java +++ b/mods/tinker/tconstruct/client/TankRender.java @@ -1,5 +1,7 @@ -package tinker.tconstruct.client; +package mods.tinker.tconstruct.client; +import mods.tinker.common.BlockSkinRenderHelper; +import mods.tinker.tconstruct.logic.LavaTankLogic; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -10,8 +12,6 @@ import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; -import tinker.common.BlockSkinRenderHelper; -import tinker.tconstruct.logic.LavaTankLogic; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -46,7 +46,7 @@ public class TankRender implements ISimpleBlockRenderingHandler renderer.setRenderBounds(0, 0, 0, 1, 1, 1); } renderer.renderStandardBlock(block, x, y, z); - LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z); + /*LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z); if (logic.containsLiquid()) { LiquidStack liquid = logic.tank.getLiquid(); @@ -64,7 +64,7 @@ public class TankRender implements ISimpleBlockRenderingHandler ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0); BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(liquid.itemMeta), liquid.itemMeta, x, y, z, renderer, world); } - } + }*/ } return false; } diff --git a/tinker/tconstruct/client/entityrender/CartRender.java b/mods/tinker/tconstruct/client/entityrender/CartRender.java similarity index 95% rename from tinker/tconstruct/client/entityrender/CartRender.java rename to mods/tinker/tconstruct/client/entityrender/CartRender.java index 4f32b9a6..f22f03cc 100644 --- a/tinker/tconstruct/client/entityrender/CartRender.java +++ b/mods/tinker/tconstruct/client/entityrender/CartRender.java @@ -1,8 +1,8 @@ -package tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entityrender; +import mods.tinker.tconstruct.entity.CartEntity; import net.minecraft.block.Block; import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelMinecart; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; @@ -11,7 +11,6 @@ import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; -import tinker.tconstruct.entity.CartEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -105,7 +104,7 @@ public class CartRender extends Render else if (cart.getCartType() == 2) { GL11.glTranslatef(0.0F, 0.3125F, 0.0F); - renderblocks.renderBlockAsItem(Block.stoneOvenIdle, 0, cart.getBrightness(par9)); + renderblocks.renderBlockAsItem(Block.furnaceIdle, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.3125F, 0.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/tinker/tconstruct/client/entityrender/CrystalModel.java b/mods/tinker/tconstruct/client/entityrender/CrystalModel.java similarity index 92% rename from tinker/tconstruct/client/entityrender/CrystalModel.java rename to mods/tinker/tconstruct/client/entityrender/CrystalModel.java index 0793ff0a..ec86d559 100644 --- a/tinker/tconstruct/client/entityrender/CrystalModel.java +++ b/mods/tinker/tconstruct/client/entityrender/CrystalModel.java @@ -1,9 +1,9 @@ -package tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entityrender; +import mods.tinker.tconstruct.client.tmt.ModelRendererTurbo; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import tinker.tconstruct.client.tmt.ModelRendererTurbo; public class CrystalModel extends ModelBase { diff --git a/tinker/tconstruct/client/entityrender/CrystalRender.java b/mods/tinker/tconstruct/client/entityrender/CrystalRender.java similarity index 97% rename from tinker/tconstruct/client/entityrender/CrystalRender.java rename to mods/tinker/tconstruct/client/entityrender/CrystalRender.java index 2018ba20..83ba1672 100644 --- a/tinker/tconstruct/client/entityrender/CrystalRender.java +++ b/mods/tinker/tconstruct/client/entityrender/CrystalRender.java @@ -1,5 +1,6 @@ -package tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entityrender; +import mods.tinker.tconstruct.entity.Crystal; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.EntityLiving; @@ -7,7 +8,6 @@ import net.minecraft.util.MathHelper; import org.lwjgl.opengl.GL11; -import tinker.tconstruct.entity.Crystal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/tinker/tconstruct/client/entityrender/ModelPullcart.java b/mods/tinker/tconstruct/client/entityrender/ModelPullcart.java similarity index 99% rename from tinker/tconstruct/client/entityrender/ModelPullcart.java rename to mods/tinker/tconstruct/client/entityrender/ModelPullcart.java index 63c92d2f..d9835b6d 100644 --- a/tinker/tconstruct/client/entityrender/ModelPullcart.java +++ b/mods/tinker/tconstruct/client/entityrender/ModelPullcart.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entityrender; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/tinker/tconstruct/client/entityrender/ModelWagon.java b/mods/tinker/tconstruct/client/entityrender/ModelWagon.java similarity index 99% rename from tinker/tconstruct/client/entityrender/ModelWagon.java rename to mods/tinker/tconstruct/client/entityrender/ModelWagon.java index 7fe0cd5b..516a2fcc 100644 --- a/tinker/tconstruct/client/entityrender/ModelWagon.java +++ b/mods/tinker/tconstruct/client/entityrender/ModelWagon.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entityrender; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/tinker/tconstruct/client/entityrender/SkylaModel.java b/mods/tinker/tconstruct/client/entityrender/SkylaModel.java similarity index 98% rename from tinker/tconstruct/client/entityrender/SkylaModel.java rename to mods/tinker/tconstruct/client/entityrender/SkylaModel.java index 6486ffde..26b569e3 100644 --- a/tinker/tconstruct/client/entityrender/SkylaModel.java +++ b/mods/tinker/tconstruct/client/entityrender/SkylaModel.java @@ -1,9 +1,9 @@ -package tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entityrender; +import mods.tinker.tconstruct.client.tmt.ModelRendererTurbo; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import tinker.tconstruct.client.tmt.ModelRendererTurbo; public class SkylaModel extends ModelBase { diff --git a/tinker/tconstruct/client/entityrender/SkylaRender.java b/mods/tinker/tconstruct/client/entityrender/SkylaRender.java similarity index 92% rename from tinker/tconstruct/client/entityrender/SkylaRender.java rename to mods/tinker/tconstruct/client/entityrender/SkylaRender.java index d556f1de..721e786e 100644 --- a/tinker/tconstruct/client/entityrender/SkylaRender.java +++ b/mods/tinker/tconstruct/client/entityrender/SkylaRender.java @@ -1,13 +1,9 @@ -package tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entityrender; +import mods.tinker.tconstruct.entity.Skyla; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.EntityLiving; -import net.minecraft.util.MathHelper; - -import org.lwjgl.opengl.GL11; - -import tinker.tconstruct.entity.Skyla; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/tinker/tconstruct/client/gui/FrypanGui.java b/mods/tinker/tconstruct/client/gui/FrypanGui.java similarity index 87% rename from tinker/tconstruct/client/gui/FrypanGui.java rename to mods/tinker/tconstruct/client/gui/FrypanGui.java index 8823db6e..270afe1f 100644 --- a/tinker/tconstruct/client/gui/FrypanGui.java +++ b/mods/tinker/tconstruct/client/gui/FrypanGui.java @@ -1,5 +1,6 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; +import mods.tinker.tconstruct.logic.FrypanLogic; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -7,8 +8,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import tinker.tconstruct.logic.FrypanLogic; - public class FrypanGui extends GuiContainer { public FrypanLogic logic; @@ -27,9 +26,8 @@ public class FrypanGui extends GuiContainer protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { - int texID = mc.renderEngine.getTexture("/tinkertextures/gui/frypan.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texID); + mc.renderEngine.func_98187_b("/tinkertextures/gui/frypan.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/tinker/tconstruct/client/gui/GuiButtonTool.java b/mods/tinker/tconstruct/client/gui/GuiButtonTool.java similarity index 93% rename from tinker/tconstruct/client/gui/GuiButtonTool.java rename to mods/tinker/tconstruct/client/gui/GuiButtonTool.java index 3e5cbc3a..a05c3cfc 100644 --- a/tinker/tconstruct/client/gui/GuiButtonTool.java +++ b/mods/tinker/tconstruct/client/gui/GuiButtonTool.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -35,7 +35,7 @@ public class GuiButtonTool extends GuiButton { boolean var4 = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(mc.renderEngine.getTexture(texture)); + mc.renderEngine.func_98187_b(texture); this.field_82253_i = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; int var5 = this.getHoverState(this.field_82253_i); diff --git a/tinker/tconstruct/client/gui/GuiManual.java b/mods/tinker/tconstruct/client/gui/GuiManual.java similarity index 85% rename from tinker/tconstruct/client/gui/GuiManual.java rename to mods/tinker/tconstruct/client/gui/GuiManual.java index dacd088d..1a0a9e83 100644 --- a/tinker/tconstruct/client/gui/GuiManual.java +++ b/mods/tinker/tconstruct/client/gui/GuiManual.java @@ -1,5 +1,7 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; +import mods.tinker.tconstruct.client.SmallFontRenderer; +import mods.tinker.tconstruct.client.TProxyClient; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiParticle; @@ -12,8 +14,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import tinker.tconstruct.client.SmallFontRenderer; -import tinker.tconstruct.client.TProxyClient; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -50,7 +50,7 @@ public class GuiManual extends GuiScreen this.fontRenderer = TProxyClient.smallFontRenderer; this.width = w; this.height = h; - this.controlList.clear(); + this.buttonList.clear(); this.initGui(); @@ -69,8 +69,8 @@ public class GuiManual extends GuiScreen maxPages = manual.getElementsByTagName("page").getLength(); updateText(); int xPos = (this.width) / 2; - this.controlList.add(this.buttonNextPage = new TurnPageButton(1, xPos+bookImageWidth-50, 180, true)); - this.controlList.add(this.buttonPreviousPage = new TurnPageButton(2, xPos-bookImageWidth+24, 180, false)); + this.buttonList.add(this.buttonNextPage = new TurnPageButton(1, xPos+bookImageWidth-50, 180, true)); + this.buttonList.add(this.buttonPreviousPage = new TurnPageButton(2, xPos-bookImageWidth+24, 180, false)); } protected void actionPerformed(GuiButton button) @@ -128,16 +128,17 @@ public class GuiManual extends GuiScreen public void drawScreen(int par1, int par2, float par3) { - int texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/bookright.png"); + //int texID = this.mc.renderEngine.getTexture(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/bookright.png"); int localWidth = (this.width) / 2; byte localHeight = 8; this.drawTexturedModalRect(localWidth, localHeight, 0, 0, this.bookImageWidth, this.bookImageHeight); - texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/bookleft.png"); + //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/bookleft.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + //this.mc.renderEngine.bindTexture(texID); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/bookleft.png"); localWidth = localWidth - this.bookImageWidth; this.drawTexturedModalRect(localWidth, localHeight, 256 - this.bookImageWidth, 0, this.bookImageWidth, this.bookImageHeight); diff --git a/tinker/tconstruct/client/gui/PartCrafterGui.java b/mods/tinker/tconstruct/client/gui/PartCrafterGui.java similarity index 86% rename from tinker/tconstruct/client/gui/PartCrafterGui.java rename to mods/tinker/tconstruct/client/gui/PartCrafterGui.java index 5cd32a71..2e4848f4 100644 --- a/tinker/tconstruct/client/gui/PartCrafterGui.java +++ b/mods/tinker/tconstruct/client/gui/PartCrafterGui.java @@ -1,5 +1,10 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; +import mods.tinker.tconstruct.TConstructRegistry; +import mods.tinker.tconstruct.ToolMaterial; +import mods.tinker.tconstruct.container.PartCrafterChestContainer; +import mods.tinker.tconstruct.crafting.PatternBuilder; +import mods.tinker.tconstruct.logic.PartCrafterLogic; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -8,12 +13,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import tinker.tconstruct.TConstructRegistry; -import tinker.tconstruct.ToolMaterial; -import tinker.tconstruct.container.PartCrafterChestContainer; -import tinker.tconstruct.crafting.PatternBuilder; -import tinker.tconstruct.logic.PartCrafterLogic; - public class PartCrafterGui extends GuiContainer { PartCrafterLogic logic; @@ -133,9 +132,8 @@ public class PartCrafterGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { // Draw the background - int texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/toolparts.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/toolparts.png"); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); @@ -162,16 +160,18 @@ public class PartCrafterGui extends GuiContainer // Draw chest if (drawChestPart) { - texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/patternchestmini.png"); + //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/patternchestmini.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + //his.mc.renderEngine.bindTexture(texID); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/patternchestmini.png"); this.drawTexturedModalRect(cornerX-116, cornerY+11, 0, 0, this.xSize, this.ySize); } // Draw description - texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/description.png"); + //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/description.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + //this.mc.renderEngine.bindTexture(texID); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/description.png"); cornerX = (this.width + this.xSize) / 2; cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 126, 0, 126, this.ySize); diff --git a/tinker/tconstruct/client/gui/PatternChestGui.java b/mods/tinker/tconstruct/client/gui/PatternChestGui.java similarity index 84% rename from tinker/tconstruct/client/gui/PatternChestGui.java rename to mods/tinker/tconstruct/client/gui/PatternChestGui.java index 8ba62aa7..c2cff2da 100644 --- a/tinker/tconstruct/client/gui/PatternChestGui.java +++ b/mods/tinker/tconstruct/client/gui/PatternChestGui.java @@ -1,5 +1,6 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; +import mods.tinker.tconstruct.logic.PatternChestLogic; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -7,8 +8,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import tinker.tconstruct.logic.PatternChestLogic; - public class PatternChestGui extends GuiContainer { public PatternChestLogic logic; @@ -29,9 +28,8 @@ public class PatternChestGui extends GuiContainer protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { - int texID = mc.renderEngine.getTexture("/tinkertextures/gui/patternchest.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texID); + mc.renderEngine.func_98187_b("/tinkertextures/gui/patternchest.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/tinker/tconstruct/client/gui/PatternShaperGui.java b/mods/tinker/tconstruct/client/gui/PatternShaperGui.java similarity index 87% rename from tinker/tconstruct/client/gui/PatternShaperGui.java rename to mods/tinker/tconstruct/client/gui/PatternShaperGui.java index 7ec0f561..2408acd2 100644 --- a/tinker/tconstruct/client/gui/PatternShaperGui.java +++ b/mods/tinker/tconstruct/client/gui/PatternShaperGui.java @@ -1,8 +1,11 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.container.PatternShaperContainer; +import mods.tinker.tconstruct.logic.PatternShaperLogic; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -15,10 +18,6 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.network.PacketDispatcher; -import tinker.tconstruct.TContent; -import tinker.tconstruct.container.PatternShaperContainer; -import tinker.tconstruct.logic.PatternShaperLogic; - public class PatternShaperGui extends GuiContainer { PatternShaperLogic logic; @@ -45,9 +44,8 @@ public class PatternShaperGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { - int texID = mc.renderEngine.getTexture("/tinkertextures/gui/patternshaper.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/patternshaper.png"); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); @@ -63,20 +61,20 @@ public class PatternShaperGui extends GuiContainer int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; - this.controlList.clear(); + this.buttonList.clear(); /*ToolGuiElement repair = TConstruct.toolButtons.get(0); GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.texture); // Repair repairButton.enabled = false; - this.controlList.add(repairButton);*/ - this.controlList.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, "Next Pattern")); - this.controlList.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, "Previous Pattern")); + this.buttonList.add(repairButton);*/ + this.buttonList.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, "Next Pattern")); + this.buttonList.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, "Previous Pattern")); //for (int iter = 0; iter < TConstructContent.patternOutputs.length; iter++) //{ /*ToolGuiElement element = TConstruct.toolButtons.get(iter); GuiButtonTool button = new GuiButtonTool(iter, cornerX - 110 + 22 * (iter % 5), cornerY + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, element.texture); // Repair - this.controlList.add(button);*/ + this.buttonList.add(button);*/ //} } diff --git a/tinker/tconstruct/client/gui/SmelteryGui.java b/mods/tinker/tconstruct/client/gui/SmelteryGui.java similarity index 92% rename from tinker/tconstruct/client/gui/SmelteryGui.java rename to mods/tinker/tconstruct/client/gui/SmelteryGui.java index a8f32073..f9be8ab3 100644 --- a/tinker/tconstruct/client/gui/SmelteryGui.java +++ b/mods/tinker/tconstruct/client/gui/SmelteryGui.java @@ -1,8 +1,10 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; +import mods.tinker.tconstruct.container.SmelteryContainer; +import mods.tinker.tconstruct.logic.SmelteryLogic; import net.minecraft.block.Block; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -18,9 +20,6 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.network.PacketDispatcher; -import tinker.tconstruct.container.SmelteryContainer; -import tinker.tconstruct.logic.SmelteryLogic; - public class SmelteryGui extends GuiContainer { public SmelteryLogic logic; @@ -121,15 +120,14 @@ public class SmelteryGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { - int texID = mc.renderEngine.getTexture("/tinkertextures/gui/smeltery.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texID); + mc.renderEngine.func_98187_b("/tinkertextures/gui/smeltery.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX + 46, cornerY, 0, 0, xSize, ySize); //Fuel - Lava - if (logic.fuelGague > 0) + /*if (logic.fuelGague > 0) { ForgeHooksClient.bindTexture(Block.lavaStill.getTextureFile(), 0); int renderIndex = Block.lavaStill.getBlockTextureFromSideAndMetadata(0, 0); @@ -144,11 +142,11 @@ public class SmelteryGui extends GuiContainer drawTexturedModalRect(cornerX + 117, (cornerY + 68) - size - 16 * count, xTex, yTex + 16 - size, 12, size); count++; } - } + }*/ //Liquids - molten metal int base = 0; - for (LiquidStack liquid : logic.moltenMetal) + /*for (LiquidStack liquid : logic.moltenMetal) { int renderIndex; if (liquid.itemID < 4096) //Block @@ -183,19 +181,18 @@ public class SmelteryGui extends GuiContainer } } //base = liquid.amount / 10000 * 52; - } + }*/ //Liquid gague - texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/smeltery.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + + mc.renderEngine.func_98187_b("/tinkertextures/gui/smeltery.png"); drawTexturedModalRect(cornerX + 54, cornerY + 16, xSize, 76, 52, 52); //drawTexturedModalRect(cornerX+111, cornerY+16, xSize, 128, 52, 52); //Side inventory - texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/smelteryside.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + mc.renderEngine.func_98187_b("/tinkertextures/gui/smelteryside.png"); if (logic.layers == 1) { drawTexturedModalRect(cornerX - 46, cornerY, 0, 0, 98, 43); diff --git a/tinker/tconstruct/client/gui/ToolGuiElement.java b/mods/tinker/tconstruct/client/gui/ToolGuiElement.java similarity index 94% rename from tinker/tconstruct/client/gui/ToolGuiElement.java rename to mods/tinker/tconstruct/client/gui/ToolGuiElement.java index cbc1aa59..f2f2990e 100644 --- a/tinker/tconstruct/client/gui/ToolGuiElement.java +++ b/mods/tinker/tconstruct/client/gui/ToolGuiElement.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; public class ToolGuiElement { diff --git a/tinker/tconstruct/client/gui/ToolStationGui.java b/mods/tinker/tconstruct/client/gui/ToolStationGui.java similarity index 91% rename from tinker/tconstruct/client/gui/ToolStationGui.java rename to mods/tinker/tconstruct/client/gui/ToolStationGui.java index 3e55f2d9..f421ccdc 100644 --- a/tinker/tconstruct/client/gui/ToolStationGui.java +++ b/mods/tinker/tconstruct/client/gui/ToolStationGui.java @@ -1,8 +1,13 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; +import mods.tinker.tconstruct.TConstructRegistry; +import mods.tinker.tconstruct.container.ToolStationContainer; +import mods.tinker.tconstruct.logic.ToolStationLogic; +import mods.tinker.tconstruct.tools.ToolCore; +import mods.tinker.tconstruct.tools.Weapon; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; @@ -16,11 +21,6 @@ import net.minecraft.world.World; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import tinker.tconstruct.TConstructRegistry; -import tinker.tconstruct.container.ToolStationContainer; -import tinker.tconstruct.logic.ToolStationLogic; -import tinker.tconstruct.tools.ToolCore; -import tinker.tconstruct.tools.Weapon; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -70,23 +70,23 @@ public class ToolStationGui extends GuiContainer int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; - this.controlList.clear(); + this.buttonList.clear(); ToolGuiElement repair = TConstructRegistry.toolButtons.get(0); GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.texture); // Repair repairButton.enabled = false; - this.controlList.add(repairButton); + this.buttonList.add(repairButton); for (int iter = 1; iter < TConstructRegistry.toolButtons.size(); iter++) { ToolGuiElement element = TConstructRegistry.toolButtons.get(iter); GuiButtonTool button = new GuiButtonTool(iter, cornerX - 110 + 22 * (iter % 5), cornerY + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, element.texture); // Repair - this.controlList.add(button); + this.buttonList.add(button); } } protected void actionPerformed (GuiButton button) { - ((GuiButton) this.controlList.get(guiType)).enabled = true; + ((GuiButton) this.buttonList.get(guiType)).enabled = true; guiType = button.id; button.enabled = false; @@ -289,16 +289,17 @@ public class ToolStationGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { // Draw the background - int texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/toolstation.png"); + //int texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/toolstation.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/toolstation.png"); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); - texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/icons.png"); + //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/icons.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + //this.mc.renderEngine.bindTexture(texID); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/icons.png"); // Draw the slots for (int i = 0; i < slotX.length; i++) @@ -311,9 +312,10 @@ public class ToolStationGui extends GuiContainer } // Draw description - texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/description.png"); + //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/description.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(texID); + //this.mc.renderEngine.bindTexture(texID); + this.mc.renderEngine.func_98187_b("/tinkertextures/gui/description.png"); cornerX = (this.width + this.xSize) / 2; cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30); diff --git a/tinker/tconstruct/client/gui/TurnPageButton.java b/mods/tinker/tconstruct/client/gui/TurnPageButton.java similarity index 88% rename from tinker/tconstruct/client/gui/TurnPageButton.java rename to mods/tinker/tconstruct/client/gui/TurnPageButton.java index 06d4fca9..dcd45012 100644 --- a/tinker/tconstruct/client/gui/TurnPageButton.java +++ b/mods/tinker/tconstruct/client/gui/TurnPageButton.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.gui; +package mods.tinker.tconstruct.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -31,7 +31,7 @@ public class TurnPageButton extends GuiButton { boolean var4 = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - par1Minecraft.renderEngine.bindTexture(par1Minecraft.renderEngine.getTexture("/tinkertextures/gui/bookleft.png")); + par1Minecraft.renderEngine.func_98187_b("/tinkertextures/gui/bookleft.png"); int var5 = 0; int var6 = 192; diff --git a/tinker/tconstruct/client/tmt/Angle3D.java b/mods/tinker/tconstruct/client/tmt/Angle3D.java similarity index 97% rename from tinker/tconstruct/client/tmt/Angle3D.java rename to mods/tinker/tconstruct/client/tmt/Angle3D.java index 692c6586..e9ee0bef 100644 --- a/tinker/tconstruct/client/tmt/Angle3D.java +++ b/mods/tinker/tconstruct/client/tmt/Angle3D.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; /** * This class handles angles. Basically all it does it store angles. You can diff --git a/tinker/tconstruct/client/tmt/Bone.java b/mods/tinker/tconstruct/client/tmt/Bone.java similarity index 99% rename from tinker/tconstruct/client/tmt/Bone.java rename to mods/tinker/tconstruct/client/tmt/Bone.java index 99973160..4fd2ae06 100644 --- a/tinker/tconstruct/client/tmt/Bone.java +++ b/mods/tinker/tconstruct/client/tmt/Bone.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import java.util.ArrayList; import java.util.HashMap; diff --git a/tinker/tconstruct/client/tmt/Coord2D.java b/mods/tinker/tconstruct/client/tmt/Coord2D.java similarity index 91% rename from tinker/tconstruct/client/tmt/Coord2D.java rename to mods/tinker/tconstruct/client/tmt/Coord2D.java index 415659d3..36ca8e97 100644 --- a/tinker/tconstruct/client/tmt/Coord2D.java +++ b/mods/tinker/tconstruct/client/tmt/Coord2D.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; /** * This class represents a coordinate space and its UV coordinates. This allows for diff --git a/tinker/tconstruct/client/tmt/ModelPool.java b/mods/tinker/tconstruct/client/tmt/ModelPool.java similarity index 97% rename from tinker/tconstruct/client/tmt/ModelPool.java rename to mods/tinker/tconstruct/client/tmt/ModelPool.java index c431b69d..013216e8 100644 --- a/tinker/tconstruct/client/tmt/ModelPool.java +++ b/mods/tinker/tconstruct/client/tmt/ModelPool.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import java.io.File; import java.util.HashMap; diff --git a/tinker/tconstruct/client/tmt/ModelPoolEntry.java b/mods/tinker/tconstruct/client/tmt/ModelPoolEntry.java similarity index 98% rename from tinker/tconstruct/client/tmt/ModelPoolEntry.java rename to mods/tinker/tconstruct/client/tmt/ModelPoolEntry.java index 7542b229..4b9f7dd8 100644 --- a/tinker/tconstruct/client/tmt/ModelPoolEntry.java +++ b/mods/tinker/tconstruct/client/tmt/ModelPoolEntry.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import java.io.File; import java.util.Collection; diff --git a/tinker/tconstruct/client/tmt/ModelPoolObjEntry.java b/mods/tinker/tconstruct/client/tmt/ModelPoolObjEntry.java similarity index 99% rename from tinker/tconstruct/client/tmt/ModelPoolObjEntry.java rename to mods/tinker/tconstruct/client/tmt/ModelPoolObjEntry.java index 8765ab99..6a1a44d6 100644 --- a/tinker/tconstruct/client/tmt/ModelPoolObjEntry.java +++ b/mods/tinker/tconstruct/client/tmt/ModelPoolObjEntry.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import java.io.BufferedReader; import java.io.File; diff --git a/tinker/tconstruct/client/tmt/ModelRendererTurbo.java b/mods/tinker/tconstruct/client/tmt/ModelRendererTurbo.java similarity index 99% rename from tinker/tconstruct/client/tmt/ModelRendererTurbo.java rename to mods/tinker/tconstruct/client/tmt/ModelRendererTurbo.java index 5d33c92e..75cebb2a 100644 --- a/tinker/tconstruct/client/tmt/ModelRendererTurbo.java +++ b/mods/tinker/tconstruct/client/tmt/ModelRendererTurbo.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import java.util.ArrayList; import java.util.Arrays; @@ -1834,7 +1834,7 @@ public class ModelRendererTurbo extends ModelRenderer curTexGroup.loadTexture(); GL11.glCallList(displayListArray[i]); if(!defaultTexture.equals("")) - renderEngine.bindTexture(renderEngine.getTexture(defaultTexture)); + renderEngine.func_98187_b(defaultTexture); } } } diff --git a/tinker/tconstruct/client/tmt/PositionTransformVertex.java b/mods/tinker/tconstruct/client/tmt/PositionTransformVertex.java similarity index 97% rename from tinker/tconstruct/client/tmt/PositionTransformVertex.java rename to mods/tinker/tconstruct/client/tmt/PositionTransformVertex.java index f03e567e..a099d99a 100644 --- a/tinker/tconstruct/client/tmt/PositionTransformVertex.java +++ b/mods/tinker/tconstruct/client/tmt/PositionTransformVertex.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import java.util.ArrayList; diff --git a/tinker/tconstruct/client/tmt/Shape2D.java b/mods/tinker/tconstruct/client/tmt/Shape2D.java similarity index 99% rename from tinker/tconstruct/client/tmt/Shape2D.java rename to mods/tinker/tconstruct/client/tmt/Shape2D.java index 2f49aef9..4077e267 100644 --- a/tinker/tconstruct/client/tmt/Shape2D.java +++ b/mods/tinker/tconstruct/client/tmt/Shape2D.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import java.util.ArrayList; diff --git a/tinker/tconstruct/client/tmt/Shape3D.java b/mods/tinker/tconstruct/client/tmt/Shape3D.java similarity index 83% rename from tinker/tconstruct/client/tmt/Shape3D.java rename to mods/tinker/tconstruct/client/tmt/Shape3D.java index a4e2068f..ce370121 100644 --- a/tinker/tconstruct/client/tmt/Shape3D.java +++ b/mods/tinker/tconstruct/client/tmt/Shape3D.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; public class Shape3D { diff --git a/tinker/tconstruct/client/tmt/TextureGroup.java b/mods/tinker/tconstruct/client/tmt/TextureGroup.java similarity index 75% rename from tinker/tconstruct/client/tmt/TextureGroup.java rename to mods/tinker/tconstruct/client/tmt/TextureGroup.java index 305ae8dc..61a62fec 100644 --- a/tinker/tconstruct/client/tmt/TextureGroup.java +++ b/mods/tinker/tconstruct/client/tmt/TextureGroup.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import java.util.ArrayList; @@ -29,12 +29,12 @@ public class TextureGroup if(!texture.equals("")) { RenderEngine renderengine = RenderManager.instance.renderEngine; - renderengine.bindTexture(renderengine.getTexture(texture)); + renderengine.func_98187_b(texture); } - else if(defaultTexture > -1) + /*else if(defaultTexture > -1) { - RenderManager.instance.renderEngine.bindTexture(defaultTexture); - } + RenderManager.instance.renderEngine.func_98187_b(defaultTexture); + }*/ } public ArrayList poly; diff --git a/tinker/tconstruct/client/tmt/TexturedPolygon.java b/mods/tinker/tconstruct/client/tmt/TexturedPolygon.java similarity index 98% rename from tinker/tconstruct/client/tmt/TexturedPolygon.java rename to mods/tinker/tconstruct/client/tmt/TexturedPolygon.java index 68929cf4..1f7cba70 100644 --- a/tinker/tconstruct/client/tmt/TexturedPolygon.java +++ b/mods/tinker/tconstruct/client/tmt/TexturedPolygon.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import java.util.ArrayList; diff --git a/tinker/tconstruct/client/tmt/TransformGroup.java b/mods/tinker/tconstruct/client/tmt/TransformGroup.java similarity index 81% rename from tinker/tconstruct/client/tmt/TransformGroup.java rename to mods/tinker/tconstruct/client/tmt/TransformGroup.java index 4e15fdb1..ae26e25d 100644 --- a/tinker/tconstruct/client/tmt/TransformGroup.java +++ b/mods/tinker/tconstruct/client/tmt/TransformGroup.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import net.minecraft.util.Vec3; diff --git a/tinker/tconstruct/client/tmt/TransformGroupBone.java b/mods/tinker/tconstruct/client/tmt/TransformGroupBone.java similarity index 98% rename from tinker/tconstruct/client/tmt/TransformGroupBone.java rename to mods/tinker/tconstruct/client/tmt/TransformGroupBone.java index 3faa119e..e953f4a4 100644 --- a/tinker/tconstruct/client/tmt/TransformGroupBone.java +++ b/mods/tinker/tconstruct/client/tmt/TransformGroupBone.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.client.tmt; +package mods.tinker.tconstruct.client.tmt; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; diff --git a/tinker/tconstruct/container/FrypanContainer.java b/mods/tinker/tconstruct/container/FrypanContainer.java similarity index 97% rename from tinker/tconstruct/container/FrypanContainer.java rename to mods/tinker/tconstruct/container/FrypanContainer.java index 3bcab9c5..f428a8ec 100644 --- a/tinker/tconstruct/container/FrypanContainer.java +++ b/mods/tinker/tconstruct/container/FrypanContainer.java @@ -1,12 +1,12 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; +import mods.tinker.tconstruct.logic.FrypanLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tinker.tconstruct.logic.FrypanLogic; public class FrypanContainer extends Container { diff --git a/tinker/tconstruct/container/PartCrafterChestContainer.java b/mods/tinker/tconstruct/container/PartCrafterChestContainer.java similarity index 95% rename from tinker/tconstruct/container/PartCrafterChestContainer.java rename to mods/tinker/tconstruct/container/PartCrafterChestContainer.java index f5c404e8..e68a20c4 100644 --- a/tinker/tconstruct/container/PartCrafterChestContainer.java +++ b/mods/tinker/tconstruct/container/PartCrafterChestContainer.java @@ -1,12 +1,12 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; +import mods.tinker.tconstruct.logic.PartCrafterLogic; +import mods.tinker.tconstruct.logic.PatternChestLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tinker.tconstruct.logic.PartCrafterLogic; -import tinker.tconstruct.logic.PatternChestLogic; public class PartCrafterChestContainer extends Container { diff --git a/tinker/tconstruct/container/PartCrafterContainer.java b/mods/tinker/tconstruct/container/PartCrafterContainer.java similarity index 95% rename from tinker/tconstruct/container/PartCrafterContainer.java rename to mods/tinker/tconstruct/container/PartCrafterContainer.java index c0c99f8a..67d9c5e3 100644 --- a/tinker/tconstruct/container/PartCrafterContainer.java +++ b/mods/tinker/tconstruct/container/PartCrafterContainer.java @@ -1,12 +1,11 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; +import mods.tinker.tconstruct.logic.PartCrafterLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tinker.common.IPattern; -import tinker.tconstruct.logic.PartCrafterLogic; public class PartCrafterContainer extends Container { diff --git a/tinker/tconstruct/container/PatternChestContainer.java b/mods/tinker/tconstruct/container/PatternChestContainer.java similarity index 89% rename from tinker/tconstruct/container/PatternChestContainer.java rename to mods/tinker/tconstruct/container/PatternChestContainer.java index 59bb171c..8ea1230e 100644 --- a/tinker/tconstruct/container/PatternChestContainer.java +++ b/mods/tinker/tconstruct/container/PatternChestContainer.java @@ -1,16 +1,12 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; -import tinker.common.IPattern; -import tinker.tconstruct.logic.PatternChestLogic; +import mods.tinker.common.IPattern; +import mods.tinker.tconstruct.logic.PatternChestLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; -import net.minecraft.inventory.SlotFurnace; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.tileentity.TileEntityFurnace; public class PatternChestContainer extends Container { diff --git a/tinker/tconstruct/container/PatternShaperContainer.java b/mods/tinker/tconstruct/container/PatternShaperContainer.java similarity index 95% rename from tinker/tconstruct/container/PatternShaperContainer.java rename to mods/tinker/tconstruct/container/PatternShaperContainer.java index 99b88133..19a95da0 100644 --- a/tinker/tconstruct/container/PatternShaperContainer.java +++ b/mods/tinker/tconstruct/container/PatternShaperContainer.java @@ -1,12 +1,11 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; +import mods.tinker.tconstruct.logic.PatternShaperLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tinker.tconstruct.logic.PatternChestLogic; -import tinker.tconstruct.logic.PatternShaperLogic; public class PatternShaperContainer extends Container { diff --git a/tinker/tconstruct/container/SlotOnlyTake.java b/mods/tinker/tconstruct/container/SlotOnlyTake.java similarity index 79% rename from tinker/tconstruct/container/SlotOnlyTake.java rename to mods/tinker/tconstruct/container/SlotOnlyTake.java index c2f3f192..cc97c113 100644 --- a/tinker/tconstruct/container/SlotOnlyTake.java +++ b/mods/tinker/tconstruct/container/SlotOnlyTake.java @@ -1,7 +1,5 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; -import tinker.tconstruct.items.Pattern; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/tinker/tconstruct/container/SlotPartBuilder.java b/mods/tinker/tconstruct/container/SlotPartBuilder.java similarity index 89% rename from tinker/tconstruct/container/SlotPartBuilder.java rename to mods/tinker/tconstruct/container/SlotPartBuilder.java index e0fd813a..41e7a8da 100644 --- a/tinker/tconstruct/container/SlotPartBuilder.java +++ b/mods/tinker/tconstruct/container/SlotPartBuilder.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/tinker/tconstruct/container/SlotPattern.java b/mods/tinker/tconstruct/container/SlotPattern.java similarity index 86% rename from tinker/tconstruct/container/SlotPattern.java rename to mods/tinker/tconstruct/container/SlotPattern.java index 518c8094..7c80e8e3 100644 --- a/tinker/tconstruct/container/SlotPattern.java +++ b/mods/tinker/tconstruct/container/SlotPattern.java @@ -1,9 +1,9 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; +import mods.tinker.common.IPattern; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import tinker.common.IPattern; public class SlotPattern extends Slot { diff --git a/tinker/tconstruct/container/SlotTool.java b/mods/tinker/tconstruct/container/SlotTool.java similarity index 82% rename from tinker/tconstruct/container/SlotTool.java rename to mods/tinker/tconstruct/container/SlotTool.java index 1a136ec9..83697383 100644 --- a/tinker/tconstruct/container/SlotTool.java +++ b/mods/tinker/tconstruct/container/SlotTool.java @@ -1,17 +1,11 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; -import tinker.tconstruct.tools.ToolCore; -import net.minecraft.entity.item.EntityXPOrb; +import mods.tinker.tconstruct.tools.ToolCore; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.stats.AchievementList; -import net.minecraft.util.MathHelper; -import cpw.mods.fml.common.registry.GameRegistry; public class SlotTool extends Slot { @@ -35,7 +29,7 @@ public class SlotTool extends Slot public void onPickupFromSlot(EntityPlayer par1EntityPlayer, ItemStack stack) { this.onCrafting(stack); - //stack.setItemName("\u00A7f" + toolName); + //stack.setUnlocalizedName("\u00A7f" + toolName); super.onPickupFromSlot(par1EntityPlayer, stack); } diff --git a/tinker/tconstruct/container/SmelteryContainer.java b/mods/tinker/tconstruct/container/SmelteryContainer.java similarity index 94% rename from tinker/tconstruct/container/SmelteryContainer.java rename to mods/tinker/tconstruct/container/SmelteryContainer.java index f761e8d5..88de641b 100644 --- a/tinker/tconstruct/container/SmelteryContainer.java +++ b/mods/tinker/tconstruct/container/SmelteryContainer.java @@ -1,19 +1,11 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; -import java.util.ArrayList; -import java.util.List; - -import tinker.tconstruct.logic.SmelteryLogic; -import net.minecraft.client.gui.inventory.GuiContainerCreative; +import mods.tinker.tconstruct.logic.SmelteryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; -import net.minecraft.inventory.SlotFurnace; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.tileentity.TileEntityFurnace; public class SmelteryContainer extends Container { diff --git a/tinker/tconstruct/container/ToolStationContainer.java b/mods/tinker/tconstruct/container/ToolStationContainer.java similarity index 98% rename from tinker/tconstruct/container/ToolStationContainer.java rename to mods/tinker/tconstruct/container/ToolStationContainer.java index d0035cd3..c8fbb9cc 100644 --- a/tinker/tconstruct/container/ToolStationContainer.java +++ b/mods/tinker/tconstruct/container/ToolStationContainer.java @@ -1,13 +1,12 @@ -package tinker.tconstruct.container; +package mods.tinker.tconstruct.container; +import mods.tinker.tconstruct.logic.ToolStationLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tinker.tconstruct.logic.ToolStationLogic; -import tinker.tconstruct.tools.ToolCore; public class ToolStationContainer extends Container { diff --git a/tinker/tconstruct/crafting/AlloyMix.java b/mods/tinker/tconstruct/crafting/AlloyMix.java similarity index 98% rename from tinker/tconstruct/crafting/AlloyMix.java rename to mods/tinker/tconstruct/crafting/AlloyMix.java index ea5d1c9c..9ed9c288 100644 --- a/tinker/tconstruct/crafting/AlloyMix.java +++ b/mods/tinker/tconstruct/crafting/AlloyMix.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.crafting; +package mods.tinker.tconstruct.crafting; import java.util.ArrayList; import java.util.Iterator; diff --git a/tinker/tconstruct/crafting/CastingRecipe.java b/mods/tinker/tconstruct/crafting/CastingRecipe.java similarity index 94% rename from tinker/tconstruct/crafting/CastingRecipe.java rename to mods/tinker/tconstruct/crafting/CastingRecipe.java index 0730549e..7d3fb277 100644 --- a/tinker/tconstruct/crafting/CastingRecipe.java +++ b/mods/tinker/tconstruct/crafting/CastingRecipe.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.crafting; +package mods.tinker.tconstruct.crafting; import net.minecraft.item.ItemStack; import net.minecraftforge.liquids.LiquidStack; diff --git a/tinker/tconstruct/crafting/LiquidCasting.java b/mods/tinker/tconstruct/crafting/LiquidCasting.java similarity index 97% rename from tinker/tconstruct/crafting/LiquidCasting.java rename to mods/tinker/tconstruct/crafting/LiquidCasting.java index 75a0b78d..a1babb9f 100644 --- a/tinker/tconstruct/crafting/LiquidCasting.java +++ b/mods/tinker/tconstruct/crafting/LiquidCasting.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.crafting; +package mods.tinker.tconstruct.crafting; import java.util.ArrayList; import java.util.Arrays; diff --git a/tinker/tconstruct/crafting/PatternBuilder.java b/mods/tinker/tconstruct/crafting/PatternBuilder.java similarity index 97% rename from tinker/tconstruct/crafting/PatternBuilder.java rename to mods/tinker/tconstruct/crafting/PatternBuilder.java index 3866bc5c..75d5fb62 100644 --- a/tinker/tconstruct/crafting/PatternBuilder.java +++ b/mods/tinker/tconstruct/crafting/PatternBuilder.java @@ -1,16 +1,16 @@ -package tinker.tconstruct.crafting; +package mods.tinker.tconstruct.crafting; /** How to build tool parts? With patterns! */ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import mods.tinker.common.IPattern; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.items.Pattern; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import tinker.common.IPattern; -import tinker.tconstruct.TContent; -import tinker.tconstruct.items.Pattern; public class PatternBuilder { diff --git a/tinker/tconstruct/crafting/Smeltery.java b/mods/tinker/tconstruct/crafting/Smeltery.java similarity index 99% rename from tinker/tconstruct/crafting/Smeltery.java rename to mods/tinker/tconstruct/crafting/Smeltery.java index 7ed92b5a..736dbb57 100644 --- a/tinker/tconstruct/crafting/Smeltery.java +++ b/mods/tinker/tconstruct/crafting/Smeltery.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.crafting; +package mods.tinker.tconstruct.crafting; import java.util.ArrayList; import java.util.Arrays; diff --git a/tinker/tconstruct/crafting/ToolBuilder.java b/mods/tinker/tconstruct/crafting/ToolBuilder.java similarity index 96% rename from tinker/tconstruct/crafting/ToolBuilder.java rename to mods/tinker/tconstruct/crafting/ToolBuilder.java index 55a1c490..a26099f4 100644 --- a/tinker/tconstruct/crafting/ToolBuilder.java +++ b/mods/tinker/tconstruct/crafting/ToolBuilder.java @@ -1,18 +1,18 @@ -package tinker.tconstruct.crafting; +package mods.tinker.tconstruct.crafting; /** Once upon a time, too many tools to count. Let's put them together automatically */ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import mods.tinker.common.IToolPart; +import mods.tinker.common.ToolMod; +import mods.tinker.tconstruct.TConstructRegistry; +import mods.tinker.tconstruct.ToolMaterial; +import mods.tinker.tconstruct.tools.ToolCore; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tinker.common.IToolPart; -import tinker.common.ToolMod; -import tinker.tconstruct.TConstructRegistry; -import tinker.tconstruct.ToolMaterial; -import tinker.tconstruct.tools.ToolCore; public class ToolBuilder { diff --git a/tinker/tconstruct/crafting/ToolRecipe.java b/mods/tinker/tconstruct/crafting/ToolRecipe.java similarity index 86% rename from tinker/tconstruct/crafting/ToolRecipe.java rename to mods/tinker/tconstruct/crafting/ToolRecipe.java index c77ca333..df1b8898 100644 --- a/tinker/tconstruct/crafting/ToolRecipe.java +++ b/mods/tinker/tconstruct/crafting/ToolRecipe.java @@ -1,7 +1,7 @@ -package tinker.tconstruct.crafting; +package mods.tinker.tconstruct.crafting; -import tinker.tconstruct.TContent; -import tinker.tconstruct.tools.ToolCore; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.tools.ToolCore; import net.minecraft.item.Item; /* diff --git a/tinker/tconstruct/entity/CartEntity.java b/mods/tinker/tconstruct/entity/CartEntity.java similarity index 97% rename from tinker/tconstruct/entity/CartEntity.java rename to mods/tinker/tconstruct/entity/CartEntity.java index dd3ebd92..51eb5770 100644 --- a/tinker/tconstruct/entity/CartEntity.java +++ b/mods/tinker/tconstruct/entity/CartEntity.java @@ -1,12 +1,8 @@ -package tinker.tconstruct.entity; +package mods.tinker.tconstruct.entity; import java.util.ArrayList; import java.util.List; -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; - -import net.minecraft.block.Block; import net.minecraft.block.BlockRail; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -25,7 +21,10 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import net.minecraftforge.common.IMinecartCollisionHandler; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -260,18 +259,18 @@ public class CartEntity extends Entity } var2.stackSize -= var6; - EntityItem var7 = new EntityItem(this.worldObj, this.posX + (double)var3, this.posY + (double)var4, this.posZ + (double)var5, new ItemStack(var2.itemID, var6, var2.getItemDamage())); + EntityItem entityitem = new EntityItem(this.worldObj, this.posX + (double)var3, this.posY + (double)var4, this.posZ + (double)var5, new ItemStack(var2.itemID, var6, var2.getItemDamage())); if (var2.hasTagCompound()) { - var7.func_92014_d().setTagCompound((NBTTagCompound)var2.getTagCompound().copy()); + entityitem.getEntityItem().setTagCompound((NBTTagCompound)var2.getTagCompound().copy()); } float var8 = 0.05F; - var7.motionX = (double)((float)this.rand.nextGaussian() * var8); - var7.motionY = (double)((float)this.rand.nextGaussian() * var8 + 0.2F); - var7.motionZ = (double)((float)this.rand.nextGaussian() * var8); - this.worldObj.spawnEntityInWorld(var7); + entityitem.motionX = (double)((float)this.rand.nextGaussian() * var8); + entityitem.motionY = (double)((float)this.rand.nextGaussian() * var8 + 0.2F); + entityitem.motionZ = (double)((float)this.rand.nextGaussian() * var8); + this.worldObj.spawnEntityInWorld(entityitem); } } } @@ -326,7 +325,7 @@ public class CartEntity extends Entity { if (var1.getAllowNether()) { - if (this.ridingEntity == null && this.field_82153_h++ >= var2) + /*if (this.ridingEntity == null && this.field_82153_h++ >= var2) { this.field_82153_h = var2; this.timeUntilPortal = this.getPortalCooldown(); @@ -344,12 +343,12 @@ public class CartEntity extends Entity this.travelToDimension(var3); } - this.inPortal = false; + this.inPortal = false;*/ } } else { - if (this.field_82153_h > 0) + /*if (this.field_82153_h > 0) { this.field_82153_h -= 4; } @@ -357,7 +356,7 @@ public class CartEntity extends Entity if (this.field_82153_h < 0) { this.field_82153_h = 0; - } + }*/ } if (this.timeUntilPortal > 0) @@ -1426,4 +1425,18 @@ public class CartEntity extends Entity pullcartType = data.readInt(); } + + @Override + public boolean func_94042_c () + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b (int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/tinker/tconstruct/entity/Crystal.java b/mods/tinker/tconstruct/entity/Crystal.java similarity index 88% rename from tinker/tconstruct/entity/Crystal.java rename to mods/tinker/tconstruct/entity/Crystal.java index 567b32b2..78fc2f24 100644 --- a/tinker/tconstruct/entity/Crystal.java +++ b/mods/tinker/tconstruct/entity/Crystal.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.entity; +package mods.tinker.tconstruct.entity; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.world.World; diff --git a/tinker/tconstruct/entity/FakeBlockEntity.java b/mods/tinker/tconstruct/entity/FakeBlockEntity.java similarity index 95% rename from tinker/tconstruct/entity/FakeBlockEntity.java rename to mods/tinker/tconstruct/entity/FakeBlockEntity.java index a568c8d8..11e0dba5 100644 --- a/tinker/tconstruct/entity/FakeBlockEntity.java +++ b/mods/tinker/tconstruct/entity/FakeBlockEntity.java @@ -1,11 +1,12 @@ -package tinker.tconstruct.entity; - -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; +package mods.tinker.tconstruct.entity; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; public class FakeBlockEntity extends Entity diff --git a/mods/tinker/tconstruct/entity/Skyla.java b/mods/tinker/tconstruct/entity/Skyla.java new file mode 100644 index 00000000..8fca2e1c --- /dev/null +++ b/mods/tinker/tconstruct/entity/Skyla.java @@ -0,0 +1,32 @@ +package mods.tinker.tconstruct.entity; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; + +public class Skyla extends EntityPlayer +{ + + public Skyla(World par1World) + { + super(par1World); + username = "Skyla"; + texture = "/tinkertextures/mob/skyla.png"; + } + + @Override + public void sendChatToPlayer (String var1) {} + + @Override + public boolean canCommandSenderUseCommand (int var1, String var2) + { + return false; + } + + @Override + public ChunkCoordinates getPlayerCoordinates () + { + return null; + } + +} diff --git a/tinker/tconstruct/items/CraftedSoilItemBlock.java b/mods/tinker/tconstruct/items/CraftedSoilItemBlock.java similarity index 84% rename from tinker/tconstruct/items/CraftedSoilItemBlock.java rename to mods/tinker/tconstruct/items/CraftedSoilItemBlock.java index b9a216c1..87cd54f4 100644 --- a/tinker/tconstruct/items/CraftedSoilItemBlock.java +++ b/mods/tinker/tconstruct/items/CraftedSoilItemBlock.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ public class CraftedSoilItemBlock extends ItemBlock return meta; } - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { return (new StringBuilder()).append("CraftedSoil.").append(blockType[itemstack.getItemDamage()]).toString(); } diff --git a/mods/tinker/tconstruct/items/CraftingItem.java b/mods/tinker/tconstruct/items/CraftingItem.java new file mode 100644 index 00000000..332f9a95 --- /dev/null +++ b/mods/tinker/tconstruct/items/CraftingItem.java @@ -0,0 +1,58 @@ +package mods.tinker.tconstruct.items; + +import java.util.List; + +import mods.tinker.tconstruct.TConstruct; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class CraftingItem extends Item +{ + public String[] textureNames; + public String[] unlocalizedNames; + public Icon[] icons; + public CraftingItem(int id, String[] names, String[] tex) + { + super(id); + this.setCreativeTab(TConstruct.materialTab); + this.setMaxDamage(0); + this.setHasSubtypes(true); + textureNames = tex; + unlocalizedNames = names; + } + + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage(int meta) + { + return icons[meta]; + } + + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister iconRegister) + { + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.func_94245_a("tinker:"+textureNames[i]); + } + } + + public String getUnlocalizedName(ItemStack stack) + { + int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, unlocalizedNames.length); + return getUnlocalizedName() + "." +unlocalizedNames[arr]; + } + + public void getSubItems (int id, CreativeTabs tab, List list) + { + for (int i = 0; i < unlocalizedNames.length; i++) + list.add(new ItemStack(id, 1, i)); + } +} diff --git a/tinker/tconstruct/items/FilledBucket.java b/mods/tinker/tconstruct/items/FilledBucket.java similarity index 80% rename from tinker/tconstruct/items/FilledBucket.java rename to mods/tinker/tconstruct/items/FilledBucket.java index f1ff148b..7ad02ba8 100644 --- a/tinker/tconstruct/items/FilledBucket.java +++ b/mods/tinker/tconstruct/items/FilledBucket.java @@ -1,18 +1,20 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import java.util.List; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.logic.LiquidTextureLogic; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumMovingObjectType; +import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import tinker.tconstruct.TContent; -import tinker.tconstruct.logic.LiquidTextureLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,9 +24,9 @@ public class FilledBucket extends ItemBucket public FilledBucket(int id) { super(id, 0); - setTextureFile(TContent.craftingTexture); - setIconIndex(224); - setItemName("tconstruct.bucket"); + //setTextureFile(TContent.craftingTexture); + //setIconIndex(224); + setUnlocalizedName("tconstruct.bucket"); } public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) @@ -132,7 +134,7 @@ public class FilledBucket extends ItemBucket } else { - world.setBlockWithNotify(clickX, clickY, clickZ, TContent.liquidMetalStill.blockID); + world.func_94575_c(clickX, clickY, clickZ, TContent.liquidMetalStill.blockID); LiquidTextureLogic logic = (LiquidTextureLogic) world.getBlockTileEntity(clickX, clickY, clickZ); logic.setTexturePos(meta); @@ -169,16 +171,41 @@ public class FilledBucket extends ItemBucket list.add(new ItemStack(id, 1, i)); } - @SideOnly(Side.CLIENT) + /*@SideOnly(Side.CLIENT) public int getIconFromDamage(int meta) { return this.iconIndex + meta; } - public String getItemNameIS(ItemStack stack) + public String getUnlocalizedName(ItemStack stack) { int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, materialNames.length); return getItemName() + "." +materialNames[arr]; + }*/ + + public Icon[] icons; + + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage(int meta) + { + return icons[meta]; + } + + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister iconRegister) + { + this.icons = new Icon[materialNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.func_94245_a("tinker"+materialNames[i]); + } + } + + public String getUnlocalizedName(ItemStack stack) + { + int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, materialNames.length); + return getUnlocalizedName() + "." +materialNames[arr]; } public static final String[] materialNames = new String[] { diff --git a/tinker/tconstruct/items/LavaTankItemBlock.java b/mods/tinker/tconstruct/items/LavaTankItemBlock.java similarity index 84% rename from tinker/tconstruct/items/LavaTankItemBlock.java rename to mods/tinker/tconstruct/items/LavaTankItemBlock.java index e0b2126e..10f97a84 100644 --- a/tinker/tconstruct/items/LavaTankItemBlock.java +++ b/mods/tinker/tconstruct/items/LavaTankItemBlock.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ public class LavaTankItemBlock extends ItemBlock return meta; } - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { return (new StringBuilder()).append("LavaTank.").append(blockType[itemstack.getItemDamage()]).toString(); } diff --git a/tinker/tconstruct/items/LiquidItemBlock.java b/mods/tinker/tconstruct/items/LiquidItemBlock.java similarity index 86% rename from tinker/tconstruct/items/LiquidItemBlock.java rename to mods/tinker/tconstruct/items/LiquidItemBlock.java index ef914d6f..00a0edb5 100644 --- a/tinker/tconstruct/items/LiquidItemBlock.java +++ b/mods/tinker/tconstruct/items/LiquidItemBlock.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -20,7 +20,7 @@ public class LiquidItemBlock extends ItemBlock return meta; } - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { return (new StringBuilder()).append("LiquidMetal.").append(blockType[itemstack.getItemDamage()]).toString(); } diff --git a/tinker/tconstruct/items/MetalItemBlock.java b/mods/tinker/tconstruct/items/MetalItemBlock.java similarity index 86% rename from tinker/tconstruct/items/MetalItemBlock.java rename to mods/tinker/tconstruct/items/MetalItemBlock.java index fd8a65b6..68d23a48 100644 --- a/tinker/tconstruct/items/MetalItemBlock.java +++ b/mods/tinker/tconstruct/items/MetalItemBlock.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ public class MetalItemBlock extends ItemBlock return meta; } - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { return (new StringBuilder()).append("StorageMetals.").append(blockType[itemstack.getItemDamage()]).toString(); } diff --git a/tinker/tconstruct/items/MetalOreItemBlock.java b/mods/tinker/tconstruct/items/MetalOreItemBlock.java similarity index 85% rename from tinker/tconstruct/items/MetalOreItemBlock.java rename to mods/tinker/tconstruct/items/MetalOreItemBlock.java index ed7f31fd..c8c7e4fc 100644 --- a/tinker/tconstruct/items/MetalOreItemBlock.java +++ b/mods/tinker/tconstruct/items/MetalOreItemBlock.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ public class MetalOreItemBlock extends ItemBlock return meta; } - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { return (new StringBuilder()).append("MetalOre.").append(blockType[itemstack.getItemDamage()]).toString(); } diff --git a/tinker/tconstruct/items/MetalPattern.java b/mods/tinker/tconstruct/items/MetalPattern.java similarity index 74% rename from tinker/tconstruct/items/MetalPattern.java rename to mods/tinker/tconstruct/items/MetalPattern.java index f70f9992..e77caa84 100644 --- a/tinker/tconstruct/items/MetalPattern.java +++ b/mods/tinker/tconstruct/items/MetalPattern.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import java.util.List; @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; public class MetalPattern extends Pattern { - public MetalPattern(int id, int icon, String tex) + public MetalPattern(int id, String partType) { - super(id, icon, tex); + super(id, partType); } public void getSubItems (int id, CreativeTabs tab, List list) diff --git a/tinker/tconstruct/items/Pattern.java b/mods/tinker/tconstruct/items/Pattern.java similarity index 80% rename from tinker/tconstruct/items/Pattern.java rename to mods/tinker/tconstruct/items/Pattern.java index 827d0696..836dbc1a 100644 --- a/tinker/tconstruct/items/Pattern.java +++ b/mods/tinker/tconstruct/items/Pattern.java @@ -1,35 +1,36 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import java.util.List; +import mods.tinker.common.IPattern; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.crafting.PatternBuilder.MaterialSet; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -import tinker.common.IPattern; -import tinker.tconstruct.TContent; -import tinker.tconstruct.crafting.PatternBuilder.MaterialSet; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class Pattern extends CraftingItem implements IPattern { - public Pattern(int id, int icon, String tex) + public Pattern(int id, String partType) { - super(id, icon, tex); + super(id, getNames(partType), getNames(partType)); this.setHasSubtypes(true); this.setMaxDamage(0); this.setContainerItem(this); this.setMaxStackSize(1); } - - public String getItemNameIS (ItemStack stack) + + private static String[] getNames (String partType) { - int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, 12); - return super.getItemName() + "." + patternName[arr]; + String[] names = new String[patternName.length]; + for (int i = 0; i < patternName.length; i++) + names[i] = patternName[i]+partType; + return names; } public static final String[] patternName = new String[] { diff --git a/tinker/tconstruct/items/PatternManual.java b/mods/tinker/tconstruct/items/PatternManual.java similarity index 57% rename from tinker/tconstruct/items/PatternManual.java rename to mods/tinker/tconstruct/items/PatternManual.java index ae55b755..6041ea77 100644 --- a/tinker/tconstruct/items/PatternManual.java +++ b/mods/tinker/tconstruct/items/PatternManual.java @@ -1,27 +1,19 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.TGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import org.w3c.dom.Document; - -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.TContent; -import tinker.tconstruct.TGuiHandler; -import tinker.tconstruct.client.TProxyClient; -import tinker.tconstruct.client.gui.GuiManual; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; - public class PatternManual extends CraftingItem { - + static String[] name = new String[] {"manualDiary"}; public PatternManual(int id) { - super(id, 176, TContent.craftingTexture); - setItemName("tconstruct.PatternManual"); + super(id, name, name); + setUnlocalizedName("tconstruct.manualDiary"); } @Override diff --git a/tinker/tconstruct/items/SearedTableItemBlock.java b/mods/tinker/tconstruct/items/SearedTableItemBlock.java similarity index 85% rename from tinker/tconstruct/items/SearedTableItemBlock.java rename to mods/tinker/tconstruct/items/SearedTableItemBlock.java index 450cb521..d5949626 100644 --- a/tinker/tconstruct/items/SearedTableItemBlock.java +++ b/mods/tinker/tconstruct/items/SearedTableItemBlock.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ public class SearedTableItemBlock extends ItemBlock return meta; } - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { return (new StringBuilder()).append("SearedBlock.").append(blockType[itemstack.getItemDamage()]).toString(); } diff --git a/tinker/tconstruct/items/SmelteryItemBlock.java b/mods/tinker/tconstruct/items/SmelteryItemBlock.java similarity index 85% rename from tinker/tconstruct/items/SmelteryItemBlock.java rename to mods/tinker/tconstruct/items/SmelteryItemBlock.java index 37891718..a202dc7f 100644 --- a/tinker/tconstruct/items/SmelteryItemBlock.java +++ b/mods/tinker/tconstruct/items/SmelteryItemBlock.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ public class SmelteryItemBlock extends ItemBlock return meta; } - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { return (new StringBuilder()).append("Smeltery.").append(blockType[itemstack.getItemDamage()]).toString(); } diff --git a/mods/tinker/tconstruct/items/TitleIcon.java b/mods/tinker/tconstruct/items/TitleIcon.java new file mode 100644 index 00000000..6c2e0206 --- /dev/null +++ b/mods/tinker/tconstruct/items/TitleIcon.java @@ -0,0 +1,21 @@ +package mods.tinker.tconstruct.items; + +import mods.tinker.tconstruct.client.TProxyClient; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.Item; +import net.minecraft.util.Icon; + +public class TitleIcon extends Item +{ + public TitleIcon(int par1) + { + super(par1); + } + + @Override + public void func_94581_a (IconRegister iconRegister) + { + TProxyClient.blankSprite = iconRegister.func_94245_a("tinker:blanksprite"); + iconIndex = iconRegister.func_94245_a("tparts"); + } +} diff --git a/mods/tinker/tconstruct/items/ToolPart.java b/mods/tinker/tconstruct/items/ToolPart.java new file mode 100644 index 00000000..c36b672f --- /dev/null +++ b/mods/tinker/tconstruct/items/ToolPart.java @@ -0,0 +1,65 @@ +package mods.tinker.tconstruct.items; + + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import mods.tinker.common.IToolPart; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; + +public class ToolPart extends CraftingItem + implements IToolPart +{ + public ToolPart(int id, String partType, String textureType) + { + super(id, getNames(partType), buildTextureNames(textureType)); + this.setHasSubtypes(true); + this.setMaxDamage(0); + } + + private static String[] getNames (String partType) + { + String[] names = new String[toolMaterialNames.length]; + for (int i = 0; i < toolMaterialNames.length; i++) + names[i] = partType + toolMaterialNames[i]; + return names; + } + + + private static String[] buildTextureNames (String textureType) + { + String[] names = new String[toolMaterialNames.length]; + for (int i = 0; i < toolMaterialNames.length; i++) + names[i] = toolTextureNames[i]+textureType; + return names; + } + + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister iconRegister) + { + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.func_94245_a("tinker:parts/"+textureNames[i]); + } + } + + public static final String[] toolMaterialNames = new String[] { + "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel" }; + + public static final String[] toolTextureNames = new String[] { + "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel" }; + + @Override + public int getMaterialID (ItemStack stack) + { + return stack.getItemDamage(); + } +} diff --git a/tinker/tconstruct/items/ToolShard.java b/mods/tinker/tconstruct/items/ToolShard.java similarity index 76% rename from tinker/tconstruct/items/ToolShard.java rename to mods/tinker/tconstruct/items/ToolShard.java index a6868175..efe5e4e0 100644 --- a/tinker/tconstruct/items/ToolShard.java +++ b/mods/tinker/tconstruct/items/ToolShard.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import java.util.List; @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; public class ToolShard extends ToolPart { - public ToolShard(int id, int icon, String tex) + public ToolShard(int id, String part, String tex) { - super(id, icon, tex); + super(id, part, tex); this.setHasSubtypes(true); this.setMaxDamage(0); } @@ -21,7 +21,7 @@ public class ToolShard extends ToolPart list.add(new ItemStack(id, 1, i)); for (int i = 6; i < 9; i++) list.add(new ItemStack(id, 1, i)); - for (int i = 10; i < 15; i++) + for (int i = 10; i < 17; i++) list.add(new ItemStack(id, 1, i)); } } diff --git a/tinker/tconstruct/items/ToolStationItemBlock.java b/mods/tinker/tconstruct/items/ToolStationItemBlock.java similarity index 87% rename from tinker/tconstruct/items/ToolStationItemBlock.java rename to mods/tinker/tconstruct/items/ToolStationItemBlock.java index 96261466..8a971c6b 100644 --- a/tinker/tconstruct/items/ToolStationItemBlock.java +++ b/mods/tinker/tconstruct/items/ToolStationItemBlock.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.items; +package mods.tinker.tconstruct.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -23,7 +23,8 @@ public class ToolStationItemBlock extends ItemBlock return meta; } - public String getItemNameIS(ItemStack itemstack) + @Override + public String getUnlocalizedName(ItemStack itemstack) { return (new StringBuilder()).append("ToolStation.").append(blockType[itemstack.getItemDamage()]).toString(); } diff --git a/tinker/tconstruct/logic/CastingTableLogic.java b/mods/tinker/tconstruct/logic/CastingTableLogic.java similarity index 92% rename from tinker/tconstruct/logic/CastingTableLogic.java rename to mods/tinker/tconstruct/logic/CastingTableLogic.java index 1aaacd48..963dc38d 100644 --- a/tinker/tconstruct/logic/CastingTableLogic.java +++ b/mods/tinker/tconstruct/logic/CastingTableLogic.java @@ -1,5 +1,10 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; +import mods.tinker.common.IPattern; +import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.crafting.CastingRecipe; +import mods.tinker.tconstruct.crafting.LiquidCasting; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; @@ -11,11 +16,6 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidStack; -import tinker.common.IPattern; -import tinker.common.InventoryLogic; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.crafting.CastingRecipe; -import tinker.tconstruct.crafting.LiquidCasting; public class CastingTableLogic extends InventoryLogic implements ILiquidTank, ITankContainer @@ -34,9 +34,16 @@ public class CastingTableLogic extends InventoryLogic { return null; } + @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) //Not a gui block + protected String getDefaultName () //Still not a gui block + { + return null; + } + + @Override + public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) //Definitely not a gui block { return null; } diff --git a/tinker/tconstruct/logic/EquipLogic.java b/mods/tinker/tconstruct/logic/EquipLogic.java similarity index 54% rename from tinker/tconstruct/logic/EquipLogic.java rename to mods/tinker/tconstruct/logic/EquipLogic.java index daca5372..dbbf5a65 100644 --- a/tinker/tconstruct/logic/EquipLogic.java +++ b/mods/tinker/tconstruct/logic/EquipLogic.java @@ -1,21 +1,7 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemHoe; +import mods.tinker.common.InventoryLogic; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.item.ItemTool; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.nbt.NBTTagCompound; -import tinker.common.IActiveLogic; -import tinker.common.InventoryLogic; -import cpw.mods.fml.common.registry.GameRegistry; /* Slots * 0: Frying pan item diff --git a/tinker/tconstruct/logic/FaucetLogic.java b/mods/tinker/tconstruct/logic/FaucetLogic.java similarity index 96% rename from tinker/tconstruct/logic/FaucetLogic.java rename to mods/tinker/tconstruct/logic/FaucetLogic.java index 7e61fa4b..0d229c7c 100644 --- a/tinker/tconstruct/logic/FaucetLogic.java +++ b/mods/tinker/tconstruct/logic/FaucetLogic.java @@ -1,5 +1,7 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; +import mods.tinker.common.IActiveLogic; +import mods.tinker.common.IFacingLogic; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; @@ -8,11 +10,8 @@ import net.minecraft.network.packet.Packet132TileEntityData; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidStack; -import tinker.common.IActiveLogic; -import tinker.common.IFacingLogic; public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic { diff --git a/tinker/tconstruct/logic/FrypanLogic.java b/mods/tinker/tconstruct/logic/FrypanLogic.java similarity index 95% rename from tinker/tconstruct/logic/FrypanLogic.java rename to mods/tinker/tconstruct/logic/FrypanLogic.java index c69e536d..ae9e086d 100644 --- a/tinker/tconstruct/logic/FrypanLogic.java +++ b/mods/tinker/tconstruct/logic/FrypanLogic.java @@ -1,5 +1,7 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; +import mods.tinker.common.IActiveLogic; +import mods.tinker.tconstruct.container.FrypanContainer; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.InventoryPlayer; @@ -14,9 +16,6 @@ import net.minecraft.item.ItemTool; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tinker.common.IActiveLogic; -import tinker.common.InventoryLogic; -import tinker.tconstruct.container.FrypanContainer; import cpw.mods.fml.common.registry.GameRegistry; /* Slots @@ -40,7 +39,7 @@ public class FrypanLogic extends EquipLogic } @Override - public String getInvName () + public String getDefaultName () { return "crafters.frypan"; } @@ -253,7 +252,7 @@ public class FrypanLogic extends EquipLogic } if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemSword && ((ItemSword) item).func_77825_f().equals("WOOD")) + if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; if (item instanceof ItemHoe && ((ItemHoe) item).func_77842_f().equals("WOOD")) return 200; diff --git a/tinker/tconstruct/logic/LavaTankLogic.java b/mods/tinker/tconstruct/logic/LavaTankLogic.java similarity index 97% rename from tinker/tconstruct/logic/LavaTankLogic.java rename to mods/tinker/tconstruct/logic/LavaTankLogic.java index 8eaa393e..a48530a8 100644 --- a/tinker/tconstruct/logic/LavaTankLogic.java +++ b/mods/tinker/tconstruct/logic/LavaTankLogic.java @@ -1,10 +1,9 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet132TileEntityData; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; diff --git a/tinker/tconstruct/logic/LiquidTextureLogic.java b/mods/tinker/tconstruct/logic/LiquidTextureLogic.java similarity index 94% rename from tinker/tconstruct/logic/LiquidTextureLogic.java rename to mods/tinker/tconstruct/logic/LiquidTextureLogic.java index f40427fe..857a1d3d 100644 --- a/tinker/tconstruct/logic/LiquidTextureLogic.java +++ b/mods/tinker/tconstruct/logic/LiquidTextureLogic.java @@ -1,12 +1,10 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet132TileEntityData; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import tinker.tconstruct.TContent; public class LiquidTextureLogic extends TileEntity { diff --git a/tinker/tconstruct/logic/MultiServantLogic.java b/mods/tinker/tconstruct/logic/MultiServantLogic.java similarity index 95% rename from tinker/tconstruct/logic/MultiServantLogic.java rename to mods/tinker/tconstruct/logic/MultiServantLogic.java index c3b5c792..5a411fbd 100644 --- a/tinker/tconstruct/logic/MultiServantLogic.java +++ b/mods/tinker/tconstruct/logic/MultiServantLogic.java @@ -1,9 +1,8 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; +import mods.tinker.common.CoordTuple; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import tinker.common.CoordTuple; public class MultiServantLogic extends TileEntity { diff --git a/tinker/tconstruct/logic/PartCrafterLogic.java b/mods/tinker/tconstruct/logic/PartCrafterLogic.java similarity index 92% rename from tinker/tconstruct/logic/PartCrafterLogic.java rename to mods/tinker/tconstruct/logic/PartCrafterLogic.java index 29568824..5759bd7a 100644 --- a/tinker/tconstruct/logic/PartCrafterLogic.java +++ b/mods/tinker/tconstruct/logic/PartCrafterLogic.java @@ -1,17 +1,16 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; +import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.container.PartCrafterChestContainer; +import mods.tinker.tconstruct.container.PartCrafterContainer; +import mods.tinker.tconstruct.crafting.PatternBuilder; +import mods.tinker.tconstruct.items.Pattern; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tinker.common.InventoryLogic; -import tinker.tconstruct.TContent; -import tinker.tconstruct.container.PartCrafterChestContainer; -import tinker.tconstruct.container.PartCrafterContainer; -import tinker.tconstruct.crafting.PatternBuilder; -import tinker.tconstruct.items.Pattern; public class PartCrafterLogic extends InventoryLogic { @@ -26,7 +25,7 @@ public class PartCrafterLogic extends InventoryLogic } @Override - public String getInvName () + public String getDefaultName () { return "toolstation.parts"; } diff --git a/tinker/tconstruct/logic/PatternChestLogic.java b/mods/tinker/tconstruct/logic/PatternChestLogic.java similarity index 75% rename from tinker/tconstruct/logic/PatternChestLogic.java rename to mods/tinker/tconstruct/logic/PatternChestLogic.java index 45edf688..d14a26cf 100644 --- a/tinker/tconstruct/logic/PatternChestLogic.java +++ b/mods/tinker/tconstruct/logic/PatternChestLogic.java @@ -1,10 +1,10 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; +import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.container.PatternChestContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.world.World; -import tinker.common.InventoryLogic; -import tinker.tconstruct.container.PatternChestContainer; public class PatternChestLogic extends InventoryLogic { @@ -19,7 +19,7 @@ public class PatternChestLogic extends InventoryLogic } @Override - public String getInvName () + public String getDefaultName () { return "toolstation.patternholder"; } diff --git a/tinker/tconstruct/logic/PatternShaperLogic.java b/mods/tinker/tconstruct/logic/PatternShaperLogic.java similarity index 90% rename from tinker/tconstruct/logic/PatternShaperLogic.java rename to mods/tinker/tconstruct/logic/PatternShaperLogic.java index de10ea5f..0939e874 100644 --- a/tinker/tconstruct/logic/PatternShaperLogic.java +++ b/mods/tinker/tconstruct/logic/PatternShaperLogic.java @@ -1,12 +1,12 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; +import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.container.PatternShaperContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tinker.common.InventoryLogic; -import tinker.tconstruct.TContent; -import tinker.tconstruct.container.PatternShaperContainer; public class PatternShaperLogic extends InventoryLogic { @@ -21,7 +21,7 @@ public class PatternShaperLogic extends InventoryLogic } @Override - public String getInvName () + public String getDefaultName () { return "toolstation.PatternShaper"; } diff --git a/tinker/tconstruct/logic/SmelteryDrainLogic.java b/mods/tinker/tconstruct/logic/SmelteryDrainLogic.java similarity index 98% rename from tinker/tconstruct/logic/SmelteryDrainLogic.java rename to mods/tinker/tconstruct/logic/SmelteryDrainLogic.java index b4a80bde..199e8558 100644 --- a/tinker/tconstruct/logic/SmelteryDrainLogic.java +++ b/mods/tinker/tconstruct/logic/SmelteryDrainLogic.java @@ -1,5 +1,6 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; +import mods.tinker.common.IFacingLogic; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; @@ -10,7 +11,6 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidStack; -import tinker.common.IFacingLogic; public class SmelteryDrainLogic extends MultiServantLogic implements ITankContainer, IFacingLogic diff --git a/tinker/tconstruct/logic/SmelteryLogic.java b/mods/tinker/tconstruct/logic/SmelteryLogic.java similarity index 97% rename from tinker/tconstruct/logic/SmelteryLogic.java rename to mods/tinker/tconstruct/logic/SmelteryLogic.java index f92ed306..db6d3830 100644 --- a/tinker/tconstruct/logic/SmelteryLogic.java +++ b/mods/tinker/tconstruct/logic/SmelteryLogic.java @@ -1,7 +1,14 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; import java.util.ArrayList; +import mods.tinker.common.CoordTuple; +import mods.tinker.common.IActiveLogic; +import mods.tinker.common.IFacingLogic; +import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.container.SmelteryContainer; +import mods.tinker.tconstruct.crafting.Smeltery; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -17,13 +24,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.LiquidStack; -import tinker.common.CoordTuple; -import tinker.common.IActiveLogic; -import tinker.common.IFacingLogic; -import tinker.common.InventoryLogic; -import tinker.tconstruct.TContent; -import tinker.tconstruct.container.SmelteryContainer; -import tinker.tconstruct.crafting.Smeltery; /* Simple class for storing items in the block */ @@ -96,7 +96,7 @@ public class SmelteryLogic extends InventoryLogic /* Misc */ @Override - public String getInvName () + public String getDefaultName () { return "crafters.Smeltery"; } diff --git a/tinker/tconstruct/logic/ToolStationLogic.java b/mods/tinker/tconstruct/logic/ToolStationLogic.java similarity index 79% rename from tinker/tconstruct/logic/ToolStationLogic.java rename to mods/tinker/tconstruct/logic/ToolStationLogic.java index 04c14b87..df3d6e5d 100644 --- a/tinker/tconstruct/logic/ToolStationLogic.java +++ b/mods/tinker/tconstruct/logic/ToolStationLogic.java @@ -1,18 +1,13 @@ -package tinker.tconstruct.logic; +package mods.tinker.tconstruct.logic; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; +import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.container.ToolStationContainer; +import mods.tinker.tconstruct.crafting.ToolBuilder; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet132TileEntityData; import net.minecraft.world.World; -import tinker.common.InventoryLogic; -import tinker.tconstruct.container.ToolStationContainer; -import tinker.tconstruct.crafting.ToolBuilder; /* Simple class for storing items in the block */ @@ -35,7 +30,7 @@ public class ToolStationLogic extends InventoryLogic } @Override - public String getInvName () + public String getDefaultName () { return "toolstation.crafting"; } diff --git a/tinker/tconstruct/modifiers/ModBlaze.java b/mods/tinker/tconstruct/modifiers/ModBlaze.java similarity index 96% rename from tinker/tconstruct/modifiers/ModBlaze.java rename to mods/tinker/tconstruct/modifiers/ModBlaze.java index 6dd83b9e..823654bd 100644 --- a/tinker/tconstruct/modifiers/ModBlaze.java +++ b/mods/tinker/tconstruct/modifiers/ModBlaze.java @@ -1,6 +1,6 @@ -package tinker.tconstruct.modifiers; +package mods.tinker.tconstruct.modifiers; -import tinker.common.ToolMod; +import mods.tinker.common.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tinker/tconstruct/modifiers/ModBoolean.java b/mods/tinker/tconstruct/modifiers/ModBoolean.java similarity index 93% rename from tinker/tconstruct/modifiers/ModBoolean.java rename to mods/tinker/tconstruct/modifiers/ModBoolean.java index 9817702e..a02286cf 100644 --- a/tinker/tconstruct/modifiers/ModBoolean.java +++ b/mods/tinker/tconstruct/modifiers/ModBoolean.java @@ -1,6 +1,6 @@ -package tinker.tconstruct.modifiers; +package mods.tinker.tconstruct.modifiers; -import tinker.common.ToolMod; +import mods.tinker.common.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tinker/tconstruct/modifiers/ModDurability.java b/mods/tinker/tconstruct/modifiers/ModDurability.java similarity index 95% rename from tinker/tconstruct/modifiers/ModDurability.java rename to mods/tinker/tconstruct/modifiers/ModDurability.java index c53cab24..2ba72759 100644 --- a/tinker/tconstruct/modifiers/ModDurability.java +++ b/mods/tinker/tconstruct/modifiers/ModDurability.java @@ -1,6 +1,6 @@ -package tinker.tconstruct.modifiers; +package mods.tinker.tconstruct.modifiers; -import tinker.common.ToolMod; +import mods.tinker.common.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tinker/tconstruct/modifiers/ModElectric.java b/mods/tinker/tconstruct/modifiers/ModElectric.java similarity index 95% rename from tinker/tconstruct/modifiers/ModElectric.java rename to mods/tinker/tconstruct/modifiers/ModElectric.java index 96f3bb8e..899ae4f3 100644 --- a/tinker/tconstruct/modifiers/ModElectric.java +++ b/mods/tinker/tconstruct/modifiers/ModElectric.java @@ -1,6 +1,6 @@ -package tinker.tconstruct.modifiers; +package mods.tinker.tconstruct.modifiers; -import java.util.*; +import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tinker/tconstruct/modifiers/ModInteger.java b/mods/tinker/tconstruct/modifiers/ModInteger.java similarity index 94% rename from tinker/tconstruct/modifiers/ModInteger.java rename to mods/tinker/tconstruct/modifiers/ModInteger.java index 3a2b8f1b..6b6c4562 100644 --- a/tinker/tconstruct/modifiers/ModInteger.java +++ b/mods/tinker/tconstruct/modifiers/ModInteger.java @@ -1,6 +1,6 @@ -package tinker.tconstruct.modifiers; +package mods.tinker.tconstruct.modifiers; -import tinker.common.ToolMod; +import mods.tinker.common.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tinker/tconstruct/modifiers/ModLapisBase.java b/mods/tinker/tconstruct/modifiers/ModLapisBase.java similarity index 89% rename from tinker/tconstruct/modifiers/ModLapisBase.java rename to mods/tinker/tconstruct/modifiers/ModLapisBase.java index 9a19d69d..4bd89c7a 100644 --- a/tinker/tconstruct/modifiers/ModLapisBase.java +++ b/mods/tinker/tconstruct/modifiers/ModLapisBase.java @@ -1,7 +1,6 @@ -package tinker.tconstruct.modifiers; +package mods.tinker.tconstruct.modifiers; -import tinker.common.ToolMod; -import net.minecraft.enchantment.Enchantment; +import mods.tinker.common.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tinker/tconstruct/modifiers/ModLapisIncrease.java b/mods/tinker/tconstruct/modifiers/ModLapisIncrease.java similarity index 96% rename from tinker/tconstruct/modifiers/ModLapisIncrease.java rename to mods/tinker/tconstruct/modifiers/ModLapisIncrease.java index f27ec047..ade8867b 100644 --- a/tinker/tconstruct/modifiers/ModLapisIncrease.java +++ b/mods/tinker/tconstruct/modifiers/ModLapisIncrease.java @@ -1,15 +1,15 @@ -package tinker.tconstruct.modifiers; +package mods.tinker.tconstruct.modifiers; import java.util.Iterator; import java.util.Map; +import mods.tinker.common.ToolMod; +import mods.tinker.tconstruct.tools.Weapon; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import tinker.common.ToolMod; -import tinker.tconstruct.tools.Weapon; public class ModLapisIncrease extends ToolMod { diff --git a/tinker/tconstruct/modifiers/ModRedstone.java b/mods/tinker/tconstruct/modifiers/ModRedstone.java similarity index 96% rename from tinker/tconstruct/modifiers/ModRedstone.java rename to mods/tinker/tconstruct/modifiers/ModRedstone.java index 765a2107..991b5356 100644 --- a/tinker/tconstruct/modifiers/ModRedstone.java +++ b/mods/tinker/tconstruct/modifiers/ModRedstone.java @@ -1,6 +1,6 @@ -package tinker.tconstruct.modifiers; +package mods.tinker.tconstruct.modifiers; -import tinker.common.ToolMod; +import mods.tinker.common.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tinker/tconstruct/modifiers/ModRepair.java b/mods/tinker/tconstruct/modifiers/ModRepair.java similarity index 91% rename from tinker/tconstruct/modifiers/ModRepair.java rename to mods/tinker/tconstruct/modifiers/ModRepair.java index 338b725a..4508198e 100644 --- a/tinker/tconstruct/modifiers/ModRepair.java +++ b/mods/tinker/tconstruct/modifiers/ModRepair.java @@ -1,8 +1,7 @@ -package tinker.tconstruct.modifiers; +package mods.tinker.tconstruct.modifiers; -import tinker.common.ToolMod; -import tinker.tconstruct.crafting.PatternBuilder; -import net.minecraft.enchantment.Enchantment; +import mods.tinker.common.ToolMod; +import mods.tinker.tconstruct.crafting.PatternBuilder; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/tinker/tconstruct/player/TPlayerHandler.java b/mods/tinker/tconstruct/player/TPlayerHandler.java similarity index 94% rename from tinker/tconstruct/player/TPlayerHandler.java rename to mods/tinker/tconstruct/player/TPlayerHandler.java index c9137868..3f67b918 100644 --- a/tinker/tconstruct/player/TPlayerHandler.java +++ b/mods/tinker/tconstruct/player/TPlayerHandler.java @@ -1,18 +1,17 @@ -package tinker.tconstruct.player; +package mods.tinker.tconstruct.player; import java.util.HashMap; +import mods.tinker.tconstruct.AbilityHelper; +import mods.tinker.tconstruct.PHConstruct; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.client.TProxyClient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.player.PlayerDropsEvent; -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.PHConstruct; -import tinker.tconstruct.TContent; -import tinker.tconstruct.client.TProxyClient; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IPlayerTracker; import cpw.mods.fml.relauncher.Side; diff --git a/tinker/tconstruct/player/TPlayerStats.java b/mods/tinker/tconstruct/player/TPlayerStats.java similarity index 86% rename from tinker/tconstruct/player/TPlayerStats.java rename to mods/tinker/tconstruct/player/TPlayerStats.java index 7e2c1120..9a7bb250 100644 --- a/tinker/tconstruct/player/TPlayerStats.java +++ b/mods/tinker/tconstruct/player/TPlayerStats.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.player; +package mods.tinker.tconstruct.player; import net.minecraft.entity.player.EntityPlayer; diff --git a/tinker/tconstruct/tools/Axe.java b/mods/tinker/tconstruct/tools/Axe.java similarity index 65% rename from tinker/tconstruct/tools/Axe.java rename to mods/tinker/tconstruct/tools/Axe.java index 32fb95f0..9f45884c 100644 --- a/tinker/tconstruct/tools/Axe.java +++ b/mods/tinker/tconstruct/tools/Axe.java @@ -1,22 +1,22 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.TContent; +import mods.tinker.tconstruct.AbilityHelper; +import mods.tinker.tconstruct.TContent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLiving; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class Axe extends HarvestTool { public Axe(int itemID, String tex) { super(itemID, 3, tex); - this.setItemName("InfiTool.Axe"); + this.setUnlocalizedName("InfiTool.Axe"); } @Override @@ -64,28 +64,49 @@ public class Axe extends HarvestTool @SideOnly(Side.CLIENT) @Override public int getRenderPasses (int metadata) + { + return 5; + } + + @Override + public int getPartAmount() { return 2; } - protected String getRenderString (int renderPass, boolean broken) + @Override + public void registerPartPaths (int index, String[] location) { - switch (renderPass) + headStrings.put(index, location[0]); + brokenHeadStrings.put(index, location[1]); + handleStrings.put(index, location[2]); + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) { case 0: - return "_axe_handle.png"; + return "_axe_head"; case 1: - if (broken) - return "_axe_head_broken.png"; - else - return "_axe_head.png"; + return "_axe_head_broken"; + case 2: + return "_axe_handle"; default: return ""; } } - protected String getEffectString (int renderPass) + @Override + public String getEffectSuffix () { - return "_axe_effect.png"; + return "_axe_effect"; + } + + @Override + public String getDefaultFolder () + { + return "axe"; } } diff --git a/tinker/tconstruct/tools/BattleSign.java b/mods/tinker/tconstruct/tools/BattleSign.java similarity index 76% rename from tinker/tconstruct/tools/BattleSign.java rename to mods/tinker/tconstruct/tools/BattleSign.java index 1020844b..e7b210e5 100644 --- a/tinker/tconstruct/tools/BattleSign.java +++ b/mods/tinker/tconstruct/tools/BattleSign.java @@ -1,26 +1,16 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.TContent; +import mods.tinker.tconstruct.TContent; +import net.minecraft.item.Item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; public class BattleSign extends Weapon { public BattleSign(int itemID, String tex) { super(itemID, 1, tex); - this.setItemName("InfiTool.Battlesign"); + this.setUnlocalizedName("InfiTool.Battlesign"); } /*public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) @@ -120,28 +110,49 @@ public class BattleSign extends Weapon @SideOnly(Side.CLIENT) @Override public int getRenderPasses (int metadata) + { + return 5; + } + + @Override + public int getPartAmount() { return 2; } - protected String getRenderString (int renderPass, boolean broken) + @Override + public void registerPartPaths (int index, String[] location) { - switch (renderPass) + headStrings.put(index, location[0]); + brokenHeadStrings.put(index, location[1]); + handleStrings.put(index, location[2]); + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) { case 0: - return "_battlesign_handle.png"; + return "_battlesign_head"; case 1: - if (broken) - return "_battlesign_head_broken.png"; - else - return "_battlesign_head.png"; + return "_battlesign_head_broken"; + case 2: + return "_battlesign_handle"; default: return ""; } } - protected String getEffectString (int renderPass) + @Override + public String getEffectSuffix () { - return "_battlesign_effect.png"; + return "_battlesign_effect"; + } + + @Override + public String getDefaultFolder () + { + return "battlesign"; } } diff --git a/mods/tinker/tconstruct/tools/Broadsword.java b/mods/tinker/tconstruct/tools/Broadsword.java new file mode 100644 index 00000000..5d827b8d --- /dev/null +++ b/mods/tinker/tconstruct/tools/Broadsword.java @@ -0,0 +1,60 @@ +package mods.tinker.tconstruct.tools; + +import mods.tinker.tconstruct.TContent; +import net.minecraft.item.Item; + +public class Broadsword extends Weapon +{ + public Broadsword(int itemID, String tex) + { + super(itemID, 4, tex); + this.setUnlocalizedName("InfiTool.Broadsword"); + } + + @Override + protected Item getHeadItem () + { + return TContent.swordBlade; + } + + @Override + protected Item getAccessoryItem () + { + return TContent.largeGuard; + } + + public float getDurabilityModifier () + { + return 1.2f; + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) + { + case 0: + return "_sword_blade"; + case 1: + return "_sword_blade_broken"; + case 2: + return "_sword_handle"; + case 3: + return "_sword_accessory"; + default: + return ""; + } + } + + @Override + public String getEffectSuffix () + { + return "_sword_effect"; + } + + @Override + public String getDefaultFolder () + { + return "broadsword"; + } +} diff --git a/tinker/tconstruct/tools/DualHarvestTool.java b/mods/tinker/tconstruct/tools/DualHarvestTool.java similarity index 96% rename from tinker/tconstruct/tools/DualHarvestTool.java rename to mods/tinker/tconstruct/tools/DualHarvestTool.java index 24ba14a7..51b313f7 100644 --- a/tinker/tconstruct/tools/DualHarvestTool.java +++ b/mods/tinker/tconstruct/tools/DualHarvestTool.java @@ -1,6 +1,5 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import tinker.tconstruct.ToolMaterial; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; @@ -45,7 +44,7 @@ public abstract class DualHarvestTool extends HarvestTool if (result != null) { //System.out.println("Woo~"); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, bID, x, y, z, player); if (!world.isRemote) @@ -65,7 +64,7 @@ public abstract class DualHarvestTool extends HarvestTool { if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, bID, x, y, z, player); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); if (!world.isRemote) world.playAuxSFX(2001, x, y, z, bID + (meta << 12)); return true; diff --git a/tinker/tconstruct/tools/FryingPan.java b/mods/tinker/tconstruct/tools/FryingPan.java similarity index 75% rename from tinker/tconstruct/tools/FryingPan.java rename to mods/tinker/tconstruct/tools/FryingPan.java index 96665c0a..3294fd8c 100644 --- a/tinker/tconstruct/tools/FryingPan.java +++ b/mods/tinker/tconstruct/tools/FryingPan.java @@ -1,7 +1,8 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import mods.tinker.tconstruct.AbilityHelper; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.logic.EquipLogic; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -9,16 +10,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.TContent; -import tinker.tconstruct.logic.EquipLogic; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FryingPan extends Weapon { public FryingPan(int itemID, String tex) { super(itemID, 2, tex); - this.setItemName("InfiTool.FryingPan"); + this.setUnlocalizedName("InfiTool.FryingPan"); } @Override @@ -83,7 +83,7 @@ public class FryingPan extends Weapon } else { - world.setBlockAndMetadataWithNotify(x, y, z, TContent.heldItemBlock.blockID, 0); + world.setBlockAndMetadataWithNotify(x, y, z, TContent.heldItemBlock.blockID, 0, 3); EquipLogic logic = (EquipLogic) world.getBlockTileEntity(x, y, z); logic.setEquipmentItem(stack); @@ -109,28 +109,49 @@ public class FryingPan extends Weapon @SideOnly(Side.CLIENT) @Override public int getRenderPasses (int metadata) + { + return 5; + } + + @Override + public int getPartAmount() { return 2; } - protected String getRenderString (int renderPass, boolean broken) + @Override + public void registerPartPaths (int index, String[] location) { - switch (renderPass) + headStrings.put(index, location[0]); + brokenHeadStrings.put(index, location[1]); + handleStrings.put(index, location[2]); + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) { case 0: - return "_frypan_handle.png"; + return "_frypan_head"; case 1: - if (broken) - return "_frypan_head_broken.png"; - else - return "_frypan_head.png"; + return "_frypan_head_broken"; + case 2: + return "_frypan_handle"; default: return ""; } } - protected String getEffectString (int renderPass) + @Override + public String getEffectSuffix () { - return "_frypan_effect.png"; + return "_frypan_effect"; + } + + @Override + public String getDefaultFolder () + { + return "frypan"; } } diff --git a/tinker/tconstruct/tools/Hammer.java b/mods/tinker/tconstruct/tools/Hammer.java similarity index 80% rename from tinker/tconstruct/tools/Hammer.java rename to mods/tinker/tconstruct/tools/Hammer.java index f8a63ee6..7fab4e19 100644 --- a/tinker/tconstruct/tools/Hammer.java +++ b/mods/tinker/tconstruct/tools/Hammer.java @@ -1,7 +1,8 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; import java.util.ArrayList; +import mods.tinker.tconstruct.AbilityHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLiving; @@ -9,14 +10,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tinker.tconstruct.AbilityHelper; public class Hammer extends HarvestTool { public Hammer(int itemID, String tex) { super(itemID, 1, tex); - this.setItemName("InfiTool.Hammer"); + this.setUnlocalizedName("InfiTool.Hammer"); setupCoords(); } @@ -68,11 +68,11 @@ public class Hammer extends HarvestTool if (block != null) { if (block.blockID == Block.stone.blockID) - world.setBlockWithNotify(xPos, yPos, zPos, Block.cobblestone.blockID); + world.func_94575_c(xPos, yPos, zPos, Block.cobblestone.blockID); else if (block.blockMaterial == Material.rock) { int meta = world.getBlockMetadata(xPos, yPos, zPos); - world.setBlockWithNotify(xPos, yPos, zPos, 0); + world.func_94571_i(x, y, z); Block.blocksList[bID].harvestBlock(world, (EntityPlayer)player, xPos, yPos, zPos, meta); if (!player.capabilities.isCreativeMode) onBlockDestroyed(itemstack, world, bID, xPos, yPos, zPos, player); @@ -96,26 +96,33 @@ public class Hammer extends HarvestTool return null; } - protected String getRenderString (int renderPass, boolean broken) + @Override + public String getIconSuffix (int partType) { - switch (renderPass) + switch (partType) { case 0: - return "_hammer_handle.png"; + return "_hammer_head"; case 1: - if (broken) - return "_hammer_head_broken.png"; - else - return "_hammer_head.png"; + return "_hammer_head_broken"; case 2: - return "_hammer_accessory.png"; + return "_hammer_handle"; + case 3: + return "_hammer_accessory"; default: return ""; } } - protected String getEffectString (int renderPass) + @Override + public String getEffectSuffix () { - return "_hammer_effect.png"; + return "_hammer_effect"; + } + + @Override + public String getDefaultFolder () + { + return "hammer"; } } diff --git a/tinker/tconstruct/tools/HarvestTool.java b/mods/tinker/tconstruct/tools/HarvestTool.java similarity index 96% rename from tinker/tconstruct/tools/HarvestTool.java rename to mods/tinker/tconstruct/tools/HarvestTool.java index 43cb9edc..6fbc710b 100644 --- a/tinker/tconstruct/tools/HarvestTool.java +++ b/mods/tinker/tconstruct/tools/HarvestTool.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -38,7 +38,7 @@ public abstract class HarvestTool extends ToolCore if (result != null) { //System.out.println("Woo~"); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, bID, x, y, z, player); if (!world.isRemote) @@ -56,7 +56,7 @@ public abstract class HarvestTool extends ToolCore } else { - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, bID, x, y, z, player); if (!world.isRemote) diff --git a/tinker/tconstruct/tools/Longsword.java b/mods/tinker/tconstruct/tools/Longsword.java similarity index 66% rename from tinker/tconstruct/tools/Longsword.java rename to mods/tinker/tconstruct/tools/Longsword.java index db2339ba..ec2ba789 100644 --- a/tinker/tconstruct/tools/Longsword.java +++ b/mods/tinker/tconstruct/tools/Longsword.java @@ -1,23 +1,14 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.TContent; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; +import mods.tinker.tconstruct.TContent; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; public class Longsword extends Weapon { public Longsword(int itemID, String tex) { super(itemID, 4, tex); - this.setItemName("InfiTool.Longsword"); + this.setUnlocalizedName("InfiTool.Longsword"); } /*public EnumAction getItemUseAction(ItemStack par1ItemStack) @@ -74,26 +65,33 @@ public class Longsword extends Weapon return true; }*/ - protected String getRenderString (int renderPass, boolean broken) + @Override + public String getIconSuffix (int partType) { - switch (renderPass) + switch (partType) { case 0: - return "_longsword_handle.png"; + return "_longsword_blade"; case 1: - if (broken) - return "_longsword_blade_broken.png"; - else - return "_longsword_blade.png"; + return "_longsword_blade_broken"; case 2: - return "_longsword_accessory.png"; + return "_longsword_handle"; + case 3: + return "_longsword_accessory"; default: return ""; } } - protected String getEffectString (int renderPass) + @Override + public String getEffectSuffix () { - return "_longsword_effect.png"; + return "_longsword_effect"; + } + + @Override + public String getDefaultFolder () + { + return "longsword"; } } diff --git a/tinker/tconstruct/tools/LumberAxe.java b/mods/tinker/tconstruct/tools/LumberAxe.java similarity index 87% rename from tinker/tconstruct/tools/LumberAxe.java rename to mods/tinker/tconstruct/tools/LumberAxe.java index 87822b08..ceb9a4b3 100644 --- a/tinker/tconstruct/tools/LumberAxe.java +++ b/mods/tinker/tconstruct/tools/LumberAxe.java @@ -1,8 +1,9 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import java.util.ArrayList; import java.util.List; +import mods.tinker.tconstruct.AbilityHelper; +import mods.tinker.tconstruct.TContent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -12,15 +13,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.TContent; public class LumberAxe extends HarvestTool { public LumberAxe(int itemID, String tex) { super(itemID, 3, tex); - this.setItemName("InfiTool.LumberAxe"); + this.setUnlocalizedName("InfiTool.LumberAxe"); } @Override @@ -130,7 +129,7 @@ public class LumberAxe extends HarvestTool if (!(tags.getBoolean("Broken"))) if (world.getBlockId(xPos, yPos, zPos) == bID && world.getBlockMetadata(xPos, yPos, zPos) % 4 == meta % 4) { - world.setBlockWithNotify(xPos, yPos, zPos, 0); + world.func_94571_i(x, y, z); Block.blocksList[bID].harvestBlock(world, player, xPos, yPos, zPos, meta); if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, bID, xPos, yPos, zPos, player); @@ -156,7 +155,7 @@ public class LumberAxe extends HarvestTool if (block != null && block.blockMaterial == Material.wood) { int meta = world.getBlockMetadata(xPos, yPos, zPos); - world.setBlockWithNotify(xPos, yPos, zPos, 0); + world.func_94571_i(x, y, z); Block.blocksList[blockID].harvestBlock(world, player, xPos, yPos, zPos, meta); if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, blockID, xPos, yPos, zPos, player); @@ -179,26 +178,33 @@ public class LumberAxe extends HarvestTool return null; } - protected String getRenderString (int renderPass, boolean broken) + @Override + public String getIconSuffix (int partType) { - switch (renderPass) + switch (partType) { case 0: - return "_lumberaxe_handle.png"; + return "_lumberaxe_head"; case 1: - if (broken) - return "_lumberaxe_head_broken.png"; - else - return "_lumberaxe_head.png"; + return "_lumberaxe_head_broken"; case 2: - return "_lumberaxe_accessory.png"; + return "_lumberaxe_handle"; + case 3: + return "_lumberaxe_accessory"; default: return ""; } } - protected String getEffectString (int renderPass) + @Override + public String getEffectSuffix () { - return "_lumber_effect.png"; + return "_lumber_effect"; + } + + @Override + public String getDefaultFolder () + { + return "lumberaxe"; } } diff --git a/tinker/tconstruct/tools/Mattock.java b/mods/tinker/tconstruct/tools/Mattock.java similarity index 68% rename from tinker/tconstruct/tools/Mattock.java rename to mods/tinker/tconstruct/tools/Mattock.java index 55ca4fb8..d28768ca 100644 --- a/tinker/tconstruct/tools/Mattock.java +++ b/mods/tinker/tconstruct/tools/Mattock.java @@ -1,23 +1,19 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.TContent; -import net.minecraft.block.Block; +import mods.tinker.tconstruct.AbilityHelper; +import mods.tinker.tconstruct.TContent; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.Event.Result; -import net.minecraftforge.event.entity.player.UseHoeEvent; public class Mattock extends DualHarvestTool { public Mattock(int itemID, String tex) { super(itemID, 3, tex); - this.setItemName("InfiTool.Mattock"); + this.setUnlocalizedName("InfiTool.Mattock"); } @Override @@ -72,26 +68,33 @@ public class Mattock extends DualHarvestTool return TContent.shovelHead; } - protected String getRenderString (int renderPass, boolean broken) + @Override + public String getIconSuffix (int partType) { - switch (renderPass) + switch (partType) { case 0: - return "_mattock_handle.png"; + return "_mattock_head"; case 1: - if (broken) - return "_mattock_head_broken.png"; - else - return "_mattock_head.png"; + return "_mattock_head_broken"; case 2: - return "_mattock_back.png"; + return "_mattock_handle"; + case 3: + return "_mattock_back"; default: return ""; } } - protected String getEffectString (int renderPass) + @Override + public String getEffectSuffix () { - return "_mattock_effect.png"; + return "_mattock_effect"; + } + + @Override + public String getDefaultFolder () + { + return "mattock"; } } \ No newline at end of file diff --git a/tinker/tconstruct/tools/Pickaxe.java b/mods/tinker/tconstruct/tools/Pickaxe.java similarity index 62% rename from tinker/tconstruct/tools/Pickaxe.java rename to mods/tinker/tconstruct/tools/Pickaxe.java index 9d7634de..07de6ec7 100644 --- a/tinker/tconstruct/tools/Pickaxe.java +++ b/mods/tinker/tconstruct/tools/Pickaxe.java @@ -1,7 +1,6 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import tinker.tconstruct.TContent; -import net.minecraft.block.Block; +import mods.tinker.tconstruct.TContent; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -10,7 +9,7 @@ public class Pickaxe extends HarvestTool public Pickaxe(int itemID, String tex) { super(itemID, 1, tex); - this.setItemName("InfiTool.Pickaxe"); + this.setUnlocalizedName("InfiTool.Pickaxe"); } @Override @@ -45,26 +44,33 @@ public class Pickaxe extends HarvestTool return TContent.binding; } - protected String getRenderString (int renderPass, boolean broken) + @Override + public String getIconSuffix (int partType) { - switch (renderPass) + switch (partType) { case 0: - return "_pickaxe_handle.png"; + return "_pickaxe_head"; case 1: - if (broken) - return "_pickaxe_head_broken.png"; - else - return "_pickaxe_head.png"; + return "_pickaxe_head_broken"; case 2: - return "_pickaxe_accessory.png"; + return "_pickaxe_handle"; + case 3: + return "_pickaxe_accessory"; default: return ""; } } - protected String getEffectString (int renderPass) + @Override + public String getEffectSuffix () { - return "_pickaxe_effect.png"; + return "_pickaxe_effect"; + } + + @Override + public String getDefaultFolder () + { + return "pickaxe"; } } diff --git a/tinker/tconstruct/tools/RangedWeapon.java b/mods/tinker/tconstruct/tools/RangedWeapon.java similarity index 98% rename from tinker/tconstruct/tools/RangedWeapon.java rename to mods/tinker/tconstruct/tools/RangedWeapon.java index 18a46cb5..2486bccf 100644 --- a/tinker/tconstruct/tools/RangedWeapon.java +++ b/mods/tinker/tconstruct/tools/RangedWeapon.java @@ -1,8 +1,6 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import tinker.tconstruct.TContent; +import mods.tinker.tconstruct.TContent; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; @@ -15,6 +13,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public abstract class RangedWeapon extends ToolCore { @@ -174,7 +174,7 @@ public abstract class RangedWeapon extends ToolCore /* Rendering */ @SideOnly(Side.CLIENT) - @Override + //@Override public int getIconIndex (ItemStack stack, int pass) { if (!stack.hasTagCompound()) @@ -232,7 +232,7 @@ public abstract class RangedWeapon extends ToolCore return 255; //Keep 255 blank } /* Animations */ - @Override + //@Override public int getIconIndex(ItemStack stack, int pass, EntityPlayer player, ItemStack usingItem, int useRemaining) { /* diff --git a/mods/tinker/tconstruct/tools/Rapier.java b/mods/tinker/tconstruct/tools/Rapier.java new file mode 100644 index 00000000..a0b9571e --- /dev/null +++ b/mods/tinker/tconstruct/tools/Rapier.java @@ -0,0 +1,97 @@ +package mods.tinker.tconstruct.tools; + +import mods.tinker.tconstruct.AbilityHelper; +import mods.tinker.tconstruct.TContent; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class Rapier extends Weapon +{ + public Rapier(int itemID, String tex) + { + super(itemID, 2, tex); + this.setUnlocalizedName("InfiTool.Rapier"); + } + + public EnumAction getItemUseAction (ItemStack par1ItemStack) + { + return EnumAction.none; + } + + public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) + { + return stack; + } + + @Override + public boolean hitEntity (ItemStack stack, EntityLiving mob, EntityLiving player) + { + //AbilityHelper.hitEntity(stack, mob, player, damageVsEntity); + AbilityHelper.knockbackEntity(mob, 0.8f); + mob.motionY *= 0.5; + if (mob.hurtResistantTime > 16) + mob.hurtResistantTime -= 6; + return true; + } + + public float getDurabilityModifier () + { + return 0.7f; + } + + public float chargeAttack () + { + return 2f; + } + + public boolean pierceArmor () + { + return true; + } + + @Override + protected Item getHeadItem () + { + return TContent.swordBlade; + } + + @Override + protected Item getAccessoryItem () + { + return TContent.crossbar; + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) + { + case 0: + return "_rapier_blade"; + case 1: + return "_rapier_blade_broken"; + case 2: + return "_rapier_handle"; + case 3: + return "_rapier_accessory"; + default: + return ""; + } + } + + @Override + public String getEffectSuffix () + { + return "_rapier_effect"; + } + + @Override + public String getDefaultFolder () + { + return "rapier"; + } +} diff --git a/mods/tinker/tconstruct/tools/Shovel.java b/mods/tinker/tconstruct/tools/Shovel.java new file mode 100644 index 00000000..9c0608de --- /dev/null +++ b/mods/tinker/tconstruct/tools/Shovel.java @@ -0,0 +1,140 @@ +package mods.tinker.tconstruct.tools; + +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.client.TProxyClient; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class Shovel extends HarvestTool +{ + public Shovel(int itemID, String tex) + { + super(itemID, 2, tex); + this.setUnlocalizedName("InfiTool.Shovel"); + } + + @Override + public int getHeadType () + { + return 1; + } + + @Override + protected Material[] getEffectiveMaterials() + { + return materials; + } + + @Override + protected String getHarvestType() + { + return "shovel"; + } + + static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; + + @Override + protected Item getHeadItem () + { + return TContent.shovelHead; + } + + @Override + protected Item getAccessoryItem () + { + return null; + } + + @SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 5; + } + + @Override + public int getPartAmount() + { + return 2; + } + + @Override + public void registerPartPaths (int index, String[] location) + { + headStrings.put(index, location[0]); + brokenHeadStrings.put(index, location[1]); + handleStrings.put(index, location[2]); + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) + { + case 0: + return "_shovel_head"; + case 1: + return "_shovel_head_broken"; + case 2: + return "_shovel_handle"; + default: + return ""; + } + } + + @Override + public String getEffectSuffix () + { + return "_shovel_effect"; + } + + @Override + public String getDefaultFolder () + { + return "shovel"; + } + + /*@Override + public Icon getIcon (ItemStack stack, int renderPass) + { + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + + if (renderPass == 0) // Handle + { + return (handleIcons.get(tags.getInteger("RenderHandle"))); + } + + if (renderPass == 1) // Head + { + if (tags.getBoolean("Broken")) + return (brokenHeadIcons.get(tags.getInteger("RenderHead"))); + else + return (headIcons.get(tags.getInteger("RenderHead"))); + } + + if (renderPass == 2) + { + if (tags.hasKey("Effect1")) + return (effectIcons.get(tags.getInteger("Effect1"))); + } + + if (renderPass == 3) + { + if (tags.hasKey("Effect2")) + return (effectIcons.get(tags.getInteger("Effect2"))); + } + + if (renderPass == 4) + { + if (tags.hasKey("Effect3")) + return (effectIcons.get(tags.getInteger("Effect3"))); + } + + return TProxyClient.blankSprite; + }*/ +} diff --git a/tinker/tconstruct/tools/ToolCore.java b/mods/tinker/tconstruct/tools/ToolCore.java similarity index 75% rename from tinker/tconstruct/tools/ToolCore.java rename to mods/tinker/tconstruct/tools/ToolCore.java index 685a7dd6..fd8e2294 100644 --- a/tinker/tconstruct/tools/ToolCore.java +++ b/mods/tinker/tconstruct/tools/ToolCore.java @@ -1,13 +1,23 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; import ic2.api.IBoxable; import ic2.api.ICustomElectricItem; import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Random; +import mods.tinker.common.ToolMod; +import mods.tinker.tconstruct.AbilityHelper; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.TConstructRegistry; +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.client.TProxyClient; +import mods.tinker.tconstruct.crafting.ToolBuilder; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -17,13 +27,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Icon; import net.minecraft.world.World; -import tinker.common.ToolMod; -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.TContent; -import tinker.tconstruct.TConstructRegistry; -import tinker.tconstruct.crafting.ToolBuilder; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -52,8 +57,7 @@ import cpw.mods.fml.relauncher.SideOnly; * @see ToolMod */ -public abstract class ToolCore extends Item - implements ICustomElectricItem, IBoxable +public abstract class ToolCore extends Item implements ICustomElectricItem, IBoxable { Random random = new Random(); String toolTexture; @@ -64,11 +68,11 @@ public abstract class ToolCore extends Item super(id); this.maxStackSize = 1; this.setMaxDamage(100); - this.setItemName("InfiTool"); + this.setUnlocalizedName("InfiTool"); this.setCreativeTab(TConstruct.toolTab); toolTexture = texture; damageVsEntity = baseDamage; - TConstructRegistry.addToolMapping(this);//tools.add(this); + TConstructRegistry.addToolMapping(this); } /** Determines what type of heads the tool has. @@ -87,35 +91,165 @@ public abstract class ToolCore extends Item /* Rendering */ - public HashMap partTextures = new HashMap(); - public HashMap effectTextures = new HashMap(); + //public HashMap partTextures = new HashMap(); + //public HashMap effectTextures = new HashMap(); + public HashMap headIcons = new HashMap(); + public HashMap brokenHeadIcons = new HashMap(); + public HashMap handleIcons = new HashMap(); + public HashMap accessoryIcons = new HashMap(); + public HashMap effectIcons = new HashMap(); + + //Not liking this + public HashMap headStrings = new HashMap(); + public HashMap brokenHeadStrings = new HashMap(); + public HashMap handleStrings = new HashMap(); + public HashMap accessoryStrings = new HashMap(); + public HashMap effectStrings = new HashMap(); @SideOnly(Side.CLIENT) @Override - public boolean requiresMultipleRenderPasses () //Redundant + public boolean requiresMultipleRenderPasses () { return true; } - @Override - public String getTextureFile () //Repurposed for default texture locations - { - return TContent.craftingTexture; - } - - public String getToolTextureFile () - { - return toolTexture; - } - @SideOnly(Side.CLIENT) @Override public int getRenderPasses (int metadata) + { + return 6; + } + + //Override me please! + public int getPartAmount () { return 3; } - @SideOnly(Side.CLIENT) + public abstract String getIconSuffix (int partType); + + public abstract String getEffectSuffix (); + + public abstract String getDefaultFolder (); + + public void registerPartPaths (int index, String[] location) + { + headStrings.put(index, location[0]); + brokenHeadStrings.put(index, location[1]); + handleStrings.put(index, location[2]); + accessoryStrings.put(index, location[3]); + } + + public void registerEffectPath (int index, String location) + { + effectStrings.put(index, location); + } + + @Override + public void func_94581_a (IconRegister iconRegister) + { + headIcons.clear(); + brokenHeadIcons.clear(); + handleIcons.clear(); + accessoryIcons.clear(); + effectIcons.clear(); + Iterator iter = headStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + headIcons.put((Integer) pairs.getKey(), iconRegister.func_94245_a((String) pairs.getValue())); + } + + iter = brokenHeadStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + brokenHeadIcons.put((Integer) pairs.getKey(), iconRegister.func_94245_a((String) pairs.getValue())); + } + + iter = handleStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + handleIcons.put((Integer) pairs.getKey(), iconRegister.func_94245_a((String) pairs.getValue())); + } + + if (getPartAmount() > 2) + { + iter = accessoryStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + accessoryIcons.put((Integer) pairs.getKey(), iconRegister.func_94245_a((String) pairs.getValue())); + } + } + + iter = effectStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + effectIcons.put((Integer) pairs.getKey(), iconRegister.func_94245_a((String) pairs.getValue())); + } + + /*System.out.println(this.getClass().getSimpleName() + " Test"); + System.out.println("Head size: " + headStrings.size() + " " + headIcons.size()); + System.out.println("Broken head size: " + brokenHeadStrings.size() + " " + brokenHeadIcons.size()); + System.out.println("Handle size: " + handleStrings.size() + " " + handleIcons.size()); + System.out.println("Accessory size: " + accessoryStrings.size() + " " + accessoryIcons.size()); + System.out.println("Effect size: " + effectStrings.size() + " " + effectIcons.size());*/ + } + + @Override + public Icon getIcon (ItemStack stack, int renderPass) + { + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + + if (renderPass < getPartAmount()) + { + if (renderPass == 0) // Handle + { + return (handleIcons.get(tags.getInteger("RenderHandle"))); + } + + else if (renderPass == 1) // Head + { + if (tags.getBoolean("Broken")) + return (brokenHeadIcons.get(tags.getInteger("RenderHead"))); + else + return (headIcons.get(tags.getInteger("RenderHead"))); + } + + else if (renderPass == 2) // Accessory + { + return (handleIcons.get(tags.getInteger("RenderAccessory"))); + } + } + + else + { + if (renderPass == getPartAmount()) + { + if (tags.hasKey("Effect1")) + return (effectIcons.get(tags.getInteger("Effect1"))); + } + + else if (renderPass == getPartAmount() + 1) + { + if (tags.hasKey("Effect2")) + return (effectIcons.get(tags.getInteger("Effect2"))); + } + + else if (renderPass == getPartAmount() + 2) + { + if (tags.hasKey("Effect3")) + return (effectIcons.get(tags.getInteger("Effect3"))); + } + } + + return TProxyClient.blankSprite; + } + + /*@SideOnly(Side.CLIENT) public String getIconLocation (ItemStack stack, int renderPass) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); @@ -168,10 +302,7 @@ public abstract class ToolCore extends Item } return TContent.blankSprite; - } - - protected abstract String getRenderString(int renderPass, boolean broken); - protected abstract String getEffectString(int renderPass); + }*/ /* Tags and information about the tool */ @Override @@ -339,8 +470,7 @@ public abstract class ToolCore extends Item return ""; } - static String[] toolMaterialNames = { "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Nethrrack ", "Slime ", "Paper ", - "Cobalt ", "Ardite ", "Manyullyn ", "Copper ", "Bronze ", "Alumite ", "Steel " }; + static String[] toolMaterialNames = { "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Nethrrack ", "Slime ", "Paper ", "Cobalt ", "Ardite ", "Manyullyn ", "Copper ", "Bronze ", "Alumite ", "Steel " }; /* Creative mode tools */ public void getSubItems (int id, CreativeTabs tab, List list) @@ -396,7 +526,7 @@ public abstract class ToolCore extends Item if (result != null) { //System.out.println("Woo~"); - world.setBlockWithNotify(x, y, z, 0); + world.func_94571_i(x, y, z); if (!player.capabilities.isCreativeMode) onBlockDestroyed(stack, world, bID, x, y, z, player); if (!world.isRemote) diff --git a/tinker/tconstruct/tools/Weapon.java b/mods/tinker/tconstruct/tools/Weapon.java similarity index 92% rename from tinker/tconstruct/tools/Weapon.java rename to mods/tinker/tconstruct/tools/Weapon.java index 1fc95ffe..621247ae 100644 --- a/tinker/tconstruct/tools/Weapon.java +++ b/mods/tinker/tconstruct/tools/Weapon.java @@ -1,14 +1,11 @@ -package tinker.tconstruct.tools; +package mods.tinker.tconstruct.tools; -import tinker.tconstruct.ToolMaterial; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; public abstract class Weapon extends ToolCore { diff --git a/tinker/tconstruct/util/SortedList.java b/mods/tinker/tconstruct/util/SortedList.java similarity index 77% rename from tinker/tconstruct/util/SortedList.java rename to mods/tinker/tconstruct/util/SortedList.java index ef0f373d..2257bf4b 100644 --- a/tinker/tconstruct/util/SortedList.java +++ b/mods/tinker/tconstruct/util/SortedList.java @@ -1,11 +1,7 @@ -package tinker.tconstruct.util; +package mods.tinker.tconstruct.util; import java.util.ArrayList; -import java.util.Collection; import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; /* Sorted List implementation * Written by RebelKeithy diff --git a/tinker/tconstruct/worldgen/NetherOreGenerator.java b/mods/tinker/tconstruct/worldgen/NetherOreGenerator.java similarity index 97% rename from tinker/tconstruct/worldgen/NetherOreGenerator.java rename to mods/tinker/tconstruct/worldgen/NetherOreGenerator.java index 613d0f30..d2d08ae1 100644 --- a/tinker/tconstruct/worldgen/NetherOreGenerator.java +++ b/mods/tinker/tconstruct/worldgen/NetherOreGenerator.java @@ -1,4 +1,4 @@ -package tinker.tconstruct.worldgen; +package mods.tinker.tconstruct.worldgen; import java.util.Random; @@ -72,7 +72,7 @@ public class NetherOreGenerator extends WorldGenerator int genID = par1World.getBlockId(var38, var41, var44); if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && genID == Block.netherrack.blockID) { - par1World.setBlockAndMetadata(var38, var41, var44, this.minableBlockId, minableBlockMeta); + par1World.setBlockAndMetadataWithNotify(var38, var41, var44, this.minableBlockId, minableBlockMeta, 2); } } } diff --git a/tinker/tconstruct/worldgen/TBaseWorldGenerator.java b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java similarity index 96% rename from tinker/tconstruct/worldgen/TBaseWorldGenerator.java rename to mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java index b9a46ff8..0d3880f9 100644 --- a/tinker/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java @@ -1,13 +1,12 @@ -package tinker.tconstruct.worldgen; +package mods.tinker.tconstruct.worldgen; import java.util.Random; -import net.minecraft.block.Block; +import mods.tinker.tconstruct.PHConstruct; +import mods.tinker.tconstruct.TContent; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; -import tinker.tconstruct.PHConstruct; -import tinker.tconstruct.TContent; import cpw.mods.fml.common.IWorldGenerator; public class TBaseWorldGenerator diff --git a/resources/tinkertextures/blocks/castingtable_bottom.png b/mods/tinker/textures/blocks/castingtable_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/castingtable_bottom.png rename to mods/tinker/textures/blocks/castingtable_bottom.png diff --git a/resources/tinkertextures/blocks/castingtable_side.png b/mods/tinker/textures/blocks/castingtable_side.png similarity index 100% rename from resources/tinkertextures/blocks/castingtable_side.png rename to mods/tinker/textures/blocks/castingtable_side.png diff --git a/resources/tinkertextures/blocks/castingtable_top.png b/mods/tinker/textures/blocks/castingtable_top.png similarity index 100% rename from resources/tinkertextures/blocks/castingtable_top.png rename to mods/tinker/textures/blocks/castingtable_top.png diff --git a/resources/tinkertextures/blocks/compressed_alubrass.png b/mods/tinker/textures/blocks/compressed_alubrass.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_alubrass.png rename to mods/tinker/textures/blocks/compressed_alubrass.png diff --git a/resources/tinkertextures/blocks/compressed_aluminum.png b/mods/tinker/textures/blocks/compressed_aluminum.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_aluminum.png rename to mods/tinker/textures/blocks/compressed_aluminum.png diff --git a/resources/tinkertextures/blocks/compressed_alumite.png b/mods/tinker/textures/blocks/compressed_alumite.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_alumite.png rename to mods/tinker/textures/blocks/compressed_alumite.png diff --git a/resources/tinkertextures/blocks/compressed_ardite.png b/mods/tinker/textures/blocks/compressed_ardite.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_ardite.png rename to mods/tinker/textures/blocks/compressed_ardite.png diff --git a/resources/tinkertextures/blocks/compressed_bronze.png b/mods/tinker/textures/blocks/compressed_bronze.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_bronze.png rename to mods/tinker/textures/blocks/compressed_bronze.png diff --git a/resources/tinkertextures/blocks/compressed_cobalt.png b/mods/tinker/textures/blocks/compressed_cobalt.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_cobalt.png rename to mods/tinker/textures/blocks/compressed_cobalt.png diff --git a/resources/tinkertextures/blocks/compressed_copper.png b/mods/tinker/textures/blocks/compressed_copper.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_copper.png rename to mods/tinker/textures/blocks/compressed_copper.png diff --git a/resources/tinkertextures/blocks/compressed_manyullyn.png b/mods/tinker/textures/blocks/compressed_manyullyn.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_manyullyn.png rename to mods/tinker/textures/blocks/compressed_manyullyn.png diff --git a/resources/tinkertextures/blocks/compressed_steel.png b/mods/tinker/textures/blocks/compressed_steel.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_steel.png rename to mods/tinker/textures/blocks/compressed_steel.png diff --git a/resources/tinkertextures/blocks/compressed_tin.png b/mods/tinker/textures/blocks/compressed_tin.png similarity index 100% rename from resources/tinkertextures/blocks/compressed_tin.png rename to mods/tinker/textures/blocks/compressed_tin.png diff --git a/resources/tinkertextures/blocks/drain_basin.png b/mods/tinker/textures/blocks/drain_basin.png similarity index 100% rename from resources/tinkertextures/blocks/drain_basin.png rename to mods/tinker/textures/blocks/drain_basin.png diff --git a/resources/tinkertextures/blocks/drain_out.png b/mods/tinker/textures/blocks/drain_out.png similarity index 100% rename from resources/tinkertextures/blocks/drain_out.png rename to mods/tinker/textures/blocks/drain_out.png diff --git a/resources/tinkertextures/blocks/drain_side.png b/mods/tinker/textures/blocks/drain_side.png similarity index 100% rename from resources/tinkertextures/blocks/drain_side.png rename to mods/tinker/textures/blocks/drain_side.png diff --git a/resources/tinkertextures/blocks/faucet.png b/mods/tinker/textures/blocks/faucet.png similarity index 100% rename from resources/tinkertextures/blocks/faucet.png rename to mods/tinker/textures/blocks/faucet.png diff --git a/resources/tinkertextures/blocks/grout.png b/mods/tinker/textures/blocks/grout.png similarity index 100% rename from resources/tinkertextures/blocks/grout.png rename to mods/tinker/textures/blocks/grout.png diff --git a/resources/tinkertextures/blocks/lavatank_side.png b/mods/tinker/textures/blocks/lavatank_side.png similarity index 100% rename from resources/tinkertextures/blocks/lavatank_side.png rename to mods/tinker/textures/blocks/lavatank_side.png diff --git a/resources/tinkertextures/blocks/lavatank_top.png b/mods/tinker/textures/blocks/lavatank_top.png similarity index 100% rename from resources/tinkertextures/blocks/lavatank_top.png rename to mods/tinker/textures/blocks/lavatank_top.png diff --git a/resources/tinkertextures/blocks/nether_ardite.png b/mods/tinker/textures/blocks/nether_ardite.png similarity index 100% rename from resources/tinkertextures/blocks/nether_ardite.png rename to mods/tinker/textures/blocks/nether_ardite.png diff --git a/resources/tinkertextures/blocks/nether_cobalt.png b/mods/tinker/textures/blocks/nether_cobalt.png similarity index 100% rename from resources/tinkertextures/blocks/nether_cobalt.png rename to mods/tinker/textures/blocks/nether_cobalt.png diff --git a/resources/tinkertextures/blocks/nether_slag.png b/mods/tinker/textures/blocks/nether_slag.png similarity index 100% rename from resources/tinkertextures/blocks/nether_slag.png rename to mods/tinker/textures/blocks/nether_slag.png diff --git a/resources/tinkertextures/blocks/ore_aluminum.png b/mods/tinker/textures/blocks/ore_aluminum.png similarity index 100% rename from resources/tinkertextures/blocks/ore_aluminum.png rename to mods/tinker/textures/blocks/ore_aluminum.png diff --git a/resources/tinkertextures/blocks/ore_copper.png b/mods/tinker/textures/blocks/ore_copper.png similarity index 100% rename from resources/tinkertextures/blocks/ore_copper.png rename to mods/tinker/textures/blocks/ore_copper.png diff --git a/resources/tinkertextures/blocks/ore_slag.png b/mods/tinker/textures/blocks/ore_slag.png similarity index 100% rename from resources/tinkertextures/blocks/ore_slag.png rename to mods/tinker/textures/blocks/ore_slag.png diff --git a/resources/tinkertextures/blocks/ore_tin.png b/mods/tinker/textures/blocks/ore_tin.png similarity index 100% rename from resources/tinkertextures/blocks/ore_tin.png rename to mods/tinker/textures/blocks/ore_tin.png diff --git a/resources/tinkertextures/blocks/partbuilder_birch_bottom.png b/mods/tinker/textures/blocks/partbuilder_birch_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_birch_bottom.png rename to mods/tinker/textures/blocks/partbuilder_birch_bottom.png diff --git a/resources/tinkertextures/blocks/partbuilder_birch_side.png b/mods/tinker/textures/blocks/partbuilder_birch_side.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_birch_side.png rename to mods/tinker/textures/blocks/partbuilder_birch_side.png diff --git a/resources/tinkertextures/blocks/partbuilder_birch_top.png b/mods/tinker/textures/blocks/partbuilder_birch_top.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_birch_top.png rename to mods/tinker/textures/blocks/partbuilder_birch_top.png diff --git a/resources/tinkertextures/blocks/partbuilder_jungle_bottom.png b/mods/tinker/textures/blocks/partbuilder_jungle_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_jungle_bottom.png rename to mods/tinker/textures/blocks/partbuilder_jungle_bottom.png diff --git a/resources/tinkertextures/blocks/partbuilder_jungle_side.png b/mods/tinker/textures/blocks/partbuilder_jungle_side.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_jungle_side.png rename to mods/tinker/textures/blocks/partbuilder_jungle_side.png diff --git a/resources/tinkertextures/blocks/partbuilder_jungle_top.png b/mods/tinker/textures/blocks/partbuilder_jungle_top.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_jungle_top.png rename to mods/tinker/textures/blocks/partbuilder_jungle_top.png diff --git a/resources/tinkertextures/blocks/partbuilder_oak_bottom.png b/mods/tinker/textures/blocks/partbuilder_oak_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_oak_bottom.png rename to mods/tinker/textures/blocks/partbuilder_oak_bottom.png diff --git a/resources/tinkertextures/blocks/partbuilder_oak_side.png b/mods/tinker/textures/blocks/partbuilder_oak_side.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_oak_side.png rename to mods/tinker/textures/blocks/partbuilder_oak_side.png diff --git a/resources/tinkertextures/blocks/partbuilder_oak_top.png b/mods/tinker/textures/blocks/partbuilder_oak_top.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_oak_top.png rename to mods/tinker/textures/blocks/partbuilder_oak_top.png diff --git a/resources/tinkertextures/blocks/partbuilder_spruce_bottom.png b/mods/tinker/textures/blocks/partbuilder_spruce_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_spruce_bottom.png rename to mods/tinker/textures/blocks/partbuilder_spruce_bottom.png diff --git a/resources/tinkertextures/blocks/partbuilder_spruce_side.png b/mods/tinker/textures/blocks/partbuilder_spruce_side.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_spruce_side.png rename to mods/tinker/textures/blocks/partbuilder_spruce_side.png diff --git a/resources/tinkertextures/blocks/partbuilder_spruce_top.png b/mods/tinker/textures/blocks/partbuilder_spruce_top.png similarity index 100% rename from resources/tinkertextures/blocks/partbuilder_spruce_top.png rename to mods/tinker/textures/blocks/partbuilder_spruce_top.png diff --git a/resources/tinkertextures/blocks/patternchest_bottom.png b/mods/tinker/textures/blocks/patternchest_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/patternchest_bottom.png rename to mods/tinker/textures/blocks/patternchest_bottom.png diff --git a/resources/tinkertextures/blocks/patternchest_side.png b/mods/tinker/textures/blocks/patternchest_side.png similarity index 100% rename from resources/tinkertextures/blocks/patternchest_side.png rename to mods/tinker/textures/blocks/patternchest_side.png diff --git a/resources/tinkertextures/blocks/patternchest_top.png b/mods/tinker/textures/blocks/patternchest_top.png similarity index 100% rename from resources/tinkertextures/blocks/patternchest_top.png rename to mods/tinker/textures/blocks/patternchest_top.png diff --git a/resources/tinkertextures/blocks/searedbrick.png b/mods/tinker/textures/blocks/searedbrick.png similarity index 100% rename from resources/tinkertextures/blocks/searedbrick.png rename to mods/tinker/textures/blocks/searedbrick.png diff --git a/resources/tinkertextures/blocks/searedgague_bottom.png b/mods/tinker/textures/blocks/searedgague_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/searedgague_bottom.png rename to mods/tinker/textures/blocks/searedgague_bottom.png diff --git a/resources/tinkertextures/blocks/searedgague_side.png b/mods/tinker/textures/blocks/searedgague_side.png similarity index 100% rename from resources/tinkertextures/blocks/searedgague_side.png rename to mods/tinker/textures/blocks/searedgague_side.png diff --git a/resources/tinkertextures/blocks/searedgague_top.png b/mods/tinker/textures/blocks/searedgague_top.png similarity index 100% rename from resources/tinkertextures/blocks/searedgague_top.png rename to mods/tinker/textures/blocks/searedgague_top.png diff --git a/resources/tinkertextures/blocks/searedwindow_bottom.png b/mods/tinker/textures/blocks/searedwindow_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/searedwindow_bottom.png rename to mods/tinker/textures/blocks/searedwindow_bottom.png diff --git a/resources/tinkertextures/blocks/searedwindow_side.png b/mods/tinker/textures/blocks/searedwindow_side.png similarity index 100% rename from resources/tinkertextures/blocks/searedwindow_side.png rename to mods/tinker/textures/blocks/searedwindow_side.png diff --git a/resources/tinkertextures/blocks/searedwindow_top.png b/mods/tinker/textures/blocks/searedwindow_top.png similarity index 100% rename from resources/tinkertextures/blocks/searedwindow_top.png rename to mods/tinker/textures/blocks/searedwindow_top.png diff --git a/resources/tinkertextures/blocks/slimesand.png b/mods/tinker/textures/blocks/slimesand.png similarity index 100% rename from resources/tinkertextures/blocks/slimesand.png rename to mods/tinker/textures/blocks/slimesand.png diff --git a/resources/tinkertextures/blocks/smeltery_active.png b/mods/tinker/textures/blocks/smeltery_active.png similarity index 100% rename from resources/tinkertextures/blocks/smeltery_active.png rename to mods/tinker/textures/blocks/smeltery_active.png diff --git a/resources/tinkertextures/blocks/smeltery_inactive.png b/mods/tinker/textures/blocks/smeltery_inactive.png similarity index 100% rename from resources/tinkertextures/blocks/smeltery_inactive.png rename to mods/tinker/textures/blocks/smeltery_inactive.png diff --git a/resources/tinkertextures/blocks/smeltery_side.png b/mods/tinker/textures/blocks/smeltery_side.png similarity index 100% rename from resources/tinkertextures/blocks/smeltery_side.png rename to mods/tinker/textures/blocks/smeltery_side.png diff --git a/resources/tinkertextures/blocks/stenciltable_birch_bottom.png b/mods/tinker/textures/blocks/stenciltable_birch_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_birch_bottom.png rename to mods/tinker/textures/blocks/stenciltable_birch_bottom.png diff --git a/resources/tinkertextures/blocks/stenciltable_birch_side.png b/mods/tinker/textures/blocks/stenciltable_birch_side.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_birch_side.png rename to mods/tinker/textures/blocks/stenciltable_birch_side.png diff --git a/resources/tinkertextures/blocks/stenciltable_jungle_top.png b/mods/tinker/textures/blocks/stenciltable_birch_top.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_jungle_top.png rename to mods/tinker/textures/blocks/stenciltable_birch_top.png diff --git a/resources/tinkertextures/blocks/stenciltable_jungle_bottom.png b/mods/tinker/textures/blocks/stenciltable_jungle_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_jungle_bottom.png rename to mods/tinker/textures/blocks/stenciltable_jungle_bottom.png diff --git a/resources/tinkertextures/blocks/stenciltable_jungle_side.png b/mods/tinker/textures/blocks/stenciltable_jungle_side.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_jungle_side.png rename to mods/tinker/textures/blocks/stenciltable_jungle_side.png diff --git a/resources/tinkertextures/blocks/stenciltable_oak_top.png b/mods/tinker/textures/blocks/stenciltable_jungle_top.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_oak_top.png rename to mods/tinker/textures/blocks/stenciltable_jungle_top.png diff --git a/resources/tinkertextures/blocks/stenciltable_oak_bottom.png b/mods/tinker/textures/blocks/stenciltable_oak_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_oak_bottom.png rename to mods/tinker/textures/blocks/stenciltable_oak_bottom.png diff --git a/resources/tinkertextures/blocks/stenciltable_oak_side.png b/mods/tinker/textures/blocks/stenciltable_oak_side.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_oak_side.png rename to mods/tinker/textures/blocks/stenciltable_oak_side.png diff --git a/resources/tinkertextures/blocks/stenciltable_spruce_top.png b/mods/tinker/textures/blocks/stenciltable_oak_top.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_spruce_top.png rename to mods/tinker/textures/blocks/stenciltable_oak_top.png diff --git a/resources/tinkertextures/blocks/stenciltable_spruce_bottom.png b/mods/tinker/textures/blocks/stenciltable_spruce_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_spruce_bottom.png rename to mods/tinker/textures/blocks/stenciltable_spruce_bottom.png diff --git a/resources/tinkertextures/blocks/stenciltable_spruce_side.png b/mods/tinker/textures/blocks/stenciltable_spruce_side.png similarity index 100% rename from resources/tinkertextures/blocks/stenciltable_spruce_side.png rename to mods/tinker/textures/blocks/stenciltable_spruce_side.png diff --git a/mods/tinker/textures/blocks/stenciltable_spruce_top.png b/mods/tinker/textures/blocks/stenciltable_spruce_top.png new file mode 100644 index 00000000..9003c077 Binary files /dev/null and b/mods/tinker/textures/blocks/stenciltable_spruce_top.png differ diff --git a/resources/tinkertextures/blocks/toolstation_bottom.png b/mods/tinker/textures/blocks/toolstation_bottom.png similarity index 100% rename from resources/tinkertextures/blocks/toolstation_bottom.png rename to mods/tinker/textures/blocks/toolstation_bottom.png diff --git a/resources/tinkertextures/blocks/toolstation_side.png b/mods/tinker/textures/blocks/toolstation_side.png similarity index 100% rename from resources/tinkertextures/blocks/toolstation_side.png rename to mods/tinker/textures/blocks/toolstation_side.png diff --git a/resources/tinkertextures/blocks/toolstation_top.png b/mods/tinker/textures/blocks/toolstation_top.png similarity index 100% rename from resources/tinkertextures/blocks/toolstation_top.png rename to mods/tinker/textures/blocks/toolstation_top.png diff --git a/resources/tinkertextures/tools/axe/alumite_axe_handle.png b/mods/tinker/textures/items/axe/alumite_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/alumite_axe_handle.png rename to mods/tinker/textures/items/axe/alumite_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/alumite_axe_head.png b/mods/tinker/textures/items/axe/alumite_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/alumite_axe_head.png rename to mods/tinker/textures/items/axe/alumite_axe_head.png diff --git a/resources/tinkertextures/tools/axe/alumite_axe_head_broken.png b/mods/tinker/textures/items/axe/alumite_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/alumite_axe_head_broken.png rename to mods/tinker/textures/items/axe/alumite_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/ardite_axe_handle.png b/mods/tinker/textures/items/axe/ardite_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/ardite_axe_handle.png rename to mods/tinker/textures/items/axe/ardite_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/ardite_axe_head.png b/mods/tinker/textures/items/axe/ardite_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/ardite_axe_head.png rename to mods/tinker/textures/items/axe/ardite_axe_head.png diff --git a/resources/tinkertextures/tools/axe/ardite_axe_head_broken.png b/mods/tinker/textures/items/axe/ardite_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/ardite_axe_head_broken.png rename to mods/tinker/textures/items/axe/ardite_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/blaze_axe_effect.png b/mods/tinker/textures/items/axe/blaze_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/blaze_axe_effect.png rename to mods/tinker/textures/items/axe/blaze_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/bone_axe_handle.png b/mods/tinker/textures/items/axe/bone_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/bone_axe_handle.png rename to mods/tinker/textures/items/axe/bone_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/bone_axe_head.png b/mods/tinker/textures/items/axe/bone_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/bone_axe_head.png rename to mods/tinker/textures/items/axe/bone_axe_head.png diff --git a/resources/tinkertextures/tools/axe/bone_axe_head_broken.png b/mods/tinker/textures/items/axe/bone_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/bone_axe_head_broken.png rename to mods/tinker/textures/items/axe/bone_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/bronze_axe_handle.png b/mods/tinker/textures/items/axe/bronze_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/bronze_axe_handle.png rename to mods/tinker/textures/items/axe/bronze_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/bronze_axe_head.png b/mods/tinker/textures/items/axe/bronze_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/bronze_axe_head.png rename to mods/tinker/textures/items/axe/bronze_axe_head.png diff --git a/resources/tinkertextures/tools/axe/bronze_axe_head_broken.png b/mods/tinker/textures/items/axe/bronze_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/bronze_axe_head_broken.png rename to mods/tinker/textures/items/axe/bronze_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/cactus_axe_handle.png b/mods/tinker/textures/items/axe/cactus_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/cactus_axe_handle.png rename to mods/tinker/textures/items/axe/cactus_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/cactus_axe_head.png b/mods/tinker/textures/items/axe/cactus_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/cactus_axe_head.png rename to mods/tinker/textures/items/axe/cactus_axe_head.png diff --git a/resources/tinkertextures/tools/axe/cactus_axe_head_broken.png b/mods/tinker/textures/items/axe/cactus_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/cactus_axe_head_broken.png rename to mods/tinker/textures/items/axe/cactus_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/cobalt_axe_handle.png b/mods/tinker/textures/items/axe/cobalt_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/cobalt_axe_handle.png rename to mods/tinker/textures/items/axe/cobalt_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/cobalt_axe_head.png b/mods/tinker/textures/items/axe/cobalt_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/cobalt_axe_head.png rename to mods/tinker/textures/items/axe/cobalt_axe_head.png diff --git a/resources/tinkertextures/tools/axe/cobalt_axe_head_broken.png b/mods/tinker/textures/items/axe/cobalt_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/cobalt_axe_head_broken.png rename to mods/tinker/textures/items/axe/cobalt_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/copper_axe_handle.png b/mods/tinker/textures/items/axe/copper_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/copper_axe_handle.png rename to mods/tinker/textures/items/axe/copper_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/copper_axe_head.png b/mods/tinker/textures/items/axe/copper_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/copper_axe_head.png rename to mods/tinker/textures/items/axe/copper_axe_head.png diff --git a/resources/tinkertextures/tools/axe/copper_axe_head_broken.png b/mods/tinker/textures/items/axe/copper_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/copper_axe_head_broken.png rename to mods/tinker/textures/items/axe/copper_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/diamond_axe_effect.png b/mods/tinker/textures/items/axe/diamond_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/diamond_axe_effect.png rename to mods/tinker/textures/items/axe/diamond_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/electric_axe_effect.png b/mods/tinker/textures/items/axe/electric_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/electric_axe_effect.png rename to mods/tinker/textures/items/axe/electric_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/emerald_axe_effect.png b/mods/tinker/textures/items/axe/emerald_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/emerald_axe_effect.png rename to mods/tinker/textures/items/axe/emerald_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/flint_axe_handle.png b/mods/tinker/textures/items/axe/flint_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/flint_axe_handle.png rename to mods/tinker/textures/items/axe/flint_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/flint_axe_head.png b/mods/tinker/textures/items/axe/flint_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/flint_axe_head.png rename to mods/tinker/textures/items/axe/flint_axe_head.png diff --git a/resources/tinkertextures/tools/axe/flint_axe_head_broken.png b/mods/tinker/textures/items/axe/flint_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/flint_axe_head_broken.png rename to mods/tinker/textures/items/axe/flint_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/glowstone_axe_effect.png b/mods/tinker/textures/items/axe/glowstone_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/glowstone_axe_effect.png rename to mods/tinker/textures/items/axe/glowstone_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/ice_axe_effect.png b/mods/tinker/textures/items/axe/ice_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/ice_axe_effect.png rename to mods/tinker/textures/items/axe/ice_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/iron_axe_handle.png b/mods/tinker/textures/items/axe/iron_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/iron_axe_handle.png rename to mods/tinker/textures/items/axe/iron_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/iron_axe_head.png b/mods/tinker/textures/items/axe/iron_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/iron_axe_head.png rename to mods/tinker/textures/items/axe/iron_axe_head.png diff --git a/resources/tinkertextures/tools/axe/iron_axe_head_broken.png b/mods/tinker/textures/items/axe/iron_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/iron_axe_head_broken.png rename to mods/tinker/textures/items/axe/iron_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/lapis_axe_effect.png b/mods/tinker/textures/items/axe/lapis_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/lapis_axe_effect.png rename to mods/tinker/textures/items/axe/lapis_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/lava_axe_effect.png b/mods/tinker/textures/items/axe/lava_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/lava_axe_effect.png rename to mods/tinker/textures/items/axe/lava_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/manyullyn_axe_handle.png b/mods/tinker/textures/items/axe/manyullyn_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/manyullyn_axe_handle.png rename to mods/tinker/textures/items/axe/manyullyn_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/manyullyn_axe_head.png b/mods/tinker/textures/items/axe/manyullyn_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/manyullyn_axe_head.png rename to mods/tinker/textures/items/axe/manyullyn_axe_head.png diff --git a/resources/tinkertextures/tools/axe/manyullyn_axe_head_broken.png b/mods/tinker/textures/items/axe/manyullyn_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/manyullyn_axe_head_broken.png rename to mods/tinker/textures/items/axe/manyullyn_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/moss_axe_effect.png b/mods/tinker/textures/items/axe/moss_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/moss_axe_effect.png rename to mods/tinker/textures/items/axe/moss_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/necrotic_axe_effect.png b/mods/tinker/textures/items/axe/necrotic_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/necrotic_axe_effect.png rename to mods/tinker/textures/items/axe/necrotic_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/netherrack_axe_handle.png b/mods/tinker/textures/items/axe/netherrack_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/netherrack_axe_handle.png rename to mods/tinker/textures/items/axe/netherrack_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/netherrack_axe_head.png b/mods/tinker/textures/items/axe/netherrack_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/netherrack_axe_head.png rename to mods/tinker/textures/items/axe/netherrack_axe_head.png diff --git a/resources/tinkertextures/tools/axe/netherrack_axe_head_broken.png b/mods/tinker/textures/items/axe/netherrack_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/netherrack_axe_head_broken.png rename to mods/tinker/textures/items/axe/netherrack_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/obsidian_axe_handle.png b/mods/tinker/textures/items/axe/obsidian_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/obsidian_axe_handle.png rename to mods/tinker/textures/items/axe/obsidian_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/obsidian_axe_head.png b/mods/tinker/textures/items/axe/obsidian_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/obsidian_axe_head.png rename to mods/tinker/textures/items/axe/obsidian_axe_head.png diff --git a/resources/tinkertextures/tools/axe/obsidian_axe_head_broken.png b/mods/tinker/textures/items/axe/obsidian_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/obsidian_axe_head_broken.png rename to mods/tinker/textures/items/axe/obsidian_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/paper_axe_handle.png b/mods/tinker/textures/items/axe/paper_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/paper_axe_handle.png rename to mods/tinker/textures/items/axe/paper_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/paper_axe_head.png b/mods/tinker/textures/items/axe/paper_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/paper_axe_head.png rename to mods/tinker/textures/items/axe/paper_axe_head.png diff --git a/resources/tinkertextures/tools/axe/paper_axe_head_broken.png b/mods/tinker/textures/items/axe/paper_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/paper_axe_head_broken.png rename to mods/tinker/textures/items/axe/paper_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/redstone_axe_effect.png b/mods/tinker/textures/items/axe/redstone_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axe/redstone_axe_effect.png rename to mods/tinker/textures/items/axe/redstone_axe_effect.png diff --git a/resources/tinkertextures/tools/axe/slime_axe_handle.png b/mods/tinker/textures/items/axe/slime_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/slime_axe_handle.png rename to mods/tinker/textures/items/axe/slime_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/slime_axe_head.png b/mods/tinker/textures/items/axe/slime_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/slime_axe_head.png rename to mods/tinker/textures/items/axe/slime_axe_head.png diff --git a/resources/tinkertextures/tools/axe/slime_axe_head_broken.png b/mods/tinker/textures/items/axe/slime_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/slime_axe_head_broken.png rename to mods/tinker/textures/items/axe/slime_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/steel_axe_handle.png b/mods/tinker/textures/items/axe/steel_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/steel_axe_handle.png rename to mods/tinker/textures/items/axe/steel_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/steel_axe_head.png b/mods/tinker/textures/items/axe/steel_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/steel_axe_head.png rename to mods/tinker/textures/items/axe/steel_axe_head.png diff --git a/resources/tinkertextures/tools/axe/steel_axe_head_broken.png b/mods/tinker/textures/items/axe/steel_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/steel_axe_head_broken.png rename to mods/tinker/textures/items/axe/steel_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/stone_axe_handle.png b/mods/tinker/textures/items/axe/stone_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/stone_axe_handle.png rename to mods/tinker/textures/items/axe/stone_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/stone_axe_head.png b/mods/tinker/textures/items/axe/stone_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/stone_axe_head.png rename to mods/tinker/textures/items/axe/stone_axe_head.png diff --git a/resources/tinkertextures/tools/axe/stone_axe_head_broken.png b/mods/tinker/textures/items/axe/stone_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/stone_axe_head_broken.png rename to mods/tinker/textures/items/axe/stone_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/thaumium_axe_handle.png b/mods/tinker/textures/items/axe/thaumium_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/thaumium_axe_handle.png rename to mods/tinker/textures/items/axe/thaumium_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/thaumium_axe_head.png b/mods/tinker/textures/items/axe/thaumium_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/thaumium_axe_head.png rename to mods/tinker/textures/items/axe/thaumium_axe_head.png diff --git a/resources/tinkertextures/tools/axe/thaumium_axe_head_broken.png b/mods/tinker/textures/items/axe/thaumium_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/thaumium_axe_head_broken.png rename to mods/tinker/textures/items/axe/thaumium_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axe/wood_axe_handle.png b/mods/tinker/textures/items/axe/wood_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axe/wood_axe_handle.png rename to mods/tinker/textures/items/axe/wood_axe_handle.png diff --git a/resources/tinkertextures/tools/axe/wood_axe_head.png b/mods/tinker/textures/items/axe/wood_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axe/wood_axe_head.png rename to mods/tinker/textures/items/axe/wood_axe_head.png diff --git a/resources/tinkertextures/tools/axe/wood_axe_head_broken.png b/mods/tinker/textures/items/axe/wood_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axe/wood_axe_head_broken.png rename to mods/tinker/textures/items/axe/wood_axe_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/alumite_battlesign_handle.png b/mods/tinker/textures/items/battlesign/alumite_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/alumite_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/alumite_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/alumite_battlesign_head.png b/mods/tinker/textures/items/battlesign/alumite_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/alumite_battlesign_head.png rename to mods/tinker/textures/items/battlesign/alumite_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/alumite_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/alumite_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/alumite_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/alumite_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/ardite_battlesign_handle.png b/mods/tinker/textures/items/battlesign/ardite_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/ardite_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/ardite_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/ardite_battlesign_head.png b/mods/tinker/textures/items/battlesign/ardite_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/ardite_battlesign_head.png rename to mods/tinker/textures/items/battlesign/ardite_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/ardite_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/ardite_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/ardite_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/ardite_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/blaze_battlesign_effect.png b/mods/tinker/textures/items/battlesign/blaze_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/blaze_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/blaze_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/bone_battlesign_handle.png b/mods/tinker/textures/items/battlesign/bone_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/bone_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/bone_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/bone_battlesign_head.png b/mods/tinker/textures/items/battlesign/bone_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/bone_battlesign_head.png rename to mods/tinker/textures/items/battlesign/bone_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/bone_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/bone_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/bone_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/bone_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/bronze_battlesign_handle.png b/mods/tinker/textures/items/battlesign/bronze_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/bronze_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/bronze_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/bronze_battlesign_head.png b/mods/tinker/textures/items/battlesign/bronze_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/bronze_battlesign_head.png rename to mods/tinker/textures/items/battlesign/bronze_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/bronze_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/bronze_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/bronze_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/bronze_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/cactus_battlesign_handle.png b/mods/tinker/textures/items/battlesign/cactus_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/cactus_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/cactus_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/cactus_battlesign_head.png b/mods/tinker/textures/items/battlesign/cactus_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/cactus_battlesign_head.png rename to mods/tinker/textures/items/battlesign/cactus_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/cactus_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/cactus_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/cactus_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/cactus_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/cobalt_battlesign_handle.png b/mods/tinker/textures/items/battlesign/cobalt_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/cobalt_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/cobalt_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/cobalt_battlesign_head.png b/mods/tinker/textures/items/battlesign/cobalt_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/cobalt_battlesign_head.png rename to mods/tinker/textures/items/battlesign/cobalt_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/cobalt_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/cobalt_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/cobalt_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/cobalt_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/copper_battlesign_handle.png b/mods/tinker/textures/items/battlesign/copper_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/copper_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/copper_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/copper_battlesign_head.png b/mods/tinker/textures/items/battlesign/copper_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/copper_battlesign_head.png rename to mods/tinker/textures/items/battlesign/copper_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/copper_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/copper_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/copper_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/copper_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/diamond_battlesign_effect.png b/mods/tinker/textures/items/battlesign/diamond_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/diamond_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/diamond_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/electric_battlesign_effect.png b/mods/tinker/textures/items/battlesign/electric_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/electric_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/electric_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/emerald_battlesign_effect.png b/mods/tinker/textures/items/battlesign/emerald_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/emerald_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/emerald_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/flint_battlesign_handle.png b/mods/tinker/textures/items/battlesign/flint_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/flint_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/flint_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/flint_battlesign_head.png b/mods/tinker/textures/items/battlesign/flint_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/flint_battlesign_head.png rename to mods/tinker/textures/items/battlesign/flint_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/flint_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/flint_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/flint_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/flint_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/glowstone_battlesign_effect.png b/mods/tinker/textures/items/battlesign/glowstone_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/glowstone_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/glowstone_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/ice_battlesign_effect.png b/mods/tinker/textures/items/battlesign/ice_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/ice_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/ice_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/iron_battlesign_handle.png b/mods/tinker/textures/items/battlesign/iron_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/iron_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/iron_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/iron_battlesign_head.png b/mods/tinker/textures/items/battlesign/iron_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/iron_battlesign_head.png rename to mods/tinker/textures/items/battlesign/iron_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/iron_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/iron_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/iron_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/iron_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/lapis_battlesign_effect.png b/mods/tinker/textures/items/battlesign/lapis_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/lapis_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/lapis_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/lava_battlesign_effect.png b/mods/tinker/textures/items/battlesign/lava_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/lava_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/lava_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_handle.png b/mods/tinker/textures/items/battlesign/manyullyn_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/manyullyn_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/manyullyn_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head.png b/mods/tinker/textures/items/battlesign/manyullyn_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head.png rename to mods/tinker/textures/items/battlesign/manyullyn_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/manyullyn_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/manyullyn_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/moss_battlesign_effect.png b/mods/tinker/textures/items/battlesign/moss_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/moss_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/moss_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/necrotic_battlesign_effect.png b/mods/tinker/textures/items/battlesign/necrotic_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/necrotic_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/necrotic_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/netherrack_battlesign_handle.png b/mods/tinker/textures/items/battlesign/netherrack_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/netherrack_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/netherrack_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/netherrack_battlesign_head.png b/mods/tinker/textures/items/battlesign/netherrack_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/netherrack_battlesign_head.png rename to mods/tinker/textures/items/battlesign/netherrack_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/netherrack_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/netherrack_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/netherrack_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/netherrack_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/obsidian_battlesign_handle.png b/mods/tinker/textures/items/battlesign/obsidian_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/obsidian_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/obsidian_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/obsidian_battlesign_head.png b/mods/tinker/textures/items/battlesign/obsidian_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/obsidian_battlesign_head.png rename to mods/tinker/textures/items/battlesign/obsidian_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/obsidian_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/obsidian_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/obsidian_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/obsidian_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/paper_battlesign_handle.png b/mods/tinker/textures/items/battlesign/paper_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/paper_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/paper_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/paper_battlesign_head.png b/mods/tinker/textures/items/battlesign/paper_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/paper_battlesign_head.png rename to mods/tinker/textures/items/battlesign/paper_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/paper_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/paper_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/paper_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/paper_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/redstone_battlesign_effect.png b/mods/tinker/textures/items/battlesign/redstone_battlesign_effect.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/redstone_battlesign_effect.png rename to mods/tinker/textures/items/battlesign/redstone_battlesign_effect.png diff --git a/resources/tinkertextures/tools/battlesign/slime_battlesign_handle.png b/mods/tinker/textures/items/battlesign/slime_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/slime_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/slime_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/slime_battlesign_head.png b/mods/tinker/textures/items/battlesign/slime_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/slime_battlesign_head.png rename to mods/tinker/textures/items/battlesign/slime_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/slime_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/slime_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/slime_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/slime_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/steel_battlesign_handle.png b/mods/tinker/textures/items/battlesign/steel_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/steel_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/steel_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/steel_battlesign_head.png b/mods/tinker/textures/items/battlesign/steel_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/steel_battlesign_head.png rename to mods/tinker/textures/items/battlesign/steel_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/steel_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/steel_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/steel_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/steel_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/stone_battlesign_handle.png b/mods/tinker/textures/items/battlesign/stone_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/stone_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/stone_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/stone_battlesign_head.png b/mods/tinker/textures/items/battlesign/stone_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/stone_battlesign_head.png rename to mods/tinker/textures/items/battlesign/stone_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/stone_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/stone_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/stone_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/stone_battlesign_head_broken.png diff --git a/resources/tinkertextures/tools/battlesign/wood_battlesign_handle.png b/mods/tinker/textures/items/battlesign/wood_battlesign_handle.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/wood_battlesign_handle.png rename to mods/tinker/textures/items/battlesign/wood_battlesign_handle.png diff --git a/resources/tinkertextures/tools/battlesign/wood_battlesign_head.png b/mods/tinker/textures/items/battlesign/wood_battlesign_head.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/wood_battlesign_head.png rename to mods/tinker/textures/items/battlesign/wood_battlesign_head.png diff --git a/resources/tinkertextures/tools/battlesign/wood_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/wood_battlesign_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/battlesign/wood_battlesign_head_broken.png rename to mods/tinker/textures/items/battlesign/wood_battlesign_head_broken.png diff --git a/mods/tinker/textures/items/blanksprite.png b/mods/tinker/textures/items/blanksprite.png new file mode 100644 index 00000000..888c7ea3 Binary files /dev/null and b/mods/tinker/textures/items/blanksprite.png differ diff --git a/resources/tinkertextures/tools/broadsword/alumite_sword_accessory.png b/mods/tinker/textures/items/broadsword/alumite_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/alumite_sword_accessory.png rename to mods/tinker/textures/items/broadsword/alumite_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/alumite_sword_blade.png b/mods/tinker/textures/items/broadsword/alumite_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/alumite_sword_blade.png rename to mods/tinker/textures/items/broadsword/alumite_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/alumite_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/alumite_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/alumite_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/alumite_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/alumite_sword_handle.png b/mods/tinker/textures/items/broadsword/alumite_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/alumite_sword_handle.png rename to mods/tinker/textures/items/broadsword/alumite_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/ardite_sword_accessory.png b/mods/tinker/textures/items/broadsword/ardite_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/ardite_sword_accessory.png rename to mods/tinker/textures/items/broadsword/ardite_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/ardite_sword_blade.png b/mods/tinker/textures/items/broadsword/ardite_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/ardite_sword_blade.png rename to mods/tinker/textures/items/broadsword/ardite_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/ardite_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/ardite_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/ardite_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/ardite_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/ardite_sword_handle.png b/mods/tinker/textures/items/broadsword/ardite_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/ardite_sword_handle.png rename to mods/tinker/textures/items/broadsword/ardite_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/blaze_sword_effect.png b/mods/tinker/textures/items/broadsword/blaze_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/blaze_sword_effect.png rename to mods/tinker/textures/items/broadsword/blaze_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/bone_sword_accessory.png b/mods/tinker/textures/items/broadsword/bone_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/bone_sword_accessory.png rename to mods/tinker/textures/items/broadsword/bone_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/bone_sword_blade.png b/mods/tinker/textures/items/broadsword/bone_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/bone_sword_blade.png rename to mods/tinker/textures/items/broadsword/bone_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/bone_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/bone_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/bone_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/bone_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/bone_sword_handle.png b/mods/tinker/textures/items/broadsword/bone_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/bone_sword_handle.png rename to mods/tinker/textures/items/broadsword/bone_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/bronze_sword_accessory.png b/mods/tinker/textures/items/broadsword/bronze_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/bronze_sword_accessory.png rename to mods/tinker/textures/items/broadsword/bronze_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/bronze_sword_blade.png b/mods/tinker/textures/items/broadsword/bronze_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/bronze_sword_blade.png rename to mods/tinker/textures/items/broadsword/bronze_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/bronze_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/bronze_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/bronze_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/bronze_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/bronze_sword_handle.png b/mods/tinker/textures/items/broadsword/bronze_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/bronze_sword_handle.png rename to mods/tinker/textures/items/broadsword/bronze_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/cactus_sword_accessory.png b/mods/tinker/textures/items/broadsword/cactus_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/cactus_sword_accessory.png rename to mods/tinker/textures/items/broadsword/cactus_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/cactus_sword_blade.png b/mods/tinker/textures/items/broadsword/cactus_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/cactus_sword_blade.png rename to mods/tinker/textures/items/broadsword/cactus_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/cactus_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/cactus_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/cactus_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/cactus_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/cactus_sword_handle.png b/mods/tinker/textures/items/broadsword/cactus_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/cactus_sword_handle.png rename to mods/tinker/textures/items/broadsword/cactus_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/cobalt_sword_accessory.png b/mods/tinker/textures/items/broadsword/cobalt_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/cobalt_sword_accessory.png rename to mods/tinker/textures/items/broadsword/cobalt_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/cobalt_sword_blade.png b/mods/tinker/textures/items/broadsword/cobalt_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/cobalt_sword_blade.png rename to mods/tinker/textures/items/broadsword/cobalt_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/cobalt_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/cobalt_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/cobalt_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/cobalt_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/cobalt_sword_handle.png b/mods/tinker/textures/items/broadsword/cobalt_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/cobalt_sword_handle.png rename to mods/tinker/textures/items/broadsword/cobalt_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/copper_sword_accessory.png b/mods/tinker/textures/items/broadsword/copper_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/copper_sword_accessory.png rename to mods/tinker/textures/items/broadsword/copper_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/copper_sword_blade.png b/mods/tinker/textures/items/broadsword/copper_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/copper_sword_blade.png rename to mods/tinker/textures/items/broadsword/copper_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/copper_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/copper_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/copper_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/copper_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/copper_sword_handle.png b/mods/tinker/textures/items/broadsword/copper_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/copper_sword_handle.png rename to mods/tinker/textures/items/broadsword/copper_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/diamond_sword_effect.png b/mods/tinker/textures/items/broadsword/diamond_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/diamond_sword_effect.png rename to mods/tinker/textures/items/broadsword/diamond_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/electric_sword_effect.png b/mods/tinker/textures/items/broadsword/electric_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/electric_sword_effect.png rename to mods/tinker/textures/items/broadsword/electric_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/emerald_sword_effect.png b/mods/tinker/textures/items/broadsword/emerald_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/emerald_sword_effect.png rename to mods/tinker/textures/items/broadsword/emerald_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/flint_sword_accessory.png b/mods/tinker/textures/items/broadsword/flint_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/flint_sword_accessory.png rename to mods/tinker/textures/items/broadsword/flint_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/flint_sword_blade.png b/mods/tinker/textures/items/broadsword/flint_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/flint_sword_blade.png rename to mods/tinker/textures/items/broadsword/flint_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/flint_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/flint_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/flint_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/flint_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/flint_sword_handle.png b/mods/tinker/textures/items/broadsword/flint_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/flint_sword_handle.png rename to mods/tinker/textures/items/broadsword/flint_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/glowstone_sword_effect.png b/mods/tinker/textures/items/broadsword/glowstone_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/glowstone_sword_effect.png rename to mods/tinker/textures/items/broadsword/glowstone_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/ice_sword_effect.png b/mods/tinker/textures/items/broadsword/ice_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/ice_sword_effect.png rename to mods/tinker/textures/items/broadsword/ice_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/iron_sword_accessory.png b/mods/tinker/textures/items/broadsword/iron_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/iron_sword_accessory.png rename to mods/tinker/textures/items/broadsword/iron_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/iron_sword_blade.png b/mods/tinker/textures/items/broadsword/iron_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/iron_sword_blade.png rename to mods/tinker/textures/items/broadsword/iron_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/iron_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/iron_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/iron_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/iron_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/iron_sword_handle.png b/mods/tinker/textures/items/broadsword/iron_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/iron_sword_handle.png rename to mods/tinker/textures/items/broadsword/iron_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/lapis_sword_effect.png b/mods/tinker/textures/items/broadsword/lapis_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/lapis_sword_effect.png rename to mods/tinker/textures/items/broadsword/lapis_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/lava_sword_effect.png b/mods/tinker/textures/items/broadsword/lava_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/lava_sword_effect.png rename to mods/tinker/textures/items/broadsword/lava_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/manyullyn_sword_accessory.png b/mods/tinker/textures/items/broadsword/manyullyn_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/manyullyn_sword_accessory.png rename to mods/tinker/textures/items/broadsword/manyullyn_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/manyullyn_sword_blade.png b/mods/tinker/textures/items/broadsword/manyullyn_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/manyullyn_sword_blade.png rename to mods/tinker/textures/items/broadsword/manyullyn_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/manyullyn_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/manyullyn_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/manyullyn_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/manyullyn_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/manyullyn_sword_handle.png b/mods/tinker/textures/items/broadsword/manyullyn_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/manyullyn_sword_handle.png rename to mods/tinker/textures/items/broadsword/manyullyn_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/moss_sword_effect.png b/mods/tinker/textures/items/broadsword/moss_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/moss_sword_effect.png rename to mods/tinker/textures/items/broadsword/moss_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/necrotic_sword_effect.png b/mods/tinker/textures/items/broadsword/necrotic_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/necrotic_sword_effect.png rename to mods/tinker/textures/items/broadsword/necrotic_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/netherrack_sword_accessory.png b/mods/tinker/textures/items/broadsword/netherrack_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/netherrack_sword_accessory.png rename to mods/tinker/textures/items/broadsword/netherrack_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/netherrack_sword_blade.png b/mods/tinker/textures/items/broadsword/netherrack_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/netherrack_sword_blade.png rename to mods/tinker/textures/items/broadsword/netherrack_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/netherrack_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/netherrack_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/netherrack_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/netherrack_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/netherrack_sword_handle.png b/mods/tinker/textures/items/broadsword/netherrack_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/netherrack_sword_handle.png rename to mods/tinker/textures/items/broadsword/netherrack_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/obsidian_sword_accessory.png b/mods/tinker/textures/items/broadsword/obsidian_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/obsidian_sword_accessory.png rename to mods/tinker/textures/items/broadsword/obsidian_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/obsidian_sword_blade.png b/mods/tinker/textures/items/broadsword/obsidian_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/obsidian_sword_blade.png rename to mods/tinker/textures/items/broadsword/obsidian_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/obsidian_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/obsidian_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/obsidian_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/obsidian_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/obsidian_sword_handle.png b/mods/tinker/textures/items/broadsword/obsidian_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/obsidian_sword_handle.png rename to mods/tinker/textures/items/broadsword/obsidian_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/paper_sword_accessory.png b/mods/tinker/textures/items/broadsword/paper_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/paper_sword_accessory.png rename to mods/tinker/textures/items/broadsword/paper_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/paper_sword_blade.png b/mods/tinker/textures/items/broadsword/paper_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/paper_sword_blade.png rename to mods/tinker/textures/items/broadsword/paper_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/paper_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/paper_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/paper_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/paper_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/paper_sword_handle.png b/mods/tinker/textures/items/broadsword/paper_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/paper_sword_handle.png rename to mods/tinker/textures/items/broadsword/paper_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/redstone_sword_effect.png b/mods/tinker/textures/items/broadsword/redstone_sword_effect.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/redstone_sword_effect.png rename to mods/tinker/textures/items/broadsword/redstone_sword_effect.png diff --git a/resources/tinkertextures/tools/broadsword/slime_sword_accessory.png b/mods/tinker/textures/items/broadsword/slime_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/slime_sword_accessory.png rename to mods/tinker/textures/items/broadsword/slime_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/slime_sword_blade.png b/mods/tinker/textures/items/broadsword/slime_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/slime_sword_blade.png rename to mods/tinker/textures/items/broadsword/slime_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/slime_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/slime_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/slime_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/slime_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/slime_sword_handle.png b/mods/tinker/textures/items/broadsword/slime_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/slime_sword_handle.png rename to mods/tinker/textures/items/broadsword/slime_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/steel_sword_accessory.png b/mods/tinker/textures/items/broadsword/steel_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/steel_sword_accessory.png rename to mods/tinker/textures/items/broadsword/steel_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/steel_sword_blade.png b/mods/tinker/textures/items/broadsword/steel_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/steel_sword_blade.png rename to mods/tinker/textures/items/broadsword/steel_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/steel_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/steel_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/steel_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/steel_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/steel_sword_handle.png b/mods/tinker/textures/items/broadsword/steel_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/steel_sword_handle.png rename to mods/tinker/textures/items/broadsword/steel_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/stone_sword_accessory.png b/mods/tinker/textures/items/broadsword/stone_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/stone_sword_accessory.png rename to mods/tinker/textures/items/broadsword/stone_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/stone_sword_blade.png b/mods/tinker/textures/items/broadsword/stone_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/stone_sword_blade.png rename to mods/tinker/textures/items/broadsword/stone_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/stone_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/stone_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/stone_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/stone_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/stone_sword_handle.png b/mods/tinker/textures/items/broadsword/stone_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/stone_sword_handle.png rename to mods/tinker/textures/items/broadsword/stone_sword_handle.png diff --git a/resources/tinkertextures/tools/broadsword/wood_sword_accessory.png b/mods/tinker/textures/items/broadsword/wood_sword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/wood_sword_accessory.png rename to mods/tinker/textures/items/broadsword/wood_sword_accessory.png diff --git a/resources/tinkertextures/tools/broadsword/wood_sword_blade.png b/mods/tinker/textures/items/broadsword/wood_sword_blade.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/wood_sword_blade.png rename to mods/tinker/textures/items/broadsword/wood_sword_blade.png diff --git a/resources/tinkertextures/tools/broadsword/wood_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/wood_sword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/wood_sword_blade_broken.png rename to mods/tinker/textures/items/broadsword/wood_sword_blade_broken.png diff --git a/resources/tinkertextures/tools/broadsword/wood_sword_handle.png b/mods/tinker/textures/items/broadsword/wood_sword_handle.png similarity index 100% rename from resources/tinkertextures/tools/broadsword/wood_sword_handle.png rename to mods/tinker/textures/items/broadsword/wood_sword_handle.png diff --git a/resources/tinkertextures/tools/frypan/alumite_frypan_handle.png b/mods/tinker/textures/items/frypan/alumite_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/alumite_frypan_handle.png rename to mods/tinker/textures/items/frypan/alumite_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/alumite_frypan_head.png b/mods/tinker/textures/items/frypan/alumite_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/alumite_frypan_head.png rename to mods/tinker/textures/items/frypan/alumite_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/alumite_frypan_head_broken.png b/mods/tinker/textures/items/frypan/alumite_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/alumite_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/alumite_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/ardite_frypan_handle.png b/mods/tinker/textures/items/frypan/ardite_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/ardite_frypan_handle.png rename to mods/tinker/textures/items/frypan/ardite_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/ardite_frypan_head.png b/mods/tinker/textures/items/frypan/ardite_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/ardite_frypan_head.png rename to mods/tinker/textures/items/frypan/ardite_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/ardite_frypan_head_broken.png b/mods/tinker/textures/items/frypan/ardite_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/ardite_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/ardite_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/blaze_frypan_effect.png b/mods/tinker/textures/items/frypan/blaze_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/blaze_frypan_effect.png rename to mods/tinker/textures/items/frypan/blaze_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/bone_frypan_handle.png b/mods/tinker/textures/items/frypan/bone_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/bone_frypan_handle.png rename to mods/tinker/textures/items/frypan/bone_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/bone_frypan_head.png b/mods/tinker/textures/items/frypan/bone_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/bone_frypan_head.png rename to mods/tinker/textures/items/frypan/bone_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/bone_frypan_head_broken.png b/mods/tinker/textures/items/frypan/bone_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/bone_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/bone_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/bronze_frypan_handle.png b/mods/tinker/textures/items/frypan/bronze_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/bronze_frypan_handle.png rename to mods/tinker/textures/items/frypan/bronze_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/bronze_frypan_head.png b/mods/tinker/textures/items/frypan/bronze_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/bronze_frypan_head.png rename to mods/tinker/textures/items/frypan/bronze_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/bronze_frypan_head_broken.png b/mods/tinker/textures/items/frypan/bronze_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/bronze_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/bronze_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/cactus_frypan_handle.png b/mods/tinker/textures/items/frypan/cactus_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/cactus_frypan_handle.png rename to mods/tinker/textures/items/frypan/cactus_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/cactus_frypan_head.png b/mods/tinker/textures/items/frypan/cactus_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/cactus_frypan_head.png rename to mods/tinker/textures/items/frypan/cactus_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/cactus_frypan_head_broken.png b/mods/tinker/textures/items/frypan/cactus_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/cactus_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/cactus_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/cobalt_frypan_handle.png b/mods/tinker/textures/items/frypan/cobalt_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/cobalt_frypan_handle.png rename to mods/tinker/textures/items/frypan/cobalt_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/cobalt_frypan_head.png b/mods/tinker/textures/items/frypan/cobalt_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/cobalt_frypan_head.png rename to mods/tinker/textures/items/frypan/cobalt_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/cobalt_frypan_head_broken.png b/mods/tinker/textures/items/frypan/cobalt_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/cobalt_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/cobalt_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/copper_frypan_handle.png b/mods/tinker/textures/items/frypan/copper_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/copper_frypan_handle.png rename to mods/tinker/textures/items/frypan/copper_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/copper_frypan_head.png b/mods/tinker/textures/items/frypan/copper_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/copper_frypan_head.png rename to mods/tinker/textures/items/frypan/copper_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/copper_frypan_head_broken.png b/mods/tinker/textures/items/frypan/copper_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/copper_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/copper_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/diamond_frypan_effect.png b/mods/tinker/textures/items/frypan/diamond_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/diamond_frypan_effect.png rename to mods/tinker/textures/items/frypan/diamond_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/electric_frypan_effect.png b/mods/tinker/textures/items/frypan/electric_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/electric_frypan_effect.png rename to mods/tinker/textures/items/frypan/electric_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/emerald_frypan_effect.png b/mods/tinker/textures/items/frypan/emerald_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/emerald_frypan_effect.png rename to mods/tinker/textures/items/frypan/emerald_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/flint_frypan_handle.png b/mods/tinker/textures/items/frypan/flint_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/flint_frypan_handle.png rename to mods/tinker/textures/items/frypan/flint_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/flint_frypan_head.png b/mods/tinker/textures/items/frypan/flint_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/flint_frypan_head.png rename to mods/tinker/textures/items/frypan/flint_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/flint_frypan_head_broken.png b/mods/tinker/textures/items/frypan/flint_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/flint_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/flint_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/ice_frypan_effect.png b/mods/tinker/textures/items/frypan/ice_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/ice_frypan_effect.png rename to mods/tinker/textures/items/frypan/ice_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/iron_frypan_handle.png b/mods/tinker/textures/items/frypan/iron_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/iron_frypan_handle.png rename to mods/tinker/textures/items/frypan/iron_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/iron_frypan_head.png b/mods/tinker/textures/items/frypan/iron_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/iron_frypan_head.png rename to mods/tinker/textures/items/frypan/iron_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/iron_frypan_head_broken.png b/mods/tinker/textures/items/frypan/iron_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/iron_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/iron_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/lapis_frypan_effect.png b/mods/tinker/textures/items/frypan/lapis_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/lapis_frypan_effect.png rename to mods/tinker/textures/items/frypan/lapis_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/lava_frypan_effect.png b/mods/tinker/textures/items/frypan/lava_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/lava_frypan_effect.png rename to mods/tinker/textures/items/frypan/lava_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/manyullyn_frypan_handle.png b/mods/tinker/textures/items/frypan/manyullyn_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/manyullyn_frypan_handle.png rename to mods/tinker/textures/items/frypan/manyullyn_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/manyullyn_frypan_head.png b/mods/tinker/textures/items/frypan/manyullyn_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/manyullyn_frypan_head.png rename to mods/tinker/textures/items/frypan/manyullyn_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/manyullyn_frypan_head_broken.png b/mods/tinker/textures/items/frypan/manyullyn_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/manyullyn_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/manyullyn_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/moss_frypan_effect.png b/mods/tinker/textures/items/frypan/moss_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/moss_frypan_effect.png rename to mods/tinker/textures/items/frypan/moss_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/necrotic_frypan_effect.png b/mods/tinker/textures/items/frypan/necrotic_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/necrotic_frypan_effect.png rename to mods/tinker/textures/items/frypan/necrotic_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/netherrack_frypan_handle.png b/mods/tinker/textures/items/frypan/netherrack_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/netherrack_frypan_handle.png rename to mods/tinker/textures/items/frypan/netherrack_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/netherrack_frypan_head.png b/mods/tinker/textures/items/frypan/netherrack_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/netherrack_frypan_head.png rename to mods/tinker/textures/items/frypan/netherrack_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/netherrack_frypan_head_broken.png b/mods/tinker/textures/items/frypan/netherrack_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/netherrack_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/netherrack_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/obsidian_frypan_handle.png b/mods/tinker/textures/items/frypan/obsidian_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/obsidian_frypan_handle.png rename to mods/tinker/textures/items/frypan/obsidian_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/obsidian_frypan_head.png b/mods/tinker/textures/items/frypan/obsidian_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/obsidian_frypan_head.png rename to mods/tinker/textures/items/frypan/obsidian_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/obsidian_frypan_head_broken.png b/mods/tinker/textures/items/frypan/obsidian_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/obsidian_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/obsidian_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/paper_frypan_handle.png b/mods/tinker/textures/items/frypan/paper_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/paper_frypan_handle.png rename to mods/tinker/textures/items/frypan/paper_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/paper_frypan_head.png b/mods/tinker/textures/items/frypan/paper_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/paper_frypan_head.png rename to mods/tinker/textures/items/frypan/paper_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/paper_frypan_head_broken.png b/mods/tinker/textures/items/frypan/paper_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/paper_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/paper_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/redstone_frypan_effect.png b/mods/tinker/textures/items/frypan/redstone_frypan_effect.png similarity index 100% rename from resources/tinkertextures/tools/frypan/redstone_frypan_effect.png rename to mods/tinker/textures/items/frypan/redstone_frypan_effect.png diff --git a/resources/tinkertextures/tools/frypan/slime_frypan_handle.png b/mods/tinker/textures/items/frypan/slime_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/slime_frypan_handle.png rename to mods/tinker/textures/items/frypan/slime_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/slime_frypan_head.png b/mods/tinker/textures/items/frypan/slime_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/slime_frypan_head.png rename to mods/tinker/textures/items/frypan/slime_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/slime_frypan_head_broken.png b/mods/tinker/textures/items/frypan/slime_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/slime_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/slime_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/steel_frypan_handle.png b/mods/tinker/textures/items/frypan/steel_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/steel_frypan_handle.png rename to mods/tinker/textures/items/frypan/steel_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/steel_frypan_head.png b/mods/tinker/textures/items/frypan/steel_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/steel_frypan_head.png rename to mods/tinker/textures/items/frypan/steel_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/steel_frypan_head_broken.png b/mods/tinker/textures/items/frypan/steel_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/steel_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/steel_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/stone_frypan_handle.png b/mods/tinker/textures/items/frypan/stone_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/stone_frypan_handle.png rename to mods/tinker/textures/items/frypan/stone_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/stone_frypan_head.png b/mods/tinker/textures/items/frypan/stone_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/stone_frypan_head.png rename to mods/tinker/textures/items/frypan/stone_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/stone_frypan_head_broken.png b/mods/tinker/textures/items/frypan/stone_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/stone_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/stone_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/frypan/thaumium_frypan_handle.png b/mods/tinker/textures/items/frypan/thaumium_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/thaumium_frypan_handle.png rename to mods/tinker/textures/items/frypan/thaumium_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/wood_frypan_handle.png b/mods/tinker/textures/items/frypan/wood_frypan_handle.png similarity index 100% rename from resources/tinkertextures/tools/frypan/wood_frypan_handle.png rename to mods/tinker/textures/items/frypan/wood_frypan_handle.png diff --git a/resources/tinkertextures/tools/frypan/wood_frypan_head.png b/mods/tinker/textures/items/frypan/wood_frypan_head.png similarity index 100% rename from resources/tinkertextures/tools/frypan/wood_frypan_head.png rename to mods/tinker/textures/items/frypan/wood_frypan_head.png diff --git a/resources/tinkertextures/tools/frypan/wood_frypan_head_broken.png b/mods/tinker/textures/items/frypan/wood_frypan_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/frypan/wood_frypan_head_broken.png rename to mods/tinker/textures/items/frypan/wood_frypan_head_broken.png diff --git a/resources/tinkertextures/tools/longsword/alumite_longsword_accessory.png b/mods/tinker/textures/items/longsword/alumite_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/alumite_longsword_accessory.png rename to mods/tinker/textures/items/longsword/alumite_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/alumite_longsword_blade.png b/mods/tinker/textures/items/longsword/alumite_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/alumite_longsword_blade.png rename to mods/tinker/textures/items/longsword/alumite_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/alumite_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/alumite_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/alumite_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/alumite_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/alumite_longsword_handle.png b/mods/tinker/textures/items/longsword/alumite_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/alumite_longsword_handle.png rename to mods/tinker/textures/items/longsword/alumite_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/ardite_longsword_accessory.png b/mods/tinker/textures/items/longsword/ardite_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/ardite_longsword_accessory.png rename to mods/tinker/textures/items/longsword/ardite_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/ardite_longsword_blade.png b/mods/tinker/textures/items/longsword/ardite_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/ardite_longsword_blade.png rename to mods/tinker/textures/items/longsword/ardite_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/ardite_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/ardite_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/ardite_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/ardite_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/ardite_longsword_handle.png b/mods/tinker/textures/items/longsword/ardite_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/ardite_longsword_handle.png rename to mods/tinker/textures/items/longsword/ardite_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/blaze_longsword_effect.png b/mods/tinker/textures/items/longsword/blaze_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/blaze_longsword_effect.png rename to mods/tinker/textures/items/longsword/blaze_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/bone_longsword_accessory.png b/mods/tinker/textures/items/longsword/bone_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/bone_longsword_accessory.png rename to mods/tinker/textures/items/longsword/bone_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/bone_longsword_blade.png b/mods/tinker/textures/items/longsword/bone_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/bone_longsword_blade.png rename to mods/tinker/textures/items/longsword/bone_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/bone_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/bone_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/bone_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/bone_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/bone_longsword_handle.png b/mods/tinker/textures/items/longsword/bone_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/bone_longsword_handle.png rename to mods/tinker/textures/items/longsword/bone_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/bronze_longsword_accessory.png b/mods/tinker/textures/items/longsword/bronze_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/bronze_longsword_accessory.png rename to mods/tinker/textures/items/longsword/bronze_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/bronze_longsword_blade.png b/mods/tinker/textures/items/longsword/bronze_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/bronze_longsword_blade.png rename to mods/tinker/textures/items/longsword/bronze_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/bronze_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/bronze_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/bronze_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/bronze_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/bronze_longsword_handle.png b/mods/tinker/textures/items/longsword/bronze_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/bronze_longsword_handle.png rename to mods/tinker/textures/items/longsword/bronze_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/cactus_longsword_accessory.png b/mods/tinker/textures/items/longsword/cactus_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/cactus_longsword_accessory.png rename to mods/tinker/textures/items/longsword/cactus_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/cactus_longsword_blade.png b/mods/tinker/textures/items/longsword/cactus_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/cactus_longsword_blade.png rename to mods/tinker/textures/items/longsword/cactus_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/cactus_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/cactus_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/cactus_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/cactus_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/cactus_longsword_handle.png b/mods/tinker/textures/items/longsword/cactus_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/cactus_longsword_handle.png rename to mods/tinker/textures/items/longsword/cactus_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/cobalt_longsword_accessory.png b/mods/tinker/textures/items/longsword/cobalt_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/cobalt_longsword_accessory.png rename to mods/tinker/textures/items/longsword/cobalt_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/cobalt_longsword_blade.png b/mods/tinker/textures/items/longsword/cobalt_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/cobalt_longsword_blade.png rename to mods/tinker/textures/items/longsword/cobalt_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/cobalt_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/cobalt_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/cobalt_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/cobalt_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/cobalt_longsword_handle.png b/mods/tinker/textures/items/longsword/cobalt_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/cobalt_longsword_handle.png rename to mods/tinker/textures/items/longsword/cobalt_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/copper_longsword_accessory.png b/mods/tinker/textures/items/longsword/copper_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/copper_longsword_accessory.png rename to mods/tinker/textures/items/longsword/copper_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/copper_longsword_blade.png b/mods/tinker/textures/items/longsword/copper_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/copper_longsword_blade.png rename to mods/tinker/textures/items/longsword/copper_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/copper_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/copper_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/copper_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/copper_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/copper_longsword_handle.png b/mods/tinker/textures/items/longsword/copper_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/copper_longsword_handle.png rename to mods/tinker/textures/items/longsword/copper_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/diamond_longsword_effect.png b/mods/tinker/textures/items/longsword/diamond_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/diamond_longsword_effect.png rename to mods/tinker/textures/items/longsword/diamond_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/electric_longsword_effect.png b/mods/tinker/textures/items/longsword/electric_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/electric_longsword_effect.png rename to mods/tinker/textures/items/longsword/electric_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/emerald_longsword_effect.png b/mods/tinker/textures/items/longsword/emerald_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/emerald_longsword_effect.png rename to mods/tinker/textures/items/longsword/emerald_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/flint_longsword_accessory.png b/mods/tinker/textures/items/longsword/flint_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/flint_longsword_accessory.png rename to mods/tinker/textures/items/longsword/flint_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/flint_longsword_blade.png b/mods/tinker/textures/items/longsword/flint_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/flint_longsword_blade.png rename to mods/tinker/textures/items/longsword/flint_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/flint_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/flint_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/flint_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/flint_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/flint_longsword_handle.png b/mods/tinker/textures/items/longsword/flint_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/flint_longsword_handle.png rename to mods/tinker/textures/items/longsword/flint_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/glowstone_longsword_effect.png b/mods/tinker/textures/items/longsword/glowstone_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/glowstone_longsword_effect.png rename to mods/tinker/textures/items/longsword/glowstone_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/ice_longsword_effect.png b/mods/tinker/textures/items/longsword/ice_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/ice_longsword_effect.png rename to mods/tinker/textures/items/longsword/ice_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/iron_longsword_accessory.png b/mods/tinker/textures/items/longsword/iron_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/iron_longsword_accessory.png rename to mods/tinker/textures/items/longsword/iron_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/iron_longsword_blade.png b/mods/tinker/textures/items/longsword/iron_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/iron_longsword_blade.png rename to mods/tinker/textures/items/longsword/iron_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/iron_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/iron_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/iron_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/iron_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/iron_longsword_handle.png b/mods/tinker/textures/items/longsword/iron_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/iron_longsword_handle.png rename to mods/tinker/textures/items/longsword/iron_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/lapis_longsword_effect.png b/mods/tinker/textures/items/longsword/lapis_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/lapis_longsword_effect.png rename to mods/tinker/textures/items/longsword/lapis_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/lava_longsword_effect.png b/mods/tinker/textures/items/longsword/lava_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/lava_longsword_effect.png rename to mods/tinker/textures/items/longsword/lava_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/manyullyn_longsword_accessory.png b/mods/tinker/textures/items/longsword/manyullyn_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/manyullyn_longsword_accessory.png rename to mods/tinker/textures/items/longsword/manyullyn_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/manyullyn_longsword_blade.png b/mods/tinker/textures/items/longsword/manyullyn_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/manyullyn_longsword_blade.png rename to mods/tinker/textures/items/longsword/manyullyn_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/manyullyn_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/manyullyn_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/manyullyn_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/manyullyn_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/manyullyn_longsword_handle.png b/mods/tinker/textures/items/longsword/manyullyn_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/manyullyn_longsword_handle.png rename to mods/tinker/textures/items/longsword/manyullyn_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/moss_longsword_effect.png b/mods/tinker/textures/items/longsword/moss_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/moss_longsword_effect.png rename to mods/tinker/textures/items/longsword/moss_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/necrotic_longsword_effect.png b/mods/tinker/textures/items/longsword/necrotic_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/necrotic_longsword_effect.png rename to mods/tinker/textures/items/longsword/necrotic_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/netherrack_longsword_accessory.png b/mods/tinker/textures/items/longsword/netherrack_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/netherrack_longsword_accessory.png rename to mods/tinker/textures/items/longsword/netherrack_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/netherrack_longsword_blade.png b/mods/tinker/textures/items/longsword/netherrack_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/netherrack_longsword_blade.png rename to mods/tinker/textures/items/longsword/netherrack_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/netherrack_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/netherrack_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/netherrack_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/netherrack_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/netherrack_longsword_handle.png b/mods/tinker/textures/items/longsword/netherrack_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/netherrack_longsword_handle.png rename to mods/tinker/textures/items/longsword/netherrack_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/obsidian_longsword_accessory.png b/mods/tinker/textures/items/longsword/obsidian_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/obsidian_longsword_accessory.png rename to mods/tinker/textures/items/longsword/obsidian_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/obsidian_longsword_blade.png b/mods/tinker/textures/items/longsword/obsidian_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/obsidian_longsword_blade.png rename to mods/tinker/textures/items/longsword/obsidian_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/obsidian_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/obsidian_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/obsidian_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/obsidian_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/obsidian_longsword_handle.png b/mods/tinker/textures/items/longsword/obsidian_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/obsidian_longsword_handle.png rename to mods/tinker/textures/items/longsword/obsidian_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/paper_longsword_accessory.png b/mods/tinker/textures/items/longsword/paper_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/paper_longsword_accessory.png rename to mods/tinker/textures/items/longsword/paper_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/paper_longsword_blade.png b/mods/tinker/textures/items/longsword/paper_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/paper_longsword_blade.png rename to mods/tinker/textures/items/longsword/paper_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/paper_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/paper_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/paper_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/paper_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/paper_longsword_handle.png b/mods/tinker/textures/items/longsword/paper_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/paper_longsword_handle.png rename to mods/tinker/textures/items/longsword/paper_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/redstone_longsword_effect.png b/mods/tinker/textures/items/longsword/redstone_longsword_effect.png similarity index 100% rename from resources/tinkertextures/tools/longsword/redstone_longsword_effect.png rename to mods/tinker/textures/items/longsword/redstone_longsword_effect.png diff --git a/resources/tinkertextures/tools/longsword/slime_longsword_accessory.png b/mods/tinker/textures/items/longsword/slime_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/slime_longsword_accessory.png rename to mods/tinker/textures/items/longsword/slime_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/slime_longsword_blade.png b/mods/tinker/textures/items/longsword/slime_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/slime_longsword_blade.png rename to mods/tinker/textures/items/longsword/slime_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/slime_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/slime_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/slime_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/slime_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/slime_longsword_handle.png b/mods/tinker/textures/items/longsword/slime_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/slime_longsword_handle.png rename to mods/tinker/textures/items/longsword/slime_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/steel_longsword_accessory.png b/mods/tinker/textures/items/longsword/steel_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/steel_longsword_accessory.png rename to mods/tinker/textures/items/longsword/steel_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/steel_longsword_blade.png b/mods/tinker/textures/items/longsword/steel_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/steel_longsword_blade.png rename to mods/tinker/textures/items/longsword/steel_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/steel_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/steel_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/steel_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/steel_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/steel_longsword_handle.png b/mods/tinker/textures/items/longsword/steel_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/steel_longsword_handle.png rename to mods/tinker/textures/items/longsword/steel_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/stone_longsword_accessory.png b/mods/tinker/textures/items/longsword/stone_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/stone_longsword_accessory.png rename to mods/tinker/textures/items/longsword/stone_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/stone_longsword_blade.png b/mods/tinker/textures/items/longsword/stone_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/stone_longsword_blade.png rename to mods/tinker/textures/items/longsword/stone_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/stone_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/stone_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/stone_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/stone_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/stone_longsword_handle.png b/mods/tinker/textures/items/longsword/stone_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/stone_longsword_handle.png rename to mods/tinker/textures/items/longsword/stone_longsword_handle.png diff --git a/resources/tinkertextures/tools/longsword/wood_longsword_accessory.png b/mods/tinker/textures/items/longsword/wood_longsword_accessory.png similarity index 100% rename from resources/tinkertextures/tools/longsword/wood_longsword_accessory.png rename to mods/tinker/textures/items/longsword/wood_longsword_accessory.png diff --git a/resources/tinkertextures/tools/longsword/wood_longsword_blade.png b/mods/tinker/textures/items/longsword/wood_longsword_blade.png similarity index 100% rename from resources/tinkertextures/tools/longsword/wood_longsword_blade.png rename to mods/tinker/textures/items/longsword/wood_longsword_blade.png diff --git a/resources/tinkertextures/tools/longsword/wood_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/wood_longsword_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/longsword/wood_longsword_blade_broken.png rename to mods/tinker/textures/items/longsword/wood_longsword_blade_broken.png diff --git a/resources/tinkertextures/tools/longsword/wood_longsword_handle.png b/mods/tinker/textures/items/longsword/wood_longsword_handle.png similarity index 100% rename from resources/tinkertextures/tools/longsword/wood_longsword_handle.png rename to mods/tinker/textures/items/longsword/wood_longsword_handle.png diff --git a/resources/tinkertextures/tools/mattock/alumite_mattock_back.png b/mods/tinker/textures/items/mattock/alumite_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/alumite_mattock_back.png rename to mods/tinker/textures/items/mattock/alumite_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/alumite_mattock_handle.png b/mods/tinker/textures/items/mattock/alumite_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/alumite_mattock_handle.png rename to mods/tinker/textures/items/mattock/alumite_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/alumite_mattock_head.png b/mods/tinker/textures/items/mattock/alumite_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/alumite_mattock_head.png rename to mods/tinker/textures/items/mattock/alumite_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/alumite_mattock_head_broken.png b/mods/tinker/textures/items/mattock/alumite_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/alumite_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/alumite_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/ardite_mattock_back.png b/mods/tinker/textures/items/mattock/ardite_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/ardite_mattock_back.png rename to mods/tinker/textures/items/mattock/ardite_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/ardite_mattock_handle.png b/mods/tinker/textures/items/mattock/ardite_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/ardite_mattock_handle.png rename to mods/tinker/textures/items/mattock/ardite_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/ardite_mattock_head.png b/mods/tinker/textures/items/mattock/ardite_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/ardite_mattock_head.png rename to mods/tinker/textures/items/mattock/ardite_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/ardite_mattock_head_broken.png b/mods/tinker/textures/items/mattock/ardite_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/ardite_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/ardite_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/blaze_mattock_effect.png b/mods/tinker/textures/items/mattock/blaze_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/blaze_mattock_effect.png rename to mods/tinker/textures/items/mattock/blaze_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/bone_mattock_back.png b/mods/tinker/textures/items/mattock/bone_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/bone_mattock_back.png rename to mods/tinker/textures/items/mattock/bone_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/bone_mattock_handle.png b/mods/tinker/textures/items/mattock/bone_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/bone_mattock_handle.png rename to mods/tinker/textures/items/mattock/bone_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/bone_mattock_head.png b/mods/tinker/textures/items/mattock/bone_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/bone_mattock_head.png rename to mods/tinker/textures/items/mattock/bone_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/bone_mattock_head_broken.png b/mods/tinker/textures/items/mattock/bone_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/bone_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/bone_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/bronze_mattock_back.png b/mods/tinker/textures/items/mattock/bronze_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/bronze_mattock_back.png rename to mods/tinker/textures/items/mattock/bronze_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/bronze_mattock_handle.png b/mods/tinker/textures/items/mattock/bronze_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/bronze_mattock_handle.png rename to mods/tinker/textures/items/mattock/bronze_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/bronze_mattock_head.png b/mods/tinker/textures/items/mattock/bronze_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/bronze_mattock_head.png rename to mods/tinker/textures/items/mattock/bronze_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/bronze_mattock_head_broken.png b/mods/tinker/textures/items/mattock/bronze_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/bronze_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/bronze_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/cactus_mattock_back.png b/mods/tinker/textures/items/mattock/cactus_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/cactus_mattock_back.png rename to mods/tinker/textures/items/mattock/cactus_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/cactus_mattock_handle.png b/mods/tinker/textures/items/mattock/cactus_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/cactus_mattock_handle.png rename to mods/tinker/textures/items/mattock/cactus_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/cactus_mattock_head.png b/mods/tinker/textures/items/mattock/cactus_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/cactus_mattock_head.png rename to mods/tinker/textures/items/mattock/cactus_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/cactus_mattock_head_broken.png b/mods/tinker/textures/items/mattock/cactus_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/cactus_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/cactus_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/cobalt_mattock_back.png b/mods/tinker/textures/items/mattock/cobalt_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/cobalt_mattock_back.png rename to mods/tinker/textures/items/mattock/cobalt_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/cobalt_mattock_handle.png b/mods/tinker/textures/items/mattock/cobalt_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/cobalt_mattock_handle.png rename to mods/tinker/textures/items/mattock/cobalt_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/cobalt_mattock_head.png b/mods/tinker/textures/items/mattock/cobalt_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/cobalt_mattock_head.png rename to mods/tinker/textures/items/mattock/cobalt_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/cobalt_mattock_head_broken.png b/mods/tinker/textures/items/mattock/cobalt_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/cobalt_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/cobalt_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/copper_mattock_back.png b/mods/tinker/textures/items/mattock/copper_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/copper_mattock_back.png rename to mods/tinker/textures/items/mattock/copper_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/copper_mattock_handle.png b/mods/tinker/textures/items/mattock/copper_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/copper_mattock_handle.png rename to mods/tinker/textures/items/mattock/copper_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/copper_mattock_head.png b/mods/tinker/textures/items/mattock/copper_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/copper_mattock_head.png rename to mods/tinker/textures/items/mattock/copper_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/copper_mattock_head_broken.png b/mods/tinker/textures/items/mattock/copper_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/copper_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/copper_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/diamond_mattock_effect.png b/mods/tinker/textures/items/mattock/diamond_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/diamond_mattock_effect.png rename to mods/tinker/textures/items/mattock/diamond_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/electric_mattock_effect.png b/mods/tinker/textures/items/mattock/electric_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/electric_mattock_effect.png rename to mods/tinker/textures/items/mattock/electric_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/emerald_mattock_effect.png b/mods/tinker/textures/items/mattock/emerald_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/emerald_mattock_effect.png rename to mods/tinker/textures/items/mattock/emerald_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/flint_mattock_back.png b/mods/tinker/textures/items/mattock/flint_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/flint_mattock_back.png rename to mods/tinker/textures/items/mattock/flint_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/flint_mattock_handle.png b/mods/tinker/textures/items/mattock/flint_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/flint_mattock_handle.png rename to mods/tinker/textures/items/mattock/flint_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/flint_mattock_head.png b/mods/tinker/textures/items/mattock/flint_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/flint_mattock_head.png rename to mods/tinker/textures/items/mattock/flint_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/flint_mattock_head_broken.png b/mods/tinker/textures/items/mattock/flint_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/flint_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/flint_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/glowstone_mattock_effect.png b/mods/tinker/textures/items/mattock/glowstone_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/glowstone_mattock_effect.png rename to mods/tinker/textures/items/mattock/glowstone_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/ice_mattock_effect.png b/mods/tinker/textures/items/mattock/ice_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/ice_mattock_effect.png rename to mods/tinker/textures/items/mattock/ice_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/iron_mattock_back.png b/mods/tinker/textures/items/mattock/iron_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/iron_mattock_back.png rename to mods/tinker/textures/items/mattock/iron_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/iron_mattock_handle.png b/mods/tinker/textures/items/mattock/iron_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/iron_mattock_handle.png rename to mods/tinker/textures/items/mattock/iron_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/iron_mattock_head.png b/mods/tinker/textures/items/mattock/iron_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/iron_mattock_head.png rename to mods/tinker/textures/items/mattock/iron_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/iron_mattock_head_broken.png b/mods/tinker/textures/items/mattock/iron_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/iron_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/iron_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/lapis_mattock_effect.png b/mods/tinker/textures/items/mattock/lapis_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/lapis_mattock_effect.png rename to mods/tinker/textures/items/mattock/lapis_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/lava_mattock_effect.png b/mods/tinker/textures/items/mattock/lava_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/lava_mattock_effect.png rename to mods/tinker/textures/items/mattock/lava_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/manyullyn_mattock_back.png b/mods/tinker/textures/items/mattock/manyullyn_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/manyullyn_mattock_back.png rename to mods/tinker/textures/items/mattock/manyullyn_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/manyullyn_mattock_handle.png b/mods/tinker/textures/items/mattock/manyullyn_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/manyullyn_mattock_handle.png rename to mods/tinker/textures/items/mattock/manyullyn_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/manyullyn_mattock_head.png b/mods/tinker/textures/items/mattock/manyullyn_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/manyullyn_mattock_head.png rename to mods/tinker/textures/items/mattock/manyullyn_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/manyullyn_mattock_head_broken.png b/mods/tinker/textures/items/mattock/manyullyn_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/manyullyn_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/manyullyn_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/moss_mattock_effect.png b/mods/tinker/textures/items/mattock/moss_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/moss_mattock_effect.png rename to mods/tinker/textures/items/mattock/moss_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/necrotic_mattock_effect.png b/mods/tinker/textures/items/mattock/necrotic_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/necrotic_mattock_effect.png rename to mods/tinker/textures/items/mattock/necrotic_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/netherrack_mattock_back.png b/mods/tinker/textures/items/mattock/netherrack_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/netherrack_mattock_back.png rename to mods/tinker/textures/items/mattock/netherrack_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/netherrack_mattock_handle.png b/mods/tinker/textures/items/mattock/netherrack_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/netherrack_mattock_handle.png rename to mods/tinker/textures/items/mattock/netherrack_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/netherrack_mattock_head.png b/mods/tinker/textures/items/mattock/netherrack_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/netherrack_mattock_head.png rename to mods/tinker/textures/items/mattock/netherrack_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/netherrack_mattock_head_broken.png b/mods/tinker/textures/items/mattock/netherrack_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/netherrack_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/netherrack_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/obsidian_mattock_back.png b/mods/tinker/textures/items/mattock/obsidian_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/obsidian_mattock_back.png rename to mods/tinker/textures/items/mattock/obsidian_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/obsidian_mattock_handle.png b/mods/tinker/textures/items/mattock/obsidian_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/obsidian_mattock_handle.png rename to mods/tinker/textures/items/mattock/obsidian_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/obsidian_mattock_head.png b/mods/tinker/textures/items/mattock/obsidian_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/obsidian_mattock_head.png rename to mods/tinker/textures/items/mattock/obsidian_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/obsidian_mattock_head_broken.png b/mods/tinker/textures/items/mattock/obsidian_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/obsidian_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/obsidian_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/paper_mattock_back.png b/mods/tinker/textures/items/mattock/paper_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/paper_mattock_back.png rename to mods/tinker/textures/items/mattock/paper_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/paper_mattock_handle.png b/mods/tinker/textures/items/mattock/paper_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/paper_mattock_handle.png rename to mods/tinker/textures/items/mattock/paper_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/paper_mattock_head.png b/mods/tinker/textures/items/mattock/paper_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/paper_mattock_head.png rename to mods/tinker/textures/items/mattock/paper_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/paper_mattock_head_broken.png b/mods/tinker/textures/items/mattock/paper_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/paper_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/paper_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/redstone_mattock_effect.png b/mods/tinker/textures/items/mattock/redstone_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/mattock/redstone_mattock_effect.png rename to mods/tinker/textures/items/mattock/redstone_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/slime_mattock_back.png b/mods/tinker/textures/items/mattock/slime_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/slime_mattock_back.png rename to mods/tinker/textures/items/mattock/slime_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/slime_mattock_handle.png b/mods/tinker/textures/items/mattock/slime_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/slime_mattock_handle.png rename to mods/tinker/textures/items/mattock/slime_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/slime_mattock_head.png b/mods/tinker/textures/items/mattock/slime_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/slime_mattock_head.png rename to mods/tinker/textures/items/mattock/slime_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/slime_mattock_head_broken.png b/mods/tinker/textures/items/mattock/slime_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/slime_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/slime_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/steel_mattock_back.png b/mods/tinker/textures/items/mattock/steel_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/steel_mattock_back.png rename to mods/tinker/textures/items/mattock/steel_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/steel_mattock_handle.png b/mods/tinker/textures/items/mattock/steel_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/steel_mattock_handle.png rename to mods/tinker/textures/items/mattock/steel_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/steel_mattock_head.png b/mods/tinker/textures/items/mattock/steel_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/steel_mattock_head.png rename to mods/tinker/textures/items/mattock/steel_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/steel_mattock_head_broken.png b/mods/tinker/textures/items/mattock/steel_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/steel_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/steel_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/stone_mattock_back.png b/mods/tinker/textures/items/mattock/stone_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/stone_mattock_back.png rename to mods/tinker/textures/items/mattock/stone_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/stone_mattock_handle.png b/mods/tinker/textures/items/mattock/stone_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/stone_mattock_handle.png rename to mods/tinker/textures/items/mattock/stone_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/stone_mattock_head.png b/mods/tinker/textures/items/mattock/stone_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/stone_mattock_head.png rename to mods/tinker/textures/items/mattock/stone_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/stone_mattock_head_broken.png b/mods/tinker/textures/items/mattock/stone_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/stone_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/stone_mattock_head_broken.png diff --git a/resources/tinkertextures/tools/mattock/wood_mattock_back.png b/mods/tinker/textures/items/mattock/wood_mattock_back.png similarity index 100% rename from resources/tinkertextures/tools/mattock/wood_mattock_back.png rename to mods/tinker/textures/items/mattock/wood_mattock_back.png diff --git a/resources/tinkertextures/tools/mattock/wood_mattock_handle.png b/mods/tinker/textures/items/mattock/wood_mattock_handle.png similarity index 100% rename from resources/tinkertextures/tools/mattock/wood_mattock_handle.png rename to mods/tinker/textures/items/mattock/wood_mattock_handle.png diff --git a/resources/tinkertextures/tools/mattock/wood_mattock_head.png b/mods/tinker/textures/items/mattock/wood_mattock_head.png similarity index 100% rename from resources/tinkertextures/tools/mattock/wood_mattock_head.png rename to mods/tinker/textures/items/mattock/wood_mattock_head.png diff --git a/resources/tinkertextures/tools/mattock/wood_mattock_head_broken.png b/mods/tinker/textures/items/mattock/wood_mattock_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/mattock/wood_mattock_head_broken.png rename to mods/tinker/textures/items/mattock/wood_mattock_head_broken.png diff --git a/mods/tinker/textures/items/parts/alumite_axe_head.png b/mods/tinker/textures/items/parts/alumite_axe_head.png new file mode 100644 index 00000000..1b467420 Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/alumite_battlesign_head.png b/mods/tinker/textures/items/parts/alumite_battlesign_head.png new file mode 100644 index 00000000..c7780cbb Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/alumite_binding.png b/mods/tinker/textures/items/parts/alumite_binding.png new file mode 100644 index 00000000..a3acce5e Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_binding.png differ diff --git a/mods/tinker/textures/items/parts/alumite_crossbar.png b/mods/tinker/textures/items/parts/alumite_crossbar.png new file mode 100644 index 00000000..467e4f12 Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/alumite_frypan_head.png b/mods/tinker/textures/items/parts/alumite_frypan_head.png new file mode 100644 index 00000000..ba5c762a Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/alumite_large_guard.png b/mods/tinker/textures/items/parts/alumite_large_guard.png new file mode 100644 index 00000000..6fa5f4f6 Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/alumite_medium_guard.png b/mods/tinker/textures/items/parts/alumite_medium_guard.png new file mode 100644 index 00000000..bd18f4ea Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/alumite_pickaxe_head.png b/mods/tinker/textures/items/parts/alumite_pickaxe_head.png new file mode 100644 index 00000000..eaea86dd Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/alumite_shovel_head.png b/mods/tinker/textures/items/parts/alumite_shovel_head.png new file mode 100644 index 00000000..3ae87129 Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/alumite_sword_blade.png b/mods/tinker/textures/items/parts/alumite_sword_blade.png new file mode 100644 index 00000000..6c798445 Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/ardite_axe_head.png b/mods/tinker/textures/items/parts/ardite_axe_head.png new file mode 100644 index 00000000..7efdb229 Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/ardite_battlesign_head.png b/mods/tinker/textures/items/parts/ardite_battlesign_head.png new file mode 100644 index 00000000..476b9ede Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/ardite_binding.png b/mods/tinker/textures/items/parts/ardite_binding.png new file mode 100644 index 00000000..e3adccdf Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_binding.png differ diff --git a/mods/tinker/textures/items/parts/ardite_crossbar.png b/mods/tinker/textures/items/parts/ardite_crossbar.png new file mode 100644 index 00000000..8a4ce322 Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/ardite_frypan_head.png b/mods/tinker/textures/items/parts/ardite_frypan_head.png new file mode 100644 index 00000000..becfe325 Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/ardite_large_guard.png b/mods/tinker/textures/items/parts/ardite_large_guard.png new file mode 100644 index 00000000..81ff464d Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/ardite_medium_guard.png b/mods/tinker/textures/items/parts/ardite_medium_guard.png new file mode 100644 index 00000000..0ac649bf Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/ardite_pickaxe_head.png b/mods/tinker/textures/items/parts/ardite_pickaxe_head.png new file mode 100644 index 00000000..552b12e5 Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/ardite_shovel_head.png b/mods/tinker/textures/items/parts/ardite_shovel_head.png new file mode 100644 index 00000000..8bc267b1 Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/ardite_sword_blade.png b/mods/tinker/textures/items/parts/ardite_sword_blade.png new file mode 100644 index 00000000..d0230e60 Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/bone_axe_head.png b/mods/tinker/textures/items/parts/bone_axe_head.png new file mode 100644 index 00000000..12c154d9 Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/bone_battlesign_head.png b/mods/tinker/textures/items/parts/bone_battlesign_head.png new file mode 100644 index 00000000..e5603661 Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/bone_binding.png b/mods/tinker/textures/items/parts/bone_binding.png new file mode 100644 index 00000000..fb78b520 Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_binding.png differ diff --git a/mods/tinker/textures/items/parts/bone_crossbar.png b/mods/tinker/textures/items/parts/bone_crossbar.png new file mode 100644 index 00000000..24116df5 Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/bone_frypan_head.png b/mods/tinker/textures/items/parts/bone_frypan_head.png new file mode 100644 index 00000000..52559935 Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/bone_large_guard.png b/mods/tinker/textures/items/parts/bone_large_guard.png new file mode 100644 index 00000000..7bb069df Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/bone_medium_guard.png b/mods/tinker/textures/items/parts/bone_medium_guard.png new file mode 100644 index 00000000..4d5ea068 Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/bone_pickaxe_head.png b/mods/tinker/textures/items/parts/bone_pickaxe_head.png new file mode 100644 index 00000000..55d19b40 Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/bone_shovel_head.png b/mods/tinker/textures/items/parts/bone_shovel_head.png new file mode 100644 index 00000000..ecb56505 Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/bone_sword_blade.png b/mods/tinker/textures/items/parts/bone_sword_blade.png new file mode 100644 index 00000000..60781215 Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/bronze_axe_head.png b/mods/tinker/textures/items/parts/bronze_axe_head.png new file mode 100644 index 00000000..5ce68844 Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/bronze_battlesign_head.png b/mods/tinker/textures/items/parts/bronze_battlesign_head.png new file mode 100644 index 00000000..3549e555 Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/bronze_binding.png b/mods/tinker/textures/items/parts/bronze_binding.png new file mode 100644 index 00000000..4be2cd36 Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_binding.png differ diff --git a/mods/tinker/textures/items/parts/bronze_crossbar.png b/mods/tinker/textures/items/parts/bronze_crossbar.png new file mode 100644 index 00000000..796fed26 Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/bronze_frypan_head.png b/mods/tinker/textures/items/parts/bronze_frypan_head.png new file mode 100644 index 00000000..1a6c039d Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/bronze_large_guard.png b/mods/tinker/textures/items/parts/bronze_large_guard.png new file mode 100644 index 00000000..54881b7f Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/bronze_medium_guard.png b/mods/tinker/textures/items/parts/bronze_medium_guard.png new file mode 100644 index 00000000..33cbc05b Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/bronze_pickaxe_head.png b/mods/tinker/textures/items/parts/bronze_pickaxe_head.png new file mode 100644 index 00000000..d636f5b3 Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/bronze_shovel_head.png b/mods/tinker/textures/items/parts/bronze_shovel_head.png new file mode 100644 index 00000000..6bf0530b Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/bronze_sword_blade.png b/mods/tinker/textures/items/parts/bronze_sword_blade.png new file mode 100644 index 00000000..fd1be00f Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/cactus_axe_head.png b/mods/tinker/textures/items/parts/cactus_axe_head.png new file mode 100644 index 00000000..b5c12ee5 Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/cactus_battlesign_head.png b/mods/tinker/textures/items/parts/cactus_battlesign_head.png new file mode 100644 index 00000000..f0b317bc Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/cactus_binding.png b/mods/tinker/textures/items/parts/cactus_binding.png new file mode 100644 index 00000000..6d92d836 Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_binding.png differ diff --git a/mods/tinker/textures/items/parts/cactus_crossbar.png b/mods/tinker/textures/items/parts/cactus_crossbar.png new file mode 100644 index 00000000..c76accd7 Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/cactus_frypan_head.png b/mods/tinker/textures/items/parts/cactus_frypan_head.png new file mode 100644 index 00000000..410293c3 Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/cactus_large_guard.png b/mods/tinker/textures/items/parts/cactus_large_guard.png new file mode 100644 index 00000000..0dcc1543 Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/cactus_medium_guard.png b/mods/tinker/textures/items/parts/cactus_medium_guard.png new file mode 100644 index 00000000..7525f4a4 Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/cactus_pickaxe_head.png b/mods/tinker/textures/items/parts/cactus_pickaxe_head.png new file mode 100644 index 00000000..731d741c Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/cactus_shovel_head.png b/mods/tinker/textures/items/parts/cactus_shovel_head.png new file mode 100644 index 00000000..d406858c Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/cactus_sword_blade.png b/mods/tinker/textures/items/parts/cactus_sword_blade.png new file mode 100644 index 00000000..2bf0131f Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_axe_head.png b/mods/tinker/textures/items/parts/cobalt_axe_head.png new file mode 100644 index 00000000..667ab9f6 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_battlesign_head.png b/mods/tinker/textures/items/parts/cobalt_battlesign_head.png new file mode 100644 index 00000000..9e92f913 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_binding.png b/mods/tinker/textures/items/parts/cobalt_binding.png new file mode 100644 index 00000000..a13487a6 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_binding.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_crossbar.png b/mods/tinker/textures/items/parts/cobalt_crossbar.png new file mode 100644 index 00000000..31a2a3d2 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_frypan_head.png b/mods/tinker/textures/items/parts/cobalt_frypan_head.png new file mode 100644 index 00000000..7b997565 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_large_guard.png b/mods/tinker/textures/items/parts/cobalt_large_guard.png new file mode 100644 index 00000000..263031ac Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_medium_guard.png b/mods/tinker/textures/items/parts/cobalt_medium_guard.png new file mode 100644 index 00000000..824f43b6 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_pickaxe_head.png b/mods/tinker/textures/items/parts/cobalt_pickaxe_head.png new file mode 100644 index 00000000..ec72c3be Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_sword_blade.png b/mods/tinker/textures/items/parts/cobalt_sword_blade.png new file mode 100644 index 00000000..fa485869 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/copper_axe_head.png b/mods/tinker/textures/items/parts/copper_axe_head.png new file mode 100644 index 00000000..75c8409f Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/copper_battlesign_head.png b/mods/tinker/textures/items/parts/copper_battlesign_head.png new file mode 100644 index 00000000..e32c5130 Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/copper_binding.png b/mods/tinker/textures/items/parts/copper_binding.png new file mode 100644 index 00000000..c2ead674 Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_binding.png differ diff --git a/mods/tinker/textures/items/parts/copper_crossbar.png b/mods/tinker/textures/items/parts/copper_crossbar.png new file mode 100644 index 00000000..bd75879e Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/copper_frypan_head.png b/mods/tinker/textures/items/parts/copper_frypan_head.png new file mode 100644 index 00000000..ad0c4cfa Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/copper_large_guard.png b/mods/tinker/textures/items/parts/copper_large_guard.png new file mode 100644 index 00000000..9f00b807 Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/copper_medium_guard.png b/mods/tinker/textures/items/parts/copper_medium_guard.png new file mode 100644 index 00000000..1ae57e26 Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/copper_pickaxe_head.png b/mods/tinker/textures/items/parts/copper_pickaxe_head.png new file mode 100644 index 00000000..1405f216 Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/copper_shovel_head.png b/mods/tinker/textures/items/parts/copper_shovel_head.png new file mode 100644 index 00000000..e1a32495 Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/copper_sword_blade.png b/mods/tinker/textures/items/parts/copper_sword_blade.png new file mode 100644 index 00000000..3a9c56b6 Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/flint_axe_head.png b/mods/tinker/textures/items/parts/flint_axe_head.png new file mode 100644 index 00000000..8394aee6 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/flint_battlesign_head.png b/mods/tinker/textures/items/parts/flint_battlesign_head.png new file mode 100644 index 00000000..328c89c9 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/flint_binding.png b/mods/tinker/textures/items/parts/flint_binding.png new file mode 100644 index 00000000..ad716273 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_binding.png differ diff --git a/mods/tinker/textures/items/parts/flint_crossbar.png b/mods/tinker/textures/items/parts/flint_crossbar.png new file mode 100644 index 00000000..0580b56c Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/flint_frypan_head.png b/mods/tinker/textures/items/parts/flint_frypan_head.png new file mode 100644 index 00000000..6baeea23 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/flint_large_guard.png b/mods/tinker/textures/items/parts/flint_large_guard.png new file mode 100644 index 00000000..d85fa3f7 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/flint_medium_guard.png b/mods/tinker/textures/items/parts/flint_medium_guard.png new file mode 100644 index 00000000..9bd33e62 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/flint_pickaxe_head.png b/mods/tinker/textures/items/parts/flint_pickaxe_head.png new file mode 100644 index 00000000..386cfa63 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/flint_shovel_head.png b/mods/tinker/textures/items/parts/flint_shovel_head.png new file mode 100644 index 00000000..6f73c011 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/flint_sword_blade.png b/mods/tinker/textures/items/parts/flint_sword_blade.png new file mode 100644 index 00000000..00e764c1 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/iron_axe_head.png b/mods/tinker/textures/items/parts/iron_axe_head.png new file mode 100644 index 00000000..947c023d Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/iron_battlesign_head.png b/mods/tinker/textures/items/parts/iron_battlesign_head.png new file mode 100644 index 00000000..58651a7a Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/iron_binding.png b/mods/tinker/textures/items/parts/iron_binding.png new file mode 100644 index 00000000..8ead0447 Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_binding.png differ diff --git a/mods/tinker/textures/items/parts/iron_crossbar.png b/mods/tinker/textures/items/parts/iron_crossbar.png new file mode 100644 index 00000000..2488ea38 Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/iron_frypan_head.png b/mods/tinker/textures/items/parts/iron_frypan_head.png new file mode 100644 index 00000000..a94c5241 Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/iron_large_guard.png b/mods/tinker/textures/items/parts/iron_large_guard.png new file mode 100644 index 00000000..39190ada Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/iron_medium_guard.png b/mods/tinker/textures/items/parts/iron_medium_guard.png new file mode 100644 index 00000000..697ab363 Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/iron_pickaxe_head.png b/mods/tinker/textures/items/parts/iron_pickaxe_head.png new file mode 100644 index 00000000..662385c3 Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/iron_shovel_head.png b/mods/tinker/textures/items/parts/iron_shovel_head.png new file mode 100644 index 00000000..7a5ee936 Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/iron_sword_blade.png b/mods/tinker/textures/items/parts/iron_sword_blade.png new file mode 100644 index 00000000..6c3b5ebb Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_axe_head.png b/mods/tinker/textures/items/parts/manyullyn_axe_head.png new file mode 100644 index 00000000..0145468d Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_battlesign_head.png b/mods/tinker/textures/items/parts/manyullyn_battlesign_head.png new file mode 100644 index 00000000..dac54bc3 Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_binding.png b/mods/tinker/textures/items/parts/manyullyn_binding.png new file mode 100644 index 00000000..8648476a Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_binding.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_crossbar.png b/mods/tinker/textures/items/parts/manyullyn_crossbar.png new file mode 100644 index 00000000..b50db682 Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_frypan_head.png b/mods/tinker/textures/items/parts/manyullyn_frypan_head.png new file mode 100644 index 00000000..b977084c Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_large_guard.png b/mods/tinker/textures/items/parts/manyullyn_large_guard.png new file mode 100644 index 00000000..26a09dfb Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_medium_guard.png b/mods/tinker/textures/items/parts/manyullyn_medium_guard.png new file mode 100644 index 00000000..60752f30 Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_pickaxe_head.png b/mods/tinker/textures/items/parts/manyullyn_pickaxe_head.png new file mode 100644 index 00000000..ef923a27 Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_shovel_head.png b/mods/tinker/textures/items/parts/manyullyn_shovel_head.png new file mode 100644 index 00000000..ff9d39cb Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_sword_blade.png b/mods/tinker/textures/items/parts/manyullyn_sword_blade.png new file mode 100644 index 00000000..fc0c0565 Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_axe_head.png b/mods/tinker/textures/items/parts/netherrack_axe_head.png new file mode 100644 index 00000000..f7f92148 Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_battlesign_head.png b/mods/tinker/textures/items/parts/netherrack_battlesign_head.png new file mode 100644 index 00000000..c61ced0f Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_binding.png b/mods/tinker/textures/items/parts/netherrack_binding.png new file mode 100644 index 00000000..dd6eb052 Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_binding.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_crossbar.png b/mods/tinker/textures/items/parts/netherrack_crossbar.png new file mode 100644 index 00000000..bf4ee387 Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_frypan_head.png b/mods/tinker/textures/items/parts/netherrack_frypan_head.png new file mode 100644 index 00000000..0c99094c Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_large_guard.png b/mods/tinker/textures/items/parts/netherrack_large_guard.png new file mode 100644 index 00000000..98333e51 Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_medium_guard.png b/mods/tinker/textures/items/parts/netherrack_medium_guard.png new file mode 100644 index 00000000..e5fc84c9 Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_pickaxe_head.png b/mods/tinker/textures/items/parts/netherrack_pickaxe_head.png new file mode 100644 index 00000000..777e21f6 Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_shovel_head.png b/mods/tinker/textures/items/parts/netherrack_shovel_head.png new file mode 100644 index 00000000..b1c6abc0 Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_sword_blade.png b/mods/tinker/textures/items/parts/netherrack_sword_blade.png new file mode 100644 index 00000000..2074273b Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_axe_head.png b/mods/tinker/textures/items/parts/obsidian_axe_head.png new file mode 100644 index 00000000..905138b2 Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_battlesign_head.png b/mods/tinker/textures/items/parts/obsidian_battlesign_head.png new file mode 100644 index 00000000..ec1ea01f Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_binding.png b/mods/tinker/textures/items/parts/obsidian_binding.png new file mode 100644 index 00000000..255b2eb2 Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_binding.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_crossbar.png b/mods/tinker/textures/items/parts/obsidian_crossbar.png new file mode 100644 index 00000000..d7bb277b Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_frypan_head.png b/mods/tinker/textures/items/parts/obsidian_frypan_head.png new file mode 100644 index 00000000..9fb9912d Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_large_guard.png b/mods/tinker/textures/items/parts/obsidian_large_guard.png new file mode 100644 index 00000000..af4bd965 Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_medium_guard.png b/mods/tinker/textures/items/parts/obsidian_medium_guard.png new file mode 100644 index 00000000..ff575f75 Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_pickaxe_head.png b/mods/tinker/textures/items/parts/obsidian_pickaxe_head.png new file mode 100644 index 00000000..95f79279 Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_shovel_head.png b/mods/tinker/textures/items/parts/obsidian_shovel_head.png new file mode 100644 index 00000000..991f708c Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_sword_blade.png b/mods/tinker/textures/items/parts/obsidian_sword_blade.png new file mode 100644 index 00000000..5ed75c2b Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/paper_axe_head.png b/mods/tinker/textures/items/parts/paper_axe_head.png new file mode 100644 index 00000000..f2a25f9d Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/paper_battlesign_head.png b/mods/tinker/textures/items/parts/paper_battlesign_head.png new file mode 100644 index 00000000..19438897 Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/paper_binding.png b/mods/tinker/textures/items/parts/paper_binding.png new file mode 100644 index 00000000..9c246613 Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_binding.png differ diff --git a/mods/tinker/textures/items/parts/paper_crossbar.png b/mods/tinker/textures/items/parts/paper_crossbar.png new file mode 100644 index 00000000..12f1d651 Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/paper_frypan_head.png b/mods/tinker/textures/items/parts/paper_frypan_head.png new file mode 100644 index 00000000..1158d32d Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/paper_large_guard.png b/mods/tinker/textures/items/parts/paper_large_guard.png new file mode 100644 index 00000000..48c08ecc Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/paper_medium_guard.png b/mods/tinker/textures/items/parts/paper_medium_guard.png new file mode 100644 index 00000000..449e9bce Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/paper_pickaxe_head.png b/mods/tinker/textures/items/parts/paper_pickaxe_head.png new file mode 100644 index 00000000..564016cc Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/paper_shovel_head.png b/mods/tinker/textures/items/parts/paper_shovel_head.png new file mode 100644 index 00000000..b992ed4c Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/paper_sword_blade.png b/mods/tinker/textures/items/parts/paper_sword_blade.png new file mode 100644 index 00000000..31b2a901 Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/slime_axe_head.png b/mods/tinker/textures/items/parts/slime_axe_head.png new file mode 100644 index 00000000..524b9b6e Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/slime_battlesign_head.png b/mods/tinker/textures/items/parts/slime_battlesign_head.png new file mode 100644 index 00000000..ae9223d3 Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/slime_binding.png b/mods/tinker/textures/items/parts/slime_binding.png new file mode 100644 index 00000000..6a0d5900 Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_binding.png differ diff --git a/mods/tinker/textures/items/parts/slime_crossbar.png b/mods/tinker/textures/items/parts/slime_crossbar.png new file mode 100644 index 00000000..b67fcfb4 Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/slime_frypan_head.png b/mods/tinker/textures/items/parts/slime_frypan_head.png new file mode 100644 index 00000000..cc57bb6e Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/slime_large_guard.png b/mods/tinker/textures/items/parts/slime_large_guard.png new file mode 100644 index 00000000..efbc7c52 Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/slime_medium_guard.png b/mods/tinker/textures/items/parts/slime_medium_guard.png new file mode 100644 index 00000000..cff7b92e Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/slime_pickaxe_head.png b/mods/tinker/textures/items/parts/slime_pickaxe_head.png new file mode 100644 index 00000000..9921e215 Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/slime_shovel_head.png b/mods/tinker/textures/items/parts/slime_shovel_head.png new file mode 100644 index 00000000..accdfa06 Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/slime_sword_blade.png b/mods/tinker/textures/items/parts/slime_sword_blade.png new file mode 100644 index 00000000..76185dea Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/steel_axe_head.png b/mods/tinker/textures/items/parts/steel_axe_head.png new file mode 100644 index 00000000..eb8cc60c Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/steel_battlesign_head.png b/mods/tinker/textures/items/parts/steel_battlesign_head.png new file mode 100644 index 00000000..4af1bfbb Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/steel_binding.png b/mods/tinker/textures/items/parts/steel_binding.png new file mode 100644 index 00000000..6b1c8909 Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_binding.png differ diff --git a/mods/tinker/textures/items/parts/steel_crossbar.png b/mods/tinker/textures/items/parts/steel_crossbar.png new file mode 100644 index 00000000..7baf7d4a Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/steel_frypan_head.png b/mods/tinker/textures/items/parts/steel_frypan_head.png new file mode 100644 index 00000000..a1017b92 Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/steel_large_guard.png b/mods/tinker/textures/items/parts/steel_large_guard.png new file mode 100644 index 00000000..3a423bd7 Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/steel_medium_guard.png b/mods/tinker/textures/items/parts/steel_medium_guard.png new file mode 100644 index 00000000..f019747f Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/steel_pickaxe_head.png b/mods/tinker/textures/items/parts/steel_pickaxe_head.png new file mode 100644 index 00000000..4502e40a Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/steel_shovel_head.png b/mods/tinker/textures/items/parts/steel_shovel_head.png new file mode 100644 index 00000000..8673b0de Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/steel_sword_blade.png b/mods/tinker/textures/items/parts/steel_sword_blade.png new file mode 100644 index 00000000..37985c95 Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/stone_axe_head.png b/mods/tinker/textures/items/parts/stone_axe_head.png new file mode 100644 index 00000000..02904427 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/stone_battlesign_head.png b/mods/tinker/textures/items/parts/stone_battlesign_head.png new file mode 100644 index 00000000..0f817ecc Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/stone_binding.png b/mods/tinker/textures/items/parts/stone_binding.png new file mode 100644 index 00000000..e1fef712 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_binding.png differ diff --git a/mods/tinker/textures/items/parts/stone_crossbar.png b/mods/tinker/textures/items/parts/stone_crossbar.png new file mode 100644 index 00000000..44a442f6 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/stone_frypan_head.png b/mods/tinker/textures/items/parts/stone_frypan_head.png new file mode 100644 index 00000000..6ea4ed63 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/stone_large_guard.png b/mods/tinker/textures/items/parts/stone_large_guard.png new file mode 100644 index 00000000..1639a8d2 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/stone_medium_guard.png b/mods/tinker/textures/items/parts/stone_medium_guard.png new file mode 100644 index 00000000..4da8fdbe Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/stone_pickaxe_head.png b/mods/tinker/textures/items/parts/stone_pickaxe_head.png new file mode 100644 index 00000000..2fe8d238 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/stone_shovel_head.png b/mods/tinker/textures/items/parts/stone_shovel_head.png new file mode 100644 index 00000000..4f29a635 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/stone_sword_blade.png b/mods/tinker/textures/items/parts/stone_sword_blade.png new file mode 100644 index 00000000..7cf45688 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_sword_blade.png differ diff --git a/mods/tinker/textures/items/parts/wood_axe_head.png b/mods/tinker/textures/items/parts/wood_axe_head.png new file mode 100644 index 00000000..f1022f4d Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/wood_battlesign_head.png b/mods/tinker/textures/items/parts/wood_battlesign_head.png new file mode 100644 index 00000000..4aed10cf Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/wood_binding.png b/mods/tinker/textures/items/parts/wood_binding.png new file mode 100644 index 00000000..292dc51f Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_binding.png differ diff --git a/mods/tinker/textures/items/parts/wood_crossbar.png b/mods/tinker/textures/items/parts/wood_crossbar.png new file mode 100644 index 00000000..cac8fff0 Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/wood_frypan_head.png b/mods/tinker/textures/items/parts/wood_frypan_head.png new file mode 100644 index 00000000..c1ff3425 Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/wood_large_guard.png b/mods/tinker/textures/items/parts/wood_large_guard.png new file mode 100644 index 00000000..74fbba06 Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/wood_medium_guard.png b/mods/tinker/textures/items/parts/wood_medium_guard.png new file mode 100644 index 00000000..6605a7d5 Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/wood_pickaxe_head.png b/mods/tinker/textures/items/parts/wood_pickaxe_head.png new file mode 100644 index 00000000..56ec7763 Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/wood_shovel_head.png b/mods/tinker/textures/items/parts/wood_shovel_head.png new file mode 100644 index 00000000..a13f4b84 Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/wood_sword_blade.png b/mods/tinker/textures/items/parts/wood_sword_blade.png new file mode 100644 index 00000000..875e3b2c Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_sword_blade.png differ diff --git a/resources/tinkertextures/tools/pickaxe/alumite_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/alumite_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/alumite_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/alumite_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/alumite_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/alumite_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/alumite_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/alumite_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/alumite_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/alumite_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/alumite_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/alumite_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/ardite_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/ardite_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/ardite_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/ardite_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/ardite_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/ardite_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/ardite_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/ardite_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/ardite_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/ardite_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/ardite_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/ardite_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/ardite_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/ardite_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/ardite_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/ardite_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/blaze_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/blaze_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/blaze_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/blaze_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/bone_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/bone_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/bone_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/bone_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/bone_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/bone_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/bone_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/bone_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/bone_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/bone_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/bone_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/bone_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/bone_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/bone_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/bone_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/bone_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/bronze_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/bronze_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/bronze_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/bronze_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/bronze_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/bronze_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/bronze_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/bronze_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/bronze_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/bronze_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/bronze_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/bronze_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/bronze_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/bronze_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/bronze_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/bronze_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/cactus_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/cactus_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/cactus_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/cactus_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/cactus_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/cactus_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/cactus_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/cactus_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/cactus_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/cactus_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/cactus_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/cactus_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/cactus_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/cactus_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/cactus_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/cactus_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/cobalt_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/cobalt_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/cobalt_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/cobalt_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/cobalt_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/cobalt_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/cobalt_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/cobalt_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/copper_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/copper_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/copper_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/copper_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/copper_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/copper_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/copper_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/copper_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/copper_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/copper_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/copper_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/copper_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/copper_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/copper_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/copper_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/copper_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/diamond_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/diamond_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/diamond_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/diamond_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/electric_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/electric_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/electric_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/electric_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/emerald_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/emerald_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/emerald_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/emerald_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/flint_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/flint_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/flint_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/flint_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/flint_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/flint_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/flint_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/flint_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/flint_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/flint_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/flint_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/flint_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/flint_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/flint_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/flint_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/flint_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/glowstone_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/glowstone_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/glowstone_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/glowstone_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/ice_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/ice_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/ice_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/ice_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/iron_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/iron_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/iron_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/iron_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/iron_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/iron_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/iron_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/iron_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/iron_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/iron_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/iron_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/iron_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/iron_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/iron_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/iron_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/iron_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/lapis_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/lapis_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/lapis_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/lapis_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/lava_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/lava_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/lava_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/lava_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/manyullyn_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/manyullyn_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/manyullyn_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/manyullyn_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/manyullyn_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/manyullyn_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/manyullyn_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/manyullyn_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/moss_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/moss_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/moss_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/moss_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/necrotic_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/necrotic_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/necrotic_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/necrotic_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/netherrack_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/netherrack_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/netherrack_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/netherrack_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/netherrack_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/netherrack_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/netherrack_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/netherrack_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/obsidian_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/obsidian_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/obsidian_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/obsidian_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/obsidian_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/obsidian_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/obsidian_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/obsidian_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/paper_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/paper_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/paper_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/paper_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/paper_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/paper_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/paper_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/paper_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/paper_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/paper_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/paper_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/paper_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/paper_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/paper_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/paper_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/paper_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/redstone_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/redstone_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/redstone_pickaxe_effect.png rename to mods/tinker/textures/items/pickaxe/redstone_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/slime_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/slime_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/slime_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/slime_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/slime_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/slime_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/slime_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/slime_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/slime_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/slime_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/slime_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/slime_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/slime_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/slime_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/slime_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/slime_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/steel_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/steel_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/steel_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/steel_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/steel_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/steel_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/steel_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/steel_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/steel_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/steel_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/steel_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/steel_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/steel_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/steel_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/steel_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/steel_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/stone_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/stone_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/stone_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/stone_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/stone_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/stone_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/stone_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/stone_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/stone_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/stone_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/stone_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/stone_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/stone_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/stone_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/stone_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/stone_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/wood_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/wood_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/wood_pickaxe_accessory.png rename to mods/tinker/textures/items/pickaxe/wood_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxe/wood_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/wood_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/wood_pickaxe_handle.png rename to mods/tinker/textures/items/pickaxe/wood_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxe/wood_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/wood_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/wood_pickaxe_head.png rename to mods/tinker/textures/items/pickaxe/wood_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxe/wood_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/wood_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/wood_pickaxe_head_broken.png rename to mods/tinker/textures/items/pickaxe/wood_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/wood_pickaxe_head_effect.png b/mods/tinker/textures/items/pickaxe/wood_pickaxe_head_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxe/wood_pickaxe_head_effect.png rename to mods/tinker/textures/items/pickaxe/wood_pickaxe_head_effect.png diff --git a/resources/tinkertextures/tools/rapier/alumite_rapier_accessory.png b/mods/tinker/textures/items/rapier/alumite_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/alumite_rapier_accessory.png rename to mods/tinker/textures/items/rapier/alumite_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/alumite_rapier_blade.png b/mods/tinker/textures/items/rapier/alumite_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/alumite_rapier_blade.png rename to mods/tinker/textures/items/rapier/alumite_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/alumite_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/alumite_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/alumite_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/alumite_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/alumite_rapier_handle.png b/mods/tinker/textures/items/rapier/alumite_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/alumite_rapier_handle.png rename to mods/tinker/textures/items/rapier/alumite_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/ardite_rapier_accessory.png b/mods/tinker/textures/items/rapier/ardite_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/ardite_rapier_accessory.png rename to mods/tinker/textures/items/rapier/ardite_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/ardite_rapier_blade.png b/mods/tinker/textures/items/rapier/ardite_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/ardite_rapier_blade.png rename to mods/tinker/textures/items/rapier/ardite_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/ardite_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/ardite_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/ardite_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/ardite_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/ardite_rapier_handle.png b/mods/tinker/textures/items/rapier/ardite_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/ardite_rapier_handle.png rename to mods/tinker/textures/items/rapier/ardite_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/blaze_rapier_effect.png b/mods/tinker/textures/items/rapier/blaze_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/blaze_rapier_effect.png rename to mods/tinker/textures/items/rapier/blaze_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/bone_rapier_accessory.png b/mods/tinker/textures/items/rapier/bone_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/bone_rapier_accessory.png rename to mods/tinker/textures/items/rapier/bone_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/bone_rapier_blade.png b/mods/tinker/textures/items/rapier/bone_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/bone_rapier_blade.png rename to mods/tinker/textures/items/rapier/bone_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/bone_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/bone_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/bone_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/bone_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/bone_rapier_handle.png b/mods/tinker/textures/items/rapier/bone_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/bone_rapier_handle.png rename to mods/tinker/textures/items/rapier/bone_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/bronze_rapier_accessory.png b/mods/tinker/textures/items/rapier/bronze_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/bronze_rapier_accessory.png rename to mods/tinker/textures/items/rapier/bronze_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/bronze_rapier_blade.png b/mods/tinker/textures/items/rapier/bronze_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/bronze_rapier_blade.png rename to mods/tinker/textures/items/rapier/bronze_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/bronze_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/bronze_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/bronze_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/bronze_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/bronze_rapier_handle.png b/mods/tinker/textures/items/rapier/bronze_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/bronze_rapier_handle.png rename to mods/tinker/textures/items/rapier/bronze_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/cactus_rapier_accessory.png b/mods/tinker/textures/items/rapier/cactus_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/cactus_rapier_accessory.png rename to mods/tinker/textures/items/rapier/cactus_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/cactus_rapier_blade.png b/mods/tinker/textures/items/rapier/cactus_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/cactus_rapier_blade.png rename to mods/tinker/textures/items/rapier/cactus_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/cactus_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/cactus_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/cactus_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/cactus_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/cactus_rapier_handle.png b/mods/tinker/textures/items/rapier/cactus_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/cactus_rapier_handle.png rename to mods/tinker/textures/items/rapier/cactus_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/cobalt_rapier_accessory.png b/mods/tinker/textures/items/rapier/cobalt_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/cobalt_rapier_accessory.png rename to mods/tinker/textures/items/rapier/cobalt_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/cobalt_rapier_blade.png b/mods/tinker/textures/items/rapier/cobalt_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/cobalt_rapier_blade.png rename to mods/tinker/textures/items/rapier/cobalt_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/cobalt_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/cobalt_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/cobalt_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/cobalt_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/cobalt_rapier_handle.png b/mods/tinker/textures/items/rapier/cobalt_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/cobalt_rapier_handle.png rename to mods/tinker/textures/items/rapier/cobalt_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/copper_rapier_accessory.png b/mods/tinker/textures/items/rapier/copper_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/copper_rapier_accessory.png rename to mods/tinker/textures/items/rapier/copper_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/copper_rapier_blade.png b/mods/tinker/textures/items/rapier/copper_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/copper_rapier_blade.png rename to mods/tinker/textures/items/rapier/copper_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/copper_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/copper_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/copper_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/copper_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/copper_rapier_handle.png b/mods/tinker/textures/items/rapier/copper_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/copper_rapier_handle.png rename to mods/tinker/textures/items/rapier/copper_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/diamond_rapier_effect.png b/mods/tinker/textures/items/rapier/diamond_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/diamond_rapier_effect.png rename to mods/tinker/textures/items/rapier/diamond_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/electric_rapier_effect.png b/mods/tinker/textures/items/rapier/electric_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/electric_rapier_effect.png rename to mods/tinker/textures/items/rapier/electric_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/emerald_rapier_effect.png b/mods/tinker/textures/items/rapier/emerald_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/emerald_rapier_effect.png rename to mods/tinker/textures/items/rapier/emerald_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/flint_rapier_accessory.png b/mods/tinker/textures/items/rapier/flint_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/flint_rapier_accessory.png rename to mods/tinker/textures/items/rapier/flint_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/flint_rapier_blade.png b/mods/tinker/textures/items/rapier/flint_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/flint_rapier_blade.png rename to mods/tinker/textures/items/rapier/flint_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/flint_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/flint_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/flint_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/flint_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/flint_rapier_handle.png b/mods/tinker/textures/items/rapier/flint_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/flint_rapier_handle.png rename to mods/tinker/textures/items/rapier/flint_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/glowstone_rapier_effect.png b/mods/tinker/textures/items/rapier/glowstone_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/glowstone_rapier_effect.png rename to mods/tinker/textures/items/rapier/glowstone_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/ice_rapier_effect.png b/mods/tinker/textures/items/rapier/ice_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/ice_rapier_effect.png rename to mods/tinker/textures/items/rapier/ice_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/iron_rapier_accessory.png b/mods/tinker/textures/items/rapier/iron_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/iron_rapier_accessory.png rename to mods/tinker/textures/items/rapier/iron_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/iron_rapier_blade.png b/mods/tinker/textures/items/rapier/iron_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/iron_rapier_blade.png rename to mods/tinker/textures/items/rapier/iron_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/iron_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/iron_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/iron_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/iron_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/iron_rapier_handle.png b/mods/tinker/textures/items/rapier/iron_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/iron_rapier_handle.png rename to mods/tinker/textures/items/rapier/iron_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/lapis_rapier_effect.png b/mods/tinker/textures/items/rapier/lapis_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/lapis_rapier_effect.png rename to mods/tinker/textures/items/rapier/lapis_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/lava_rapier_effect.png b/mods/tinker/textures/items/rapier/lava_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/lava_rapier_effect.png rename to mods/tinker/textures/items/rapier/lava_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/manyullyn_rapier_accessory.png b/mods/tinker/textures/items/rapier/manyullyn_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/manyullyn_rapier_accessory.png rename to mods/tinker/textures/items/rapier/manyullyn_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/manyullyn_rapier_blade.png b/mods/tinker/textures/items/rapier/manyullyn_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/manyullyn_rapier_blade.png rename to mods/tinker/textures/items/rapier/manyullyn_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/manyullyn_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/manyullyn_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/manyullyn_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/manyullyn_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/manyullyn_rapier_handle.png b/mods/tinker/textures/items/rapier/manyullyn_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/manyullyn_rapier_handle.png rename to mods/tinker/textures/items/rapier/manyullyn_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/moss_rapier_effect.png b/mods/tinker/textures/items/rapier/moss_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/moss_rapier_effect.png rename to mods/tinker/textures/items/rapier/moss_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/necrotic_rapier_effect.png b/mods/tinker/textures/items/rapier/necrotic_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/necrotic_rapier_effect.png rename to mods/tinker/textures/items/rapier/necrotic_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/netherrack_rapier_accessory.png b/mods/tinker/textures/items/rapier/netherrack_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/netherrack_rapier_accessory.png rename to mods/tinker/textures/items/rapier/netherrack_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/netherrack_rapier_blade.png b/mods/tinker/textures/items/rapier/netherrack_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/netherrack_rapier_blade.png rename to mods/tinker/textures/items/rapier/netherrack_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/netherrack_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/netherrack_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/netherrack_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/netherrack_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/netherrack_rapier_handle.png b/mods/tinker/textures/items/rapier/netherrack_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/netherrack_rapier_handle.png rename to mods/tinker/textures/items/rapier/netherrack_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/obsidian_rapier_accessory.png b/mods/tinker/textures/items/rapier/obsidian_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/obsidian_rapier_accessory.png rename to mods/tinker/textures/items/rapier/obsidian_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/obsidian_rapier_blade.png b/mods/tinker/textures/items/rapier/obsidian_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/obsidian_rapier_blade.png rename to mods/tinker/textures/items/rapier/obsidian_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/obsidian_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/obsidian_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/obsidian_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/obsidian_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/obsidian_rapier_handle.png b/mods/tinker/textures/items/rapier/obsidian_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/obsidian_rapier_handle.png rename to mods/tinker/textures/items/rapier/obsidian_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/paper_rapier_accessory.png b/mods/tinker/textures/items/rapier/paper_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/paper_rapier_accessory.png rename to mods/tinker/textures/items/rapier/paper_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/paper_rapier_blade.png b/mods/tinker/textures/items/rapier/paper_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/paper_rapier_blade.png rename to mods/tinker/textures/items/rapier/paper_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/paper_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/paper_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/paper_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/paper_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/paper_rapier_handle.png b/mods/tinker/textures/items/rapier/paper_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/paper_rapier_handle.png rename to mods/tinker/textures/items/rapier/paper_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/redstone_rapier_effect.png b/mods/tinker/textures/items/rapier/redstone_rapier_effect.png similarity index 100% rename from resources/tinkertextures/tools/rapier/redstone_rapier_effect.png rename to mods/tinker/textures/items/rapier/redstone_rapier_effect.png diff --git a/resources/tinkertextures/tools/rapier/slime_rapier_accessory.png b/mods/tinker/textures/items/rapier/slime_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/slime_rapier_accessory.png rename to mods/tinker/textures/items/rapier/slime_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/slime_rapier_blade.png b/mods/tinker/textures/items/rapier/slime_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/slime_rapier_blade.png rename to mods/tinker/textures/items/rapier/slime_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/slime_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/slime_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/slime_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/slime_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/slime_rapier_handle.png b/mods/tinker/textures/items/rapier/slime_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/slime_rapier_handle.png rename to mods/tinker/textures/items/rapier/slime_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/steel_rapier_accessory.png b/mods/tinker/textures/items/rapier/steel_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/steel_rapier_accessory.png rename to mods/tinker/textures/items/rapier/steel_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/steel_rapier_blade.png b/mods/tinker/textures/items/rapier/steel_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/steel_rapier_blade.png rename to mods/tinker/textures/items/rapier/steel_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/steel_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/steel_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/steel_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/steel_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/steel_rapier_handle.png b/mods/tinker/textures/items/rapier/steel_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/steel_rapier_handle.png rename to mods/tinker/textures/items/rapier/steel_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/stone_rapier_accessory.png b/mods/tinker/textures/items/rapier/stone_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/stone_rapier_accessory.png rename to mods/tinker/textures/items/rapier/stone_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/stone_rapier_blade.png b/mods/tinker/textures/items/rapier/stone_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/stone_rapier_blade.png rename to mods/tinker/textures/items/rapier/stone_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/stone_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/stone_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/stone_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/stone_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/stone_rapier_handle.png b/mods/tinker/textures/items/rapier/stone_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/stone_rapier_handle.png rename to mods/tinker/textures/items/rapier/stone_rapier_handle.png diff --git a/resources/tinkertextures/tools/rapier/wood_rapier_accessory.png b/mods/tinker/textures/items/rapier/wood_rapier_accessory.png similarity index 100% rename from resources/tinkertextures/tools/rapier/wood_rapier_accessory.png rename to mods/tinker/textures/items/rapier/wood_rapier_accessory.png diff --git a/resources/tinkertextures/tools/rapier/wood_rapier_blade.png b/mods/tinker/textures/items/rapier/wood_rapier_blade.png similarity index 100% rename from resources/tinkertextures/tools/rapier/wood_rapier_blade.png rename to mods/tinker/textures/items/rapier/wood_rapier_blade.png diff --git a/resources/tinkertextures/tools/rapier/wood_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/wood_rapier_blade_broken.png similarity index 100% rename from resources/tinkertextures/tools/rapier/wood_rapier_blade_broken.png rename to mods/tinker/textures/items/rapier/wood_rapier_blade_broken.png diff --git a/resources/tinkertextures/tools/rapier/wood_rapier_handle.png b/mods/tinker/textures/items/rapier/wood_rapier_handle.png similarity index 100% rename from resources/tinkertextures/tools/rapier/wood_rapier_handle.png rename to mods/tinker/textures/items/rapier/wood_rapier_handle.png diff --git a/resources/tinkertextures/tools/shovel/alumite_shovel_handle.png b/mods/tinker/textures/items/shovel/alumite_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/alumite_shovel_handle.png rename to mods/tinker/textures/items/shovel/alumite_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/alumite_shovel_head.png b/mods/tinker/textures/items/shovel/alumite_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/alumite_shovel_head.png rename to mods/tinker/textures/items/shovel/alumite_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/alumite_shovel_head_broken.png b/mods/tinker/textures/items/shovel/alumite_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/alumite_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/alumite_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/ardite_shovel_handle.png b/mods/tinker/textures/items/shovel/ardite_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/ardite_shovel_handle.png rename to mods/tinker/textures/items/shovel/ardite_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/ardite_shovel_head.png b/mods/tinker/textures/items/shovel/ardite_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/ardite_shovel_head.png rename to mods/tinker/textures/items/shovel/ardite_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/ardite_shovel_head_broken.png b/mods/tinker/textures/items/shovel/ardite_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/ardite_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/ardite_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/blaze_shovel_effect.png b/mods/tinker/textures/items/shovel/blaze_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/blaze_shovel_effect.png rename to mods/tinker/textures/items/shovel/blaze_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/bone_shovel_handle.png b/mods/tinker/textures/items/shovel/bone_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/bone_shovel_handle.png rename to mods/tinker/textures/items/shovel/bone_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/bone_shovel_head.png b/mods/tinker/textures/items/shovel/bone_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/bone_shovel_head.png rename to mods/tinker/textures/items/shovel/bone_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/bone_shovel_head_broken.png b/mods/tinker/textures/items/shovel/bone_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/bone_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/bone_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/bronze_shovel_handle.png b/mods/tinker/textures/items/shovel/bronze_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/bronze_shovel_handle.png rename to mods/tinker/textures/items/shovel/bronze_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/bronze_shovel_head.png b/mods/tinker/textures/items/shovel/bronze_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/bronze_shovel_head.png rename to mods/tinker/textures/items/shovel/bronze_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/bronze_shovel_head_broken.png b/mods/tinker/textures/items/shovel/bronze_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/bronze_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/bronze_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/cactus_shovel_handle.png b/mods/tinker/textures/items/shovel/cactus_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/cactus_shovel_handle.png rename to mods/tinker/textures/items/shovel/cactus_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/cactus_shovel_head.png b/mods/tinker/textures/items/shovel/cactus_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/cactus_shovel_head.png rename to mods/tinker/textures/items/shovel/cactus_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/cactus_shovel_head_broken.png b/mods/tinker/textures/items/shovel/cactus_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/cactus_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/cactus_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/cobalt_shovel_handle.png b/mods/tinker/textures/items/shovel/cobalt_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/cobalt_shovel_handle.png rename to mods/tinker/textures/items/shovel/cobalt_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/cobalt_shovel_head.png b/mods/tinker/textures/items/shovel/cobalt_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/cobalt_shovel_head.png rename to mods/tinker/textures/items/shovel/cobalt_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/cobalt_shovel_head_broken.png b/mods/tinker/textures/items/shovel/cobalt_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/cobalt_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/cobalt_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/copper_shovel_handle.png b/mods/tinker/textures/items/shovel/copper_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/copper_shovel_handle.png rename to mods/tinker/textures/items/shovel/copper_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/copper_shovel_head.png b/mods/tinker/textures/items/shovel/copper_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/copper_shovel_head.png rename to mods/tinker/textures/items/shovel/copper_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/copper_shovel_head_broken.png b/mods/tinker/textures/items/shovel/copper_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/copper_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/copper_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/diamond_shovel_effect.png b/mods/tinker/textures/items/shovel/diamond_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/diamond_shovel_effect.png rename to mods/tinker/textures/items/shovel/diamond_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/electric_shovel_effect.png b/mods/tinker/textures/items/shovel/electric_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/electric_shovel_effect.png rename to mods/tinker/textures/items/shovel/electric_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/emerald_shovel_effect.png b/mods/tinker/textures/items/shovel/emerald_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/emerald_shovel_effect.png rename to mods/tinker/textures/items/shovel/emerald_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/flint_shovel_handle.png b/mods/tinker/textures/items/shovel/flint_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/flint_shovel_handle.png rename to mods/tinker/textures/items/shovel/flint_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/flint_shovel_head.png b/mods/tinker/textures/items/shovel/flint_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/flint_shovel_head.png rename to mods/tinker/textures/items/shovel/flint_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/flint_shovel_head_broken.png b/mods/tinker/textures/items/shovel/flint_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/flint_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/flint_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/glowstone_shovel_effect.png b/mods/tinker/textures/items/shovel/glowstone_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/glowstone_shovel_effect.png rename to mods/tinker/textures/items/shovel/glowstone_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/ice_shovel_effect.png b/mods/tinker/textures/items/shovel/ice_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/ice_shovel_effect.png rename to mods/tinker/textures/items/shovel/ice_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/iron_shovel_handle.png b/mods/tinker/textures/items/shovel/iron_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/iron_shovel_handle.png rename to mods/tinker/textures/items/shovel/iron_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/iron_shovel_head.png b/mods/tinker/textures/items/shovel/iron_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/iron_shovel_head.png rename to mods/tinker/textures/items/shovel/iron_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/iron_shovel_head_broken.png b/mods/tinker/textures/items/shovel/iron_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/iron_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/iron_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/lapis_shovel_effect.png b/mods/tinker/textures/items/shovel/lapis_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/lapis_shovel_effect.png rename to mods/tinker/textures/items/shovel/lapis_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/lava_shovel_effect.png b/mods/tinker/textures/items/shovel/lava_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/lava_shovel_effect.png rename to mods/tinker/textures/items/shovel/lava_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/manyullyn_shovel_handle.png b/mods/tinker/textures/items/shovel/manyullyn_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/manyullyn_shovel_handle.png rename to mods/tinker/textures/items/shovel/manyullyn_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/manyullyn_shovel_head.png b/mods/tinker/textures/items/shovel/manyullyn_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/manyullyn_shovel_head.png rename to mods/tinker/textures/items/shovel/manyullyn_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/manyullyn_shovel_head_broken.png b/mods/tinker/textures/items/shovel/manyullyn_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/manyullyn_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/manyullyn_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/moss_shovel_effect.png b/mods/tinker/textures/items/shovel/moss_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/moss_shovel_effect.png rename to mods/tinker/textures/items/shovel/moss_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/necrotic_shovel_effect.png b/mods/tinker/textures/items/shovel/necrotic_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/necrotic_shovel_effect.png rename to mods/tinker/textures/items/shovel/necrotic_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/netherrack_shovel_handle.png b/mods/tinker/textures/items/shovel/netherrack_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/netherrack_shovel_handle.png rename to mods/tinker/textures/items/shovel/netherrack_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/netherrack_shovel_head.png b/mods/tinker/textures/items/shovel/netherrack_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/netherrack_shovel_head.png rename to mods/tinker/textures/items/shovel/netherrack_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/netherrack_shovel_head_broken.png b/mods/tinker/textures/items/shovel/netherrack_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/netherrack_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/netherrack_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/obsidian_shovel_handle.png b/mods/tinker/textures/items/shovel/obsidian_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/obsidian_shovel_handle.png rename to mods/tinker/textures/items/shovel/obsidian_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/obsidian_shovel_head.png b/mods/tinker/textures/items/shovel/obsidian_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/obsidian_shovel_head.png rename to mods/tinker/textures/items/shovel/obsidian_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/obsidian_shovel_head_broken.png b/mods/tinker/textures/items/shovel/obsidian_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/obsidian_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/obsidian_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/paper_shovel_handle.png b/mods/tinker/textures/items/shovel/paper_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/paper_shovel_handle.png rename to mods/tinker/textures/items/shovel/paper_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/paper_shovel_head.png b/mods/tinker/textures/items/shovel/paper_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/paper_shovel_head.png rename to mods/tinker/textures/items/shovel/paper_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/paper_shovel_head_broken.png b/mods/tinker/textures/items/shovel/paper_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/paper_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/paper_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/redstone_shovel_effect.png b/mods/tinker/textures/items/shovel/redstone_shovel_effect.png similarity index 100% rename from resources/tinkertextures/tools/shovel/redstone_shovel_effect.png rename to mods/tinker/textures/items/shovel/redstone_shovel_effect.png diff --git a/resources/tinkertextures/tools/shovel/slime_shovel_handle.png b/mods/tinker/textures/items/shovel/slime_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/slime_shovel_handle.png rename to mods/tinker/textures/items/shovel/slime_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/slime_shovel_head.png b/mods/tinker/textures/items/shovel/slime_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/slime_shovel_head.png rename to mods/tinker/textures/items/shovel/slime_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/slime_shovel_head_broken.png b/mods/tinker/textures/items/shovel/slime_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/slime_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/slime_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/steel_shovel_handle.png b/mods/tinker/textures/items/shovel/steel_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/steel_shovel_handle.png rename to mods/tinker/textures/items/shovel/steel_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/steel_shovel_head.png b/mods/tinker/textures/items/shovel/steel_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/steel_shovel_head.png rename to mods/tinker/textures/items/shovel/steel_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/steel_shovel_head_broken.png b/mods/tinker/textures/items/shovel/steel_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/steel_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/steel_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/stone_shovel_handle.png b/mods/tinker/textures/items/shovel/stone_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/stone_shovel_handle.png rename to mods/tinker/textures/items/shovel/stone_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/stone_shovel_head.png b/mods/tinker/textures/items/shovel/stone_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/stone_shovel_head.png rename to mods/tinker/textures/items/shovel/stone_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/stone_shovel_head_broken.png b/mods/tinker/textures/items/shovel/stone_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/stone_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/stone_shovel_head_broken.png diff --git a/resources/tinkertextures/tools/shovel/wood_shovel_handle.png b/mods/tinker/textures/items/shovel/wood_shovel_handle.png similarity index 100% rename from resources/tinkertextures/tools/shovel/wood_shovel_handle.png rename to mods/tinker/textures/items/shovel/wood_shovel_handle.png diff --git a/resources/tinkertextures/tools/shovel/wood_shovel_head.png b/mods/tinker/textures/items/shovel/wood_shovel_head.png similarity index 100% rename from resources/tinkertextures/tools/shovel/wood_shovel_head.png rename to mods/tinker/textures/items/shovel/wood_shovel_head.png diff --git a/resources/tinkertextures/tools/shovel/wood_shovel_head_broken.png b/mods/tinker/textures/items/shovel/wood_shovel_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/shovel/wood_shovel_head_broken.png rename to mods/tinker/textures/items/shovel/wood_shovel_head_broken.png diff --git a/mods/tinker/textures/items/tparts.png b/mods/tinker/textures/items/tparts.png new file mode 100644 index 00000000..8c67a7a4 Binary files /dev/null and b/mods/tinker/textures/items/tparts.png differ diff --git a/resources/tinkertextures/ConstructBlocks.png b/resources/tinkertextures/ConstructBlocks.png deleted file mode 100644 index 37a6db63..00000000 Binary files a/resources/tinkertextures/ConstructBlocks.png and /dev/null differ diff --git a/resources/tinkertextures/LiquidWhite.png b/resources/tinkertextures/LiquidWhite.png deleted file mode 100644 index feed3708..00000000 Binary files a/resources/tinkertextures/LiquidWhite.png and /dev/null differ diff --git a/resources/tinkertextures/armory.png b/resources/tinkertextures/armory.png deleted file mode 100644 index 06316b1e..00000000 Binary files a/resources/tinkertextures/armory.png and /dev/null differ diff --git a/resources/tinkertextures/blanksprite.png b/resources/tinkertextures/blanksprite.png deleted file mode 100644 index 8e808b75..00000000 Binary files a/resources/tinkertextures/blanksprite.png and /dev/null differ diff --git a/resources/tinkertextures/tools/baseaccessories.png b/resources/tinkertextures/tools/baseaccessories.png deleted file mode 100644 index 9a43c77f..00000000 Binary files a/resources/tinkertextures/tools/baseaccessories.png and /dev/null differ diff --git a/resources/tinkertextures/tools/baseheads.png b/resources/tinkertextures/tools/baseheads.png deleted file mode 100644 index 08991593..00000000 Binary files a/resources/tinkertextures/tools/baseheads.png and /dev/null differ diff --git a/resources/tinkertextures/tools/bows.png b/resources/tinkertextures/tools/bows.png deleted file mode 100644 index 098ca037..00000000 Binary files a/resources/tinkertextures/tools/bows.png and /dev/null differ diff --git a/resources/tinkertextures/tools/broadheads.png b/resources/tinkertextures/tools/broadheads.png deleted file mode 100644 index db6216f8..00000000 Binary files a/resources/tinkertextures/tools/broadheads.png and /dev/null differ diff --git a/resources/tinkertextures/tools/iceaxes.png b/resources/tinkertextures/tools/iceaxes.png deleted file mode 100644 index 41b0bed4..00000000 Binary files a/resources/tinkertextures/tools/iceaxes.png and /dev/null differ diff --git a/resources/tinkertextures/tools/jokeparts.png b/resources/tinkertextures/tools/jokeparts.png deleted file mode 100644 index a420e7ea..00000000 Binary files a/resources/tinkertextures/tools/jokeparts.png and /dev/null differ diff --git a/resources/tinkertextures/tools/lumberaxe.png b/resources/tinkertextures/tools/lumberaxe.png deleted file mode 100644 index d5125d34..00000000 Binary files a/resources/tinkertextures/tools/lumberaxe.png and /dev/null differ diff --git a/resources/tinkertextures/tools/scythes.png b/resources/tinkertextures/tools/scythes.png deleted file mode 100644 index 5575a7ec..00000000 Binary files a/resources/tinkertextures/tools/scythes.png and /dev/null differ diff --git a/resources/tinkertextures/tools/swordparts.png b/resources/tinkertextures/tools/swordparts.png deleted file mode 100644 index 0de4b953..00000000 Binary files a/resources/tinkertextures/tools/swordparts.png and /dev/null differ diff --git a/tinker/armory/client/RenderPedestal.java b/tinker/armory/client/RenderPedestal.java deleted file mode 100644 index c6d47fd2..00000000 --- a/tinker/armory/client/RenderPedestal.java +++ /dev/null @@ -1,5 +0,0 @@ -package tinker.armory.client; - -public class RenderPedestal { - -} diff --git a/tinker/armory/content/ArmorStandBlock.java b/tinker/armory/content/ArmorStandBlock.java deleted file mode 100644 index 84a22ab0..00000000 --- a/tinker/armory/content/ArmorStandBlock.java +++ /dev/null @@ -1,5 +0,0 @@ -package tinker.armory.content; - -public class ArmorStandBlock { - -} diff --git a/tinker/common/fancyitem/FancyEntityItem.java b/tinker/common/fancyitem/FancyEntityItem.java deleted file mode 100644 index 887909e4..00000000 --- a/tinker/common/fancyitem/FancyEntityItem.java +++ /dev/null @@ -1,41 +0,0 @@ -package tinker.common.fancyitem; - -import java.util.Iterator; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.stats.AchievementList; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.Event.Result; -import net.minecraftforge.event.entity.item.ItemExpireEvent; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import cpw.mods.fml.common.registry.GameRegistry; - -public class FancyEntityItem extends EntityItem -{ - public FancyEntityItem(World par1World, double par2, double par4, double par6) - { - super(par1World, par2, par4, par6); - } - - public FancyEntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) - { - this(par1World, par2, par4, par6); - this.func_92013_a(par8ItemStack); - this.lifespan = (par8ItemStack.getItem() == null ? 6000 : par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World)); - } - - public FancyEntityItem(World par1World) - { - super(par1World); - } -} diff --git a/tinker/common/fancyitem/FancyItemRender.java b/tinker/common/fancyitem/FancyItemRender.java deleted file mode 100644 index ed51150a..00000000 --- a/tinker/common/fancyitem/FancyItemRender.java +++ /dev/null @@ -1,620 +0,0 @@ -package tinker.common.fancyitem; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderEngine; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraftforge.client.ForgeHooksClient; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class FancyItemRender extends Render -{ - private RenderBlocks itemRenderBlocks = new RenderBlocks(); - - /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ - private Random random = new Random(); - public boolean field_77024_a = true; - - /** Defines the zLevel of rendering of item on GUI. */ - public float zLevel = 0.0F; - public static boolean field_82407_g = false; - - public FancyItemRender() - { - this.shadowSize = 0.15F; - this.shadowOpaque = 0.75F; - } - - /** - * Renders the item - */ - public void doRenderItem(EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9) - { - this.random.setSeed(187L); - ItemStack var10 = par1EntityItem.func_92014_d(); - - if (var10.getItem() != null) - { - GL11.glPushMatrix(); - float var11 = shouldBob() ? MathHelper.sin(((float)par1EntityItem.age + par9) / 10.0F + par1EntityItem.hoverStart) * 0.1F + 0.1F : 0F; - float var12 = (((float)par1EntityItem.age + par9) / 20.0F + par1EntityItem.hoverStart) * (180F / (float)Math.PI); - byte var13 = getMiniBlockCountForItemStack(var10); - - GL11.glTranslatef((float)par2, (float)par4 + var11, (float)par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - int var16; - float var19; - float var20; - float var24; - - if (ForgeHooksClient.renderEntityItem(par1EntityItem, var10, var11, var12, random, renderManager.renderEngine, renderBlocks)) - { - ; - } - else if (var10.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType())) - { - GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); - - if (field_82407_g) - { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glTranslatef(0.0F, 0.05F, 0.0F); - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - } - - this.loadTexture(Block.blocksList[var10.itemID].getTextureFile()); - float var22 = 0.25F; - var16 = Block.blocksList[var10.itemID].getRenderType(); - - if (var16 == 1 || var16 == 19 || var16 == 12 || var16 == 2) - { - var22 = 0.5F; - } - - GL11.glScalef(var22, var22, var22); - - for (int var23 = 0; var23 < var13; ++var23) - { - GL11.glPushMatrix(); - - if (var23 > 0) - { - var24 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var22; - var19 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var22; - var20 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var22; - GL11.glTranslatef(var24, var19, var20); - } - - var24 = 1.0F; - this.itemRenderBlocks.renderBlockAsItem(Block.blocksList[var10.itemID], var10.getItemDamage(), var24); - GL11.glPopMatrix(); - } - } - else - { - int var15; - float var17; - - if (var10.getItem().requiresMultipleRenderPasses()) - { - if (field_82407_g) - { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { - GL11.glScalef(0.5F, 0.5F, 0.5F); - } - - - for (var15 = 0; var15 <= var10.getItem().getRenderPasses(var10.getItemDamage()); ++var15) - { - this.loadTexture(Item.itemsList[var10.itemID].getTextureFile()); - this.random.setSeed(187L); - var16 = var10.getItem().getIconIndex(var10, var15); - var17 = 1.0F; - - if (this.field_77024_a) - { - int var18 = Item.itemsList[var10.itemID].getColorFromItemStack(var10, var15); - var19 = (float)(var18 >> 16 & 255) / 255.0F; - var20 = (float)(var18 >> 8 & 255) / 255.0F; - float var21 = (float)(var18 & 255) / 255.0F; - GL11.glColor4f(var19 * var17, var20 * var17, var21 * var17, 1.0F); - this.func_77020_a(par1EntityItem, var16, var13, par9, var19 * var17, var20 * var17, var21 * var17); - } - else - { - this.func_77020_a(par1EntityItem, var16, var13, par9, 1.0F, 1.0F, 1.0F); - } - } - } - else - { - if (field_82407_g) - { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); - } - else - { - GL11.glScalef(0.5F, 0.5F, 0.5F); - } - - var15 = var10.getIconIndex(); - - this.loadTexture(var10.getItem().getTextureFile()); - - if (this.field_77024_a) - { - var16 = Item.itemsList[var10.itemID].getColorFromItemStack(var10, 0); - var17 = (float)(var16 >> 16 & 255) / 255.0F; - var24 = (float)(var16 >> 8 & 255) / 255.0F; - var19 = (float)(var16 & 255) / 255.0F; - var20 = 1.0F; - this.func_77020_a(par1EntityItem, var15, var13, par9, var17 * var20, var24 * var20, var19 * var20); - } - else - { - this.func_77020_a(par1EntityItem, var15, var13, par9, 1.0F, 1.0F, 1.0F); - } - } - } - - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } - } - - private void func_77020_a(EntityItem par1EntityItem, int par2, int par3, float par4, float par5, float par6, float par7) - { - Tessellator var8 = Tessellator.instance; - float var9 = (float)(par2 % 16 * 16 + 0) / 256.0F; - float var10 = (float)(par2 % 16 * 16 + 16) / 256.0F; - float var11 = (float)(par2 / 16 * 16 + 0) / 256.0F; - float var12 = (float)(par2 / 16 * 16 + 16) / 256.0F; - float var13 = 1.0F; - float var14 = 0.5F; - float var15 = 0.25F; - float var17; - - //if (true) - //{ - GL11.glPushMatrix(); - - if (field_82407_g) - { - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - } - else - { - GL11.glRotatef((((float)par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); - } - - float var16 = 0.0625F; - var17 = 0.021875F; - ItemStack var18 = par1EntityItem.func_92014_d(); - int var19 = var18.stackSize; - byte var24 = getMiniItemCountForItemStack(var18); - - - GL11.glTranslatef(-var14, -var15, -((var16 + var17) * (float)var24 / 2.0F)); - - for (int var20 = 0; var20 < var24; ++var20) - { - // Makes items offset when in 3D, like when in 2D, looks much better. Considered a vanilla bug... - if (var20 > 0 && shouldSpreadItems()) - { - float x = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - float y = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - float z = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; - GL11.glTranslatef(x, y, var16 + var17); - } - else - { - GL11.glTranslatef(0f, 0f, var16 + var17); - } - - this.loadTexture(Item.itemsList[var18.itemID].getTextureFile()); - - GL11.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(var8, var10, var11, var9, var12, var16); - - if (var18 != null && var18.hasEffect()) - { - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDisable(GL11.GL_LIGHTING); - this.renderManager.renderEngine.bindTexture(this.renderManager.renderEngine.getTexture("%blur%/misc/glint.png")); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - float var21 = 0.76F; - GL11.glColor4f(0.5F * var21, 0.25F * var21, 0.8F * var21, 1.0F); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glPushMatrix(); - float var22 = 0.125F; - GL11.glScalef(var22, var22, var22); - float var23 = (float)(Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; - GL11.glTranslatef(var23, 0.0F, 0.0F); - GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(var8, 0.0F, 0.0F, 1.0F, 1.0F, var16); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(var22, var22, var22); - var23 = (float)(Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; - GL11.glTranslatef(-var23, 0.0F, 0.0F); - GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(var8, 0.0F, 0.0F, 1.0F, 1.0F, 0.0625F); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - } - } - - GL11.glPopMatrix(); - //} - /*else - { - for (int var25 = 0; var25 < par3; ++var25) - { - GL11.glPushMatrix(); - - if (var25 > 0) - { - var17 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; - float var27 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; - float var26 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; - GL11.glTranslatef(var17, var27, var26); - } - - if (!field_82407_g) - { - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - } - - GL11.glColor4f(par5, par6, par7, 1.0F); - var8.startDrawingQuads(); - var8.setNormal(0.0F, 1.0F, 0.0F); - var8.addVertexWithUV((double)(0.0F - var14), (double)(0.0F - var15), 0.0D, (double)var9, (double)var12); - var8.addVertexWithUV((double)(var13 - var14), (double)(0.0F - var15), 0.0D, (double)var10, (double)var12); - var8.addVertexWithUV((double)(var13 - var14), (double)(1.0F - var15), 0.0D, (double)var10, (double)var11); - var8.addVertexWithUV((double)(0.0F - var14), (double)(1.0F - var15), 0.0D, (double)var9, (double)var11); - var8.draw(); - GL11.glPopMatrix(); - } - }*/ - } - - /** - * Renders the item's icon or block into the UI at the specified position. - */ - public void renderItemIntoGUI(FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5) - { - int var6 = par3ItemStack.itemID; - int var7 = par3ItemStack.getItemDamage(); - int var8 = par3ItemStack.getIconIndex(); - int var10; - float var12; - float var13; - float var16; - - if (par3ItemStack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.blocksList[par3ItemStack.itemID].getRenderType())) - { - Block var15 = Block.blocksList[var6]; - par2RenderEngine.bindTexture(par2RenderEngine.getTexture(var15.getTextureFile())); - GL11.glPushMatrix(); - GL11.glTranslatef((float)(par4 - 2), (float)(par5 + 3), -3.0F + this.zLevel); - GL11.glScalef(10.0F, 10.0F, 10.0F); - GL11.glTranslatef(1.0F, 0.5F, 1.0F); - GL11.glScalef(1.0F, 1.0F, -1.0F); - GL11.glRotatef(210.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); - var10 = Item.itemsList[var6].getColorFromItemStack(par3ItemStack, 0); - var16 = (float)(var10 >> 16 & 255) / 255.0F; - var12 = (float)(var10 >> 8 & 255) / 255.0F; - var13 = (float)(var10 & 255) / 255.0F; - - if (this.field_77024_a) - { - GL11.glColor4f(var16, var12, var13, 1.0F); - } - - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - this.itemRenderBlocks.useInventoryTint = this.field_77024_a; - this.itemRenderBlocks.renderBlockAsItem(var15, var7, 1.0F); - this.itemRenderBlocks.useInventoryTint = true; - GL11.glPopMatrix(); - } - else - { - int var9; - - if (Item.itemsList[var6].requiresMultipleRenderPasses()) - { - GL11.glDisable(GL11.GL_LIGHTING); - par2RenderEngine.bindTexture(par2RenderEngine.getTexture(Item.itemsList[var6].getTextureFile())); - - for (var9 = 0; var9 < Item.itemsList[var6].getRenderPasses(var7); ++var9) - { - var10 = Item.itemsList[var6].getIconIndex(par3ItemStack, var9); - int var11 = Item.itemsList[var6].getColorFromItemStack(par3ItemStack, var9); - var12 = (float)(var11 >> 16 & 255) / 255.0F; - var13 = (float)(var11 >> 8 & 255) / 255.0F; - float var14 = (float)(var11 & 255) / 255.0F; - - if (this.field_77024_a) - { - GL11.glColor4f(var12, var13, var14, 1.0F); - } - - this.renderTexturedQuad(par4, par5, var10 % 16 * 16, var10 / 16 * 16, 16, 16); - } - - GL11.glEnable(GL11.GL_LIGHTING); - } - else if (var8 >= 0) - { - GL11.glDisable(GL11.GL_LIGHTING); - - par2RenderEngine.bindTexture(par2RenderEngine.getTexture(par3ItemStack.getItem().getTextureFile())); - - var9 = Item.itemsList[var6].getColorFromItemStack(par3ItemStack, 0); - float var17 = (float)(var9 >> 16 & 255) / 255.0F; - var16 = (float)(var9 >> 8 & 255) / 255.0F; - var12 = (float)(var9 & 255) / 255.0F; - - if (this.field_77024_a) - { - GL11.glColor4f(var17, var16, var12, 1.0F); - } - - this.renderTexturedQuad(par4, par5, var8 % 16 * 16, var8 / 16 * 16, 16, 16); - GL11.glEnable(GL11.GL_LIGHTING); - } - } - - GL11.glEnable(GL11.GL_CULL_FACE); - } - - /** - * Render the item's icon or block into the GUI, including the glint effect. - */ - public void renderItemAndEffectIntoGUI(FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5) - { - if (par3ItemStack != null) - { - if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2RenderEngine, par3ItemStack, field_77024_a, zLevel, (float)par4, (float)par5)) - { - this.renderItemIntoGUI(par1FontRenderer, par2RenderEngine, par3ItemStack, par4, par5); - } - - if (par3ItemStack != null && par3ItemStack.hasEffect()) - { - GL11.glDepthFunc(GL11.GL_GREATER); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); - par2RenderEngine.bindTexture(par2RenderEngine.getTexture("%blur%/misc/glint.png")); - this.zLevel -= 50.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); - GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); - this.func_77018_a(par4 * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - this.zLevel += 50.0F; - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - } - } - } - - private void func_77018_a(int par1, int par2, int par3, int par4, int par5) - { - for (int var6 = 0; var6 < 2; ++var6) - { - if (var6 == 0) - { - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - } - - if (var6 == 1) - { - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - } - - float var7 = 0.00390625F; - float var8 = 0.00390625F; - float var9 = (float)(Minecraft.getSystemTime() % (long)(3000 + var6 * 1873)) / (3000.0F + (float)(var6 * 1873)) * 256.0F; - float var10 = 0.0F; - Tessellator var11 = Tessellator.instance; - float var12 = 4.0F; - - if (var6 == 1) - { - var12 = -1.0F; - } - - var11.startDrawingQuads(); - var11.addVertexWithUV((double)(par2 + 0), (double)(par3 + par5), (double)this.zLevel, (double)((var9 + (float)par5 * var12) * var7), (double)((var10 + (float)par5) * var8)); - var11.addVertexWithUV((double)(par2 + par4), (double)(par3 + par5), (double)this.zLevel, (double)((var9 + (float)par4 + (float)par5 * var12) * var7), (double)((var10 + (float)par5) * var8)); - var11.addVertexWithUV((double)(par2 + par4), (double)(par3 + 0), (double)this.zLevel, (double)((var9 + (float)par4) * var7), (double)((var10 + 0.0F) * var8)); - var11.addVertexWithUV((double)(par2 + 0), (double)(par3 + 0), (double)this.zLevel, (double)((var9 + 0.0F) * var7), (double)((var10 + 0.0F) * var8)); - var11.draw(); - } - } - - /** - * Renders the item's overlay information. Examples being stack count or damage on top of the item's image at the - * specified position. - */ - public void renderItemOverlayIntoGUI(FontRenderer par1FontRenderer, RenderEngine par2RenderEngine, ItemStack par3ItemStack, int par4, int par5) - { - if (par3ItemStack != null) - { - if (par3ItemStack.stackSize > 1) - { - String var6 = "" + par3ItemStack.stackSize; - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - par1FontRenderer.drawStringWithShadow(var6, par4 + 19 - 2 - par1FontRenderer.getStringWidth(var6), par5 + 6 + 3, 16777215); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - } - - if (par3ItemStack.isItemDamaged()) - { - int var11 = (int)Math.round(13.0D - (double)par3ItemStack.getItemDamageForDisplay() * 13.0D / (double)par3ItemStack.getMaxDamage()); - int var7 = (int)Math.round(255.0D - (double)par3ItemStack.getItemDamageForDisplay() * 255.0D / (double)par3ItemStack.getMaxDamage()); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_TEXTURE_2D); - Tessellator var8 = Tessellator.instance; - int var9 = 255 - var7 << 16 | var7 << 8; - int var10 = (255 - var7) / 4 << 16 | 16128; - this.renderQuad(var8, par4 + 2, par5 + 13, 13, 2, 0); - this.renderQuad(var8, par4 + 2, par5 + 13, 12, 1, var10); - this.renderQuad(var8, par4 + 2, par5 + 13, var11, 1, var9); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - } - } - - /** - * Adds a quad to the tesselator at the specified position with the set width and height and color. Args: - * tessellator, x, y, width, height, color - */ - private void renderQuad(Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) - { - par1Tessellator.startDrawingQuads(); - par1Tessellator.setColorOpaque_I(par6); - par1Tessellator.addVertex((double)(par2 + 0), (double)(par3 + 0), 0.0D); - par1Tessellator.addVertex((double)(par2 + 0), (double)(par3 + par5), 0.0D); - par1Tessellator.addVertex((double)(par2 + par4), (double)(par3 + par5), 0.0D); - par1Tessellator.addVertex((double)(par2 + par4), (double)(par3 + 0), 0.0D); - par1Tessellator.draw(); - } - - /** - * Adds a textured quad to the tesselator at the specified position with the specified texture coords, width and - * height. Args: x, y, u, v, width, height - */ - public void renderTexturedQuad(int par1, int par2, int par3, int par4, int par5, int par6) - { - float var7 = 0.00390625F; - float var8 = 0.00390625F; - Tessellator var9 = Tessellator.instance; - var9.startDrawingQuads(); - var9.addVertexWithUV((double)(par1 + 0), (double)(par2 + par6), (double)this.zLevel, (double)((float)(par3 + 0) * var7), (double)((float)(par4 + par6) * var8)); - var9.addVertexWithUV((double)(par1 + par5), (double)(par2 + par6), (double)this.zLevel, (double)((float)(par3 + par5) * var7), (double)((float)(par4 + par6) * var8)); - var9.addVertexWithUV((double)(par1 + par5), (double)(par2 + 0), (double)this.zLevel, (double)((float)(par3 + par5) * var7), (double)((float)(par4 + 0) * var8)); - var9.addVertexWithUV((double)(par1 + 0), (double)(par2 + 0), (double)this.zLevel, (double)((float)(par3 + 0) * var7), (double)((float)(par4 + 0) * var8)); - var9.draw(); - } - - /** - * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then - * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic - * (Render 1) - { - var13 = 2; - } - - if (stack.stackSize > 5) - { - var13 = 3; - } - - if (stack.stackSize > 20) - { - var13 = 4; - } - - if (stack.stackSize > 40) - { - var13 = 5; - } - return var13; - } - - /** - * Allows for a subclass to override how many rendered items appear in a - * "mini item 3d stack" - * @param stack - * @return - */ - public byte getMiniItemCountForItemStack(ItemStack stack) - { - byte var24; - int var19 = stack.stackSize; - if (var19 < 2) - { - var24 = 1; - } - else if (var19 < 16) - { - var24 = 2; - } - else if (var19 < 32) - { - var24 = 3; - } - else - { - var24 = 4; - } - return var24; - } -} diff --git a/tinker/tconstruct/blocks/TConstructBlock.java b/tinker/tconstruct/blocks/TConstructBlock.java deleted file mode 100644 index ea9e63f9..00000000 --- a/tinker/tconstruct/blocks/TConstructBlock.java +++ /dev/null @@ -1,49 +0,0 @@ -package tinker.tconstruct.blocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.TContent; - -public class TConstructBlock extends Block -{ - int subblocks; - public TConstructBlock(int id, int tex, Material material, float hardness, int sub) - { - super(id, tex, material); - setHardness(hardness); - this.setCreativeTab(TConstruct.blockTab); - subblocks = sub; - } - - @Override - public int damageDropped (int meta) - { - return meta; - } - - @Override - public int getBlockTextureFromSideAndMetadata (int side, int meta) - { - return blockIndexInTexture + meta; - } - - @Override - public String getTextureFile () - { - return TContent.blockTexture; - } - - @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < subblocks; iter++) - { - list.add(new ItemStack(id, 1, iter)); - } - } -} diff --git a/tinker/tconstruct/client/liquidrender/LiquidAlBrassFX.java b/tinker/tconstruct/client/liquidrender/LiquidAlBrassFX.java deleted file mode 100644 index adde56ef..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidAlBrassFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidAlBrassFX extends TextureLiquidStillFX -{ - public LiquidAlBrassFX() - { - super(200, 255, 165, 255, 20, 100, 41, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidAlBrassFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidAlBrassFlowFX.java deleted file mode 100644 index c25a666d..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidAlBrassFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidAlBrassFlowFX extends TextureLiquidFlowingFX -{ - public LiquidAlBrassFlowFX() - { - super(200, 255, 165, 255, 20, 100, 41+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidAluminumFX.java b/tinker/tconstruct/client/liquidrender/LiquidAluminumFX.java deleted file mode 100644 index d2cf4543..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidAluminumFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidAluminumFX extends TextureLiquidStillFX -{ - public LiquidAluminumFX() - { - super(50, 255, 0, 150, 0, 120, 12, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidAluminumFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidAluminumFlowFX.java deleted file mode 100644 index 4ad48c95..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidAluminumFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidAluminumFlowFX extends TextureLiquidFlowingFX -{ - public LiquidAluminumFlowFX() - { - super(50, 255, 0, 150, 0, 120, 12+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidAlumiteFX.java b/tinker/tconstruct/client/liquidrender/LiquidAlumiteFX.java deleted file mode 100644 index 5fc3d84d..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidAlumiteFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidAlumiteFX extends TextureLiquidStillFX -{ - public LiquidAlumiteFX() - { - super(0, 255, 0, 200, 0, 255, 64, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidAlumiteFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidAlumiteFlowFX.java deleted file mode 100644 index b4d1b093..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidAlumiteFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidAlumiteFlowFX extends TextureLiquidFlowingFX -{ - public LiquidAlumiteFlowFX() - { - super(0, 255, 0, 200, 0, 255, 64+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidAngmallenFX.java b/tinker/tconstruct/client/liquidrender/LiquidAngmallenFX.java deleted file mode 100644 index 6ad2defd..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidAngmallenFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidAngmallenFX extends TextureLiquidStillFX -{ - public LiquidAngmallenFX() - { - super(180, 255, 137, 237, 20, 120, 99, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidAngmallenFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidAngmallenFlowFX.java deleted file mode 100644 index 4a7cde6f..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidAngmallenFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidAngmallenFlowFX extends TextureLiquidFlowingFX -{ - public LiquidAngmallenFlowFX() - { - super(180, 255, 137, 237, 20, 120, 99+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidArditeFX.java b/tinker/tconstruct/client/liquidrender/LiquidArditeFX.java deleted file mode 100644 index 5a38be6d..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidArditeFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidArditeFX extends TextureLiquidStillFX -{ - public LiquidArditeFX() - { - super(10, 250, 10, 150, 10, 50, 35, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidArditeFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidArditeFlowFX.java deleted file mode 100644 index 9710fc5d..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidArditeFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidArditeFlowFX extends TextureLiquidFlowingFX -{ - public LiquidArditeFlowFX() - { - super(10, 250, 10, 150, 10, 50, 35+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidBronzeFX.java b/tinker/tconstruct/client/liquidrender/LiquidBronzeFX.java deleted file mode 100644 index 008a351e..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidBronzeFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidBronzeFX extends TextureLiquidStillFX -{ - public LiquidBronzeFX() - { - super(0, 180, 0, 140, 0, 50, 38, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidBronzeFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidBronzeFlowFX.java deleted file mode 100644 index 1456d7a0..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidBronzeFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidBronzeFlowFX extends TextureLiquidFlowingFX -{ - public LiquidBronzeFlowFX() - { - super(0, 180, 0, 140, 0, 50, 38+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidCobaltFX.java b/tinker/tconstruct/client/liquidrender/LiquidCobaltFX.java deleted file mode 100644 index 45b2fe95..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidCobaltFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidCobaltFX extends TextureLiquidStillFX -{ - public LiquidCobaltFX() - { - super(0, 30, 30, 100, 100, 250, 32, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidCobaltFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidCobaltFlowFX.java deleted file mode 100644 index dbc429de..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidCobaltFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidCobaltFlowFX extends TextureLiquidFlowingFX -{ - public LiquidCobaltFlowFX() - { - super(0, 30, 30, 100, 100, 250, 32+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidCopperFX.java b/tinker/tconstruct/client/liquidrender/LiquidCopperFX.java deleted file mode 100644 index ab7b4aab..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidCopperFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidCopperFX extends TextureLiquidStillFX -{ - public LiquidCopperFX() - { - super(220, 255, 130, 220, 0, 120, 6, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidCopperFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidCopperFlowFX.java deleted file mode 100644 index 87469b5e..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidCopperFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidCopperFlowFX extends TextureLiquidFlowingFX -{ - public LiquidCopperFlowFX() - { - super(220, 255, 130, 220, 0, 120, 6+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFX.java b/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFX.java deleted file mode 100644 index 1f5660d2..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidDamascusSteelFX extends TextureLiquidStillFX -{ - public LiquidDamascusSteelFX() - { - super(37, 137, 12, 112, 0, 83, 96, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFlowFX.java deleted file mode 100644 index b12ec6fb..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidDamascusSteelFlowFX extends TextureLiquidFlowingFX -{ - public LiquidDamascusSteelFlowFX() - { - super(37, 137, 12, 112, 0, 83, 96+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidGoldFX.java b/tinker/tconstruct/client/liquidrender/LiquidGoldFX.java deleted file mode 100644 index 92f30499..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidGoldFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidGoldFX extends TextureLiquidStillFX -{ - public LiquidGoldFX() - { - super(180, 255, 180, 255, 10, 40, 3, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidGoldFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidGoldFlowFX.java deleted file mode 100644 index 5cea8012..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidGoldFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidGoldFlowFX extends TextureLiquidFlowingFX -{ - public LiquidGoldFlowFX() - { - super(180, 255, 180, 255, 10, 40, 3+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidHeptazionFX.java b/tinker/tconstruct/client/liquidrender/LiquidHeptazionFX.java deleted file mode 100644 index 38b7d703..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidHeptazionFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidHeptazionFX extends TextureLiquidStillFX -{ - public LiquidHeptazionFX() - { - super(66, 166, 43, 143, 66, 166, 76, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidHeptazionFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidHeptazionFlowFX.java deleted file mode 100644 index fcf1b126..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidHeptazionFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidHeptazionFlowFX extends TextureLiquidFlowingFX -{ - public LiquidHeptazionFlowFX() - { - super(66, 166, 43, 143, 66, 166, 76+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidIronFX.java b/tinker/tconstruct/client/liquidrender/LiquidIronFX.java deleted file mode 100644 index 6345adc5..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidIronFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidIronFX extends TextureLiquidStillFX -{ - public LiquidIronFX() - { - super(10, 250, 10, 100, 10, 50, 0, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidIronFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidIronFlowFX.java deleted file mode 100644 index 22b8c01a..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidIronFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidIronFlowFX extends TextureLiquidFlowingFX -{ - public LiquidIronFlowFX() - { - super(10, 250, 10, 100, 10, 50, 0+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidManganeseFX.java b/tinker/tconstruct/client/liquidrender/LiquidManganeseFX.java deleted file mode 100644 index 5f55b1aa..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidManganeseFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidManganeseFX extends TextureLiquidStillFX -{ - public LiquidManganeseFX() - { - super(200, 255, 118, 218, 118, 218, 73, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidManganeseFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidManganeseFlowFX.java deleted file mode 100644 index dd7af453..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidManganeseFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidManganeseFlowFX extends TextureLiquidFlowingFX -{ - public LiquidManganeseFlowFX() - { - super(200, 255, 118, 218, 118, 218, 73+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidManyullynFX.java b/tinker/tconstruct/client/liquidrender/LiquidManyullynFX.java deleted file mode 100644 index 31f989e3..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidManyullynFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidManyullynFX extends TextureLiquidStillFX -{ - public LiquidManyullynFX() - { - super(50, 200, 0, 40, 50, 200, 44, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidManyullynFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidManyullynFlowFX.java deleted file mode 100644 index cbf19cfc..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidManyullynFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidManyullynFlowFX extends TextureLiquidFlowingFX -{ - public LiquidManyullynFlowFX() - { - super(50, 200, 0, 40, 50, 200, 44+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidObsidianFX.java b/tinker/tconstruct/client/liquidrender/LiquidObsidianFX.java deleted file mode 100644 index 23521b1a..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidObsidianFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidObsidianFX extends TextureLiquidStillFX -{ - public LiquidObsidianFX() - { - super(0, 120, 0, 40, 0, 120, 67, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidObsidianFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidObsidianFlowFX.java deleted file mode 100644 index 0c3e31f2..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidObsidianFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidObsidianFlowFX extends TextureLiquidFlowingFX -{ - public LiquidObsidianFlowFX() - { - super(0, 120, 0, 40, 0, 120, 67+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidSteelFX.java b/tinker/tconstruct/client/liquidrender/LiquidSteelFX.java deleted file mode 100644 index 8563d571..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidSteelFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidSteelFX extends TextureLiquidStillFX -{ - public LiquidSteelFX() - { - super(30, 150, 30, 150, 30, 150, 70, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidSteelFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidSteelFlowFX.java deleted file mode 100644 index f01a494b..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidSteelFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidSteelFlowFX extends TextureLiquidFlowingFX -{ - public LiquidSteelFlowFX() - { - super(30, 150, 30, 150, 30, 150, 70+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidTinFX.java b/tinker/tconstruct/client/liquidrender/LiquidTinFX.java deleted file mode 100644 index be898851..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidTinFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidTinFX extends TextureLiquidStillFX -{ - public LiquidTinFX() - { - super(150, 250, 150, 250, 150, 250, 9, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/LiquidTinFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidTinFlowFX.java deleted file mode 100644 index da9feab3..00000000 --- a/tinker/tconstruct/client/liquidrender/LiquidTinFlowFX.java +++ /dev/null @@ -1,11 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import tinker.tconstruct.TContent; - -public class LiquidTinFlowFX extends TextureLiquidFlowingFX -{ - public LiquidTinFlowFX() - { - super(150, 250, 150, 250, 150, 250, 9+1, TContent.liquidTexture); - } -} \ No newline at end of file diff --git a/tinker/tconstruct/client/liquidrender/TextureLiquidFlowingFX.java b/tinker/tconstruct/client/liquidrender/TextureLiquidFlowingFX.java deleted file mode 100644 index 70802f3a..00000000 --- a/tinker/tconstruct/client/liquidrender/TextureLiquidFlowingFX.java +++ /dev/null @@ -1,217 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderEngine; -import net.minecraft.util.MathHelper; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.client.FMLTextureFX; - -public class TextureLiquidFlowingFX extends FMLTextureFX -{ - private final int redMin, redMax, greenMin, greenMax, blueMin, blueMax; - private final String texture; - - protected float red[]; - protected float blue[]; - protected float green[]; - protected float alpha[]; - private int animFrame; - - public TextureLiquidFlowingFX(int redMin, int redMax, int greenMin, int greenMax, int blueMin, int blueMax, int spriteIndex, String texture) - { - super(spriteIndex); - this.redMin = redMin; - this.redMax = redMax; - this.greenMin = greenMin; - this.greenMax = greenMax; - this.blueMin = blueMin; - this.blueMax = blueMax; - this.texture = texture; - - tileSize = 2; - } - - @Override - protected void setup () - { - super.setup(); - red = new float[tileSizeSquare]; - blue = new float[tileSizeSquare]; - green = new float[tileSizeSquare]; - alpha = new float[tileSizeSquare]; - animFrame = 0; - } - - @Override - public void bindImage (RenderEngine renderengine) - { - GL11.glBindTexture(3553, renderengine.getTexture(texture)); - } - - @Override - public void onTick () - { - ++this.animFrame; - int var2; - float var3; - int r; - int g; - int b; - int var8; - int var9; - - for (int var1 = 0; var1 < tileSizeBase; ++var1) - { - for (var2 = 0; var2 < tileSizeBase; ++var2) - { - var3 = 0.0F; - int var4 = (int)(MathHelper.sin((float)var2 * (float)Math.PI * 2.0F / 16.0F) * 1.2F); - r = (int)(MathHelper.sin((float)var1 * (float)Math.PI * 2.0F / 16.0F) * 1.2F); - - for (g = var1 - 1; g <= var1 + 1; ++g) - { - for (b = var2 - 1; b <= var2 + 1; ++b) - { - var8 = g + var4 & tileSizeMask; - var9 = b + r & tileSizeMask; - var3 += this.red[var8 + var9 * tileSizeBase]; - } - } - - this.blue[var1 + var2 * tileSizeBase] = var3 / 10.0F + (this.green[(var1 + 0 & tileSizeMask) + (var2 + 0 & tileSizeMask) * tileSizeBase] + this.green[(var1 + 1 & tileSizeMask) + (var2 + 0 & tileSizeMask) * tileSizeBase] + this.green[(var1 + 1 & tileSizeMask) + (var2 + 1 & tileSizeMask) * tileSizeBase] + this.green[(var1 + 0 & tileSizeMask) + (var2 + 1 & tileSizeMask) * tileSizeBase]) / 4.0F * 0.8F; - this.green[var1 + var2 * tileSizeBase] += this.alpha[var1 + var2 * tileSizeBase] * 0.01F; - - if (this.green[var1 + var2 * tileSizeBase] < 0.0F) - { - this.green[var1 + var2 * tileSizeBase] = 0.0F; - } - - this.alpha[var1 + var2 * tileSizeBase] -= 0.06F; - - if (Math.random() < 0.005D) - { - this.alpha[var1 + var2 * tileSizeBase] = 1.5F; - } - } - } - - float[] var11 = this.blue; - this.blue = this.red; - this.red = var11; - - for (var2 = 0; var2 < tileSizeSquare; ++var2) - { - var3 = this.red[(var2 - this.animFrame / 3 * tileSizeBase) & tileSizeSquareMask] * 2.0F; - - if (var3 > 1.0F) - { - var3 = 1.0F; - } - - if (var3 < 0.0F) - { - var3 = 0.0F; - } - - //r = (int)(var3 * 100.0F + 155.0F); - //g = (int)(var3 * var3 * 255.0F); - //b = (int)(var3 * var3 * var3 * var3 * 128.0F); - r = (int) (redMin + var3 * (redMax - redMin)); - g = (int) (greenMin + var3 * (greenMax - greenMin)); - b = (int) (blueMin + var3 * (blueMax - blueMin)); - - if (this.anaglyphEnabled) - { - var8 = (r * 30 + g * 59 + b * 11) / 100; - var9 = (r * 30 + g * 70) / 100; - int var10 = (r * 30 + b * 70) / 100; - r = var8; - g = var9; - b = var10; - } - - this.imageData[var2 * 4 + 0] = (byte)r; - this.imageData[var2 * 4 + 1] = (byte)g; - this.imageData[var2 * 4 + 2] = (byte)b; - this.imageData[var2 * 4 + 3] = -1; - } - /*animFrame++; - for (int i = 0; i < tileSizeBase; i++) - { - for (int k = 0; k < tileSizeBase; k++) - { - float f = 0.0F; - for (int j1 = k - 2; j1 <= k; j1++) - { - int k1 = i & tileSizeMask; - int i2 = j1 & tileSizeMask; - f += red[k1 + i2 * tileSizeBase]; - } - - blue[i + k * tileSizeBase] = f / 3.2F + green[i + k * tileSizeBase] * 0.8F; - } - } - - for (int j = 0; j < tileSizeBase; j++) - { - for (int l = 0; l < tileSizeBase; l++) - { - green[j + l * tileSizeBase] += alpha[j + l * tileSizeBase] * 0.05F; - if (green[j + l * tileSizeBase] < 0.0F) - { - green[j + l * tileSizeBase] = 0.0F; - } - alpha[j + l * tileSizeBase] -= 0.3F; - if (Math.random() < 0.20000000000000001D) - { - alpha[j + l * tileSizeBase] = 0.5F; - } - } - } - - float af[] = blue; - blue = red; - red = af; - for (int i1 = 0; i1 < tileSizeSquare; i1++) - { - float f1 = red[i1 - animFrame * tileSizeBase & tileSizeSquareMask]; - if (f1 > 1.0F) - { - f1 = 1.0F; - } - if (f1 < 0.0F) - { - f1 = 0.0F; - } - float f2 = f1 * f1; - //int r = (int) (10F + f2 * 22F); - //int g = (int) (50F + f2 * 64F); - //int b = 255; - - int r = (int) (redMin + f2 * (redMax - redMin)); - int g = (int) (greenMin + f2 * (greenMax - greenMin)); - int b = (int) (blueMin + f2 * (blueMax - blueMin)); - if (anaglyphEnabled) - { - int redTemp = (r * 30 + g * 59 + b * 11) / 100; - int greenTemp = (r * 30 + g * 70) / 100; - int blueTemp = (r * 30 + b * 70) / 100; - r = redTemp; - g = greenTemp; - b = blueTemp; - } - imageData[i1 * 4 + 0] = (byte) r; - imageData[i1 * 4 + 1] = (byte) g; - imageData[i1 * 4 + 2] = (byte) b; - imageData[i1 * 4 + 3] = (byte)l2(byte) 255; - - //imageData[i1 * 4 + 0] = (byte) l1; - //imageData[i1 * 4 + 1] = (byte) l1; - //imageData[i1 * 4 + 2] = (byte) l1; - //imageData[i1 * 4 + 3] = (byte)l2 (byte) 255; - }*/ - - } -} diff --git a/tinker/tconstruct/client/liquidrender/TextureLiquidStillFX.java b/tinker/tconstruct/client/liquidrender/TextureLiquidStillFX.java deleted file mode 100644 index c1180ed6..00000000 --- a/tinker/tconstruct/client/liquidrender/TextureLiquidStillFX.java +++ /dev/null @@ -1,208 +0,0 @@ -package tinker.tconstruct.client.liquidrender; - -import net.minecraft.client.renderer.RenderEngine; -import net.minecraft.util.MathHelper; -import net.minecraftforge.client.ForgeHooksClient; -import cpw.mods.fml.client.FMLTextureFX; - -public class TextureLiquidStillFX extends FMLTextureFX -{ - private final int redMin, redMax, greenMin, greenMax, blueMin, blueMax; - private final String texture; - - protected float red[]; - protected float green[]; - protected float blue[]; - protected float alpha[]; - - public TextureLiquidStillFX(int redMin, int redMax, int greenMin, int greenMax, int blueMin, int blueMax, int spriteIndex, String texture) - { - super(spriteIndex); - - this.redMin = redMin; - this.redMax = redMax; - this.greenMin = greenMin; - this.greenMax = greenMax; - this.blueMin = blueMin; - this.blueMax = blueMax; - this.texture = texture; - setup(); - } - - @Override - public void setup () - { - super.setup(); - - red = new float[tileSizeSquare]; - green = new float[tileSizeSquare]; - blue = new float[tileSizeSquare]; - alpha = new float[tileSizeSquare]; - } - - @Override - public void bindImage (RenderEngine renderengine) - { - ForgeHooksClient.bindTexture(texture, 0); - } - - @Override - public void onTick () - { - int var2; - float var3; - int r; - int g; - int b; - int var8; - int var9; - - for (int var1 = 0; var1 < tileSizeBase; ++var1) - { - for (var2 = 0; var2 < tileSizeBase; ++var2) - { - var3 = 0.0F; - int var4 = (int)(MathHelper.sin((float)var2 * (float)Math.PI * 2.0F / 16.0F) * 1.2F); - r = (int)(MathHelper.sin((float)var1 * (float)Math.PI * 2.0F / 16.0F) * 1.2F); - - for (g = var1 - 1; g <= var1 + 1; ++g) - { - for (b = var2 - 1; b <= var2 + 1; ++b) - { - var8 = g + var4 & tileSizeMask; - var9 = b + r & tileSizeMask; - var3 += this.red[var8 + var9 * tileSizeBase]; - } - } - - this.green[var1 + var2 * tileSizeBase] = var3 / 10.0F + (this.blue[(var1 + 0 & tileSizeMask) + (var2 + 0 & tileSizeMask) * tileSizeBase] + this.blue[(var1 + 1 & tileSizeMask) + (var2 + 0 & tileSizeMask) * tileSizeBase] + this.blue[(var1 + 1 & tileSizeMask) + (var2 + 1 & tileSizeMask) * tileSizeBase] + this.blue[(var1 + 0 & tileSizeMask) + (var2 + 1 & tileSizeMask) * tileSizeBase]) / 4.0F * 0.8F; - this.blue[var1 + var2 * tileSizeBase] += this.alpha[var1 + var2 * tileSizeBase] * 0.01F; - - if (this.blue[var1 + var2 * tileSizeBase] < 0.0F) - { - this.blue[var1 + var2 * tileSizeBase] = 0.0F; - } - - this.alpha[var1 + var2 * tileSizeBase] -= 0.06F; - - if (Math.random() < 0.005D) - { - this.alpha[var1 + var2 * tileSizeBase] = 1.5F; - } - } - } - - float[] var11 = this.green; - this.green = this.red; - this.red = var11; - - for (var2 = 0; var2 < tileSizeSquare; ++var2) - { - var3 = this.red[var2] * 2.0F; - - if (var3 > 1.0F) - { - var3 = 1.0F; - } - - if (var3 < 0.0F) - { - var3 = 0.0F; - } - - /*r = (int)(var3 * 100.0F + 155.0F); - g = (int)(var3 * var3 * 255.0F); - b = (int)(var3 * var3 * var3 * var3 * 128.0F);*/ - r = (int) (redMin + var3 * (redMax - redMin)); - g = (int) (greenMin + var3 * (greenMax - greenMin)); - b = (int) (blueMin + var3 * (blueMax - blueMin)); - - if (this.anaglyphEnabled) - { - var8 = (r * 30 + g * 59 + b * 11) / 100; - var9 = (r * 30 + g * 70) / 100; - int var10 = (r * 30 + b * 70) / 100; - r = var8; - g = var9; - b = var10; - } - - this.imageData[var2 * 4 + 0] = (byte)r; - this.imageData[var2 * 4 + 1] = (byte)g; - this.imageData[var2 * 4 + 2] = (byte)b; - this.imageData[var2 * 4 + 3] = -1; - } - - /*for (int i = 0; i < tileSizeBase; ++i) - { - for (int j = 0; j < tileSizeBase; ++j) - { - float var3 = 0.0F; - - for (int k = i - 1; k <= i + 1; ++k) - { - int r = k & tileSizeMask; - int g = j & tileSizeMask; - var3 += this.red[r + g * tileSizeBase]; - } - - this.green[i + j * tileSizeBase] = var3 / 3.3F + this.blue[i + j * tileSizeBase] * 0.8F; - } - } - - for (int i = 0; i < tileSizeBase; ++i) - { - for (int j = 0; j < tileSizeBase; ++j) - { - this.blue[i + j * tileSizeBase] += this.alpha[i + j * tileSizeBase] * 0.05F; - - if (this.blue[i + j * tileSizeBase] < 0.0F) - { - this.blue[i + j * tileSizeBase] = 0.0F; - } - - this.alpha[i + j * tileSizeBase] -= 0.1F; - - if (Math.random() < 0.05D) - { - this.alpha[i + j * tileSizeBase] = 0.5F; - } - } - } - - float af[] = green; - green = red; - red = af; - for (int i1 = 0; i1 < tileSizeSquare; i1++) - { - float f1 = red[i1]; - if (f1 > 1.0F) - { - f1 = 1.0F; - } - if (f1 < 0.0F) - { - f1 = 0.0F; - } - float f2 = f1 * f1; - int r = (int) (redMin + f2 * (redMax - redMin)); - int g = (int) (greenMin + f2 * (greenMax - greenMin)); - int b = (int) (blueMin + f2 * (blueMax - blueMin)); - if (anaglyphEnabled) - { - int i3 = (r * 30 + g * 59 + b * 11) / 100; - int j3 = (r * 30 + g * 70) / 100; - int k3 = (r * 30 + b * 70) / 100; - r = i3; - g = j3; - b = k3; - } - - imageData[i1 * 4 + 0] = (byte) r; - imageData[i1 * 4 + 1] = (byte) g; - imageData[i1 * 4 + 2] = (byte) b; - imageData[i1 * 4 + 3] = (byte) 255; - }*/ - - } -} diff --git a/tinker/tconstruct/entity/Skyla.java b/tinker/tconstruct/entity/Skyla.java deleted file mode 100644 index f5aaf281..00000000 --- a/tinker/tconstruct/entity/Skyla.java +++ /dev/null @@ -1,51 +0,0 @@ -package tinker.tconstruct.entity; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.ai.EntityAIAttackOnCollide; -import net.minecraft.entity.ai.EntityAIAvoidEntity; -import net.minecraft.entity.ai.EntityAICreeperSwell; -import net.minecraft.entity.ai.EntityAIHurtByTarget; -import net.minecraft.entity.ai.EntityAILookIdle; -import net.minecraft.entity.ai.EntityAINearestAttackableTarget; -import net.minecraft.entity.ai.EntityAISwimming; -import net.minecraft.entity.ai.EntityAIWander; -import net.minecraft.entity.ai.EntityAIWatchClosest; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class Skyla extends EntityPlayer -{ - - public Skyla(World par1World) - { - super(par1World); - username = "Skyla"; - texture = "/tinkertextures/mob/skyla.png"; - } - - @Override - public void sendChatToPlayer (String var1) {} - - @Override - public boolean canCommandSenderUseCommand (int var1, String var2) - { - return false; - } - - @Override - public ChunkCoordinates getPlayerCoordinates () - { - return null; - } - -} diff --git a/tinker/tconstruct/items/BlankPattern.java b/tinker/tconstruct/items/BlankPattern.java deleted file mode 100644 index e4bc8291..00000000 --- a/tinker/tconstruct/items/BlankPattern.java +++ /dev/null @@ -1,32 +0,0 @@ -package tinker.tconstruct.items; - -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; - -public class BlankPattern extends CraftingItem -{ - public BlankPattern(int id, int icon, String tex) - { - super(id, icon, tex); - this.setHasSubtypes(true); - this.setMaxDamage(0); - } - - public String getItemNameIS(ItemStack stack) - { - int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, 2); - return getItemName() + "." +patternTypes[arr]; - } - - public void getSubItems (int id, CreativeTabs tab, List list) - { - for (int i = 0; i < 2; i++) - list.add(new ItemStack(id, 1, i)); - } - - public static final String[] patternTypes = new String[] { - "pattern", "cast" }; -} diff --git a/tinker/tconstruct/items/CraftingItem.java b/tinker/tconstruct/items/CraftingItem.java deleted file mode 100644 index 3f4c28ef..00000000 --- a/tinker/tconstruct/items/CraftingItem.java +++ /dev/null @@ -1,29 +0,0 @@ -package tinker.tconstruct.items; - -import java.util.List; - -import tinker.tconstruct.TConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class CraftingItem extends Item -{ - public CraftingItem(int id, int icon, String tex) - { - super(id); - this.setCreativeTab(TConstruct.materialTab); - this.iconIndex = icon; - this.setTextureFile(tex); - this.setMaxDamage(0); - this.setHasSubtypes(true); - } - - @SideOnly(Side.CLIENT) - public int getIconFromDamage(int meta) - { - return this.iconIndex + meta; - } -} diff --git a/tinker/tconstruct/items/Materials.java b/tinker/tconstruct/items/Materials.java deleted file mode 100644 index 50d1304f..00000000 --- a/tinker/tconstruct/items/Materials.java +++ /dev/null @@ -1,46 +0,0 @@ -package tinker.tconstruct.items; - -import java.util.List; - -import tinker.tconstruct.TConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; - -public class Materials extends Item -{ - public Materials(int id, int icon, String tex) - { - super(id); - this.setCreativeTab(TConstruct.materialTab); - this.iconIndex = icon; - this.setTextureFile(tex); - this.setHasSubtypes(true); - this.setMaxDamage(0); - } - - @SideOnly(Side.CLIENT) - public int getIconFromDamage(int meta) - { - return this.iconIndex + meta; - } - - public String getItemNameIS(ItemStack stack) - { - int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, materialNames.length); - return getItemName() + "." +materialNames[arr]; - } - - public void getSubItems(int id, CreativeTabs tab, List list) - { - for (int i = 0; i < materialNames.length; i++) - list.add(new ItemStack(id, 1, i)); - } - - public static final String[] materialNames = new String[] { - "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", - "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot" }; -} diff --git a/tinker/tconstruct/items/ToolPart.java b/tinker/tconstruct/items/ToolPart.java deleted file mode 100644 index 462b7427..00000000 --- a/tinker/tconstruct/items/ToolPart.java +++ /dev/null @@ -1,41 +0,0 @@ -package tinker.tconstruct.items; - - -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import tinker.common.IToolPart; - -public class ToolPart extends CraftingItem - implements IToolPart -{ - public ToolPart(int id, int icon, String tex) - { - super(id, icon, tex); - this.setHasSubtypes(true); - this.setMaxDamage(0); - } - - public String getItemNameIS(ItemStack stack) - { - int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, 16); - return getItemName() + "." +toolMaterialNames[arr]; - } - - public void getSubItems(int id, CreativeTabs tab, List list) - { - for (int i = 0; i < 17; i++) - list.add(new ItemStack(id, 1, i)); - } - - public static final String[] toolMaterialNames = new String[] { - "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel" }; - - @Override - public int getMaterialID (ItemStack stack) - { - return stack.getItemDamage(); - } -} diff --git a/tinker/tconstruct/tools/Broadsword.java b/tinker/tconstruct/tools/Broadsword.java deleted file mode 100644 index 52ee24ff..00000000 --- a/tinker/tconstruct/tools/Broadsword.java +++ /dev/null @@ -1,59 +0,0 @@ -package tinker.tconstruct.tools; - -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.TContent; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLiving; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class Broadsword extends Weapon -{ - public Broadsword(int itemID, String tex) - { - super(itemID, 4, tex); - this.setItemName("InfiTool.Broadsword"); - } - - @Override - protected Item getHeadItem () - { - return TContent.swordBlade; - } - - @Override - protected Item getAccessoryItem () - { - return TContent.largeGuard; - } - - public float getDurabilityModifier () - { - return 1.2f; - } - - protected String getRenderString (int renderPass, boolean broken) - { - switch (renderPass) - { - case 0: - return "_sword_handle.png"; - case 1: - if (broken) - return "_sword_blade_broken.png"; - else - return "_sword_blade.png"; - case 2: - return "_sword_accessory.png"; - default: - return ""; - } - } - - protected String getEffectString (int renderPass) - { - return "_sword_effect.png"; - } -} diff --git a/tinker/tconstruct/tools/Rapier.java b/tinker/tconstruct/tools/Rapier.java deleted file mode 100644 index c66a3e02..00000000 --- a/tinker/tconstruct/tools/Rapier.java +++ /dev/null @@ -1,93 +0,0 @@ -package tinker.tconstruct.tools; - -import tinker.tconstruct.AbilityHelper; -import tinker.tconstruct.TContent; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -public class Rapier extends Weapon -{ - public Rapier(int itemID, String tex) - { - super(itemID, 2, tex); - this.setItemName("InfiTool.Rapier"); - } - - public EnumAction getItemUseAction(ItemStack par1ItemStack) - { - return EnumAction.none; - } - - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) - { - return stack; - } - - @Override - public boolean hitEntity(ItemStack stack, EntityLiving mob, EntityLiving player) - { - //AbilityHelper.hitEntity(stack, mob, player, damageVsEntity); - AbilityHelper.knockbackEntity(mob, 0.8f); - mob.motionY *= 0.5; - if (mob.hurtResistantTime > 16) - mob.hurtResistantTime -= 6; - return true; - } - - public float getDurabilityModifier () - { - return 0.7f; - } - - public float chargeAttack() - { - return 2f; - } - - public boolean pierceArmor() - { - return true; - } - - @Override - protected Item getHeadItem () - { - return TContent.swordBlade; - } - - @Override - protected Item getAccessoryItem () - { - return TContent.crossbar; - } - - protected String getRenderString (int renderPass, boolean broken) - { - switch (renderPass) - { - case 0: - return "_rapier_handle.png"; - case 1: - if (broken) - return "_rapier_blade_broken.png"; - else - return "_rapier_blade.png"; - case 2: - return "_rapier_accessory.png"; - default: - return ""; - } - } - - protected String getEffectString (int renderPass) - { - return "_rapier_effect.png"; - } -} diff --git a/tinker/tconstruct/tools/Shovel.java b/tinker/tconstruct/tools/Shovel.java deleted file mode 100644 index 43346b22..00000000 --- a/tinker/tconstruct/tools/Shovel.java +++ /dev/null @@ -1,76 +0,0 @@ -package tinker.tconstruct.tools; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import tinker.tconstruct.TContent; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item; - -public class Shovel extends HarvestTool -{ - public Shovel(int itemID, String tex) - { - super(itemID, 2, tex); - this.setItemName("InfiTool.Shovel"); - } - - @Override - public int getHeadType () - { - return 1; - } - - @Override - protected Material[] getEffectiveMaterials() - { - return materials; - } - - @Override - protected String getHarvestType() - { - return "shovel"; - } - - static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; - - @Override - protected Item getHeadItem () - { - return TContent.shovelHead; - } - - @Override - protected Item getAccessoryItem () - { - return null; - } - - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 2; - } - - protected String getRenderString (int renderPass, boolean broken) - { - switch (renderPass) - { - case 0: - return "_shovel_handle.png"; - case 1: - if (broken) - return "_shovel_head_broken.png"; - else - return "_shovel_head.png"; - default: - return ""; - } - } - - protected String getEffectString (int renderPass) - { - return "_shovel_effect.png"; - } -} diff --git a/tinker/tconstruct/worldgen/ManhattanOreGenerator.java b/tinker/tconstruct/worldgen/ManhattanOreGenerator.java deleted file mode 100644 index ea1d7c6e..00000000 --- a/tinker/tconstruct/worldgen/ManhattanOreGenerator.java +++ /dev/null @@ -1,152 +0,0 @@ -package tinker.tconstruct.worldgen; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Random; - -import tinker.tconstruct.util.SortedList; - -import net.minecraft.block.Block; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - -/* Metallurgy ore generator - * Specially given by RebelKeithy! - */ - -public class ManhattanOreGenerator extends WorldGenerator -{ - private List replaceableBlocks; - private int numberOfBlocks; - private int sizeVariance; - private int metadata; - private int minableBlockId; - private int density; - private boolean generateLines; - private boolean checkGenMinable; - - List possibleMoves = new ArrayList(); - - public ManhattanOreGenerator(int id, int meta, int minSize, int maxSize, int dense, boolean lines, boolean replaceGenMinable, Object... replacableIDs) - { - minableBlockId = id; - metadata = meta; - numberOfBlocks = minSize; - sizeVariance = maxSize - minSize + 1; - density = dense; - replaceableBlocks = new ArrayList(); - generateLines = lines; - checkGenMinable = replaceGenMinable; - for(Object i : replacableIDs) - { - replaceableBlocks.add((Integer) i); - } - initPossibleMoves(); - } - - void initPossibleMoves() - { - possibleMoves.add(new Integer[] {1, 0, 0}); - possibleMoves.add(new Integer[] {0, 1, 0}); - possibleMoves.add(new Integer[] {0, 0, 1}); - possibleMoves.add(new Integer[] {-1, 0, 0}); - possibleMoves.add(new Integer[] {0, -1, 0}); - possibleMoves.add(new Integer[] {0, 0, -1}); - possibleMoves.add(new Integer[] {1, 1, 0}); - possibleMoves.add(new Integer[] {-1, 1, 0}); - possibleMoves.add(new Integer[] {1, -1, 0}); - possibleMoves.add(new Integer[] {-1, -1, 0}); - possibleMoves.add(new Integer[] {1, 0, 1}); - possibleMoves.add(new Integer[] {-1, 0, 1}); - possibleMoves.add(new Integer[] {1, 0, -1}); - possibleMoves.add(new Integer[] {-1, 0, -1}); - possibleMoves.add(new Integer[] {0, 1, 1}); - possibleMoves.add(new Integer[] {0, -1, 1}); - possibleMoves.add(new Integer[] {0, 1, -1}); - possibleMoves.add(new Integer[] {0, -1, -1}); - } - - public boolean spawnOre(World world, Integer[] coords) - { - return spawnOre(world, coords[0], coords[1], coords[2]); - } - - public boolean spawnOre(World world, int x, int y, int z) - { - int currentID = world.getBlockId(x, y, z); - if (checkGenMinable) - { - Block block = Block.blocksList[currentID]; - if (block != null && block.isGenMineableReplaceable(world, x, y, z)) - { - world.setBlock(x, y, z, this.minableBlockId); - world.setBlockMetadata(x, y, z, this.metadata); - } - } - else if(replaceableBlocks.contains(currentID)) - { - world.setBlock(x, y, z, this.minableBlockId); - world.setBlockMetadata(x, y, z, this.metadata); - return true; - } - - return false; - } - - private class CompareCoordinates implements Comparator - { - @Override - public int compare(Integer[] arg0, Integer[] arg1) { - return (arg0[0] - arg1[0]) + (arg0[1] - arg1[1]) + (arg0[2] - arg1[2]); - } - } - - @Override - public boolean generate(World world, Random random, int x, int y, int z) - { - SortedList sortedList = new SortedList(new CompareCoordinates()); - - spawnOre(world, x, y, z); - sortedList.add(new Integer[] {x, y, z}); - - int trueSize = 1; - int randomSize = this.numberOfBlocks + random.nextInt(this.sizeVariance); - for(int n = 1; n < randomSize; n++) - { - List cpm = new ArrayList(); - for(Integer[] i : possibleMoves) - cpm.add(i); - - int pickedOre = (int) (((random.nextFloat()*random.nextFloat())) * sortedList.size()); - if (!generateLines) - pickedOre = sortedList.size()-1; - Integer[] coords = sortedList.get(pickedOre); - - Integer[] finalCoords = {coords[0], coords[1], coords[2]}; - do - { - if(cpm.size() == 0) - { - n--; - sortedList.remove(pickedOre); - break; - } - int pick = (int) (random.nextFloat() * cpm.size()); - Integer[] offset = cpm.get(pick); - finalCoords = new Integer[] { coords[0] + offset[0], coords[1] + offset[1], coords[2] + offset[2] }; - cpm.remove(pick); - } while(sortedList.contains(finalCoords)); - - //if(random.nextInt(100) < density) - //{ - spawnOre(world, finalCoords); - trueSize++; - //} - sortedList.add(finalCoords); - } - - //System.out.println("Ore vein size = " + trueSize); - return true; - } -} \ No newline at end of file