diff --git a/mods/tinker/resources/lang/en_US.xml b/mods/tinker/resources/lang/en_US.xml
index 757d19c0..b936f64d 100644
--- a/mods/tinker/resources/lang/en_US.xml
+++ b/mods/tinker/resources/lang/en_US.xml
@@ -21,6 +21,7 @@
Casting Table
Tool Forge
+ Drying Rack
Slimy Mud
Grout
Slimy Mud
diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java
index 4ca7cdbd..ac9b0f69 100644
--- a/mods/tinker/tconstruct/TConstruct.java
+++ b/mods/tinker/tconstruct/TConstruct.java
@@ -37,7 +37,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry;
* @dependencies: IC2 API, MFR API
*/
-@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.4.dev.7", dependencies = "required-after:Forge@[7.7.1.675,)")
+@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.4.dev.8", dependencies = "required-after:Forge@[7.7.1.675,)")
@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.util.network.TPacketHandler.class)
public class TConstruct
{
diff --git a/mods/tinker/tconstruct/blocks/DryingRack.java b/mods/tinker/tconstruct/blocks/DryingRack.java
new file mode 100644
index 00000000..c503282c
--- /dev/null
+++ b/mods/tinker/tconstruct/blocks/DryingRack.java
@@ -0,0 +1,325 @@
+package mods.tinker.tconstruct.blocks;
+
+import java.util.List;
+
+import mods.tinker.tconstruct.TConstruct;
+import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic;
+import mods.tinker.tconstruct.blocks.logic.DryingRackLogic;
+import mods.tinker.tconstruct.blocks.logic.FaucetLogic;
+import mods.tinker.tconstruct.client.block.DryingRackRender;
+import mods.tinker.tconstruct.library.TConstructRegistry;
+import mods.tinker.tconstruct.library.blocks.InventoryBlock;
+import mods.tinker.tconstruct.library.tools.AbilityHelper;
+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.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.Icon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class DryingRack extends InventoryBlock
+{
+
+ public DryingRack(int id)
+ {
+ super(id, Material.rock);
+ this.setCreativeTab(TConstructRegistry.blockTab);
+ setHardness(12);
+ setStepSound(soundMetalFootstep);
+ }
+
+ @Override
+ public TileEntity createTileEntity (World world, int metadata)
+ {
+ /*switch (metadata)
+ {
+ case 0:
+ case 1:
+ return new FaucetLogic();
+ case 2:
+ return new CastingBasinLogic();
+ default:
+ return null;
+ }*/
+ return new DryingRackLogic();
+ }
+
+ @Override
+ public int getRenderBlockPass ()
+ {
+ return 1;
+ }
+
+ @Override
+ public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer)
+ {
+ return null;
+ }
+
+ @Override
+ public Object getModInstance ()
+ {
+ return TConstruct.instance;
+ }
+
+ public int onBlockPlaced(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta)
+ {
+ if (side > 1)
+ return side;
+ return meta;
+ }
+
+ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving living, ItemStack stack)
+ {
+ int meta = world.getBlockMetadata(x, y, z);
+ if (meta == 0)
+ {
+ int l = MathHelper.floor_double((double)(living.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
+ int direction = l % 2;
+ if (direction == 1)
+ world.setBlockMetadataWithNotify(x, y, z, 1, 2);
+ }
+ }
+
+ /* Activation */
+ @Override
+ public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ)
+ {
+ return activateDryingRack(world, x, y, z, player);
+ }
+
+ boolean activateDryingRack (World world, int x, int y, int z, EntityPlayer player)
+ {
+ if (!world.isRemote)
+ {
+ DryingRackLogic logic = (DryingRackLogic) world.getBlockTileEntity(x, y, z);
+
+ if (!logic.isStackInSlot(0))
+ {
+ ItemStack stack = player.getCurrentEquippedItem();
+ if (stack != null)
+ {
+ stack = player.inventory.decrStackSize(player.inventory.currentItem, 1);
+ logic.setInventorySlotContents(0, stack);
+ }
+ }
+ else
+ {
+ if (logic.isStackInSlot(0))
+ {
+ ItemStack decrStack = logic.decrStackSize(0, 1);
+ if (decrStack != null)
+ addItemToInventory(player, world, x, y, z, decrStack);
+ }
+ }
+
+ world.markBlockForUpdate(x, y, z);
+ }
+ return true;
+ }
+
+ public void addItemToInventory (EntityPlayer player, World world, int x, int y, int z, ItemStack stack)
+ {
+ AbilityHelper.spawnItemAtPlayer(player, stack);
+ }
+
+
+ public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z)
+ {
+ int metadata = world.getBlockMetadata(x, y, z);
+ float xMin = 0F;
+ float yMin = 0F;
+ float zMin = 0F;
+ float xMax = 1F;
+ float yMax = 1F;
+ float zMax = 1F;
+ switch (metadata)
+ {
+ case 0: zMin = 0.375F; yMax = 0.25F; zMax = 0.625F; break;
+ case 1: xMin = 0.375F; yMax = 0.25F; xMax = 0.625F; break;
+ case 2: zMin = 0.75F; yMin = 0.75F; break;
+ case 3: zMax = 0.25F; yMin = 0.75F; break;
+ case 4: xMin = 0.75F; yMin = 0.75F; break;
+ case 5: xMax = 0.25F; yMin = 0.75F; break;
+ }
+ return AxisAlignedBB.getAABBPool().getAABB((double)x + xMin, (double)y + yMin, (double)z + zMin, (double)x + xMax, (double)y + yMax, (double)z + zMax);
+ }
+
+ public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z)
+ {
+ int metadata = world.getBlockMetadata(x, y, z);
+ float xMin = 0F;
+ float yMin = 0F;
+ float zMin = 0F;
+ float xMax = 1F;
+ float yMax = 1F;
+ float zMax = 1F;
+ switch (metadata)
+ {
+ case 0: zMin = 0.375F; yMax = 0.25F; zMax = 0.625F; break;
+ case 1: xMin = 0.375F; yMax = 0.25F; xMax = 0.625F; break;
+ case 2: zMin = 0.75F; yMin = 0.75F; break;
+ case 3: zMax = 0.25F; yMin = 0.75F; break;
+ case 4: xMin = 0.75F; yMin = 0.75F; break;
+ case 5: xMax = 0.25F; yMin = 0.75F; break;
+ }
+ this.setBlockBounds(xMin, yMin, zMin, xMax, yMax, zMax);
+ }
+
+ public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity)
+ {
+ this.setBlockBoundsBasedOnState(world, x, y, z);
+ super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
+ }
+
+ /* Rendering */
+ @Override
+ public int getRenderType ()
+ {
+ return DryingRackRender.model;
+ }
+
+ @Override
+ public String[] getTextureNames ()
+ {
+ String[] textureNames = { "castingtable_top", "castingtable_side", "castingtable_bottom", "faucet", "blockcast_top", "blockcast_side", "blockcast_bottom" };
+
+ return textureNames;
+ }
+
+ @Override
+ public Icon getIcon (int side, int meta)
+ {
+ return Block.planks.getIcon(side, 0);
+ }
+
+ public int getTextureIndex (int side)
+ {
+ if (side == 0)
+ return 2;
+ if (side == 1)
+ return 0;
+
+ return 1;
+ }
+
+ @Override
+ public boolean renderAsNormalBlock ()
+ {
+ return false;
+ }
+
+ @Override
+ public boolean isOpaqueCube ()
+ {
+ return false;
+ }
+
+ /*@Override
+ public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
+ {
+ return true;
+ }*/
+
+ /*@Override
+ public void getSubBlocks (int id, CreativeTabs tab, List list)
+ {
+ for (int iter = 0; iter < 3; iter++)
+ {
+ list.add(new ItemStack(id, 1, iter));
+ }
+ }*/
+
+ /*@Override
+ public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z)
+ {
+ int meta = world.getBlockMetadata(x, y, z);
+ if (meta != 1)
+ {
+ this.setBlockBounds(0, 0, 0, 1, 1, 1);
+ }
+ else
+ {
+ FaucetLogic logic = (FaucetLogic) world.getBlockTileEntity(x, y, z);
+ float xMin = 0.25F;
+ float xMax = 0.75F;
+ float zMin = 0.25F;
+ float zMax = 0.75F;
+
+ switch (logic.getRenderDirection())
+ {
+ case 2:
+ zMin = 0.625F;
+ zMax = 1.0F;
+ break;
+ case 3:
+ zMax = 0.375F;
+ zMin = 0F;
+ break;
+ case 4:
+ xMin = 0.625F;
+ xMax = 1.0F;
+ break;
+ case 5:
+ xMax = 0.375F;
+ xMin = 0F;
+ break;
+ }
+
+ this.setBlockBounds(xMin, 0.25F, zMin, xMax, 0.625F, zMax);
+ }
+ }*/
+
+ /*@Override
+ public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
+ {
+ int meta = world.getBlockMetadata(x, y, z);
+ if (meta != 1)
+ {
+ return AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 1, z + 1);
+ }
+ else
+ {
+ FaucetLogic logic = (FaucetLogic) world.getBlockTileEntity(x, y, z);
+ if (logic != null)
+ {
+ float xMin = 0.25F;
+ float xMax = 0.75F;
+ float zMin = 0.25F;
+ float zMax = 0.75F;
+
+ switch (logic.getRenderDirection())
+ {
+ case 2:
+ zMin = 0.625F;
+ zMax = 1.0F;
+ break;
+ case 3:
+ zMax = 0.375F;
+ zMin = 0F;
+ break;
+ case 4:
+ xMin = 0.625F;
+ xMax = 1.0F;
+ break;
+ case 5:
+ xMax = 0.375F;
+ xMin = 0F;
+ break;
+ }
+
+ 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));
+ }
+ }
+
+ return super.getCollisionBoundingBoxFromPool(world, x, y, z);
+ }*/
+
+ /* Redstone */
+}
diff --git a/mods/tinker/tconstruct/blocks/LightCrystalBase.java b/mods/tinker/tconstruct/blocks/LightCrystalBase.java
index 101dd8a0..9479d936 100644
--- a/mods/tinker/tconstruct/blocks/LightCrystalBase.java
+++ b/mods/tinker/tconstruct/blocks/LightCrystalBase.java
@@ -1,3 +1,4 @@
+
package mods.tinker.tconstruct.blocks;
import java.util.List;
diff --git a/mods/tinker/tconstruct/blocks/logic/DryingRackLogic.java b/mods/tinker/tconstruct/blocks/logic/DryingRackLogic.java
new file mode 100644
index 00000000..02efbc1d
--- /dev/null
+++ b/mods/tinker/tconstruct/blocks/logic/DryingRackLogic.java
@@ -0,0 +1,181 @@
+package mods.tinker.tconstruct.blocks.logic;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mods.tinker.tconstruct.common.TContent;
+import mods.tinker.tconstruct.library.blocks.InventoryLogic;
+import mods.tinker.tconstruct.library.util.IActiveLogic;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+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.util.AxisAlignedBB;
+import net.minecraft.world.World;
+
+public class DryingRackLogic extends InventoryLogic implements IActiveLogic
+{
+ short currentTime;
+ short maxTime = 20 * 60 * 5;
+ public int currentLightLevel;
+ public boolean active;
+ public byte crystalValue;
+
+ public DryingRackLogic()
+ {
+ super(1);
+ }
+
+ @Override
+ public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z)
+ {
+ return null;
+ }
+
+ @Override
+ protected String getDefaultName ()
+ {
+ return "";
+ }
+
+ @Override
+ public void updateEntity ()
+ {
+ /*if (worldObj.isRemote)
+ return;
+
+ if (worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) && crystalValue < 64)
+ {
+ Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 1, zCoord)];
+ if (block == null || validBlock(block) || block.isAirBlock(worldObj, xCoord, yCoord + 1, zCoord))
+ {
+ currentLightLevel = worldObj.getSavedLightValue(EnumSkyBlock.Sky, xCoord, yCoord, zCoord) - worldObj.skylightSubtracted;
+ if (currentLightLevel > 12)
+ {
+ currentTime++;
+ if (currentTime >= 180)
+ {
+ currentTime = 0;
+ crystalValue++;
+ if (block == TContent.lightCrystalBase)
+ {
+ int meta = worldObj.getBlockMetadata(xCoord, yCoord + 1, zCoord);
+ if (crystalValue >= 64)
+ {
+ if (meta < 3)
+ {
+ worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 3, 3);
+ TheftValueTracker.updateCrystallinity(worldObj.provider.dimensionId, xCoord, zCoord, 25); //Total 60
+ }
+ }
+ else if (crystalValue >= 28)
+ {
+ if (meta < 2)
+ {
+ worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 2, 3);
+ TheftValueTracker.updateCrystallinity(worldObj.provider.dimensionId, xCoord, zCoord, 15); //Total 35
+ }
+ }
+ else if (crystalValue >= 8)
+ {
+ if (meta < 1)
+ {
+ worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 1, 3);
+ TheftValueTracker.updateCrystallinity(worldObj.provider.dimensionId, xCoord, zCoord, 10); //Total 20
+ }
+ }
+ }
+ else
+ {
+ worldObj.setBlock(xCoord, yCoord + 1, zCoord, TContent.lightCrystalBase.blockID, 0, 3);
+ TheftValueTracker.updateCrystallinity(worldObj.provider.dimensionId, xCoord, zCoord, 10); //Total 10
+ }
+ }
+ if (active == false)
+ {
+ active = true;
+ worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
+ }
+ }
+ else
+ {
+ if (active == true)
+ {
+ active = false;
+ worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
+ }
+ }
+ }
+ }*/
+ }
+
+ boolean validBlock (Block block)
+ {
+ return block == TContent.lightCrystalBase;
+ }
+
+ @Override
+ public boolean getActive ()
+ {
+ return active;
+ }
+
+ @Override
+ public void setActive (boolean flag)
+ {
+ active = flag;
+ }
+
+ @Override
+ public void readFromNBT (NBTTagCompound tags)
+ {
+ super.readFromNBT(tags);
+ tags.setShort("Time", currentTime);
+ tags.setByte("Value", crystalValue);
+ readCustomNBT(tags);
+ }
+
+ @Override
+ public void writeToNBT (NBTTagCompound tags)
+ {
+ super.writeToNBT(tags);
+ currentTime = tags.getShort("Time");
+ crystalValue = tags.getByte("Value");
+ writeCustomNBT(tags);
+ }
+
+ public void readCustomNBT (NBTTagCompound tags)
+ {
+ active = tags.getBoolean("Active");
+ }
+
+ public void writeCustomNBT (NBTTagCompound tags)
+ {
+ tags.setBoolean("Active", active);
+ }
+
+ /* Packets */
+ @Override
+ public Packet getDescriptionPacket ()
+ {
+ NBTTagCompound tag = new NBTTagCompound();
+ writeToNBT(tag);
+ return new Packet132TileEntityData(xCoord, yCoord, zCoord, 1, tag);
+ }
+
+ @Override
+ public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
+ {
+ readFromNBT(packet.customParam1);
+ worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
+ }
+
+ @SideOnly(Side.CLIENT)
+ public AxisAlignedBB getRenderBoundingBox()
+ {
+ AxisAlignedBB cbb = AxisAlignedBB.getAABBPool().getAABB(xCoord, yCoord - 1, zCoord, xCoord + 1, yCoord + 1, zCoord + 1);
+ return cbb;
+ }
+}
diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java
index 576639a9..fe1e9d89 100644
--- a/mods/tinker/tconstruct/client/TProxyClient.java
+++ b/mods/tinker/tconstruct/client/TProxyClient.java
@@ -13,6 +13,7 @@ import mods.tinker.tconstruct.TConstruct;
import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic;
import mods.tinker.tconstruct.blocks.logic.CastingTableLogic;
import mods.tinker.tconstruct.blocks.logic.DrawbridgeLogic;
+import mods.tinker.tconstruct.blocks.logic.DryingRackLogic;
import mods.tinker.tconstruct.blocks.logic.FrypanLogic;
import mods.tinker.tconstruct.blocks.logic.GlowstoneAggregator;
import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic;
@@ -25,6 +26,8 @@ import mods.tinker.tconstruct.client.block.BarricadeRender;
import mods.tinker.tconstruct.client.block.CastingBasinSpecialRender;
import mods.tinker.tconstruct.client.block.CastingTableSpecialRenderer;
import mods.tinker.tconstruct.client.block.CrystalBlockRender;
+import mods.tinker.tconstruct.client.block.DryingRackRender;
+import mods.tinker.tconstruct.client.block.DryingRackSpecialRender;
import mods.tinker.tconstruct.client.block.FluidRender;
import mods.tinker.tconstruct.client.block.FrypanRender;
import mods.tinker.tconstruct.client.block.GolemCoreRender;
@@ -336,13 +339,15 @@ public class TProxyClient extends TProxyCommon
RenderingRegistry.registerBlockHandler(new BarricadeRender());
RenderingRegistry.registerBlockHandler(new CrystalBlockRender());
RenderingRegistry.registerBlockHandler(new MachineRender());
+ RenderingRegistry.registerBlockHandler(new DryingRackRender());
//RenderingRegistry.registerBlockHandler(new BrickRender());
//RenderingRegistry.registerBlockHandler(new BallRepeaterRender());
//Special Renderers
ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer());
- //ClientRegistry.bindTileEntitySpecialRenderer(GolemCoreLogic.class, new GolemCoreSpecialRender());
ClientRegistry.bindTileEntitySpecialRenderer(CastingBasinLogic.class, new CastingBasinSpecialRender());
+ ClientRegistry.bindTileEntitySpecialRenderer(DryingRackLogic.class, new DryingRackSpecialRender());
+ //ClientRegistry.bindTileEntitySpecialRenderer(GolemCoreLogic.class, new GolemCoreSpecialRender());
//Entities
RenderingRegistry.registerEntityRenderingHandler(FancyEntityItem.class, new FancyItemRender());
@@ -759,6 +764,7 @@ public class TProxyClient extends TProxyCommon
{
String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel",
"blueslime" };
+ String[] modPartTypes = { "thaumium" };
String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis", "quartz", "silk", "beheading", "smite", "spider",
"reinforced" };
int[] universalEffects = { 0, 1, 4, 9, 16 };
@@ -770,6 +776,11 @@ public class TProxyClient extends TProxyCommon
{
TConstructClientRegistry.addMaterialRenderMapping(partIter, "tinker", partTypes[partIter], true);
}
+
+ for (int iter = 0; iter < modPartTypes.length; iter++)
+ {
+ TConstructClientRegistry.addMaterialRenderMapping(31 + iter, "tinker", modPartTypes[iter], true);
+ }
for (ToolCore tool : TConstructRegistry.getToolMapping())
{
@@ -777,35 +788,6 @@ public class TProxyClient extends TProxyCommon
{
TConstructClientRegistry.addEffectRenderMapping(tool, i, "tinker", effectTypes[i], true);
}
- /*List list = Arrays.asList(tool.toolCategories());
- for (int i = 0; i < universalEffects.length; i++)
- {
- TConstructClientRegistry.addEffectRenderMapping(tool, universalEffects[i], "tinker", effectTypes[universalEffects[i]], true);
- }
-
- if (list.contains("harvest") || list.contains("utility"))
- {
- for (int i = 0; i < harvestEffects.length; i++)
- {
- TConstructClientRegistry.addEffectRenderMapping(tool, harvestEffects[i], "tinker", effectTypes[harvestEffects[i]], true);
- }
- }
-
- if (list.contains("weapon"))
- {
- for (int i = 0; i < weaponEffects.length; i++)
- {
- TConstructClientRegistry.addEffectRenderMapping(tool, weaponEffects[i], "tinker", effectTypes[weaponEffects[i]], true);
- }
- }
-
- if (list.contains("weapon") || list.contains("harvest"))
- {
- for (int i = 0; i < nonUtility.length; i++)
- {
- TConstructClientRegistry.addEffectRenderMapping(tool, nonUtility[i], "tinker", effectTypes[nonUtility[i]], true);
- }
- }*/
}
}
diff --git a/mods/tinker/tconstruct/client/block/DryingRackRender.java b/mods/tinker/tconstruct/client/block/DryingRackRender.java
new file mode 100644
index 00000000..202aeadb
--- /dev/null
+++ b/mods/tinker/tconstruct/client/block/DryingRackRender.java
@@ -0,0 +1,106 @@
+package mods.tinker.tconstruct.client.block;
+
+import mods.tinker.tconstruct.client.TProxyClient;
+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;
+
+public class DryingRackRender implements ISimpleBlockRenderingHandler
+{
+ public static int model = RenderingRegistry.getNextAvailableRenderId();
+
+ @Override
+ public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer)
+ {
+ if (modelID == model)
+ {
+ renderer.setRenderBounds(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F);
+ TProxyClient.renderStandardInvBlock(renderer, block, metadata);
+ }
+ }
+
+ @Override
+ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer)
+ {
+ if (modelID == model)
+ {
+ int metadata = world.getBlockMetadata(x, y, z);
+ if (metadata == 0)
+ {
+ renderer.setRenderBounds(0.0F, 0.0, 0.375F, 1.0F, 0.25F, 0.625F);
+ }
+ if (metadata == 1)
+ {
+ renderer.setRenderBounds(0.375F, 0.0, 0.0f, 0.625F, 0.25F, 1F);
+ }
+
+ if (metadata == 2)
+ {
+ renderer.setRenderBounds(0.0F, 0.75F, 0.75F, 1F, 1.0F, 1F);
+ }
+ if (metadata == 3)
+ {
+ renderer.setRenderBounds(0.0F, 0.75F, 0F, 1F, 1.0F, 0.25F);
+ }
+ if (metadata == 4)
+ {
+ renderer.setRenderBounds(0.75F, 0.75F, 0.0f, 1F, 1.0F, 1F);
+ }
+ if (metadata == 5)
+ {
+ renderer.setRenderBounds(0F, 0.75F, 0.0f, 0.25F, 1.0F, 1F);
+ }
+ renderer.renderStandardBlock(block, x, y, z);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean shouldRender3DInInventory ()
+ {
+ return true;
+ }
+
+ @Override
+ public int getRenderId ()
+ {
+ return model;
+ }
+
+ public static void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta)
+ {
+ Tessellator tessellator = Tessellator.instance;
+ GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, -1F, 0.0F);
+ renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, 1.0F, 0.0F);
+ renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, 0.0F, -1F);
+ renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(0.0F, 0.0F, 1.0F);
+ renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(-1F, 0.0F, 0.0F);
+ renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
+ tessellator.draw();
+ tessellator.startDrawingQuads();
+ tessellator.setNormal(1.0F, 0.0F, 0.0F);
+ renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
+ tessellator.draw();
+ GL11.glTranslatef(0.5F, 0.5F, 0.5F);
+ }
+}
diff --git a/mods/tinker/tconstruct/client/block/DryingRackSpecialRender.java b/mods/tinker/tconstruct/client/block/DryingRackSpecialRender.java
new file mode 100644
index 00000000..f6c4ef4e
--- /dev/null
+++ b/mods/tinker/tconstruct/client/block/DryingRackSpecialRender.java
@@ -0,0 +1,88 @@
+package mods.tinker.tconstruct.client.block;
+
+import mods.tinker.tconstruct.blocks.logic.DryingRackLogic;
+import mods.tinker.tconstruct.entity.FancyEntityItem;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/* Special renderer, only used for drawing tools */
+
+@SideOnly(Side.CLIENT)
+public class DryingRackSpecialRender extends TileEntitySpecialRenderer
+{
+ @Override
+ public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8)
+ {
+ //System.out.println("Render!!!");
+ this.render((DryingRackLogic) logic, var2, var4, var6, var8);
+ }
+
+ public void render (DryingRackLogic logic, double posX, double posY, double posZ, float var8)
+ {
+ GL11.glPushMatrix();
+ float var10 = (float) (posX - 0.5F);
+ float var11 = (float) (posY - 0.5F);
+ float var12 = (float) (posZ - 0.5F);
+ GL11.glTranslatef(var10, var11, var12);
+ this.func_82402_b(logic);
+ GL11.glPopMatrix();
+ }
+
+ private void func_82402_b (DryingRackLogic logic)
+ {
+ ItemStack stack = logic.getStackInSlot(0);
+
+ if (stack != null)
+ renderItem(logic, stack);
+ }
+
+ void renderItem (DryingRackLogic logic, ItemStack stack)
+ {
+ FancyEntityItem entityitem = new FancyEntityItem(logic.worldObj, 0.0D, 0.0D, 0.0D, stack);
+ entityitem.getEntityItem().stackSize = 1;
+ entityitem.hoverStart = 0.0F;
+ GL11.glPushMatrix();
+ int meta = logic.worldObj.getBlockMetadata(logic.xCoord, logic.yCoord, logic.zCoord);
+ if (meta <= 1)
+ GL11.glTranslatef(1F, -0.375F, 0.905F);
+ else
+ {
+ GL11.glTranslatef(1F, 0.375F, 0.905F);
+
+ if (meta / 2 == 2)
+ {
+ GL11.glRotatef(90F, 0F, 1F, 0F);
+ GL11.glTranslatef(-0.0625F, 0F, 0F);
+ }
+ if (meta == 2)
+ GL11.glTranslatef(0F, 0F, 0.375F);
+ if (meta == 3)
+ GL11.glTranslatef(0F, 0F, -0.375F);
+ if (meta == 4)
+ GL11.glTranslatef(0F, 0F, 0.2875F);
+ if (meta == 5)
+ GL11.glTranslatef(0F, 0F, -0.5F);
+ }
+ GL11.glScalef(2F, 2F, 2F);
+ if (stack.getItem() instanceof ItemBlock)
+ {
+ //GL11.glRotatef(90F, -1, 0F, 0F);
+ GL11.glTranslatef(0F, 0.2125F, 0.0375F);
+ }
+
+ RenderItem.renderInFrame = true;
+ RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+ RenderItem.renderInFrame = false;
+
+ GL11.glPopMatrix();
+ }
+}
diff --git a/mods/tinker/tconstruct/common/TContent.java b/mods/tinker/tconstruct/common/TContent.java
index abaf883d..c08e7587 100644
--- a/mods/tinker/tconstruct/common/TContent.java
+++ b/mods/tinker/tconstruct/common/TContent.java
@@ -4,6 +4,7 @@ import java.util.Collection;
import mods.tinker.tconstruct.TConstruct;
import mods.tinker.tconstruct.blocks.Aggregator;
+import mods.tinker.tconstruct.blocks.DryingRack;
import mods.tinker.tconstruct.blocks.EquipBlock;
import mods.tinker.tconstruct.blocks.GlassBlock;
import mods.tinker.tconstruct.blocks.GlassBlockStained;
@@ -28,6 +29,7 @@ import mods.tinker.tconstruct.blocks.ToolStationBlock;
import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic;
import mods.tinker.tconstruct.blocks.logic.CastingTableLogic;
import mods.tinker.tconstruct.blocks.logic.DrawbridgeLogic;
+import mods.tinker.tconstruct.blocks.logic.DryingRackLogic;
import mods.tinker.tconstruct.blocks.logic.FaucetLogic;
import mods.tinker.tconstruct.blocks.logic.FirestarterLogic;
import mods.tinker.tconstruct.blocks.logic.FrypanLogic;
@@ -244,6 +246,7 @@ public class TContent implements IFuelHandler
public static Block metalBlock;
public static Block redstoneMachine;
+ public static Block dryingRack;
//Decoration
public static Block stoneTorch;
@@ -443,6 +446,10 @@ public class TContent implements IFuelHandler
GameRegistry.registerTileEntity(DrawbridgeLogic.class, "Drawbridge");
GameRegistry.registerTileEntity(FirestarterLogic.class, "Firestarter");
+ dryingRack = new DryingRack(PHConstruct.dryingRack).setUnlocalizedName("Armor.DryingRack");
+ GameRegistry.registerBlock(dryingRack, "Armor.DryingRack");
+ GameRegistry.registerTileEntity(DryingRackLogic.class, "Armor.DryingRack");
+
//Traps
/*landmine = new Landmine(PHConstruct.landmine, 0, EnumMobType.mobs, Material.cactus).setUnlocalizedName("landmine");
GameRegistry.registerBlock(landmine, "landmine");*/
@@ -545,8 +552,8 @@ public class TContent implements IFuelHandler
blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern");
materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials");
- toolRod = new ToolPart(PHConstruct.toolRod, "ToolRod", "_rod").setUnlocalizedName("tconstruct.ToolRod");
- toolShard = new ToolShard(PHConstruct.toolShard, "ToolShard", "_chunk").setUnlocalizedName("tconstruct.ToolShard");
+ toolRod = new ToolPart(PHConstruct.toolRod, "_rod").setUnlocalizedName("tconstruct.ToolRod");
+ toolShard = new ToolShard(PHConstruct.toolShard, "_chunk").setUnlocalizedName("tconstruct.ToolShard");
woodPattern = new Pattern(PHConstruct.woodPattern, "WoodPattern", "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern");
metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern", "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern");
//netherPattern = new Pattern(PHTools.netherPattern, 128, patternTexture).setUnlocalizedName("tconstruct.Pattern");
@@ -602,30 +609,30 @@ public class TContent implements IFuelHandler
potionLauncher = new PotionLauncher(PHConstruct.potionLauncher).setUnlocalizedName("tconstruct.PotionLauncher");
- pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "PickaxeHead", "_pickaxe_head").setUnlocalizedName("tconstruct.PickaxeHead");
- shovelHead = new ToolPart(PHConstruct.shovelHead, "ShovelHead", "_shovel_head").setUnlocalizedName("tconstruct.ShovelHead");
- hatchetHead = new ToolPart(PHConstruct.axeHead, "AxeHead", "_axe_head").setUnlocalizedName("tconstruct.AxeHead");
- binding = new ToolPart(PHConstruct.binding, "Binding", "_binding").setUnlocalizedName("tconstruct.Binding");
- toughBinding = new ToolPart(PHConstruct.toughBinding, "ThickBinding", "_toughbind").setUnlocalizedName("tconstruct.ThickBinding");
- toughRod = new ToolPart(PHConstruct.toughRod, "ThickRod", "_toughrod").setUnlocalizedName("tconstruct.ThickRod");
- heavyPlate = new ToolPart(PHConstruct.largePlate, "LargePlate", "_largeplate").setUnlocalizedName("tconstruct.LargePlate");
+ pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "_pickaxe_head").setUnlocalizedName("tconstruct.PickaxeHead");
+ shovelHead = new ToolPart(PHConstruct.shovelHead, "_shovel_head").setUnlocalizedName("tconstruct.ShovelHead");
+ hatchetHead = new ToolPart(PHConstruct.axeHead, "_axe_head").setUnlocalizedName("tconstruct.AxeHead");
+ binding = new ToolPart(PHConstruct.binding, "_binding").setUnlocalizedName("tconstruct.Binding");
+ toughBinding = new ToolPart(PHConstruct.toughBinding, "_toughbind").setUnlocalizedName("tconstruct.ThickBinding");
+ toughRod = new ToolPart(PHConstruct.toughRod, "_toughrod").setUnlocalizedName("tconstruct.ThickRod");
+ heavyPlate = new ToolPart(PHConstruct.largePlate, "_largeplate").setUnlocalizedName("tconstruct.LargePlate");
- swordBlade = new ToolPart(PHConstruct.swordBlade, "SwordBlade", "_sword_blade").setUnlocalizedName("tconstruct.SwordBlade");
- wideGuard = new ToolPart(PHConstruct.largeGuard, "LargeGuard", "_large_guard").setUnlocalizedName("tconstruct.LargeGuard");
- handGuard = new ToolPart(PHConstruct.medGuard, "MediumGuard", "_medium_guard").setUnlocalizedName("tconstruct.MediumGuard");
- crossbar = new ToolPart(PHConstruct.crossbar, "Crossbar", "_crossbar").setUnlocalizedName("tconstruct.Crossbar");
- knifeBlade = new ToolPart(PHConstruct.knifeBlade, "KnifeBlade", "_knife_blade").setUnlocalizedName("tconstruct.KnifeBlade");
- fullGuard = new ToolPartHidden(PHConstruct.fullGuard, "FullGuard", "_full_guard").setUnlocalizedName("tconstruct.FullGuard");
+ swordBlade = new ToolPart(PHConstruct.swordBlade, "_sword_blade").setUnlocalizedName("tconstruct.SwordBlade");
+ wideGuard = new ToolPart(PHConstruct.largeGuard, "_large_guard").setUnlocalizedName("tconstruct.LargeGuard");
+ handGuard = new ToolPart(PHConstruct.medGuard, "_medium_guard").setUnlocalizedName("tconstruct.MediumGuard");
+ crossbar = new ToolPart(PHConstruct.crossbar, "_crossbar").setUnlocalizedName("tconstruct.Crossbar");
+ knifeBlade = new ToolPart(PHConstruct.knifeBlade, "_knife_blade").setUnlocalizedName("tconstruct.KnifeBlade");
+ fullGuard = new ToolPartHidden(PHConstruct.fullGuard, "_full_guard").setUnlocalizedName("tconstruct.FullGuard");
- frypanHead = new ToolPart(PHConstruct.frypanHead, "FrypanHead", "_frypan_head").setUnlocalizedName("tconstruct.FrypanHead");
- signHead = new ToolPart(PHConstruct.signHead, "SignHead", "_battlesign_head").setUnlocalizedName("tconstruct.SignHead");
- chiselHead = new ToolPart(PHConstruct.chiselHead, "ChiselHead", "_chisel_head").setUnlocalizedName("tconstruct.ChiselHead");
+ frypanHead = new ToolPart(PHConstruct.frypanHead, "_frypan_head").setUnlocalizedName("tconstruct.FrypanHead");
+ signHead = new ToolPart(PHConstruct.signHead, "_battlesign_head").setUnlocalizedName("tconstruct.SignHead");
+ chiselHead = new ToolPart(PHConstruct.chiselHead, "_chisel_head").setUnlocalizedName("tconstruct.ChiselHead");
- scytheBlade = new ToolPart(PHConstruct.scytheBlade, "ScytheBlade", "_scythe_head").setUnlocalizedName("tconstruct.ScytheBlade");
- broadAxeHead = new ToolPart(PHConstruct.lumberHead, "LumberHead", "_lumberaxe_head").setUnlocalizedName("tconstruct.LumberHead");
- excavatorHead = new ToolPart(PHConstruct.excavatorHead, "ExcavatorHead", "_excavator_head").setUnlocalizedName("tconstruct.ExcavatorHead");
- largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "LargeSwordBlade", "_large_sword_blade").setUnlocalizedName("tconstruct.LargeSwordBlade");
- hammerHead = new ToolPart(PHConstruct.hammerHead, "HammerHead", "_hammer_head").setUnlocalizedName("tconstruct.HammerHead");
+ scytheBlade = new ToolPart(PHConstruct.scytheBlade, "_scythe_head").setUnlocalizedName("tconstruct.ScytheBlade");
+ broadAxeHead = new ToolPart(PHConstruct.lumberHead, "_lumberaxe_head").setUnlocalizedName("tconstruct.LumberHead");
+ excavatorHead = new ToolPart(PHConstruct.excavatorHead, "_excavator_head").setUnlocalizedName("tconstruct.ExcavatorHead");
+ largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "_large_sword_blade").setUnlocalizedName("tconstruct.LargeSwordBlade");
+ hammerHead = new ToolPart(PHConstruct.hammerHead, "_hammer_head").setUnlocalizedName("tconstruct.HammerHead");
Item[] toolParts = { toolRod, toolShard, pickaxeHead, shovelHead, hatchetHead, binding, toughBinding, toughRod, heavyPlate, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, fullGuard,
frypanHead, signHead, chiselHead, scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead };
@@ -685,12 +692,12 @@ public class TContent implements IFuelHandler
Item.minecartEmpty.setMaxStackSize(3);
Item.minecartCrate.setMaxStackSize(3);
Item.minecartPowered.setMaxStackSize(3);
- Block.torchWood.setTickRandomly(false);
+ //Block.torchWood.setTickRandomly(false);
}
void registerMaterials ()
{
- TConstructRegistry.addToolMaterial(0, "Wood", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", "");
+ TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", "");
TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", "Stonebound");
TConstructRegistry.addToolMaterial(2, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", "");
TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, 1f, "\u00A78", "Stonebound");
@@ -707,10 +714,7 @@ public class TContent implements IFuelHandler
TConstructRegistry.addToolMaterial(14, "Bronze", 2, 350, 700, 2, 1.3F, 1, 0f, "\u00A76", "");
TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", "");
TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", "");
- TConstructRegistry.addToolMaterial(17, "BlueSlime", 1, 500, 150, 0, 1.5F, 0, 0f, "\u00A7b", "");
-
- //Thaumcraft
- //TConstructRegistry.addToolMaterial(21, "Thaumium", 2, 250, 600, 2, 1.3F, 1, 0f, "", "");
+ TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 1, 500, 150, 0, 1.5F, 0, 0f, "\u00A7b", "");
/*//Metallurgy
TConstructRegistry.addToolMaterial(22, "Heptazion", 2, 2, 300, 800, 1, 1.0F, 0, 0f);
@@ -792,7 +796,6 @@ public class TContent implements IFuelHandler
{
TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, mat, new ItemStack(patternOutputs[meta], 1, mat));
}
- TConstructRegistry.addPartMapping(woodPattern.itemID, 22, mat, new ItemStack(fullGuard, 1, mat));
}
}
else
@@ -803,7 +806,6 @@ public class TContent implements IFuelHandler
{
TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, nonMetals[mat], new ItemStack(patternOutputs[meta], 1, nonMetals[mat]));
}
- TConstructRegistry.addPartMapping(woodPattern.itemID, 22, nonMetals[mat], new ItemStack(fullGuard, 1, nonMetals[mat]));
}
}
@@ -990,7 +992,7 @@ public class TContent implements IFuelHandler
Smeltery.addMelting(new ItemStack(Item.ingotIron, 4), Block.blockIron.blockID, 0, 500, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 0));
Smeltery.addMelting(new ItemStack(Item.ingotGold, 4), Block.blockGold.blockID, 0, 300, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 1));
Smeltery.addMelting(new ItemStack(Item.goldNugget, 4), Block.blockGold.blockID, 0, 150, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 1));
-
+
Smeltery.addMelting(new ItemStack(materials, 1, 18), Block.obsidian.blockID, 0, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 11)); //Obsidian ingot
Smeltery.addMelting(new ItemStack(blankPattern, 4, 1), metalBlock.blockID, 7, 150, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8));
@@ -1035,7 +1037,7 @@ public class TContent implements IFuelHandler
Smeltery.addMelting(new ItemStack(Item.plateChain, 1, 0), this.metalBlock.blockID, 9, 700, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 12));
Smeltery.addMelting(new ItemStack(Item.legsChain, 1, 0), this.metalBlock.blockID, 9, 700, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 12));
Smeltery.addMelting(new ItemStack(Item.bootsChain, 1, 0), this.metalBlock.blockID, 9, 700, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12));
-
+
//Vanilla tools
Smeltery.addMelting(new ItemStack(Item.hoeIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0));
Smeltery.addMelting(new ItemStack(Item.swordIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0));
@@ -1052,7 +1054,7 @@ public class TContent implements IFuelHandler
Smeltery.addMelting(new ItemStack(Item.flintAndSteel, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 0));
Smeltery.addMelting(new ItemStack(Item.compass, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 4, 0));
-
+
//Vanilla blocks
Smeltery.addMelting(new ItemStack(Item.bucketEmpty), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 3, 0));
Smeltery.addMelting(new ItemStack(Item.minecartEmpty), Block.blockIron.blockID, 8, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 5, 0));
@@ -1065,10 +1067,10 @@ public class TContent implements IFuelHandler
Smeltery.addMelting(new ItemStack(Block.railDetector), Block.blockIron.blockID, 8, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 0));
Smeltery.addMelting(new ItemStack(Block.railActivator), Block.blockIron.blockID, 8, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 0));
Smeltery.addMelting(new ItemStack(Block.enchantmentTable), Block.obsidian.blockID, 0, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 4, 11));
- Smeltery.addMelting(new ItemStack(Block.cauldron), Block.blockIron.blockID, 8, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*7, 0));
- Smeltery.addMelting(new ItemStack(Block.anvil, 1, 0), Block.blockIron.blockID, 8, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*31, 0));
- Smeltery.addMelting(new ItemStack(Block.anvil, 1, 1), Block.blockIron.blockID, 8, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*31, 0));
- Smeltery.addMelting(new ItemStack(Block.anvil, 1, 2), Block.blockIron.blockID, 8, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*31, 0));
+ Smeltery.addMelting(new ItemStack(Block.cauldron), Block.blockIron.blockID, 8, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 7, 0));
+ Smeltery.addMelting(new ItemStack(Block.anvil, 1, 0), Block.blockIron.blockID, 8, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 31, 0));
+ Smeltery.addMelting(new ItemStack(Block.anvil, 1, 1), Block.blockIron.blockID, 8, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 31, 0));
+ Smeltery.addMelting(new ItemStack(Block.anvil, 1, 2), Block.blockIron.blockID, 8, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 31, 0));
/* Detailing */
Detailing chiseling = TConstructRegistry.getChiselDetailing();
@@ -1153,9 +1155,9 @@ public class TContent implements IFuelHandler
'r', new ItemStack(Item.redstone), 'd', new ItemStack(Block.dispenser))); //Drawbridge
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(redstoneMachine, 1, 0), "aca", "#d#", "#r#", '#', "ingotBronze", 'a', "ingotAluminumBrass", 'c', new ItemStack(blankPattern, 1, 2),
'r', new ItemStack(Item.redstone), 'd', new ItemStack(Block.dispenser)));
-
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(redstoneMachine, 1, 1), "aca", "#d#", "#r#", '#', "ingotBronze", 'a', "ingotAluminumBrass", 'c', new ItemStack(heavyPlate, 1, 7),
- 'r', new ItemStack(Item.redstone), 'd', new ItemStack(Item.flintAndSteel))); //Igniter
+
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(redstoneMachine, 1, 1), "aca", "#d#", "#r#", '#', "ingotBronze", 'a', "ingotAluminumBrass", 'c', new ItemStack(heavyPlate, 1, 7), 'r',
+ new ItemStack(Item.redstone), 'd', new ItemStack(Item.flintAndSteel))); //Igniter
/* Crafting */
GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.workbench);
@@ -1287,6 +1289,9 @@ public class TContent implements IFuelHandler
GameRegistry.addRecipe(new ItemStack(knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(toughRod, 1, 2), 'm', new ItemStack(Item.ingotGold));
GameRegistry.addRecipe(new ItemStack(knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(toughRod, 1, 2), 'm', new ItemStack(materials, 1, 14));
+ //Armor
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(dryingRack, 1, 0), "bbb", 'b', "slabWood"));
+
//Remove vanilla recipes
if (!PHConstruct.vanillaMetalBlocks)
{
@@ -1407,7 +1412,7 @@ public class TContent implements IFuelHandler
OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(materials, 1, 24));
String[] names = new String[] { "Molten Iron", "Molten Gold", "Molten Copper", "Molten Tin", "Molten Aluminum", "Molten Cobalt", "Molten Ardite", "Molten Bronze", "Molten Aluminum Brass",
- "Molten Manyullyn", "Molten Alumite", "Molten Obsidian", "Molten Steel", "Molten Glass", "Seared Stone", "Liquified Emerald", "Blood" };
+ "Molten Manyullyn", "Molten Alumite", "Molten Obsidian", "Molten Steel", "Molten Glass", "Seared Stone", "Molten Emerald", "mushroomsoup" };
liquidIcons = new LiquidStack[names.length];
liquidNames = new String[names.length];
for (int iter = 0; iter < names.length; iter++)
@@ -1426,7 +1431,7 @@ public class TContent implements IFuelHandler
{
OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(stainedGlassClear, 1, i));
}
-
+
BlockDispenser.dispenseBehaviorRegistry.putObject(titleIcon, new TDispenserBehaviorSpawnEgg());
//Vanilla stuff
@@ -1479,7 +1484,21 @@ public class TContent implements IFuelHandler
TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), chargedReBattery, electronicCircuit);
/* Thaumcraft */
- //Object obj = getItem("itemResource", "thaumcraft.common.Config");
+ Object obj = getItem("itemResource", "thaumcraft.common.Config");
+ if (obj != null)
+ {
+ System.out.println("[TConstruct] Thaumcraft detected. Adding thaumium tools.");
+ TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 2, 0f, "\u00A75", "Thaumic");
+ PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(toolShard, 1, 31), new ItemStack(toolRod, 1, 31), 31);
+ for (int meta = 0; meta < patternOutputs.length; meta++)
+ {
+ TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, 31, new ItemStack(patternOutputs[meta], 1, 31));
+ }
+ }
+ else
+ {
+ System.out.println("[TConstruct] Thaumcraft not detected.");
+ }
}
public static Object getItem (String name, String classPackage)
@@ -1494,7 +1513,7 @@ public class TContent implements IFuelHandler
}
catch (Exception e)
{
- System.out.println("[TConstruct] Could not find item for " + name);
+ //System.out.println("[TConstruct] Could not find " + name);
return null;
}
}
diff --git a/mods/tinker/tconstruct/common/TProxyCommon.java b/mods/tinker/tconstruct/common/TProxyCommon.java
index 335ab32f..593adca6 100644
--- a/mods/tinker/tconstruct/common/TProxyCommon.java
+++ b/mods/tinker/tconstruct/common/TProxyCommon.java
@@ -205,7 +205,7 @@ public class TProxyCommon implements IGuiHandler
"Copper Nugget", "Tin Nugget", "Aluminum Nugget", "Silver Nugget" };*/
public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn",
- "Copper", "Bronze", "Alumite", "Steel", "Blue Slime" };
+ "Copper", "Bronze", "Alumite", "Steel", "Blue Slime", "", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" };
public static final String[] materialTypes = new String[] { "ToolRod", "PickaxeHead", "ShovelHead", "AxeHead", "SwordBlade", "LargeGuard", "MediumGuard", "Crossbar", "Binding", "FrypanHead",
"SignHead", "LumberHead", "KnifeBlade", "ChiselHead", "ScytheBlade", "LumberHead", "ThickRod", "ThickBinding", "LargeSwordBlade", "LargePlate", "ExcavatorHead", "HammerHead", "FullGuard" };
diff --git a/mods/tinker/tconstruct/items/CraftingItem.java b/mods/tinker/tconstruct/items/CraftingItem.java
index 0d6542ec..d086c3fa 100644
--- a/mods/tinker/tconstruct/items/CraftingItem.java
+++ b/mods/tinker/tconstruct/items/CraftingItem.java
@@ -14,49 +14,52 @@ import cpw.mods.fml.relauncher.SideOnly;
public class CraftingItem extends Item
{
- public String[] textureNames;
- public String[] unlocalizedNames;
- public String folder;
- public Icon[] icons;
- public CraftingItem(int id, String[] names, String[] tex, String folder)
- {
- super(id);
- this.setCreativeTab(TConstructRegistry.materialTab);
- this.setMaxDamage(0);
- this.setHasSubtypes(true);
- this.textureNames = tex;
- this.unlocalizedNames = names;
- this.folder = folder;
- }
+ public String[] textureNames;
+ public String[] unlocalizedNames;
+ public String folder;
+ public Icon[] icons;
- @SideOnly(Side.CLIENT)
- public Icon getIconFromDamage(int meta)
- {
- int arr = MathHelper.clamp_int(meta, 0, unlocalizedNames.length);
- return icons[arr];
- }
-
- @SideOnly(Side.CLIENT)
- @Override
- public void registerIcons(IconRegister iconRegister)
+ public CraftingItem(int id, String[] names, String[] tex, String folder)
{
- this.icons = new Icon[textureNames.length];
+ super(id);
+ this.setCreativeTab(TConstructRegistry.materialTab);
+ this.setMaxDamage(0);
+ this.setHasSubtypes(true);
+ this.textureNames = tex;
+ this.unlocalizedNames = names;
+ this.folder = folder;
+ }
+
+ @SideOnly(Side.CLIENT)
+ public Icon getIconFromDamage (int meta)
+ {
+ int arr = MathHelper.clamp_int(meta, 0, unlocalizedNames.length);
+ return icons[arr];
+ }
+
+ @SideOnly(Side.CLIENT)
+ @Override
+ public void registerIcons (IconRegister iconRegister)
+ {
+ this.icons = new Icon[textureNames.length];
for (int i = 0; i < this.icons.length; ++i)
{
- this.icons[i] = iconRegister.registerIcon("tinker:"+folder+textureNames[i]);
+ if (!(textureNames[i].equals("")))
+ this.icons[i] = iconRegister.registerIcon("tinker:" + folder + 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));
- }
+ 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++)
+ if (!(textureNames[i].equals("")))
+ list.add(new ItemStack(id, 1, i));
+ }
}
diff --git a/mods/tinker/tconstruct/items/ToolPart.java b/mods/tinker/tconstruct/items/ToolPart.java
index 94739696..4c98bd81 100644
--- a/mods/tinker/tconstruct/items/ToolPart.java
+++ b/mods/tinker/tconstruct/items/ToolPart.java
@@ -1,6 +1,5 @@
package mods.tinker.tconstruct.items;
-
import java.util.List;
import cpw.mods.fml.relauncher.Side;
@@ -13,44 +12,48 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.MathHelper;
-public class ToolPart extends CraftingItem
- implements IToolPart
+public class ToolPart extends CraftingItem implements IToolPart
{
- public ToolPart(int id, String partType, String textureType)
- {
- super(id, toolMaterialNames, buildTextureNames(textureType), "parts/");
- this.setHasSubtypes(true);
- this.setMaxDamage(0);
- }
+ public ToolPart(int id, String textureType)
+ {
+ super(id, toolMaterialNames, buildTextureNames(textureType), "parts/");
+ this.setHasSubtypes(true);
+ this.setMaxDamage(0);
+ }
- 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)
+ private static String[] buildTextureNames (String textureType)
+ {
+ String[] names = new String[toolMaterialNames.length];
+ for (int i = 0; i < toolMaterialNames.length; i++)
+ {
+ if (toolTextureNames[i].equals(""))
+ names[i] = "";
+ else
+ names[i] = toolTextureNames[i] + textureType;
+ }
+ return names;
+ }
+
+ /*@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
- this.icons = new Icon[textureNames.length];
+ this.icons = new Icon[textureNames.length];
for (int i = 0; i < this.icons.length; ++i)
{
this.icons[i] = iconRegister.registerIcon("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", "Blue Slime" };
-
- public static final String[] toolTextureNames = new String[] {
- "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime" };
- @Override
- public int getMaterialID (ItemStack stack)
- {
- return stack.getItemDamage();
- }
+ public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn",
+ "Copper", "Bronze", "Alumite", "Steel", "Blue Slime", "", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" };
+
+ public static final String[] toolTextureNames = new String[] { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn",
+ "copper", "bronze", "alumite", "steel", "blueslime", "", "", "", "", "", "", "", "", "", "", "", "", "", "thaumium" };
+
+ @Override
+ public int getMaterialID (ItemStack stack)
+ {
+ return stack.getItemDamage();
+ }
}
diff --git a/mods/tinker/tconstruct/items/ToolPartHidden.java b/mods/tinker/tconstruct/items/ToolPartHidden.java
index 874a2f49..a3320196 100644
--- a/mods/tinker/tconstruct/items/ToolPartHidden.java
+++ b/mods/tinker/tconstruct/items/ToolPartHidden.java
@@ -7,9 +7,9 @@ import net.minecraft.creativetab.CreativeTabs;
public class ToolPartHidden extends ToolPart
{
- public ToolPartHidden(int id, String partType, String textureType)
+ public ToolPartHidden(int id, String textureType)
{
- super(id, partType, textureType);
+ super(id, textureType);
}
public void getSubItems (int id, CreativeTabs tab, List list)
diff --git a/mods/tinker/tconstruct/items/ToolShard.java b/mods/tinker/tconstruct/items/ToolShard.java
index 3d9fd322..ea15b9ee 100644
--- a/mods/tinker/tconstruct/items/ToolShard.java
+++ b/mods/tinker/tconstruct/items/ToolShard.java
@@ -13,49 +13,50 @@ import net.minecraft.util.Icon;
public class ToolShard extends ToolPart
{
- public ToolShard(int id, String part, String tex)
- {
- super(id, part, tex);
- this.setHasSubtypes(true);
- this.setMaxDamage(0);
- }
-
- private static String[] buildTextureNames (String textureType)
+ public ToolShard(int id, String tex)
+ {
+ super(id, tex);
+ this.setHasSubtypes(true);
+ this.setMaxDamage(0);
+ }
+
+ 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;
+ names[i] = toolTextureNames[i] + textureType;
return names;
}
-
- @SideOnly(Side.CLIENT)
- public void registerIcons(IconRegister iconRegister)
+
+ @SideOnly(Side.CLIENT)
+ public void registerIcons (IconRegister iconRegister)
{
this.icons = new Icon[textureNames.length];
for (int i = 0; i < 5; ++i)
{
- this.icons[i] = iconRegister.registerIcon("tinker:"+folder+textureNames[i]);
+ this.icons[i] = iconRegister.registerIcon("tinker:" + folder + textureNames[i]);
}
icons[5] = icons[4];
for (int i = 6; i < 9; ++i)
{
- this.icons[i] = iconRegister.registerIcon("tinker:"+folder+textureNames[i]);
+ this.icons[i] = iconRegister.registerIcon("tinker:" + folder + textureNames[i]);
}
icons[9] = icons[8];
for (int i = 10; i < icons.length; ++i)
{
- this.icons[i] = iconRegister.registerIcon("tinker:"+folder+textureNames[i]);
+ this.icons[i] = iconRegister.registerIcon("tinker:" + folder + textureNames[i]);
}
}
-
- public void getSubItems(int id, CreativeTabs tab, List list)
+
+ public void getSubItems (int id, CreativeTabs tab, List list)
{
- for (int i = 1; i < 5; i++)
- 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 < icons.length; i++)
- list.add(new ItemStack(id, 1, i));
+ for (int i = 1; i < 5; i++)
+ 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 < icons.length; i++)
+ if (!(textureNames[i].equals("")))
+ list.add(new ItemStack(id, 1, i));
}
}
diff --git a/mods/tinker/tconstruct/library/TConstructRegistry.java b/mods/tinker/tconstruct/library/TConstructRegistry.java
index dbc12963..dcb28314 100644
--- a/mods/tinker/tconstruct/library/TConstructRegistry.java
+++ b/mods/tinker/tconstruct/library/TConstructRegistry.java
@@ -227,6 +227,35 @@ public class TConstructRegistry
throw new IllegalArgumentException("[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName);
}
+ /** Adds a tool material to the registry
+ *
+ * @param materialID Unique ID, stored for each part
+ * @exception materialID must be unique
+ * @param materialName Unique name for data lookup purposes
+ * @param displayName Prefix for creative mode tools
+ * @param harvestLevel The materials which the tool can harvest. Pickaxe levels - 0: Wood, 1: Stone, 2: Redstone/Diamond, 3: Obsidian, 4: Cobalt/Ardite, 5: Manyullyn
+ * @param durability Base durability of the tool, affects tool heads.
+ * @param miningspeed Base mining speed, divided by 100 in use
+ * @param attack Base attack
+ * @param handleModifier Durability multiplier on the tool
+ * @param reinforced Reinforced level
+ * @param unbreaking Amount of Stonebound to put on the tool. Negative numbers are Spiny.
+ */
+
+ public static void addToolMaterial (int materialID, String materialName, String displayName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced,
+ float unbreaking, String style, String ability)
+ {
+ ToolMaterial mat = toolMaterials.get(materialID);
+ if (mat == null)
+ {
+ mat = new ToolMaterial(materialName, displayName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, unbreaking, style, ability);
+ toolMaterials.put(materialID, mat);
+ toolMaterialStrings.put(materialName, mat);
+ }
+ else
+ throw new IllegalArgumentException("[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName);
+ }
+
/** Adds a tool material to the registry
*
* @param materialID Unique ID, stored for each part
diff --git a/mods/tinker/tconstruct/library/tools/HarvestTool.java b/mods/tinker/tconstruct/library/tools/HarvestTool.java
index 7c7c97cf..9379d6e8 100644
--- a/mods/tinker/tconstruct/library/tools/HarvestTool.java
+++ b/mods/tinker/tconstruct/library/tools/HarvestTool.java
@@ -14,115 +14,115 @@ import net.minecraftforge.common.MinecraftForge;
public abstract class HarvestTool extends ToolCore
{
- public HarvestTool(int itemID, int baseDamage)
- {
- super(itemID, baseDamage);
- }
+ public HarvestTool(int itemID, int baseDamage)
+ {
+ super(itemID, baseDamage);
+ }
- @Override
- public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player)
- {
- NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
- World world = player.worldObj;
- int bID = player.worldObj.getBlockId(x, y, z);
- int meta = world.getBlockMetadata(x, y, z);
- Block block = Block.blocksList[bID];
- if (block == null || bID < 1)
- return false;
- int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType());
+ @Override
+ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player)
+ {
+ NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
+ World world = player.worldObj;
+ int bID = player.worldObj.getBlockId(x, y, z);
+ int meta = world.getBlockMetadata(x, y, z);
+ Block block = Block.blocksList[bID];
+ if (block == null || bID < 1)
+ return false;
+ int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType());
- if (hlvl <= tags.getInteger("HarvestLevel"))
- {
- boolean cancelHarvest = false;
- for (ActiveToolMod mod : TConstructRegistry.activeModifiers)
- {
- if (mod.beforeBlockBreak(this, stack, x, y, z, player))
- cancelHarvest = true;
- }
- return cancelHarvest;
- }
- else
- {
- world.setBlockToAir(x, y, z);
- if (!player.capabilities.isCreativeMode)
- onBlockDestroyed(stack, world, bID, x, y, z, player);
- if (!world.isRemote)
- world.playAuxSFX(2001, x, y, z, bID + (meta << 12));
- return true;
- }
- }
+ if (hlvl <= tags.getInteger("HarvestLevel"))
+ {
+ boolean cancelHarvest = false;
+ for (ActiveToolMod mod : TConstructRegistry.activeModifiers)
+ {
+ if (mod.beforeBlockBreak(this, stack, x, y, z, player))
+ cancelHarvest = true;
+ }
+ return cancelHarvest;
+ }
+ else
+ {
+ world.setBlockToAir(x, y, z);
+ if (!player.capabilities.isCreativeMode)
+ onBlockDestroyed(stack, world, bID, x, y, z, player);
+ if (!world.isRemote)
+ world.playAuxSFX(2001, x, y, z, bID + (meta << 12));
+ return true;
+ }
+ }
- @Override
- public float getStrVsBlock (ItemStack stack, Block block, int meta)
- {
+ @Override
+ public float getStrVsBlock (ItemStack stack, Block block, int meta)
+ {
if (!stack.hasTagCompound())
- return 1.0f;
+ return 1.0f;
+
+ NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
+ if (tags.getBoolean("Broken"))
+ return 0.1f;
- NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
- if (tags.getBoolean("Broken"))
- return 0.1f;
+ Material[] materials = getEffectiveMaterials();
+ for (int i = 0; i < materials.length; i++)
+ {
+ if (materials[i] == block.blockMaterial)
+ {
+ float mineSpeed = tags.getInteger("MiningSpeed");
+ int heads = 1;
+ if (tags.hasKey("MiningSpeed2"))
+ {
+ mineSpeed += tags.getInteger("MiningSpeed2");
+ heads++;
+ }
+
+ if (tags.hasKey("MiningSpeedHandle"))
+ {
+ mineSpeed += tags.getInteger("MiningSpeedHandle");
+ heads++;
+ }
+
+ if (tags.hasKey("MiningSpeedExtra"))
+ {
+ mineSpeed += tags.getInteger("MiningSpeedExtra");
+ heads++;
+ }
+ float trueSpeed = mineSpeed / (heads * 100f);
+ int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType());
+ int durability = tags.getInteger("Damage");
- Material[] materials = getEffectiveMaterials();
- for (int i = 0; i < materials.length; i++)
- {
- if (materials[i] == block.blockMaterial)
- {
- float mineSpeed = tags.getInteger("MiningSpeed");
- int heads = 1;
- if (tags.hasKey("MiningSpeed2"))
- {
- mineSpeed += tags.getInteger("MiningSpeed2");
- heads++;
- }
+ float stonebound = tags.getFloat("Shoddy");
+ float bonusLog = (float) Math.log(durability / 72f + 1) * 2 * stonebound;
+ trueSpeed += bonusLog;
- if (tags.hasKey("MiningSpeedHandle"))
- {
- mineSpeed += tags.getInteger("MiningSpeedHandle");
- heads++;
- }
+ if (hlvl <= tags.getInteger("HarvestLevel"))
+ return trueSpeed;
+ return 0.1f;
+ }
+ }
+ return super.getStrVsBlock(stack, block, meta);
+ }
- if (tags.hasKey("MiningSpeedExtra"))
- {
- mineSpeed += tags.getInteger("MiningSpeedExtra");
- heads++;
- }
- float trueSpeed = mineSpeed / (heads * 100f);
- int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType());
- int durability = tags.getInteger("Damage");
+ public boolean canHarvestBlock (Block block)
+ {
+ if (block.blockMaterial.isToolNotRequired())
+ {
+ return true;
+ }
+ for (Material m : getEffectiveMaterials())
+ {
+ if (m == block.blockMaterial)
+ return true;
+ }
+ return false;
+ }
- float stonebound = tags.getFloat("Shoddy");
- float bonusLog = (float) Math.log(durability / 72f + 1) * 2 * stonebound;
- trueSpeed += bonusLog;
+ @Override
+ public String[] toolCategories ()
+ {
+ return new String[] { "harvest" };
+ }
- if (hlvl <= tags.getInteger("HarvestLevel"))
- return trueSpeed;
- return 0.1f;
- }
- }
- return super.getStrVsBlock(stack, block, meta);
- }
+ protected abstract Material[] getEffectiveMaterials ();
- public boolean canHarvestBlock (Block block)
- {
- if (block.blockMaterial.isToolNotRequired())
- {
- return true;
- }
- for (Material m : getEffectiveMaterials())
- {
- if (m == block.blockMaterial)
- return true;
- }
- return false;
- }
-
- @Override
- public String[] toolCategories ()
- {
- return new String[] { "harvest" };
- }
-
- protected abstract Material[] getEffectiveMaterials ();
-
- protected abstract String getHarvestType ();
+ protected abstract String getHarvestType ();
}
diff --git a/mods/tinker/tconstruct/library/tools/ToolCore.java b/mods/tinker/tconstruct/library/tools/ToolCore.java
index f9cd2689..4aea0526 100644
--- a/mods/tinker/tconstruct/library/tools/ToolCore.java
+++ b/mods/tinker/tconstruct/library/tools/ToolCore.java
@@ -228,10 +228,10 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
emptyIcon = iconRegister.registerIcon("tinker:blankface");
}
-
+
@Override
@SideOnly(Side.CLIENT)
- public Icon getIconFromDamage(int meta)
+ public Icon getIconFromDamage (int meta)
{
return blankSprite;
}
@@ -449,7 +449,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
reinforced = current;
}
}
-
+
reinforced += unbreaking - reinforced;
if (reinforced > 0)
@@ -507,28 +507,34 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
}
/* Creative mode tools */
- static String[] toolMaterialNames = { "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Netherrack ", "Slime ", "Paper ", "Cobalt ", "Ardite ", "Manyullyn ", "Copper ",
- "Bronze ", "Alumite ", "Steel ", "Slime " };
public void getSubItems (int id, CreativeTabs tab, List list)
{
- for (int i = 0; i < 18; i++)
+ Iterator iter = TConstructRegistry.toolMaterials.entrySet().iterator();
+ while (iter.hasNext())
{
- Item accessory = getAccessoryItem();
- ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, i) : null;
- Item extra = getExtraItem();
- ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, i) : null;
- ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, i), new ItemStack(getHandleItem(), 1, i), accessoryStack, extraStack, toolMaterialNames[i] + getToolName());
- if (tool == null)
- {
- System.out.println("Creative builder failed tool for "+toolMaterialNames[i] + this.getToolName());
- System.out.println("Make sure you do not have item ID conflicts");
- }
- else
- {
- tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
- list.add(tool);
- }
+ Map.Entry pairs = (Map.Entry) iter.next();
+ ToolMaterial material = (ToolMaterial) pairs.getValue();
+ buildTool((Integer) pairs.getKey(), material.displayName, list);
+ }
+ }
+
+ public void buildTool (int id, String name, List list)
+ {
+ Item accessory = getAccessoryItem();
+ ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, id) : null;
+ Item extra = getExtraItem();
+ ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, id) : null;
+ ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName());
+ if (tool == null)
+ {
+ System.out.println("Creative builder failed tool for " + name + this.getToolName());
+ System.out.println("Make sure you do not have item ID conflicts");
+ }
+ else
+ {
+ tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
+ list.add(tool);
}
}
@@ -579,7 +585,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
public boolean onBlockDestroyed (ItemStack itemstack, World world, int blockID, int x, int y, int z, EntityLiving player)
{
Block block = Block.blocksList[blockID];
- if (block != null && (double)block.getBlockHardness(world, x, y, z) != 0.0D)
+ if (block != null && (double) block.getBlockHardness(world, x, y, z) != 0.0D)
{
return AbilityHelper.onBlockChanged(itemstack, world, blockID, x, y, z, player, random);
}
@@ -690,7 +696,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
int hotbarSlot = player.inventory.currentItem;
int itemSlot = hotbarSlot == 0 ? 8 : hotbarSlot + 1;
ItemStack nearbyStack = null;
-
+
if (hotbarSlot < 8)
{
nearbyStack = player.inventory.getStackInSlot(itemSlot);
@@ -704,7 +710,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
}
}
}
-
+
/*if (used) //Update client
{
Packet103SetSlot packet = new Packet103SetSlot(player.openContainer.windowId, itemSlot, nearbyStack);
@@ -898,7 +904,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
}
return tags.getCompoundTag("InfiTool").getInteger("TotalDurability");
}
-
+
public int getItemDamageFromStackForDisplay (ItemStack stack)
{
NBTTagCompound tags = stack.getTagCompound();
diff --git a/mods/tinker/tconstruct/library/tools/ToolMaterial.java b/mods/tinker/tconstruct/library/tools/ToolMaterial.java
index 5e213879..d0ee6ae2 100644
--- a/mods/tinker/tconstruct/library/tools/ToolMaterial.java
+++ b/mods/tinker/tconstruct/library/tools/ToolMaterial.java
@@ -7,6 +7,7 @@ public class ToolMaterial
//mining level, durability, mining speed, baseDamage, handle modifier, Reinforced level, shoddy/spiny level, color/style on name
public final String materialName;
+ public final String displayName;
public final int harvestLevel;
public final int durability;
public final int miningspeed; // <-- divided by 100
@@ -19,7 +20,13 @@ public class ToolMaterial
public ToolMaterial(String name, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
{
- this.materialName = name;
+ this(name, name + " ", level, durability, speed, damage, handle, reinforced, stonebound, style, ability);
+ }
+
+ public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability)
+ {
+ this.materialName = name;
+ this.displayName = name + " ";
this.harvestLevel = level;
this.durability = durability;
this.miningspeed = speed;
diff --git a/mods/tinker/tconstruct/util/PHConstruct.java b/mods/tinker/tconstruct/util/PHConstruct.java
index e0ab4f3c..5445ae55 100644
--- a/mods/tinker/tconstruct/util/PHConstruct.java
+++ b/mods/tinker/tconstruct/util/PHConstruct.java
@@ -97,6 +97,7 @@ public class PHConstruct
stainedGlass = config.getBlock("Stained Glass", 3224).getInt(3224);
stainedGlassClear = config.getBlock("Clear Stained Glass", 3225).getInt(3225);
redstoneMachine = config.getBlock("Redstone Machines", 3226).getInt(3226);
+ dryingRack = config.getBlock("Drying Rack", 3227).getInt(3227);
/*golemCore = config.getBlock("Golem Core", 1481).getInt(1481);
golemHead = config.getBlock("Golem Head", 1482).getInt(1482);*/
@@ -295,6 +296,7 @@ public class PHConstruct
public static int metalBlock;
public static int redstoneMachine;
+ public static int dryingRack;
public static int golemCore;
public static int golemHead;
diff --git a/mods/tinker/tconstruct/util/TEventHandler.java b/mods/tinker/tconstruct/util/TEventHandler.java
index b082cc3c..10cf03ae 100644
--- a/mods/tinker/tconstruct/util/TEventHandler.java
+++ b/mods/tinker/tconstruct/util/TEventHandler.java
@@ -53,10 +53,29 @@ public class TEventHandler
@ForgeSubscribe
public void craftTool (ToolCraftEvent event)
{
- /*if (event.tool == TContent.cleaver)
+ NBTTagCompound toolTag = event.toolTag.getCompoundTag("InfiTool");
+ int thaum = 0;
+ if (toolTag.getInteger("Head") == 31)
+ thaum++;
+ if (toolTag.getInteger("Handle") == 31)
+ thaum++;
+ if (toolTag.getInteger("Accessory") == 31)
+ thaum++;
+ if (toolTag.getInteger("Extra") == 31)
+ thaum++;
+
+ if ( (thaum >= 3) || (!toolTag.hasKey("Accessory") && thaum >= 2) )
{
- event.toolTag.getCompoundTag("InfiTool").setInteger("Beheading", 2);
- }*/
+ int modifiers = toolTag.getInteger("Modifiers");
+ modifiers += 2;
+ toolTag.setInteger("Modifiers", modifiers);
+ }
+ else if (thaum >= 1)
+ {
+ int modifiers = toolTag.getInteger("Modifiers");
+ modifiers += 1;
+ toolTag.setInteger("Modifiers", modifiers);
+ }
}
/* Interact */
diff --git a/mods/tinker/textures/items/axe/thaumium_axe_handle.png b/mods/tinker/textures/items/axe/thaumium_axe_handle.png
index 6ba47033..e056fb9d 100644
Binary files a/mods/tinker/textures/items/axe/thaumium_axe_handle.png and b/mods/tinker/textures/items/axe/thaumium_axe_handle.png differ
diff --git a/mods/tinker/textures/items/axe/thaumium_axe_head.png b/mods/tinker/textures/items/axe/thaumium_axe_head.png
index 75787a05..81391587 100644
Binary files a/mods/tinker/textures/items/axe/thaumium_axe_head.png and b/mods/tinker/textures/items/axe/thaumium_axe_head.png differ
diff --git a/mods/tinker/textures/items/axe/thaumium_axe_head_broken.png b/mods/tinker/textures/items/axe/thaumium_axe_head_broken.png
index f19425b4..ed0ecb70 100644
Binary files a/mods/tinker/textures/items/axe/thaumium_axe_head_broken.png and b/mods/tinker/textures/items/axe/thaumium_axe_head_broken.png differ
diff --git a/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_backhead.png
new file mode 100644
index 00000000..a1db6152
Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_backhead.png differ
diff --git a/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_binding.png
new file mode 100644
index 00000000..fbcbbe2d
Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_binding.png differ
diff --git a/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_fronthead.png
new file mode 100644
index 00000000..60828993
Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_fronthead.png differ
diff --git a/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_fronthead_broken.png
new file mode 100644
index 00000000..13ccf873
Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_fronthead_broken.png differ
diff --git a/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_handle.png
new file mode 100644
index 00000000..7195b193
Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/thaumium_battleaxe_handle.png differ
diff --git a/mods/tinker/textures/items/battlesign/thaumium_battlesign_handle.png b/mods/tinker/textures/items/battlesign/thaumium_battlesign_handle.png
new file mode 100644
index 00000000..9da4f38b
Binary files /dev/null and b/mods/tinker/textures/items/battlesign/thaumium_battlesign_handle.png differ
diff --git a/mods/tinker/textures/items/battlesign/thaumium_battlesign_head.png b/mods/tinker/textures/items/battlesign/thaumium_battlesign_head.png
new file mode 100644
index 00000000..71e156ed
Binary files /dev/null and b/mods/tinker/textures/items/battlesign/thaumium_battlesign_head.png differ
diff --git a/mods/tinker/textures/items/battlesign/thaumium_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/thaumium_battlesign_head_broken.png
new file mode 100644
index 00000000..04bd3f7c
Binary files /dev/null and b/mods/tinker/textures/items/battlesign/thaumium_battlesign_head_broken.png differ
diff --git a/mods/tinker/textures/items/broadsword/thaumium_sword_accessory.png b/mods/tinker/textures/items/broadsword/thaumium_sword_accessory.png
new file mode 100644
index 00000000..cfe4e370
Binary files /dev/null and b/mods/tinker/textures/items/broadsword/thaumium_sword_accessory.png differ
diff --git a/mods/tinker/textures/items/broadsword/thaumium_sword_blade.png b/mods/tinker/textures/items/broadsword/thaumium_sword_blade.png
new file mode 100644
index 00000000..ca0c384d
Binary files /dev/null and b/mods/tinker/textures/items/broadsword/thaumium_sword_blade.png differ
diff --git a/mods/tinker/textures/items/broadsword/thaumium_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/thaumium_sword_blade_broken.png
new file mode 100644
index 00000000..a4f56459
Binary files /dev/null and b/mods/tinker/textures/items/broadsword/thaumium_sword_blade_broken.png differ
diff --git a/mods/tinker/textures/items/broadsword/thaumium_sword_handle.png b/mods/tinker/textures/items/broadsword/thaumium_sword_handle.png
new file mode 100644
index 00000000..92cfee9d
Binary files /dev/null and b/mods/tinker/textures/items/broadsword/thaumium_sword_handle.png differ
diff --git a/mods/tinker/textures/items/chisel/thaumium_chisel_handle.png b/mods/tinker/textures/items/chisel/thaumium_chisel_handle.png
new file mode 100644
index 00000000..f891e24b
Binary files /dev/null and b/mods/tinker/textures/items/chisel/thaumium_chisel_handle.png differ
diff --git a/mods/tinker/textures/items/chisel/thaumium_chisel_head.png b/mods/tinker/textures/items/chisel/thaumium_chisel_head.png
new file mode 100644
index 00000000..0660ee67
Binary files /dev/null and b/mods/tinker/textures/items/chisel/thaumium_chisel_head.png differ
diff --git a/mods/tinker/textures/items/chisel/thaumium_chisel_head_broken.png b/mods/tinker/textures/items/chisel/thaumium_chisel_head_broken.png
new file mode 100644
index 00000000..857fab4a
Binary files /dev/null and b/mods/tinker/textures/items/chisel/thaumium_chisel_head_broken.png differ
diff --git a/mods/tinker/textures/items/cleaver/thaumium_cleaver_guard.png b/mods/tinker/textures/items/cleaver/thaumium_cleaver_guard.png
new file mode 100644
index 00000000..a7a84bd9
Binary files /dev/null and b/mods/tinker/textures/items/cleaver/thaumium_cleaver_guard.png differ
diff --git a/mods/tinker/textures/items/cleaver/thaumium_cleaver_handle.png b/mods/tinker/textures/items/cleaver/thaumium_cleaver_handle.png
new file mode 100644
index 00000000..a068f81e
Binary files /dev/null and b/mods/tinker/textures/items/cleaver/thaumium_cleaver_handle.png differ
diff --git a/mods/tinker/textures/items/cleaver/thaumium_cleaver_head.png b/mods/tinker/textures/items/cleaver/thaumium_cleaver_head.png
new file mode 100644
index 00000000..6ec2ed5e
Binary files /dev/null and b/mods/tinker/textures/items/cleaver/thaumium_cleaver_head.png differ
diff --git a/mods/tinker/textures/items/cleaver/thaumium_cleaver_head_broken.png b/mods/tinker/textures/items/cleaver/thaumium_cleaver_head_broken.png
new file mode 100644
index 00000000..f6c9532c
Binary files /dev/null and b/mods/tinker/textures/items/cleaver/thaumium_cleaver_head_broken.png differ
diff --git a/mods/tinker/textures/items/cleaver/thaumium_cleaver_shield.png b/mods/tinker/textures/items/cleaver/thaumium_cleaver_shield.png
new file mode 100644
index 00000000..0b8eaf3d
Binary files /dev/null and b/mods/tinker/textures/items/cleaver/thaumium_cleaver_shield.png differ
diff --git a/mods/tinker/textures/items/cutlass/thaumium_cutlass_blade.png b/mods/tinker/textures/items/cutlass/thaumium_cutlass_blade.png
new file mode 100644
index 00000000..58cbfb62
Binary files /dev/null and b/mods/tinker/textures/items/cutlass/thaumium_cutlass_blade.png differ
diff --git a/mods/tinker/textures/items/cutlass/thaumium_cutlass_blade_broken.png b/mods/tinker/textures/items/cutlass/thaumium_cutlass_blade_broken.png
new file mode 100644
index 00000000..e52635d3
Binary files /dev/null and b/mods/tinker/textures/items/cutlass/thaumium_cutlass_blade_broken.png differ
diff --git a/mods/tinker/textures/items/cutlass/thaumium_cutlass_guard.png b/mods/tinker/textures/items/cutlass/thaumium_cutlass_guard.png
new file mode 100644
index 00000000..192ae7f7
Binary files /dev/null and b/mods/tinker/textures/items/cutlass/thaumium_cutlass_guard.png differ
diff --git a/mods/tinker/textures/items/cutlass/thaumium_cutlass_handle.png b/mods/tinker/textures/items/cutlass/thaumium_cutlass_handle.png
new file mode 100644
index 00000000..7c396078
Binary files /dev/null and b/mods/tinker/textures/items/cutlass/thaumium_cutlass_handle.png differ
diff --git a/mods/tinker/textures/items/dagger/thaumium_dagger_accessory.png b/mods/tinker/textures/items/dagger/thaumium_dagger_accessory.png
new file mode 100644
index 00000000..5759320d
Binary files /dev/null and b/mods/tinker/textures/items/dagger/thaumium_dagger_accessory.png differ
diff --git a/mods/tinker/textures/items/dagger/thaumium_dagger_blade.png b/mods/tinker/textures/items/dagger/thaumium_dagger_blade.png
new file mode 100644
index 00000000..4dbabcff
Binary files /dev/null and b/mods/tinker/textures/items/dagger/thaumium_dagger_blade.png differ
diff --git a/mods/tinker/textures/items/dagger/thaumium_dagger_blade_broken.png b/mods/tinker/textures/items/dagger/thaumium_dagger_blade_broken.png
new file mode 100644
index 00000000..cd2243d6
Binary files /dev/null and b/mods/tinker/textures/items/dagger/thaumium_dagger_blade_broken.png differ
diff --git a/mods/tinker/textures/items/dagger/thaumium_dagger_handle.png b/mods/tinker/textures/items/dagger/thaumium_dagger_handle.png
new file mode 100644
index 00000000..a23e1712
Binary files /dev/null and b/mods/tinker/textures/items/dagger/thaumium_dagger_handle.png differ
diff --git a/mods/tinker/textures/items/excavator/thaumium_excavator_binding.png b/mods/tinker/textures/items/excavator/thaumium_excavator_binding.png
new file mode 100644
index 00000000..434db8d8
Binary files /dev/null and b/mods/tinker/textures/items/excavator/thaumium_excavator_binding.png differ
diff --git a/mods/tinker/textures/items/excavator/thaumium_excavator_grip.png b/mods/tinker/textures/items/excavator/thaumium_excavator_grip.png
new file mode 100644
index 00000000..84ad5b5a
Binary files /dev/null and b/mods/tinker/textures/items/excavator/thaumium_excavator_grip.png differ
diff --git a/mods/tinker/textures/items/excavator/thaumium_excavator_handle.png b/mods/tinker/textures/items/excavator/thaumium_excavator_handle.png
new file mode 100644
index 00000000..cc8945cf
Binary files /dev/null and b/mods/tinker/textures/items/excavator/thaumium_excavator_handle.png differ
diff --git a/mods/tinker/textures/items/excavator/thaumium_excavator_head.png b/mods/tinker/textures/items/excavator/thaumium_excavator_head.png
new file mode 100644
index 00000000..36f428d4
Binary files /dev/null and b/mods/tinker/textures/items/excavator/thaumium_excavator_head.png differ
diff --git a/mods/tinker/textures/items/excavator/thaumium_excavator_head_broken.png b/mods/tinker/textures/items/excavator/thaumium_excavator_head_broken.png
new file mode 100644
index 00000000..d3cdee59
Binary files /dev/null and b/mods/tinker/textures/items/excavator/thaumium_excavator_head_broken.png differ
diff --git a/mods/tinker/textures/items/frypan/thaumium_frypan_handle.png b/mods/tinker/textures/items/frypan/thaumium_frypan_handle.png
index 1a884bb6..e016c84d 100644
Binary files a/mods/tinker/textures/items/frypan/thaumium_frypan_handle.png and b/mods/tinker/textures/items/frypan/thaumium_frypan_handle.png differ
diff --git a/mods/tinker/textures/items/frypan/thaumium_frypan_head.png b/mods/tinker/textures/items/frypan/thaumium_frypan_head.png
new file mode 100644
index 00000000..a63dbfa3
Binary files /dev/null and b/mods/tinker/textures/items/frypan/thaumium_frypan_head.png differ
diff --git a/mods/tinker/textures/items/frypan/thaumium_frypan_head_broken.png b/mods/tinker/textures/items/frypan/thaumium_frypan_head_broken.png
new file mode 100644
index 00000000..43933667
Binary files /dev/null and b/mods/tinker/textures/items/frypan/thaumium_frypan_head_broken.png differ
diff --git a/mods/tinker/textures/items/hammer/thaumium_hammer_back.png b/mods/tinker/textures/items/hammer/thaumium_hammer_back.png
new file mode 100644
index 00000000..f3576c35
Binary files /dev/null and b/mods/tinker/textures/items/hammer/thaumium_hammer_back.png differ
diff --git a/mods/tinker/textures/items/hammer/thaumium_hammer_front.png b/mods/tinker/textures/items/hammer/thaumium_hammer_front.png
new file mode 100644
index 00000000..f3ceddf7
Binary files /dev/null and b/mods/tinker/textures/items/hammer/thaumium_hammer_front.png differ
diff --git a/mods/tinker/textures/items/hammer/thaumium_hammer_handle.png b/mods/tinker/textures/items/hammer/thaumium_hammer_handle.png
new file mode 100644
index 00000000..e6bb2cec
Binary files /dev/null and b/mods/tinker/textures/items/hammer/thaumium_hammer_handle.png differ
diff --git a/mods/tinker/textures/items/hammer/thaumium_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/thaumium_hammer_handle_broken.png
new file mode 100644
index 00000000..e149a4a8
Binary files /dev/null and b/mods/tinker/textures/items/hammer/thaumium_hammer_handle_broken.png differ
diff --git a/mods/tinker/textures/items/hammer/thaumium_hammer_head.png b/mods/tinker/textures/items/hammer/thaumium_hammer_head.png
new file mode 100644
index 00000000..1d6f25f0
Binary files /dev/null and b/mods/tinker/textures/items/hammer/thaumium_hammer_head.png differ
diff --git a/mods/tinker/textures/items/longsword/thaumium_longsword_accessory.png b/mods/tinker/textures/items/longsword/thaumium_longsword_accessory.png
new file mode 100644
index 00000000..6b3fa0c8
Binary files /dev/null and b/mods/tinker/textures/items/longsword/thaumium_longsword_accessory.png differ
diff --git a/mods/tinker/textures/items/longsword/thaumium_longsword_blade.png b/mods/tinker/textures/items/longsword/thaumium_longsword_blade.png
new file mode 100644
index 00000000..d1d230e8
Binary files /dev/null and b/mods/tinker/textures/items/longsword/thaumium_longsword_blade.png differ
diff --git a/mods/tinker/textures/items/longsword/thaumium_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/thaumium_longsword_blade_broken.png
new file mode 100644
index 00000000..97e06e49
Binary files /dev/null and b/mods/tinker/textures/items/longsword/thaumium_longsword_blade_broken.png differ
diff --git a/mods/tinker/textures/items/longsword/thaumium_longsword_handle.png b/mods/tinker/textures/items/longsword/thaumium_longsword_handle.png
new file mode 100644
index 00000000..945078a6
Binary files /dev/null and b/mods/tinker/textures/items/longsword/thaumium_longsword_handle.png differ
diff --git a/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_binding.png b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_binding.png
new file mode 100644
index 00000000..aae7bf93
Binary files /dev/null and b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_binding.png differ
diff --git a/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_handle.png b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_handle.png
new file mode 100644
index 00000000..7a159687
Binary files /dev/null and b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_handle.png differ
diff --git a/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_head.png b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_head.png
new file mode 100644
index 00000000..b4c45259
Binary files /dev/null and b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_head.png differ
diff --git a/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_head_broken.png b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_head_broken.png
new file mode 100644
index 00000000..f129c6a7
Binary files /dev/null and b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_head_broken.png differ
diff --git a/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_shield.png b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_shield.png
new file mode 100644
index 00000000..1a139dd2
Binary files /dev/null and b/mods/tinker/textures/items/lumberaxe/thaumium_lumberaxe_shield.png differ
diff --git a/mods/tinker/textures/items/mattock/thaumium_mattock_back.png b/mods/tinker/textures/items/mattock/thaumium_mattock_back.png
new file mode 100644
index 00000000..86acd064
Binary files /dev/null and b/mods/tinker/textures/items/mattock/thaumium_mattock_back.png differ
diff --git a/mods/tinker/textures/items/mattock/thaumium_mattock_handle.png b/mods/tinker/textures/items/mattock/thaumium_mattock_handle.png
new file mode 100644
index 00000000..c4a82103
Binary files /dev/null and b/mods/tinker/textures/items/mattock/thaumium_mattock_handle.png differ
diff --git a/mods/tinker/textures/items/mattock/thaumium_mattock_head.png b/mods/tinker/textures/items/mattock/thaumium_mattock_head.png
new file mode 100644
index 00000000..f93a35dd
Binary files /dev/null and b/mods/tinker/textures/items/mattock/thaumium_mattock_head.png differ
diff --git a/mods/tinker/textures/items/mattock/thaumium_mattock_head_broken.png b/mods/tinker/textures/items/mattock/thaumium_mattock_head_broken.png
new file mode 100644
index 00000000..96df8a29
Binary files /dev/null and b/mods/tinker/textures/items/mattock/thaumium_mattock_head_broken.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_axe_head.png b/mods/tinker/textures/items/parts/thaumium_axe_head.png
new file mode 100644
index 00000000..5cb5eb50
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_axe_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_battlesign_head.png b/mods/tinker/textures/items/parts/thaumium_battlesign_head.png
new file mode 100644
index 00000000..f8fbaf16
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_battlesign_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_binding.png b/mods/tinker/textures/items/parts/thaumium_binding.png
new file mode 100644
index 00000000..95dfef94
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_binding.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_chisel_head.png b/mods/tinker/textures/items/parts/thaumium_chisel_head.png
new file mode 100644
index 00000000..3a6cb9d4
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_chisel_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_chunk.png b/mods/tinker/textures/items/parts/thaumium_chunk.png
new file mode 100644
index 00000000..9c73b9ff
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_chunk.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_crossbar.png b/mods/tinker/textures/items/parts/thaumium_crossbar.png
new file mode 100644
index 00000000..3f178cee
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_crossbar.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_excavator_head.png b/mods/tinker/textures/items/parts/thaumium_excavator_head.png
new file mode 100644
index 00000000..6bc65802
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_excavator_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_frypan_head.png b/mods/tinker/textures/items/parts/thaumium_frypan_head.png
new file mode 100644
index 00000000..9657852d
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_frypan_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_full_guard.png b/mods/tinker/textures/items/parts/thaumium_full_guard.png
new file mode 100644
index 00000000..974c00ad
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_full_guard.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_hammer_head.png b/mods/tinker/textures/items/parts/thaumium_hammer_head.png
new file mode 100644
index 00000000..48e14c8d
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_hammer_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_knife_blade.png b/mods/tinker/textures/items/parts/thaumium_knife_blade.png
new file mode 100644
index 00000000..567cf162
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_knife_blade.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_large_guard.png b/mods/tinker/textures/items/parts/thaumium_large_guard.png
new file mode 100644
index 00000000..15de0716
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_large_guard.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_large_sword_blade.png b/mods/tinker/textures/items/parts/thaumium_large_sword_blade.png
new file mode 100644
index 00000000..889f79f0
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_large_sword_blade.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_largeplate.png b/mods/tinker/textures/items/parts/thaumium_largeplate.png
new file mode 100644
index 00000000..c04495d1
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_largeplate.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_lumberaxe_head.png b/mods/tinker/textures/items/parts/thaumium_lumberaxe_head.png
new file mode 100644
index 00000000..175cfecf
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_lumberaxe_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_medium_guard.png b/mods/tinker/textures/items/parts/thaumium_medium_guard.png
new file mode 100644
index 00000000..bd9e3dc4
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_medium_guard.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_pickaxe_head.png b/mods/tinker/textures/items/parts/thaumium_pickaxe_head.png
new file mode 100644
index 00000000..0246db5a
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_pickaxe_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_rod.png b/mods/tinker/textures/items/parts/thaumium_rod.png
new file mode 100644
index 00000000..e3bb3d16
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_rod.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_scythe_head.png b/mods/tinker/textures/items/parts/thaumium_scythe_head.png
new file mode 100644
index 00000000..45b120a9
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_scythe_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_shovel_head.png b/mods/tinker/textures/items/parts/thaumium_shovel_head.png
new file mode 100644
index 00000000..f92ade58
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_shovel_head.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_sword_blade.png b/mods/tinker/textures/items/parts/thaumium_sword_blade.png
new file mode 100644
index 00000000..5b7047c8
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_sword_blade.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_toughbind.png b/mods/tinker/textures/items/parts/thaumium_toughbind.png
new file mode 100644
index 00000000..485df1c1
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_toughbind.png differ
diff --git a/mods/tinker/textures/items/parts/thaumium_toughrod.png b/mods/tinker/textures/items/parts/thaumium_toughrod.png
new file mode 100644
index 00000000..0521c358
Binary files /dev/null and b/mods/tinker/textures/items/parts/thaumium_toughrod.png differ
diff --git a/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_accessory.png
new file mode 100644
index 00000000..f00c73dd
Binary files /dev/null and b/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_accessory.png differ
diff --git a/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_handle.png
new file mode 100644
index 00000000..1178bfcc
Binary files /dev/null and b/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_handle.png differ
diff --git a/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_head.png
new file mode 100644
index 00000000..c72a3040
Binary files /dev/null and b/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_head.png differ
diff --git a/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_head_broken.png
new file mode 100644
index 00000000..340065a2
Binary files /dev/null and b/mods/tinker/textures/items/pickaxe/thaumium_pickaxe_head_broken.png differ
diff --git a/mods/tinker/textures/items/rapier/thaumium_rapier_accessory.png b/mods/tinker/textures/items/rapier/thaumium_rapier_accessory.png
new file mode 100644
index 00000000..a383a5f6
Binary files /dev/null and b/mods/tinker/textures/items/rapier/thaumium_rapier_accessory.png differ
diff --git a/mods/tinker/textures/items/rapier/thaumium_rapier_blade.png b/mods/tinker/textures/items/rapier/thaumium_rapier_blade.png
new file mode 100644
index 00000000..95d44c4d
Binary files /dev/null and b/mods/tinker/textures/items/rapier/thaumium_rapier_blade.png differ
diff --git a/mods/tinker/textures/items/rapier/thaumium_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/thaumium_rapier_blade_broken.png
new file mode 100644
index 00000000..cdc0b7dd
Binary files /dev/null and b/mods/tinker/textures/items/rapier/thaumium_rapier_blade_broken.png differ
diff --git a/mods/tinker/textures/items/rapier/thaumium_rapier_handle.png b/mods/tinker/textures/items/rapier/thaumium_rapier_handle.png
new file mode 100644
index 00000000..fdaf47e8
Binary files /dev/null and b/mods/tinker/textures/items/rapier/thaumium_rapier_handle.png differ
diff --git a/mods/tinker/textures/items/scythe/thaumium_scythe_accessory.png b/mods/tinker/textures/items/scythe/thaumium_scythe_accessory.png
new file mode 100644
index 00000000..dd2d2361
Binary files /dev/null and b/mods/tinker/textures/items/scythe/thaumium_scythe_accessory.png differ
diff --git a/mods/tinker/textures/items/scythe/thaumium_scythe_binding.png b/mods/tinker/textures/items/scythe/thaumium_scythe_binding.png
new file mode 100644
index 00000000..eb4b191b
Binary files /dev/null and b/mods/tinker/textures/items/scythe/thaumium_scythe_binding.png differ
diff --git a/mods/tinker/textures/items/scythe/thaumium_scythe_handle.png b/mods/tinker/textures/items/scythe/thaumium_scythe_handle.png
new file mode 100644
index 00000000..7991c8b2
Binary files /dev/null and b/mods/tinker/textures/items/scythe/thaumium_scythe_handle.png differ
diff --git a/mods/tinker/textures/items/scythe/thaumium_scythe_head.png b/mods/tinker/textures/items/scythe/thaumium_scythe_head.png
new file mode 100644
index 00000000..fbe08223
Binary files /dev/null and b/mods/tinker/textures/items/scythe/thaumium_scythe_head.png differ
diff --git a/mods/tinker/textures/items/scythe/thaumium_scythe_head_broken.png b/mods/tinker/textures/items/scythe/thaumium_scythe_head_broken.png
new file mode 100644
index 00000000..3f7f6eaf
Binary files /dev/null and b/mods/tinker/textures/items/scythe/thaumium_scythe_head_broken.png differ
diff --git a/mods/tinker/textures/items/shovel/thaumium_shovel_handle.png b/mods/tinker/textures/items/shovel/thaumium_shovel_handle.png
new file mode 100644
index 00000000..d892c8ce
Binary files /dev/null and b/mods/tinker/textures/items/shovel/thaumium_shovel_handle.png differ
diff --git a/mods/tinker/textures/items/shovel/thaumium_shovel_head.png b/mods/tinker/textures/items/shovel/thaumium_shovel_head.png
new file mode 100644
index 00000000..93f8e68f
Binary files /dev/null and b/mods/tinker/textures/items/shovel/thaumium_shovel_head.png differ
diff --git a/mods/tinker/textures/items/shovel/thaumium_shovel_head_broken.png b/mods/tinker/textures/items/shovel/thaumium_shovel_head_broken.png
new file mode 100644
index 00000000..b4ce339f
Binary files /dev/null and b/mods/tinker/textures/items/shovel/thaumium_shovel_head_broken.png differ