diff --git a/mods/tinker/resources/lang/en_US.xml b/mods/tinker/resources/lang/en_US.xml
index db7504a9..9511a594 100644
--- a/mods/tinker/resources/lang/en_US.xml
+++ b/mods/tinker/resources/lang/en_US.xml
@@ -72,6 +72,23 @@
Endstone Brick
Obsidian Brick
+ Obsidian Fancy Brick
+ Sandstone Fancy Brick
+ Netherrack Fancy Brick
+ Iron Fancy Brick
+ Gold Fancy Brick
+ Diamond Fancy Brick
+ Lapis Fancy Brick
+ Refined Stone Fancy Brick
+ Redstone Fancy Brick
+ Bone Fancy Brick
+ Slime Fancy Brick
+ Slime Fancy Brick
+ Endstone Fancy Brick
+ Obsidian Fancy Brick
+ Stone Road
+ Stone Fancy Brick
+
Iron Oreberry
Gold Oreberry
Copper Oreberry
@@ -129,6 +146,7 @@
Torch
+ Knapsack
Blank Pattern
Blank Cast
@@ -149,10 +167,6 @@
Liquid Alumite Bucket
Liquid Obsidian Bucket
Liquid Steel Bucket
- Liquid Manganese Bucket
- Liquid Heptazion Bucket
- Liquid Damascus Steel Bucket
- Liquid Angmallen Bucket
Liquid Iron
Liquid Gold
diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java
index 14bd3ee9..c7f5542c 100644
--- a/mods/tinker/tconstruct/TConstruct.java
+++ b/mods/tinker/tconstruct/TConstruct.java
@@ -38,7 +38,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry;
* @dependencies: IC2 API, MFR API
*/
-@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.dev.63", dependencies = "required-after:Forge@[7.7.1.675,)")
+@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.dev.67", 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/api/TConstructAPI.java b/mods/tinker/tconstruct/api/TConstructAPI.java
deleted file mode 100644
index c07ae438..00000000
--- a/mods/tinker/tconstruct/api/TConstructAPI.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package mods.tinker.tconstruct.api;
-
-public class TConstructAPI
-{
-
-}
diff --git a/mods/tinker/tconstruct/blocks/Aggregator.java b/mods/tinker/tconstruct/blocks/Aggregator.java
new file mode 100644
index 00000000..ae70657d
--- /dev/null
+++ b/mods/tinker/tconstruct/blocks/Aggregator.java
@@ -0,0 +1,114 @@
+package mods.tinker.tconstruct.blocks;
+
+import java.util.List;
+
+import mods.tinker.tconstruct.TConstruct;
+import mods.tinker.tconstruct.blocks.logic.GlowstoneAggregator;
+import mods.tinker.tconstruct.common.TProxyCommon;
+import mods.tinker.tconstruct.library.TConstructRegistry;
+import mods.tinker.tconstruct.library.blocks.InventoryBlock;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Icon;
+import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class Aggregator extends InventoryBlock
+{
+ public String[] textureNames = { "glowstone_top", "glowstone_top_inactive", "glowstone_side", "glowstone_bottom"};
+ public Icon[] icons;
+ public Aggregator(int id)
+ {
+ super(id, Material.iron);
+ setHardness(2.0f);
+ this.setCreativeTab(TConstructRegistry.blockTab);
+ setLightValue(1.0f);
+ }
+
+ @Override
+ public int damageDropped (int meta)
+ {
+ return meta;
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ 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:machines/aggregator_"+textureNames[i]);
+ }
+ }
+
+ /*@Override
+ public Icon getBlockTexture(IBlockAccess iblockaccess, int x, int y, int z, int side)
+ {
+ if (iblockaccess instanceof World)
+ {
+ System.out.println("Rawr!");
+ World world = (World) iblockaccess;
+ if (world.canBlockSeeTheSky(x, y, z))
+ {
+ int level = world.getSavedLightValue(EnumSkyBlock.Sky, x, y, z) - world.skylightSubtracted;
+ System.out.println("Level: "+level);
+ if (level < 12)
+ return icons[1];
+ }
+ }
+ return this.getIcon(side, iblockaccess.getBlockMetadata(x, y, z));
+ }*/
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public Icon getIcon (int side, int meta)
+ {
+ if (side == 0)
+ return icons[3];
+ if (side == 1)
+ return icons[0];
+ return icons[2];
+ //return icons[meta];
+ }
+
+ @Override
+ public void getSubBlocks (int id, CreativeTabs tab, List list)
+ {
+ list.add(new ItemStack(id, 1, 0));
+ /*for (int iter = 0; iter < icons.length; iter++)
+ {
+ list.add(new ItemStack(id, 1, iter));
+ }*/
+ }
+
+ @Override
+ public TileEntity createTileEntity (World world, int metadata)
+ {
+ return new GlowstoneAggregator();
+ }
+
+ @Override
+ public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer)
+ {
+ return TProxyCommon.glowstoneAggregatorGui;
+ }
+
+ @Override
+ public Object getModInstance ()
+ {
+ return TConstruct.instance;
+ }
+
+ @Override
+ public String[] getTextureNames ()
+ {
+ return textureNames;
+ }
+}
diff --git a/mods/tinker/tconstruct/blocks/LiquidMetalBase.java b/mods/tinker/tconstruct/blocks/LiquidMetalBase.java
index 852ee4f8..2f47fbe8 100644
--- a/mods/tinker/tconstruct/blocks/LiquidMetalBase.java
+++ b/mods/tinker/tconstruct/blocks/LiquidMetalBase.java
@@ -34,7 +34,7 @@ public abstract class LiquidMetalBase extends Block
protected LiquidMetalBase(int par1, Material par2Material)
{
super(par1, par2Material);
- textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel" };
+ textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass" };
setLightValue(0.625F);
}
diff --git a/mods/tinker/tconstruct/blocks/MultiBrickFancy.java b/mods/tinker/tconstruct/blocks/MultiBrickFancy.java
index 1321b6b9..8503413d 100644
--- a/mods/tinker/tconstruct/blocks/MultiBrickFancy.java
+++ b/mods/tinker/tconstruct/blocks/MultiBrickFancy.java
@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class MultiBrickFancy extends TConstructBlock
{
static String blockTextures[] = { "fancybrick_obsidian", "fancybrick_sandstone", "fancybrick_netherrack", "fancybrick_stone_refined", "fancybrick_iron", "fancybrick_gold", "fancybrick_lapis", "fancybrick_diamond", "fancybrick_redstone",
- "fancybrick_bone", "fancybrick_slime", "fancybrick_blueslime", "fancybrick_endstone", "fancybrick_obsidian_ingot", "road_stone", "road_refinedstone" };
+ "fancybrick_bone", "fancybrick_slime", "fancybrick_blueslime", "fancybrick_endstone", "fancybrick_obsidian_ingot", "fancybrick_stone", "road_stone" };
public MultiBrickFancy(int id)
{
diff --git a/mods/tinker/tconstruct/blocks/logic/AggregatorLogic.java b/mods/tinker/tconstruct/blocks/logic/AggregatorLogic.java
new file mode 100644
index 00000000..259a4248
--- /dev/null
+++ b/mods/tinker/tconstruct/blocks/logic/AggregatorLogic.java
@@ -0,0 +1,14 @@
+package mods.tinker.tconstruct.blocks.logic;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.world.World;
+import mods.tinker.tconstruct.library.blocks.InventoryLogic;
+
+public abstract class AggregatorLogic extends InventoryLogic
+{
+ public AggregatorLogic(int invSize)
+ {
+ super(invSize);
+ }
+}
diff --git a/mods/tinker/tconstruct/blocks/logic/GlowstoneAggregator.java b/mods/tinker/tconstruct/blocks/logic/GlowstoneAggregator.java
new file mode 100644
index 00000000..75a0cd61
--- /dev/null
+++ b/mods/tinker/tconstruct/blocks/logic/GlowstoneAggregator.java
@@ -0,0 +1,71 @@
+package mods.tinker.tconstruct.blocks.logic;
+
+import mods.tinker.tconstruct.inventory.AggregatorContainer;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.EnumSkyBlock;
+import net.minecraft.world.World;
+
+public class GlowstoneAggregator extends AggregatorLogic
+{
+ short currentTime;
+ short maxTime = 20 * 60 * 5;
+ int currentLightLevel;
+
+ public GlowstoneAggregator()
+ {
+ super(3);
+ }
+
+ @Override
+ public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z)
+ {
+ return new AggregatorContainer(inventoryplayer, this);
+ }
+
+ @Override
+ protected String getDefaultName ()
+ {
+ return "aggregator.glowstone";
+ }
+
+ @Override
+ public void updateEntity ()
+ {
+ if (worldObj.isRemote)
+ return;
+ if (inventory[2] == null || inventory[2].stackSize < this.getInventoryStackLimit())
+ {
+ if (inventory[0] != null && inventory[0].itemID == Block.cobblestone.blockID)
+ {
+ currentLightLevel = worldObj.getSavedLightValue(EnumSkyBlock.Sky, xCoord, yCoord, zCoord) - worldObj.skylightSubtracted;
+ if (currentLightLevel > 12)
+ {
+ currentTime++;
+ if (currentTime >= 20)
+ {
+ currentTime = 0;
+ inventory[0].stackSize--;
+ if (inventory[0].stackSize < 1)
+ inventory[0] = null;
+
+ if (inventory[2] != null)
+ inventory[2].stackSize++;
+ else
+ inventory[2] = new ItemStack(Block.glowStone);
+ }
+ }
+ /*
+ if (this.currentTime % 60 == 0)
+ System.out.println("Light: " + lightLevel);
+ currentTime++;
+ if (currentTime >= maxTime)
+ {
+ currentTime = 0;
+ }*/
+ }
+ }
+ }
+}
diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java
index 1af8349a..56664530 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.FrypanLogic;
+import mods.tinker.tconstruct.blocks.logic.GlowstoneAggregator;
import mods.tinker.tconstruct.blocks.logic.GolemCoreLogic;
import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic;
import mods.tinker.tconstruct.blocks.logic.PatternChestLogic;
@@ -45,6 +46,7 @@ import mods.tinker.tconstruct.client.entity.projectile.DaggerRender;
import mods.tinker.tconstruct.client.entity.projectile.LaunchedItemRender;
import mods.tinker.tconstruct.client.gui.ArmorExtendedGui;
import mods.tinker.tconstruct.client.gui.FrypanGui;
+import mods.tinker.tconstruct.client.gui.GlowstoneAggregatorGui;
import mods.tinker.tconstruct.client.gui.GuiManual;
import mods.tinker.tconstruct.client.gui.InventoryTab;
import mods.tinker.tconstruct.client.gui.KnapsackGui;
@@ -155,6 +157,9 @@ public class TProxyClient extends TProxyCommon
return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
if (ID == toolForge)
return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
+ if (ID == glowstoneAggregatorGui)
+ return new GlowstoneAggregatorGui(player.inventory, (GlowstoneAggregator) world.getBlockTileEntity(x, y, z), world, x, y, z);
+
if (ID == manualGuiID)
{
ItemStack stack = player.getCurrentEquippedItem();
@@ -386,7 +391,7 @@ public class TProxyClient extends TProxyCommon
//Tool parts
TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TContent.pickaxeHead, 1, 2));
TConstructClientRegistry.registerManualIcon("shovelhead", new ItemStack(TContent.shovelHead, 1, 2));
- TConstructClientRegistry.registerManualIcon("axehead", new ItemStack(TContent.axeHead, 1, 2));
+ TConstructClientRegistry.registerManualIcon("axehead", new ItemStack(TContent.hatchetHead, 1, 2));
TConstructClientRegistry.registerManualIcon("swordblade", new ItemStack(TContent.swordBlade, 1, 2));
TConstructClientRegistry.registerManualIcon("pan", new ItemStack(TContent.frypanHead, 1, 2));
TConstructClientRegistry.registerManualIcon("board", new ItemStack(TContent.signHead, 1, 2));
@@ -404,9 +409,9 @@ public class TProxyClient extends TProxyCommon
TConstructClientRegistry.registerManualIcon("pickicon",
ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.binding, 1, 12), ""));
TConstructClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.shovelHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
- TConstructClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.axeHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
+ TConstructClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
TConstructClientRegistry.registerManualIcon("mattockicon",
- ToolBuilder.instance.buildTool(new ItemStack(TContent.axeHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.shovelHead, 1, 12), ""));
+ ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.shovelHead, 1, 12), ""));
TConstructClientRegistry.registerManualIcon("swordicon",
ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.wideGuard, 1, 12), ""));
TConstructClientRegistry.registerManualIcon("longswordicon",
@@ -645,9 +650,9 @@ public class TProxyClient extends TProxyCommon
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 };
- int[] weaponEffects = { 3, 5, 7, 8, 11, 13, 14, 15 };
+ int[] weaponEffects = { 3, 5, 7, 13, 14, 15 };
int[] harvestEffects = { 2 };
- int[] nonUtility = { 6, 10, 12 };
+ int[] nonUtility = { 6, 8, 10, 11, 12 };
for (int partIter = 0; partIter < partTypes.length; partIter++)
{
@@ -656,13 +661,17 @@ public class TProxyClient extends TProxyCommon
for (ToolCore tool : TConstructRegistry.getToolMapping())
{
- List list = Arrays.asList(tool.toolCategories());
+ for (int i = 0; i < effectTypes.length; i++)
+ {
+ 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"))
+ if (list.contains("harvest") || list.contains("utility"))
{
for (int i = 0; i < harvestEffects.length; i++)
{
@@ -684,7 +693,7 @@ public class TProxyClient extends TProxyCommon
{
TConstructClientRegistry.addEffectRenderMapping(tool, nonUtility[i], "tinker", effectTypes[nonUtility[i]], true);
}
- }
+ }*/
}
}
diff --git a/mods/tinker/tconstruct/client/block/SmelteryRender.java b/mods/tinker/tconstruct/client/block/SmelteryRender.java
index dca8fc8b..01f1bb23 100644
--- a/mods/tinker/tconstruct/client/block/SmelteryRender.java
+++ b/mods/tinker/tconstruct/client/block/SmelteryRender.java
@@ -61,22 +61,25 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
if (input != null && logic.getTempForSlot(i) > 20)
{
ItemStack blockToRender = Smeltery.getRenderIndex(input);
- float blockHeight = input.stackSize / (float) blockToRender.stackSize;
- renderer.setRenderBounds(-0.001F, 0.0F, -0.001F, 1.001F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.001F);
+ if (blockToRender != null)
+ {
+ float blockHeight = input.stackSize / (float) blockToRender.stackSize;
+ renderer.setRenderBounds(-0.001F, 0.0F, -0.001F, 1.001F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.001F);
- if (blockToRender.itemID < 4096) //Block
- {
- Block liquidBlock = Block.blocksList[blockToRender.itemID];
- //ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0);
- BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY + i / 9, posZ + i / 3, renderer, world);
- }
- else
- //Item
- {
- Item liquidItem = Item.itemsList[blockToRender.itemID];
- //ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0);
- int metadata = blockToRender.getItemDamage();
- BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(metadata), posX, posY + i / 9, posZ, renderer, world);
+ if (blockToRender.itemID < 4096) //Block
+ {
+ Block liquidBlock = Block.blocksList[blockToRender.itemID];
+ //ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0);
+ BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY + i / 9, posZ + i / 3, renderer, world);
+ }
+ else
+ //Item
+ {
+ Item liquidItem = Item.itemsList[blockToRender.itemID];
+ //ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0);
+ int metadata = blockToRender.getItemDamage();
+ BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(metadata), posX, posY + i / 9, posZ, renderer, world);
+ }
}
}
}
@@ -147,7 +150,8 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler
Block liquidBlock = Block.blocksList[blockToRender.itemID];
BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY, posZ + i / 3, renderer, world);
}
- else //Item
+ else
+ //Item
{
Item liquidItem = Item.itemsList[blockToRender.itemID];
int metadata = blockToRender.getItemDamage();
diff --git a/mods/tinker/tconstruct/client/gui/GlowstoneAggregatorGui.java b/mods/tinker/tconstruct/client/gui/GlowstoneAggregatorGui.java
new file mode 100644
index 00000000..3287b974
--- /dev/null
+++ b/mods/tinker/tconstruct/client/gui/GlowstoneAggregatorGui.java
@@ -0,0 +1,43 @@
+package mods.tinker.tconstruct.client.gui;
+
+import mods.tinker.tconstruct.blocks.logic.GlowstoneAggregator;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+import org.lwjgl.opengl.GL11;
+
+public class GlowstoneAggregatorGui extends GuiContainer
+{
+ public GlowstoneAggregator logic;
+
+ public GlowstoneAggregatorGui(InventoryPlayer inventoryplayer, GlowstoneAggregator frypan, World world, int x, int y, int z)
+ {
+ super(frypan.getGuiContainer(inventoryplayer, world, x, y, z));
+ logic = frypan;
+ }
+
+ protected void drawGuiContainerForegroundLayer(int par1, int par2)
+ {
+ //fontRenderer.drawString(StatCollector.translateToLocal("aggregator.glowstone"), 60, 6, 0x404040);
+ fontRenderer.drawString("Glowstone Aggregator", 8, 6, 0x404040);
+ fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
+ }
+
+ protected void drawGuiContainerBackgroundLayer(float f, int i, int j)
+ {
+ GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+ mc.renderEngine.bindTexture("/mods/tinker/textures/gui/aggregator.png");
+ int cornerX = (width - xSize) / 2;
+ int cornerY = (height - ySize) / 2;
+ drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
+ /*if (logic.fuel > 0)
+ {
+ int fuel = logic.gaugeFuelScaled(12);
+ drawTexturedModalRect(cornerX + 27, (cornerY + 40) - fuel, 176, 12 - fuel, 14, fuel + 2);
+ }
+ int fuelgague = logic.gaugeProgressScaled(24);
+ drawTexturedModalRect(cornerX + 140, cornerY + 8, 176, 14, fuelgague, 16);*/
+ }
+}
diff --git a/mods/tinker/tconstruct/client/gui/GuiManual.java b/mods/tinker/tconstruct/client/gui/GuiManual.java
index 4335fc66..1f6b8e15 100644
--- a/mods/tinker/tconstruct/client/gui/GuiManual.java
+++ b/mods/tinker/tconstruct/client/gui/GuiManual.java
@@ -49,7 +49,7 @@ public class GuiManual extends GuiScreen
ItemStack[] iconsRight;
String[] multiTextRight;
ToolMaterial materialRight;
-
+
SmallFontRenderer fonts = TProxyClient.smallFontRenderer;
public GuiManual(ItemStack stack, Document doc)
@@ -784,7 +784,7 @@ public class GuiManual extends GuiScreen
if (icons[2] != null)
renderitem.renderItemAndEffectIntoGUI(fonts, mc.renderEngine, icons[2], (localWidth + 18) / 2, (localHeight + 74) / 2);
renderitem.zLevel = 0;
-
+
GL11.glScalef(0.5F, 0.5F, 0.5F);
RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
@@ -811,8 +811,10 @@ public class GuiManual extends GuiScreen
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
this.fonts.drawSplitString(icons[1].getTooltip(this.mc.thePlayer, false).get((0)).toString(), localWidth + 128, localHeight + 53, 52, 0);
- this.fonts.drawSplitString(icons[2].getTooltip(this.mc.thePlayer, false).get((0)).toString(), localWidth + 128, localHeight + 85, 52, 0);
- this.fonts.drawSplitString(icons[3].getTooltip(this.mc.thePlayer, false).get((0)).toString(), localWidth + 128, localHeight + 117, 52, 0);
+ if (icons[2] != null)
+ this.fonts.drawSplitString(icons[2].getTooltip(this.mc.thePlayer, false).get((0)).toString(), localWidth + 128, localHeight + 85, 52, 0);
+ if (icons[3] != null)
+ this.fonts.drawSplitString(icons[3].getTooltip(this.mc.thePlayer, false).get((0)).toString(), localWidth + 128, localHeight + 117, 52, 0);
this.fonts.drawString("Durability: " + material.durability(), localWidth, localHeight + 40, 0);
this.fonts.drawString("Handle Modifier: " + material.handleDurability() + "x", localWidth, localHeight + 50, 0);
diff --git a/mods/tinker/tconstruct/client/gui/StencilTableGui.java b/mods/tinker/tconstruct/client/gui/StencilTableGui.java
index 20ef028e..957dc108 100644
--- a/mods/tinker/tconstruct/client/gui/StencilTableGui.java
+++ b/mods/tinker/tconstruct/client/gui/StencilTableGui.java
@@ -89,14 +89,14 @@ public class StencilTableGui extends GuiContainer
if (button.id == 0)
{
patternIndex++;
- if (patternIndex > TContent.patternOutputs.length-1)
+ if (patternIndex >= TContent.patternOutputs.length-1)
patternIndex = 0;
}
else if (button.id == 1)
{
patternIndex--;
if (patternIndex < 0)
- patternIndex = TContent.patternOutputs.length-1;
+ patternIndex = TContent.patternOutputs.length-2;
}
ItemStack stack = new ItemStack(TContent.woodPattern, 1, patternIndex + 1);
logic.setInventorySlotContents(1, stack);
@@ -107,14 +107,14 @@ public class StencilTableGui extends GuiContainer
if (button.id == 0)
{
patternIndex++;
- if (patternIndex > TContent.patternOutputs.length)
+ if (patternIndex > TContent.patternOutputs.length-1)
patternIndex = 0;
}
else if (button.id == 1)
{
patternIndex--;
if (patternIndex < 0)
- patternIndex = TContent.patternOutputs.length;
+ patternIndex = TContent.patternOutputs.length-1;
}
ItemStack stack = new ItemStack(TContent.metalPattern, 1, patternIndex);
logic.setInventorySlotContents(1, stack);
diff --git a/mods/tinker/tconstruct/client/gui/ToolStationGui.java b/mods/tinker/tconstruct/client/gui/ToolStationGui.java
index c7b7ec64..14726691 100644
--- a/mods/tinker/tconstruct/client/gui/ToolStationGui.java
+++ b/mods/tinker/tconstruct/client/gui/ToolStationGui.java
@@ -300,6 +300,14 @@ public class ToolStationGui extends NewContainerGui
offset++;
offset++;
}
+ else if (categories.contains("utility"))
+ {
+ float mineSpeed = tags.getInteger("MiningSpeed");
+ float trueSpeed = mineSpeed / (100f);
+ fontRenderer.drawString("Usage Speed: " + trueSpeed, xSize + 8, base + offset * 10, 0xffffff);
+ offset++;
+ offset++;
+ }
int modifiers = tags.getInteger("Modifiers");
if (modifiers > 0)
diff --git a/mods/tinker/tconstruct/common/TContent.java b/mods/tinker/tconstruct/common/TContent.java
index 9db15373..75d31481 100644
--- a/mods/tinker/tconstruct/common/TContent.java
+++ b/mods/tinker/tconstruct/common/TContent.java
@@ -47,57 +47,57 @@ import extrabiomes.api.BiomeManager;
public class TContent implements IFuelHandler
{
- //Patterns and other materials
- public static Item blankPattern;
- public static Item materials;
- public static Item toolRod;
- public static Item toolShard;
- public static Item woodPattern;
- public static Item metalPattern;
+ //Patterns and other materials
+ public static Item blankPattern;
+ public static Item materials;
+ public static Item toolRod;
+ public static Item toolShard;
+ public static Item woodPattern;
+ public static Item metalPattern;
- public static Item manualBook;
- public static Item buckets;
- public static Item titleIcon;
+ public static Item manualBook;
+ public static Item buckets;
+ public static Item titleIcon;
- public static Item strangeFood;
- public static Item diamondApple;
- //public static Item stonePattern;
- //public static Item netherPattern;
+ public static Item strangeFood;
+ public static Item diamondApple;
+ //public static Item stonePattern;
+ //public static Item netherPattern;
- //Tools
- public static ToolCore pickaxe;
- public static ToolCore shovel;
- public static ToolCore axe;
- public static ToolCore broadsword;
- public static ToolCore longsword;
- public static ToolCore rapier;
- public static ToolCore dagger;
+ //Tools
+ public static ToolCore pickaxe;
+ public static ToolCore shovel;
+ public static ToolCore hatchet;
+ public static ToolCore broadsword;
+ public static ToolCore longsword;
+ public static ToolCore rapier;
+ public static ToolCore dagger;
public static ToolCore cutlass;
- public static ToolCore frypan;
- public static ToolCore battlesign;
- public static ToolCore chisel;
+ public static ToolCore frypan;
+ public static ToolCore battlesign;
+ public static ToolCore chisel;
public static ToolCore mattock;
- //public static ToolCore longbow;
+ //public static ToolCore longbow;
- public static ToolCore scythe;
- public static ToolCore lumberaxe;
+ public static ToolCore scythe;
+ public static ToolCore lumberaxe;
public static ToolCore cleaver;
public static ToolCore excavator;
public static ToolCore hammer;
public static ToolCore battleaxe;
- public static Item potionLauncher;
+ public static Item potionLauncher;
- //Tool parts
+ //Tool parts
public static Item binding;
public static Item toughBinding;
public static Item toughRod;
public static Item heavyPlate;
-
- public static Item pickaxeHead;
- public static Item shovelHead;
- public static Item axeHead;
+
+ public static Item pickaxeHead;
+ public static Item shovelHead;
+ public static Item hatchetHead;
public static Item frypanHead;
public static Item signHead;
public static Item chiselHead;
@@ -106,1018 +106,1084 @@ public class TContent implements IFuelHandler
public static Item excavatorHead;
public static Item hammerHead;
- public static Item swordBlade;
+ public static Item swordBlade;
public static Item largeSwordBlade;
public static Item knifeBlade;
-
- public static Item wideGuard;
- public static Item handGuard;
- public static Item crossbar;
+
+ public static Item wideGuard;
+ public static Item handGuard;
+ public static Item crossbar;
public static Item fullGuard;
- //Crafting blocks
- public static Block toolStationWood;
- public static Block toolStationStone;
- public static Block toolForge;
- public static Block heldItemBlock;
- public static Block craftedSoil;
+ //Crafting blocks
+ public static Block toolStationWood;
+ public static Block toolStationStone;
+ public static Block toolForge;
+ public static Block heldItemBlock;
+ public static Block craftedSoil;
- public static Block smeltery;
- public static Block lavaTank;
- public static Block searedBlock;
- public static Block metalBlock;
+ public static Block smeltery;
+ public static Block lavaTank;
+ public static Block searedBlock;
+ public static Block metalBlock;
- //Decoration
- public static Block stoneTorch;
- public static Block multiBrick;
+ //Decoration
+ public static Block stoneTorch;
+ public static Block multiBrick;
+ public static Block multiBrickFancy;
- //Traps
- public static Block landmine;
- public static Block barricade;
+ //Traps
+ public static Block landmine;
+ public static Block barricade;
- //InfiBlocks
- public static Block speedBlock;
+ //InfiBlocks
+ public static Block speedBlock;
- //Liquids
- public static Block liquidMetalFlowing;
- public static Block liquidMetalStill;
- public static Material liquidMetal;
+ public static Block aggregator;
- //Ores
- public static Block oreSlag;
- public static Block oreGravel;
- public static OreberryBush oreBerry;
- public static OreberryBush oreBerrySecond;
- public static Item oreBerries;
+ //Liquids
+ public static Block liquidMetalFlowing;
+ public static Block liquidMetalStill;
+ public static Material liquidMetal;
- //Tool modifiers
- public static ModElectric modE;
- public static ModLapis modL;
+ //Ores
+ public static Block oreSlag;
+ public static Block oreGravel;
+ public static OreberryBush oreBerry;
+ public static OreberryBush oreBerrySecond;
+ public static Item oreBerries;
- //Golems
- /*public static Block glowSapling;
- public static Block glowLeaves;
- public static Block glowLog;*/
+ //Tool modifiers
+ public static ModElectric modE;
+ public static ModLapis modL;
- public static Block redstoneBallRepeater;
- public static Item redstoneBallRepeaterItem;
+ //Golems
+ /*public static Block glowSapling;
+ public static Block glowLeaves;
+ public static Block glowLog;*/
- public static Block golemCore;
- public static Block golemPedestal;
- public static Block golemHead;
+ public static Block redstoneBallRepeater;
+ public static Item redstoneBallRepeaterItem;
- public static Item golemWand;
- public static Item golemRecharger;
- public static Item corestone;
- public static Item notebook;
- public static Item note;
+ public static Block golemCore;
+ public static Block golemPedestal;
+ public static Block golemHead;
- //Wearables
- public static Item heavyHelmet;
- public static Item heavyChestplate;
- public static Item heavyPants;
- public static Item heavyBoots;
- public static Item glove;
- public static Item knapsack;
+ public static Item golemWand;
+ public static Item golemRecharger;
+ public static Item corestone;
+ public static Item notebook;
+ public static Item note;
- public static Item heartCanister;
-
- //Chest hooks
- public static ChestGenHooks tinkerHouseChest;
- public static ChestGenHooks tinkerHousePatterns;
+ //Wearables
+ public static Item heavyHelmet;
+ public static Item heavyChestplate;
+ public static Item heavyPants;
+ public static Item heavyBoots;
+ public static Item glove;
+ public static Item knapsack;
- public TContent()
- {
- registerBlocks();
- registerItems();
- registerMaterials();
- addCraftingRecipes();
- setupToolTabs();
- addLoot();
- }
+ public static Item heartCanister;
- public void createEntities ()
- {
- EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true);
- EntityRegistry.registerModEntity(DaggerEntity.class, "Dagger", 1, TConstruct.instance, 32, 5, true);
- //EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 5, true);
- //EntityRegistry.registerModEntity(SlimeClone.class, "SlimeClone", 2, TConstruct.instance, 32, 5, true);
- //EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 1, TConstruct.instance, 32, 3, true);
- //EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, TConstruct.instance, 32, 5, true);
+ //Chest hooks
+ public static ChestGenHooks tinkerHouseChest;
+ public static ChestGenHooks tinkerHousePatterns;
- //EntityRegistry.registerModEntity(Skyla.class, "Skyla", 10, TConstruct.instance, 32, 5, true);
- EntityRegistry.registerModEntity(Automaton.class, "Automaton", 11, TConstruct.instance, 64, 5, true);
- EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true);
- //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true);
+ public TContent()
+ {
+ registerBlocks();
+ registerItems();
+ registerMaterials();
+ addCraftingRecipes();
+ setupToolTabs();
+ addLoot();
+ }
- BiomeGenBase[] plains = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.PLAINS);
- BiomeGenBase[] mountain = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.MOUNTAIN);
- BiomeGenBase[] hills = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.HILLS);
- BiomeGenBase[] swamp = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.SWAMP);
- BiomeGenBase[] desert = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.DESERT);
- BiomeGenBase[] frozen = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.FROZEN);
- BiomeGenBase[] jungle = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.JUNGLE);
- BiomeGenBase[] wasteland = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.WASTELAND);
+ public void createEntities ()
+ {
+ EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true);
+ EntityRegistry.registerModEntity(DaggerEntity.class, "Dagger", 1, TConstruct.instance, 32, 5, true);
+ //EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 5, true);
+ //EntityRegistry.registerModEntity(SlimeClone.class, "SlimeClone", 2, TConstruct.instance, 32, 5, true);
+ //EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 1, TConstruct.instance, 32, 3, true);
+ //EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, TConstruct.instance, 32, 5, true);
- BiomeGenBase[] nether = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.NETHER);
+ //EntityRegistry.registerModEntity(Skyla.class, "Skyla", 10, TConstruct.instance, 32, 5, true);
+ EntityRegistry.registerModEntity(Automaton.class, "Automaton", 11, TConstruct.instance, 64, 5, true);
+ EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true);
+ //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true);
- /*if (PHConstruct.superfunWorld)
- {
- EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, plains);
- EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, mountain);
- EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, hills);
- EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, swamp);
- EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, desert);
- EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, frozen);
- EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, jungle);
- EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, wasteland);
- DimensionManager.unregisterProviderType(0);
- DimensionManager.registerProviderType(0, OverworldProvider.class, true);
- }*/
- if (PHConstruct.blueSlime)
- {
- EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, plains);
- EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, mountain);
- EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, hills);
- EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, swamp);
- EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, desert);
- EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, frozen);
- EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, jungle);
- EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, wasteland);
- }
-
- try
- {
- Class.forName("extrabiomes.api.BiomeManager");
- Collection ebxlCollection = BiomeManager.getBiomes();
- BiomeGenBase[] ebxlBiomes = (BiomeGenBase[]) ebxlCollection.toArray();
- EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, ebxlBiomes);
- }
- catch (Exception e)
- {
-
- }
- //EntityRegistry.addSpawn(MetalSlime.class, 1, 4, 4, EnumCreatureType.monster, overworldBiomes);
- }
+ BiomeGenBase[] plains = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.PLAINS);
+ BiomeGenBase[] mountain = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.MOUNTAIN);
+ BiomeGenBase[] hills = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.HILLS);
+ BiomeGenBase[] swamp = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.SWAMP);
+ BiomeGenBase[] desert = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.DESERT);
+ BiomeGenBase[] frozen = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.FROZEN);
+ BiomeGenBase[] jungle = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.JUNGLE);
+ BiomeGenBase[] wasteland = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.WASTELAND);
- void registerBlocks ()
- {
- //Tool Station
- toolStationWood = new ToolStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("ToolStation");
- GameRegistry.registerBlock(toolStationWood, ToolStationItemBlock.class, "ToolStationBlock");
- GameRegistry.registerTileEntity(ToolStationLogic.class, "ToolStation");
- GameRegistry.registerTileEntity(PartCrafterLogic.class, "PartCrafter");
- GameRegistry.registerTileEntity(PatternChestLogic.class, "PatternHolder");
- GameRegistry.registerTileEntity(StencilTableLogic.class, "PatternShaper");
-
- toolForge = new ToolForgeBlock(PHConstruct.toolForge, Material.iron).setUnlocalizedName("ToolForge");
- GameRegistry.registerBlock(toolForge, ToolForgeItemBlock.class, "ToolForgeBlock");
- GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge");
+ BiomeGenBase[] nether = BiomeDictionary.getBiomesForType(BiomeDictionary.Type.NETHER);
- heldItemBlock = new EquipBlock(PHConstruct.heldItemBlock, Material.wood).setUnlocalizedName("Frypan");
- GameRegistry.registerBlock(heldItemBlock, "HeldItemBlock");
- GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic");
+ /*if (PHConstruct.superfunWorld)
+ {
+ EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, plains);
+ EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, mountain);
+ EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, hills);
+ EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, swamp);
+ EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, desert);
+ EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, frozen);
+ EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, jungle);
+ EntityRegistry.addSpawn(NitroCreeper.class, 1000, 100, 100, EnumCreatureType.monster, wasteland);
+ DimensionManager.unregisterProviderType(0);
+ DimensionManager.registerProviderType(0, OverworldProvider.class, true);
+ }*/
+ if (PHConstruct.blueSlime)
+ {
+ EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, plains);
+ EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, mountain);
+ EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, hills);
+ EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, swamp);
+ EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, desert);
+ EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, frozen);
+ EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, jungle);
+ EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, wasteland);
+ }
- craftedSoil = new SoilBlock(PHConstruct.craftedSoil).setUnlocalizedName("TConstruct.Soil");
- craftedSoil.stepSound = Block.soundGravelFootstep;
- GameRegistry.registerBlock(craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil");
+ try
+ {
+ Class.forName("extrabiomes.api.BiomeManager");
+ Collection ebxlCollection = BiomeManager.getBiomes();
+ BiomeGenBase[] ebxlBiomes = (BiomeGenBase[]) ebxlCollection.toArray();
+ EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, ebxlBiomes);
+ }
+ catch (Exception e)
+ {
- metalBlock = new TMetalBlock(PHConstruct.metalBlock, Material.iron, 10.0F).setUnlocalizedName("tconstruct.metalblock");
- metalBlock.stepSound = Block.soundMetalFootstep;
- GameRegistry.registerBlock(metalBlock, MetalItemBlock.class, "MetalBlock");
+ }
+ //EntityRegistry.addSpawn(MetalSlime.class, 1, 4, 4, EnumCreatureType.monster, overworldBiomes);
+ }
- //Smeltery
- smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery");
- GameRegistry.registerBlock(smeltery, SmelteryItemBlock.class, "Smeltery");
- GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery");
- GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain");
- GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants");
+ void registerBlocks ()
+ {
+ //Tool Station
+ toolStationWood = new ToolStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("ToolStation");
+ GameRegistry.registerBlock(toolStationWood, ToolStationItemBlock.class, "ToolStationBlock");
+ GameRegistry.registerTileEntity(ToolStationLogic.class, "ToolStation");
+ GameRegistry.registerTileEntity(PartCrafterLogic.class, "PartCrafter");
+ GameRegistry.registerTileEntity(PatternChestLogic.class, "PatternHolder");
+ GameRegistry.registerTileEntity(StencilTableLogic.class, "PatternShaper");
- lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank");
- lavaTank.setStepSound(Block.soundGlassFootstep);
- GameRegistry.registerBlock(lavaTank, LavaTankItemBlock.class, "LavaTank");
- GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank");
+ toolForge = new ToolForgeBlock(PHConstruct.toolForge, Material.iron).setUnlocalizedName("ToolForge");
+ GameRegistry.registerBlock(toolForge, ToolForgeItemBlock.class, "ToolForgeBlock");
+ GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge");
- searedBlock = new SearedBlock(PHConstruct.searedTable).setUnlocalizedName("SearedBlock");
- GameRegistry.registerBlock(searedBlock, SearedTableItemBlock.class, "SearedBlock");
- GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable");
- GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet");
- GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin");
+ heldItemBlock = new EquipBlock(PHConstruct.heldItemBlock, Material.wood).setUnlocalizedName("Frypan");
+ GameRegistry.registerBlock(heldItemBlock, "HeldItemBlock");
+ GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic");
- //Traps
- /*landmine = new Landmine(PHConstruct.landmine, 0, EnumMobType.mobs, Material.cactus).setUnlocalizedName("landmine");
- GameRegistry.registerBlock(landmine, "landmine");*/
+ craftedSoil = new SoilBlock(PHConstruct.craftedSoil).setUnlocalizedName("TConstruct.Soil");
+ craftedSoil.stepSound = Block.soundGravelFootstep;
+ GameRegistry.registerBlock(craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil");
- //Liquids
- liquidMetal = new MaterialLiquid(MapColor.tntColor);
- liquidMetalFlowing = new LiquidMetalFlowing(PHConstruct.metalFlowing).setUnlocalizedName("liquid.metalFlow");
- liquidMetalStill = new LiquidMetalStill(PHConstruct.metalStill).setUnlocalizedName("liquid.metalStill");
- GameRegistry.registerBlock(liquidMetalFlowing, LiquidItemBlock.class, "metalFlow");
- GameRegistry.registerBlock(liquidMetalStill, LiquidItemBlock.class, "metalStill");
- GameRegistry.registerTileEntity(LiquidTextureLogic.class, "LiquidTexture");
+ metalBlock = new TMetalBlock(PHConstruct.metalBlock, Material.iron, 10.0F).setUnlocalizedName("tconstruct.metalblock");
+ metalBlock.stepSound = Block.soundMetalFootstep;
+ GameRegistry.registerBlock(metalBlock, MetalItemBlock.class, "MetalBlock");
- //Decoration
- stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch");
- GameRegistry.registerBlock(stoneTorch, "decoration.stonetorch");
+ //Smeltery
+ smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery");
+ GameRegistry.registerBlock(smeltery, SmelteryItemBlock.class, "Smeltery");
+ GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery");
+ GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain");
+ GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants");
- multiBrick = new MultiBrick(PHConstruct.multiBrick).setUnlocalizedName("Decoration.Brick");
- GameRegistry.registerBlock(multiBrick, MultiBrickItem.class, "decoration.multibrick");
+ lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank");
+ lavaTank.setStepSound(Block.soundGlassFootstep);
+ GameRegistry.registerBlock(lavaTank, LavaTankItemBlock.class, "LavaTank");
+ GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank");
- //Ores
- String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" };
- oreBerry = (OreberryBush) new OreberryBush(PHConstruct.oreBerry, berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setUnlocalizedName("ore.berries.one");
- GameRegistry.registerBlock(oreBerry, OreberryBushItem.class, "ore.berries.one");
- String[] berryOresTwo = new String[] { "berry_aluminum", "berry_silver", "", "", "berry_aluminum_ripe", "berry_silver_ripe", "", "" };
- oreBerrySecond = (OreberryBush) new OreberryBush(PHConstruct.oreBerrySecond, berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setUnlocalizedName("ore.berries.two");
- GameRegistry.registerBlock(oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two");
+ searedBlock = new SearedBlock(PHConstruct.searedTable).setUnlocalizedName("SearedBlock");
+ GameRegistry.registerBlock(searedBlock, SearedTableItemBlock.class, "SearedBlock");
+ GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable");
+ GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet");
+ GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin");
- String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" };
- oreSlag = new MetalOre(PHConstruct.oreSlag, Material.iron, 10.0F, oreTypes).setUnlocalizedName("tconstruct.stoneore");
- GameRegistry.registerBlock(oreSlag, MetalOreItemBlock.class, "SearedBrick");
- MinecraftForge.setBlockHarvestLevel(oreSlag, 1, "pickaxe", 4);
- MinecraftForge.setBlockHarvestLevel(oreSlag, 2, "pickaxe", 4);
- MinecraftForge.setBlockHarvestLevel(oreSlag, 3, "pickaxe", 1);
- MinecraftForge.setBlockHarvestLevel(oreSlag, 4, "pickaxe", 1);
- MinecraftForge.setBlockHarvestLevel(oreSlag, 5, "pickaxe", 1);
+ //Traps
+ /*landmine = new Landmine(PHConstruct.landmine, 0, EnumMobType.mobs, Material.cactus).setUnlocalizedName("landmine");
+ GameRegistry.registerBlock(landmine, "landmine");*/
- oreGravel = new GravelOre(PHConstruct.oreGravel).setUnlocalizedName("GravelOre").setUnlocalizedName("tconstruct.gravelore");
- GameRegistry.registerBlock(oreGravel, GravelOreItem.class, "GravelOre");
+ //Liquids
+ liquidMetal = new MaterialLiquid(MapColor.tntColor);
+ liquidMetalFlowing = new LiquidMetalFlowing(PHConstruct.metalFlowing).setUnlocalizedName("liquid.metalFlow");
+ liquidMetalStill = new LiquidMetalStill(PHConstruct.metalStill).setUnlocalizedName("liquid.metalStill");
+ GameRegistry.registerBlock(liquidMetalFlowing, LiquidItemBlock.class, "metalFlow");
+ GameRegistry.registerBlock(liquidMetalStill, LiquidItemBlock.class, "metalStill");
+ GameRegistry.registerTileEntity(LiquidTextureLogic.class, "LiquidTexture");
- MinecraftForge.setBlockHarvestLevel(oreGravel, 0, "shovel", 1);
- MinecraftForge.setBlockHarvestLevel(oreGravel, 1, "shovel", 2);
- MinecraftForge.setBlockHarvestLevel(oreGravel, 2, "shovel", 1);
- MinecraftForge.setBlockHarvestLevel(oreGravel, 3, "shovel", 1);
- MinecraftForge.setBlockHarvestLevel(oreGravel, 4, "shovel", 1);
- MinecraftForge.setBlockHarvestLevel(oreGravel, 5, "shovel", 4);
+ //Decoration
+ stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch");
+ GameRegistry.registerBlock(stoneTorch, "decoration.stonetorch");
- speedBlock = new SpeedBlock(PHConstruct.speedBlock).setUnlocalizedName("SpeedBlock");
- GameRegistry.registerBlock(speedBlock, SpeedBlockItem.class, "SpeedBlock");
+ multiBrick = new MultiBrick(PHConstruct.multiBrick).setUnlocalizedName("Decoration.Brick");
+ GameRegistry.registerBlock(multiBrick, MultiBrickItem.class, "decoration.multibrick");
+ multiBrickFancy = new MultiBrickFancy(PHConstruct.multiBrickFancy).setUnlocalizedName("Decoration.BrickFancy");
+ GameRegistry.registerBlock(multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy");
- /*redstoneBallRepeater = new RedstoneBallRepeater(PHConstruct.redstoneBallRepeater, false).setUnlocalizedName("decoration.redstoneballrepeater");
- GameRegistry.registerBlock(redstoneBallRepeater, "decoration.redstoneballrepeater");
- Item.itemsList[PHConstruct.redstoneBallRepeater] = null;
- redstoneBallRepeaterItem = new RedstoneBallRepeaterItem(PHConstruct.redstoneBallRepeater-256).setUnlocalizedName("decoration.redstoneballrepeater");*/
+ //Ores
+ String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" };
+ oreBerry = (OreberryBush) new OreberryBush(PHConstruct.oreBerry, berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setUnlocalizedName("ore.berries.one");
+ GameRegistry.registerBlock(oreBerry, OreberryBushItem.class, "ore.berries.one");
+ String[] berryOresTwo = new String[] { "berry_aluminum", "berry_silver", "", "", "berry_aluminum_ripe", "berry_silver_ripe", "", "" };
+ oreBerrySecond = (OreberryBush) new OreberryBush(PHConstruct.oreBerrySecond, berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setUnlocalizedName("ore.berries.two");
+ GameRegistry.registerBlock(oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two");
- //Golems
- /*golemCore = new GolemCoreBlock(PHConstruct.golemCore).setUnlocalizedName("golemcore");
- GameRegistry.registerBlock(golemCore, "Golem Core");
- GameRegistry.registerTileEntity(GolemCoreLogic.class, "TConstruct.GolemCore");
-
- golemHead = new GolemHeadBlock(PHConstruct.golemHead).setUnlocalizedName("golemhead");
- GameRegistry.registerBlock(golemHead, "Golem Head");*/
+ String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" };
+ oreSlag = new MetalOre(PHConstruct.oreSlag, Material.iron, 10.0F, oreTypes).setUnlocalizedName("tconstruct.stoneore");
+ GameRegistry.registerBlock(oreSlag, MetalOreItemBlock.class, "SearedBrick");
+ MinecraftForge.setBlockHarvestLevel(oreSlag, 1, "pickaxe", 4);
+ MinecraftForge.setBlockHarvestLevel(oreSlag, 2, "pickaxe", 4);
+ MinecraftForge.setBlockHarvestLevel(oreSlag, 3, "pickaxe", 1);
+ MinecraftForge.setBlockHarvestLevel(oreSlag, 4, "pickaxe", 1);
+ MinecraftForge.setBlockHarvestLevel(oreSlag, 5, "pickaxe", 1);
- /*golemPedestal = new GolemPedestalBlock(PHConstruct.golemPedestal).setUnlocalizedName("golempedestal");
- GameRegistry.registerBlock(golemPedestal, "Golem Pedestal");
- GameRegistry.registerTileEntity(GolemPedestalLogic.class, "TConstruct.GolemPedestal");*/
-
- //Traps
- /*landmine = new Landmine(PHConstruct.landmine, EnumMobType.mobs, Material.wood).setUnlocalizedName("tconstruct.landmine");
- GameRegistry.registerBlock(landmine, "Landmine");
- barricade = new BarricadeBlock(PHConstruct.barricade).setUnlocalizedName("tconstruct.barricade");
- GameRegistry.registerBlock(barricade, "Barricade");*/
- }
+ oreGravel = new GravelOre(PHConstruct.oreGravel).setUnlocalizedName("GravelOre").setUnlocalizedName("tconstruct.gravelore");
+ GameRegistry.registerBlock(oreGravel, GravelOreItem.class, "GravelOre");
- void registerItems ()
- {
- titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon");
- String[] blanks = new String[] { "blank_pattern", "blank_cast" };
- blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern");
+ MinecraftForge.setBlockHarvestLevel(oreGravel, 0, "shovel", 1);
+ MinecraftForge.setBlockHarvestLevel(oreGravel, 1, "shovel", 2);
+ MinecraftForge.setBlockHarvestLevel(oreGravel, 2, "shovel", 1);
+ MinecraftForge.setBlockHarvestLevel(oreGravel, 3, "shovel", 1);
+ MinecraftForge.setBlockHarvestLevel(oreGravel, 4, "shovel", 1);
+ MinecraftForge.setBlockHarvestLevel(oreGravel, 5, "shovel", 4);
- materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials");
- toolRod = new ToolPart(PHConstruct.toolRod, "ToolRod", "_rod").setUnlocalizedName("tconstruct.ToolRod");
- TConstructRegistry.toolRod = toolRod;
- toolShard = new ToolShard(PHConstruct.toolShard, "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");
+ speedBlock = new SpeedBlock(PHConstruct.speedBlock).setUnlocalizedName("SpeedBlock");
+ GameRegistry.registerBlock(speedBlock, SpeedBlockItem.class, "SpeedBlock");
- manualBook = new Manual(PHConstruct.manual);
- buckets = new FilledBucket(PHConstruct.buckets);
+ aggregator = new Aggregator(PHConstruct.aggregator).setUnlocalizedName("Aggregator");
+ GameRegistry.registerBlock(aggregator, "Aggregator");
+ GameRegistry.registerTileEntity(GlowstoneAggregator.class, "GlowstoneAggregator");
- pickaxe = new Pickaxe(PHConstruct.pickaxe);
- shovel = new Shovel(PHConstruct.shovel);
- axe = new Hatchet(PHConstruct.axe);
- broadsword = new Broadsword(PHConstruct.broadsword);
- longsword = new Longsword(PHConstruct.longsword);
- rapier = new Rapier(PHConstruct.rapier);
- dagger = new Dagger(PHConstruct.dagger);
- cutlass = new Cutlass(PHConstruct.cutlass);
+ /*redstoneBallRepeater = new RedstoneBallRepeater(PHConstruct.redstoneBallRepeater, false).setUnlocalizedName("decoration.redstoneballrepeater");
+ GameRegistry.registerBlock(redstoneBallRepeater, "decoration.redstoneballrepeater");
+ Item.itemsList[PHConstruct.redstoneBallRepeater] = null;
+ redstoneBallRepeaterItem = new RedstoneBallRepeaterItem(PHConstruct.redstoneBallRepeater-256).setUnlocalizedName("decoration.redstoneballrepeater");*/
+
+ //Golems
+ /*golemCore = new GolemCoreBlock(PHConstruct.golemCore).setUnlocalizedName("golemcore");
+ GameRegistry.registerBlock(golemCore, "Golem Core");
+ GameRegistry.registerTileEntity(GolemCoreLogic.class, "TConstruct.GolemCore");
+
+ golemHead = new GolemHeadBlock(PHConstruct.golemHead).setUnlocalizedName("golemhead");
+ GameRegistry.registerBlock(golemHead, "Golem Head");*/
+
+ /*golemPedestal = new GolemPedestalBlock(PHConstruct.golemPedestal).setUnlocalizedName("golempedestal");
+ GameRegistry.registerBlock(golemPedestal, "Golem Pedestal");
+ GameRegistry.registerTileEntity(GolemPedestalLogic.class, "TConstruct.GolemPedestal");*/
+
+ //Traps
+ /*landmine = new Landmine(PHConstruct.landmine, EnumMobType.mobs, Material.wood).setUnlocalizedName("tconstruct.landmine");
+ GameRegistry.registerBlock(landmine, "Landmine");
+ barricade = new BarricadeBlock(PHConstruct.barricade).setUnlocalizedName("tconstruct.barricade");
+ GameRegistry.registerBlock(barricade, "Barricade");*/
+ }
+
+ void registerItems ()
+ {
+ titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon");
+ String[] blanks = new String[] { "blank_pattern", "blank_cast" };
+ 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");
+ 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");
+
+ manualBook = new Manual(PHConstruct.manual);
+ buckets = new FilledBucket(PHConstruct.buckets);
+
+ pickaxe = new Pickaxe(PHConstruct.pickaxe);
+ shovel = new Shovel(PHConstruct.shovel);
+ hatchet = new Hatchet(PHConstruct.axe);
+ broadsword = new Broadsword(PHConstruct.broadsword);
+ longsword = new Longsword(PHConstruct.longsword);
+ rapier = new Rapier(PHConstruct.rapier);
+ dagger = new Dagger(PHConstruct.dagger);
+ cutlass = new Cutlass(PHConstruct.cutlass);
+
+ frypan = new FryingPan(PHConstruct.frypan);
+ battlesign = new BattleSign(PHConstruct.battlesign);
+ mattock = new Mattock(PHConstruct.mattock);
+ chisel = new Chisel(PHConstruct.chisel);
- frypan = new FryingPan(PHConstruct.frypan);
- battlesign = new BattleSign(PHConstruct.battlesign);
- mattock = new Mattock(PHConstruct.mattock);
- chisel = new Chisel(PHConstruct.chisel);
-
lumberaxe = new LumberAxe(PHConstruct.lumberaxe);
cleaver = new Cleaver(PHConstruct.cleaver);
scythe = new Scythe(PHConstruct.scythe);
excavator = new Excavator(PHConstruct.excavator);
hammer = new Hammer(PHConstruct.hammer);
battleaxe = new Battleaxe(PHConstruct.battleaxe);
-
- 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");
- axeHead = 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");
+ Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe };
+ String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", "scythe",
+ "excavator", "hammer", "battleaxe" };
- 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");
+ for (int i = 0; i < tools.length; i++)
+ {
+ TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]);
+ }
- 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");
-
- scytheBlade = new ToolPart(PHConstruct.scytheBlade, "ScytheBlade", "_scythe_head").setUnlocalizedName("tconstruct.ScytheBlade");
+ 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");
+
+ 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");
+
+ 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");
+
+ 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");
- diamondApple = new DiamondApple(PHConstruct.diamondApple).setUnlocalizedName("tconstruct.apple.diamond");
- strangeFood = new StrangeFood(PHConstruct.slimefood).setUnlocalizedName("tconstruct.strangefood");
- oreBerries = new OreBerries(PHConstruct.oreChunks).setUnlocalizedName("oreberry");
+ 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 };
+ String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard",
+ "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead" };
- //Wearables
- //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet");
- heartCanister = new HeartCanister(PHConstruct.heartCanister).setUnlocalizedName("tconstruct.canister");
- heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots");
- glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove");
- knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage");
- /*public static Item heavyHelmet;
- public static Item heavyChestplate;
- public static Item heavyPants;
- public static Item heavyBoots;*/
+ for (int i = 0; i < toolParts.length; i++)
+ {
+ TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]);
+ }
- //Vanilla stack sizes
- Item.doorWood.setMaxStackSize(16);
- Item.doorIron.setMaxStackSize(16);
- Item.snowball.setMaxStackSize(64);
- Item.boat.setMaxStackSize(16);
- Item.minecartEmpty.setMaxStackSize(3);
- Item.minecartCrate.setMaxStackSize(3);
- Item.minecartPowered.setMaxStackSize(3);
- Block.torchWood.setTickRandomly(false);
- }
+ diamondApple = new DiamondApple(PHConstruct.diamondApple).setUnlocalizedName("tconstruct.apple.diamond");
+ strangeFood = new StrangeFood(PHConstruct.slimefood).setUnlocalizedName("tconstruct.strangefood");
+ oreBerries = new OreBerries(PHConstruct.oreChunks).setUnlocalizedName("oreberry");
- void registerMaterials ()
- {
- TConstructRegistry.addToolMaterial(0, "Wood", 1, 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", "");
- TConstructRegistry.addToolMaterial(1, "Stone", 1, 1, 131, 400, 1, 0.5F, 0, 1f, "", "Stonebound");
- TConstructRegistry.addToolMaterial(2, "Iron", 1, 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", "");
- TConstructRegistry.addToolMaterial(3, "Flint", 1, 1, 171, 525, 2, 0.7F, 0, 1f, "\u00A78", "Stonebound");
- TConstructRegistry.addToolMaterial(4, "Cactus", 1, 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", "Spiny");
- TConstructRegistry.addToolMaterial(5, "Bone", 1, 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", "");
- TConstructRegistry.addToolMaterial(6, "Obsidian", 1, 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", "");
- TConstructRegistry.addToolMaterial(7, "Netherrack", 1, 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", "Stonebound");
- TConstructRegistry.addToolMaterial(8, "Slime", 1, 3, 1500, 150, 0, 2.0F, 0, 0f, "\u00A7a", "");
- TConstructRegistry.addToolMaterial(9, "Paper", 1, 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", "Writable");
- TConstructRegistry.addToolMaterial(10, "Cobalt", 2, 4, 800, 1100, 3, 1.75F, 2, 0f, "\u00A73", "");
- TConstructRegistry.addToolMaterial(11, "Ardite", 2, 4, 600, 800, 3, 2.0F, 0, 2f, "\u00A74", "Stonebound");
- TConstructRegistry.addToolMaterial(12, "Manyullyn", 2, 5, 1200, 900, 4, 2.5F, 0, 0f, "\u00A75", "");
- TConstructRegistry.addToolMaterial(13, "Copper", 1, 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c", "");
- TConstructRegistry.addToolMaterial(14, "Bronze", 1, 2, 350, 700, 2, 1.3F, 1, 0f, "\u00A76", "");
- TConstructRegistry.addToolMaterial(15, "Alumite", 2, 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", "");
- TConstructRegistry.addToolMaterial(16, "Steel", 2, 4, 750, 800, 3, 1.3F, 2, 0f);
- TConstructRegistry.addToolMaterial(17, "BlueSlime", 1, 1, 500, 150, 0, 1.5F, 0, 0f, "\u00A7b", "");
+ //Wearables
+ //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet");
+ heartCanister = new HeartCanister(PHConstruct.heartCanister).setUnlocalizedName("tconstruct.canister");
+ heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots");
+ glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove");
+ knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage");
+ /*public static Item heavyHelmet;
+ public static Item heavyChestplate;
+ public static Item heavyPants;
+ public static Item heavyBoots;*/
- //Thaumcraft
- TConstructRegistry.addToolMaterial(21, "Thaumium", 2, 2, 250, 600, 2, 1.3F, 1, 0f);
+ String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper",
+ "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper",
+ "nuggetTin", "nuggetAluminum", "nuggetSilver", "nuggetAluminumBrass", "silkyCloth", "silkyJewel" };
+
+ for (int i = 0; i < materialStrings.length; i++)
+ {
+ TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(materials, 1, i));
+ }
- /*//Metallurgy
- TConstructRegistry.addToolMaterial(22, "Heptazion", 2, 2, 300, 800, 1, 1.0F, 0, 0f);
- TConstructRegistry.addToolMaterial(23, "Damascus Steel", 2, 3, 500, 600, 2, 1.35F, 1, 0f);
- TConstructRegistry.addToolMaterial(24, "Angmallen", 2, 2, 300, 800, 2, 0.8F, 0, 0f);
+ String[] oreberries = { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Silver" };
+
+ for (int i = 0; i < oreberries.length; i++)
+ {
+ TConstructRegistry.addItemStackToDirectory("oreberry"+oreberries[i], new ItemStack(oreBerries, 1, i));
+ }
+
+ TConstructRegistry.addItemStackToDirectory("diamondApple", new ItemStack(diamondApple, 1, 0));
+ TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(strangeFood, 1, 0));
+
+ TConstructRegistry.addItemStackToDirectory("canisterEmpty", new ItemStack(heartCanister, 1, 0));
+ TConstructRegistry.addItemStackToDirectory("miniRedHeart", new ItemStack(heartCanister, 1, 1));
+ TConstructRegistry.addItemStackToDirectory("canisterRedHeart", new ItemStack(heartCanister, 1, 2));
- TConstructRegistry.addToolMaterial(25, "Promethium", 1, 1, 200, 400, 1, 1.0F, 0, 0.5f);
- TConstructRegistry.addToolMaterial(26, "Deep Iron", 1, 2, 250, 600, 2, 1.3F, 1, 0f);
- TConstructRegistry.addToolMaterial(27, "Oureclase", 2, 3, 750, 800, 2, 1.2F, 0, 0f);
- TConstructRegistry.addToolMaterial(28, "Aredrite", 2, 3, 1000, 400, 2, 1.5F, 0, 1.0f);
- TConstructRegistry.addToolMaterial(29, "Astral Silver", 1, 4, 35, 1200, 1, 0.5F, 0, 0f);
- TConstructRegistry.addToolMaterial(30, "Carmot", 1, 4, 50, 1200, 1, 0.5F, 0, 0f);
- TConstructRegistry.addToolMaterial(31, "Mithril", 2, 4, 1000, 900, 3, 1.25F, 3, 0f);
- TConstructRegistry.addToolMaterial(32, "Orichalcum", 2, 5, 1350, 900, 3, 1.25F, 0, 0f);
- TConstructRegistry.addToolMaterial(33, "Adamantine", 3, 6, 1550, 1000, 4, 1.5F, 1, 0f);
- TConstructRegistry.addToolMaterial(34, "Atlarus", 3, 6, 1750, 1000, 4, 1.6F, 2, 0f);
+ //Vanilla stack sizes
+ Item.doorWood.setMaxStackSize(16);
+ Item.doorIron.setMaxStackSize(16);
+ Item.snowball.setMaxStackSize(64);
+ Item.boat.setMaxStackSize(16);
+ Item.minecartEmpty.setMaxStackSize(3);
+ Item.minecartCrate.setMaxStackSize(3);
+ Item.minecartPowered.setMaxStackSize(3);
+ Block.torchWood.setTickRandomly(false);
+ }
- TConstructRegistry.addToolMaterial(35, "Black Steel", 2, 2, 500, 800, 2, 1.3F, 2, 0f);
- TConstructRegistry.addToolMaterial(36, "Quicksilver", 2, 4, 1100, 1400, 3, 1.0F, 1, 0f);
- TConstructRegistry.addToolMaterial(37, "Haderoth", 2, 4, 1250, 1200, 3, 1.0F, 2, 0f);
- TConstructRegistry.addToolMaterial(38, "Celenegil", 3, 5, 1600, 1400, 3, 1.0F, 2, 0f);
- TConstructRegistry.addToolMaterial(39, "Tartarite", 3, 7, 3000, 1400, 5, 1.6667F, 4, 0f);*/
+ void registerMaterials ()
+ {
+ TConstructRegistry.addToolMaterial(0, "Wood", 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");
+ TConstructRegistry.addToolMaterial(4, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", "Spiny");
+ TConstructRegistry.addToolMaterial(5, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", "");
+ TConstructRegistry.addToolMaterial(6, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", "");
+ TConstructRegistry.addToolMaterial(7, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", "Stonebound");
+ TConstructRegistry.addToolMaterial(8, "Slime", 3, 1500, 150, 0, 2.0F, 0, 0f, "\u00A7a", "");
+ TConstructRegistry.addToolMaterial(9, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", "Writable");
+ TConstructRegistry.addToolMaterial(10, "Cobalt", 4, 800, 1100, 3, 1.75F, 2, 0f, "\u00A73", "");
+ TConstructRegistry.addToolMaterial(11, "Ardite", 4, 600, 800, 3, 2.0F, 0, 2f, "\u00A74", "Stonebound");
+ TConstructRegistry.addToolMaterial(12, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, "\u00A75", "");
+ TConstructRegistry.addToolMaterial(13, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c", "");
+ 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", "");
- PatternBuilder pb = PatternBuilder.instance;
- if (PHConstruct.enableTWood)
- pb.registerFullMaterial(Block.planks, 2, "Wood", new ItemStack(Item.stick, 2), new ItemStack(Item.stick), 0);
- else
- pb.registerMaterialSet("Wood", new ItemStack(Item.stick, 2), new ItemStack(Item.stick), 0);
- if (PHConstruct.enableTStone)
- {
- pb.registerFullMaterial(Block.stone, 2, "Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 1);
- pb.registerMaterial(Block.cobblestone, 2, "Stone");
- }
- //else
- //pb.registerMaterialSet("Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 1);
- pb.registerFullMaterial(Item.ingotIron, 2, "Iron", new ItemStack(TContent.toolShard, 1, 2), new ItemStack(TContent.toolRod, 1, 2), 2);
- pb.registerFullMaterial(Item.flint, 2, "Flint", new ItemStack(TContent.toolShard, 1, 3), new ItemStack(TContent.toolRod, 1, 3), 3);
- if (PHConstruct.enableTCactus)
- pb.registerFullMaterial(Block.cactus, 2, "Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4);
- else
- pb.registerMaterialSet("Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4);
- if (PHConstruct.enableTBone)
- pb.registerFullMaterial(Item.bone, 2, "Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
- else
- pb.registerMaterialSet("Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
- pb.registerFullMaterial(Block.obsidian, 2, "Obsidian", new ItemStack(TContent.toolShard, 1, 6), new ItemStack(TContent.toolRod, 1, 6), 6);
- pb.registerMaterial(new ItemStack(materials, 1, 18), 2, "Obsidian");
- pb.registerFullMaterial(Block.netherrack, 2, "Netherrack", new ItemStack(TContent.toolShard, 1, 7), new ItemStack(TContent.toolRod, 1, 7), 7);
- pb.registerFullMaterial(new ItemStack(materials, 1, 1), 2, "Slime", new ItemStack(toolShard, 1, 8), new ItemStack(toolRod, 1, 8), 8);
- pb.registerFullMaterial(new ItemStack(materials, 1, 0), 2, "Paper", new ItemStack(Item.paper, 2), new ItemStack(toolRod, 1, 9), 9);
- pb.registerMaterialSet("Cobalt", new ItemStack(toolShard, 1, 10), new ItemStack(toolRod, 1, 10), 10);
- pb.registerMaterialSet("Ardite", new ItemStack(toolShard, 1, 11), new ItemStack(toolRod, 1, 11), 11);
- pb.registerMaterialSet("Manyullyn", new ItemStack(toolShard, 1, 12), new ItemStack(toolRod, 1, 12), 12);
- pb.registerMaterialSet("Copper", new ItemStack(toolShard, 1, 13), new ItemStack(toolRod, 1, 13), 13);
- pb.registerMaterialSet("Bronze", new ItemStack(toolShard, 1, 14), new ItemStack(toolRod, 1, 14), 14);
- pb.registerMaterialSet("Alumite", new ItemStack(toolShard, 1, 15), new ItemStack(toolRod, 1, 15), 15);
- pb.registerMaterialSet("Steel", new ItemStack(toolShard, 1, 16), new ItemStack(toolRod, 1, 16), 16);
- pb.registerFullMaterial(new ItemStack(materials, 1, 17), 2, "BlueSlime", new ItemStack(toolShard, 1, 17), new ItemStack(toolRod, 1, 17), 17);
+ //Thaumcraft
+ //TConstructRegistry.addToolMaterial(21, "Thaumium", 2, 250, 600, 2, 1.3F, 1, 0f, "", "");
- pb.addToolPattern((IPattern) woodPattern);
- }
+ /*//Metallurgy
+ TConstructRegistry.addToolMaterial(22, "Heptazion", 2, 2, 300, 800, 1, 1.0F, 0, 0f);
+ TConstructRegistry.addToolMaterial(23, "Damascus Steel", 2, 3, 500, 600, 2, 1.35F, 1, 0f);
+ TConstructRegistry.addToolMaterial(24, "Angmallen", 2, 2, 300, 800, 2, 0.8F, 0, 0f);
- public static Item[] patternOutputs;
- public static LiquidStack[] liquids;
+ TConstructRegistry.addToolMaterial(25, "Promethium", 1, 1, 200, 400, 1, 1.0F, 0, 0.5f);
+ TConstructRegistry.addToolMaterial(26, "Deep Iron", 1, 2, 250, 600, 2, 1.3F, 1, 0f);
+ TConstructRegistry.addToolMaterial(27, "Oureclase", 2, 3, 750, 800, 2, 1.2F, 0, 0f);
+ TConstructRegistry.addToolMaterial(28, "Aredrite", 2, 3, 1000, 400, 2, 1.5F, 0, 1.0f);
+ TConstructRegistry.addToolMaterial(29, "Astral Silver", 1, 4, 35, 1200, 1, 0.5F, 0, 0f);
+ TConstructRegistry.addToolMaterial(30, "Carmot", 1, 4, 50, 1200, 1, 0.5F, 0, 0f);
+ TConstructRegistry.addToolMaterial(31, "Mithril", 2, 4, 1000, 900, 3, 1.25F, 3, 0f);
+ TConstructRegistry.addToolMaterial(32, "Orichalcum", 2, 5, 1350, 900, 3, 1.25F, 0, 0f);
+ TConstructRegistry.addToolMaterial(33, "Adamantine", 3, 6, 1550, 1000, 4, 1.5F, 1, 0f);
+ TConstructRegistry.addToolMaterial(34, "Atlarus", 3, 6, 1750, 1000, 4, 1.6F, 2, 0f);
- void addCraftingRecipes ()
- {
- /* Tools */
- patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, axeHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead,
- toughRod, toughBinding, heavyPlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead };
+ TConstructRegistry.addToolMaterial(35, "Black Steel", 2, 2, 500, 800, 2, 1.3F, 2, 0f);
+ TConstructRegistry.addToolMaterial(36, "Quicksilver", 2, 4, 1100, 1400, 3, 1.0F, 1, 0f);
+ TConstructRegistry.addToolMaterial(37, "Haderoth", 2, 4, 1250, 1200, 3, 1.0F, 2, 0f);
+ TConstructRegistry.addToolMaterial(38, "Celenegil", 3, 5, 1600, 1400, 3, 1.0F, 2, 0f);
+ TConstructRegistry.addToolMaterial(39, "Tartarite", 3, 7, 3000, 1400, 5, 1.6667F, 4, 0f);*/
- ToolBuilder tb = ToolBuilder.instance;
- tb.addToolRecipe(pickaxe, pickaxeHead, binding);
- tb.addToolRecipe(broadsword, swordBlade, wideGuard);
- tb.addToolRecipe(axe, axeHead);
- tb.addToolRecipe(shovel, shovelHead);
- tb.addToolRecipe(longsword, swordBlade, handGuard);
- tb.addToolRecipe(rapier, swordBlade, crossbar);
- tb.addToolRecipe(frypan, frypanHead);
- tb.addToolRecipe(battlesign, signHead);
- tb.addToolRecipe(mattock, axeHead, shovelHead);
- tb.addToolRecipe(dagger, knifeBlade, crossbar);
- tb.addToolRecipe(cutlass, swordBlade, fullGuard);
- tb.addToolRecipe(chisel, chiselHead);
- tb.addCustomToolRecipe(scythe, scytheBlade, toughRod, toughBinding, toughRod);
- tb.addCustomToolRecipe(lumberaxe, broadAxeHead, toughRod, heavyPlate, toughBinding);
- tb.addCustomToolRecipe(cleaver, largeSwordBlade, toughRod, heavyPlate, toughRod);
- tb.addCustomToolRecipe(excavator, excavatorHead, toughRod, toughBinding, toughRod);
- tb.addCustomToolRecipe(hammer, hammerHead, toughRod, heavyPlate, heavyPlate);
- tb.addCustomToolRecipe(battleaxe, broadAxeHead, toughRod, broadAxeHead, toughBinding);
+ PatternBuilder pb = PatternBuilder.instance;
+ if (PHConstruct.enableTWood)
+ pb.registerFullMaterial(Block.planks, 2, "Wood", new ItemStack(Item.stick), new ItemStack(Item.stick), 0);
+ else
+ pb.registerMaterialSet("Wood", new ItemStack(Item.stick, 2), new ItemStack(Item.stick), 0);
+ if (PHConstruct.enableTStone)
+ {
+ pb.registerFullMaterial(Block.stone, 2, "Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 1);
+ pb.registerMaterial(Block.cobblestone, 2, "Stone");
+ }
+ //else
+ //pb.registerMaterialSet("Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 1);
+ pb.registerFullMaterial(Item.ingotIron, 2, "Iron", new ItemStack(TContent.toolShard, 1, 2), new ItemStack(TContent.toolRod, 1, 2), 2);
+ pb.registerFullMaterial(Item.flint, 2, "Flint", new ItemStack(TContent.toolShard, 1, 3), new ItemStack(TContent.toolRod, 1, 3), 3);
+ if (PHConstruct.enableTCactus)
+ pb.registerFullMaterial(Block.cactus, 2, "Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4);
+ else
+ pb.registerMaterialSet("Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4);
+ if (PHConstruct.enableTBone)
+ pb.registerFullMaterial(Item.bone, 2, "Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
+ else
+ pb.registerMaterialSet("Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5);
+ pb.registerFullMaterial(Block.obsidian, 2, "Obsidian", new ItemStack(TContent.toolShard, 1, 6), new ItemStack(TContent.toolRod, 1, 6), 6);
+ pb.registerMaterial(new ItemStack(materials, 1, 18), 2, "Obsidian");
+ pb.registerFullMaterial(Block.netherrack, 2, "Netherrack", new ItemStack(TContent.toolShard, 1, 7), new ItemStack(TContent.toolRod, 1, 7), 7);
+ pb.registerFullMaterial(new ItemStack(materials, 1, 1), 2, "Slime", new ItemStack(toolShard, 1, 8), new ItemStack(toolRod, 1, 8), 8);
+ pb.registerFullMaterial(new ItemStack(materials, 1, 0), 2, "Paper", new ItemStack(Item.paper, 2), new ItemStack(toolRod, 1, 9), 9);
+ pb.registerMaterialSet("Cobalt", new ItemStack(toolShard, 1, 10), new ItemStack(toolRod, 1, 10), 10);
+ pb.registerMaterialSet("Ardite", new ItemStack(toolShard, 1, 11), new ItemStack(toolRod, 1, 11), 11);
+ pb.registerMaterialSet("Manyullyn", new ItemStack(toolShard, 1, 12), new ItemStack(toolRod, 1, 12), 12);
+ pb.registerMaterialSet("Copper", new ItemStack(toolShard, 1, 13), new ItemStack(toolRod, 1, 13), 13);
+ pb.registerMaterialSet("Bronze", new ItemStack(toolShard, 1, 14), new ItemStack(toolRod, 1, 14), 14);
+ pb.registerMaterialSet("Alumite", new ItemStack(toolShard, 1, 15), new ItemStack(toolRod, 1, 15), 15);
+ pb.registerMaterialSet("Steel", new ItemStack(toolShard, 1, 16), new ItemStack(toolRod, 1, 16), 16);
+ pb.registerFullMaterial(new ItemStack(materials, 1, 17), 2, "BlueSlime", new ItemStack(toolShard, 1, 17), new ItemStack(toolRod, 1, 17), 17);
- ItemStack diamond = new ItemStack(Item.diamond);
- tb.registerToolMod(new ModRepair());
- tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b"));
- tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72"));
+ pb.addToolPattern((IPattern) woodPattern);
+ }
- modE = new ModElectric();
- tb.registerToolMod(modE);
+ public static Item[] patternOutputs;
+ public static LiquidStack[] liquids;
- ItemStack redstoneItem = new ItemStack(Item.redstone);
- ItemStack redstoneBlock = new ItemStack(Block.blockRedstone);
- tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem }, 2, 1));
- tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem, redstoneItem }, 2, 2));
- tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneBlock }, 2, 9));
- tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem, redstoneBlock }, 2, 10));
- tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneBlock, redstoneBlock }, 2, 18));
+ void addCraftingRecipes ()
+ {
+ /* Tools */
+ patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, toughRod,
+ toughBinding, heavyPlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard };
- ItemStack lapisItem = new ItemStack(Item.dyePowder, 1, 4);
- ItemStack lapisBlock = new ItemStack(Block.blockLapis);
- modL = new ModLapis(new ItemStack[] { lapisItem }, 10, 1);
- tb.registerToolMod(modL);
- tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisItem }, 10, 2));
- tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock }, 10, 9));
- tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisBlock }, 10, 10));
- tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock, lapisBlock }, 10, 18));
+ ToolBuilder tb = ToolBuilder.instance;
+ tb.addNormalToolRecipe(pickaxe, pickaxeHead, binding);
+ tb.addNormalToolRecipe(broadsword, swordBlade, wideGuard);
+ tb.addNormalToolRecipe(hatchet, hatchetHead);
+ tb.addNormalToolRecipe(shovel, shovelHead);
+ tb.addNormalToolRecipe(longsword, swordBlade, handGuard);
+ tb.addNormalToolRecipe(rapier, swordBlade, crossbar);
+ tb.addNormalToolRecipe(frypan, frypanHead);
+ tb.addNormalToolRecipe(battlesign, signHead);
+ tb.addNormalToolRecipe(mattock, hatchetHead, shovelHead);
+ tb.addNormalToolRecipe(dagger, knifeBlade, crossbar);
+ tb.addNormalToolRecipe(cutlass, swordBlade, fullGuard);
+ tb.addNormalToolRecipe(chisel, chiselHead);
+ tb.addNormalToolRecipe(scythe, scytheBlade, toughRod, toughBinding, toughRod);
+ tb.addNormalToolRecipe(lumberaxe, broadAxeHead, toughRod, heavyPlate, toughBinding);
+ tb.addNormalToolRecipe(cleaver, largeSwordBlade, toughRod, heavyPlate, toughRod);
+ tb.addNormalToolRecipe(excavator, excavatorHead, toughRod, toughBinding, toughRod);
+ tb.addNormalToolRecipe(hammer, hammerHead, toughRod, heavyPlate, heavyPlate);
+ tb.addNormalToolRecipe(battleaxe, broadAxeHead, toughRod, broadAxeHead, toughBinding);
- tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair"));
- ItemStack blazePowder = new ItemStack(Item.blazePowder);
- tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder }, 7, 1));
- tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder, blazePowder }, 7, 2));
- tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt"));
- tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal"));
+ ItemStack diamond = new ItemStack(Item.diamond);
+ tb.registerToolMod(new ModRepair());
+ tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b"));
+ tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72"));
- ItemStack quartzItem = new ItemStack(Item.netherQuartz);
- ItemStack quartzBlock = new ItemStack(Block.blockNetherQuartz, 1, Short.MAX_VALUE);
- tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem }, 11, 1));
- tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem, quartzItem }, 11, 2));
- tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzBlock }, 11, 4));
- tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem, quartzBlock }, 11, 5));
- tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzBlock, quartzBlock }, 11, 8));
+ modE = new ModElectric();
+ tb.registerToolMod(modE);
- tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Block.blockGold) }, "Tier1Free"));
- tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Item.netherStar) }, "Tier2Free"));
+ ItemStack redstoneItem = new ItemStack(Item.redstone);
+ ItemStack redstoneBlock = new ItemStack(Block.blockRedstone);
+ tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem }, 2, 1));
+ tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem, redstoneItem }, 2, 2));
+ tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneBlock }, 2, 9));
+ tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem, redstoneBlock }, 2, 10));
+ tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneBlock, redstoneBlock }, 2, 18));
- ItemStack silkyJewel = new ItemStack(materials, 1, 26);
- tb.registerToolMod(new ModButtertouch(new ItemStack[] { silkyJewel }, 12));
-
- ItemStack piston = new ItemStack(Block.pistonBase);
+ ItemStack lapisItem = new ItemStack(Item.dyePowder, 1, 4);
+ ItemStack lapisBlock = new ItemStack(Block.blockLapis);
+ modL = new ModLapis(new ItemStack[] { lapisItem }, 10, 1);
+ tb.registerToolMod(modL);
+ tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisItem }, 10, 2));
+ tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock }, 10, 9));
+ tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisBlock }, 10, 10));
+ tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock, lapisBlock }, 10, 18));
+
+ tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair"));
+ ItemStack blazePowder = new ItemStack(Item.blazePowder);
+ tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder }, 7, 1));
+ tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder, blazePowder }, 7, 2));
+ tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt"));
+ tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal"));
+
+ ItemStack quartzItem = new ItemStack(Item.netherQuartz);
+ ItemStack quartzBlock = new ItemStack(Block.blockNetherQuartz, 1, Short.MAX_VALUE);
+ tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem }, 11, 1));
+ tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem, quartzItem }, 11, 2));
+ tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzBlock }, 11, 4));
+ tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem, quartzBlock }, 11, 5));
+ tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzBlock, quartzBlock }, 11, 8));
+
+ tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Block.blockGold) }, "Tier1Free"));
+ tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Item.netherStar) }, "Tier2Free"));
+
+ ItemStack silkyJewel = new ItemStack(materials, 1, 26);
+ tb.registerToolMod(new ModButtertouch(new ItemStack[] { silkyJewel }, 12));
+
+ ItemStack piston = new ItemStack(Block.pistonBase);
tb.registerToolMod(new ModPiston(new ItemStack[] { piston }, 3, 1));
tb.registerToolMod(new ModPiston(new ItemStack[] { piston, piston }, 3, 2));
tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Block.obsidian), new ItemStack(Item.enderPearl) }, 13, "Beheading", 1, "\u00a7d", "Beheading"));
-
+
ItemStack holySoil = new ItemStack(craftedSoil, 1, 4);
tb.registerToolMod(new ModSmite("Smite", new ItemStack[] { holySoil }, 14, 1));
tb.registerToolMod(new ModSmite("Smite", new ItemStack[] { holySoil, holySoil }, 14, 2));
-
+
ItemStack spidereyeball = new ItemStack(Item.fermentedSpiderEye);
tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball }, 15, 1));
tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball, spidereyeball }, 15, 2));
-
+
ItemStack obsidianPlate = new ItemStack(heavyPlate, 1, 6);
- tb.registerToolMod(new ModReinforced( new ItemStack[] { obsidianPlate }, 16, 1));
+ tb.registerToolMod(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1));
- TConstructRegistry.registerActiveToolMod(new TActiveOmniMod());
+ TConstructRegistry.registerActiveToolMod(new TActiveOmniMod());
- /* Smeltery */
- ItemStack ingotcast = new ItemStack(metalPattern, 1, 0);
+ /* Smeltery */
+ ItemStack ingotcast = new ItemStack(metalPattern, 1, 0);
- LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting();
- //Blank
- tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8), 80);
- tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 1), 80);
+ LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting();
+ //Blank
+ tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8), 80);
+ tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 1), 80);
- //Ingots
- tableCasting.addCastingRecipe(new ItemStack(Item.ingotIron), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 0), ingotcast, 80); //Iron
- tableCasting.addCastingRecipe(new ItemStack(Item.ingotGold), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 1), ingotcast, 80); //gold
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 9), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2), ingotcast, 80); //copper
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 10), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3), ingotcast, 80); //tin
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 11), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4), ingotcast, 80); //aluminum
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 3), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5), ingotcast, 80); //cobalt
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 4), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6), ingotcast, 80); //ardite
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 13), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7), ingotcast, 80); //bronze
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 14), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8), ingotcast, 80); //albrass
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 5), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9), ingotcast, 80); //manyullyn
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 15), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10), ingotcast, 80); //alumite
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 18), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 11), ingotcast, 80); //obsidian
- tableCasting.addCastingRecipe(new ItemStack(materials, 1, 16), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12), ingotcast, 80); //steel
+ //Ingots
+ tableCasting.addCastingRecipe(new ItemStack(Item.ingotIron), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 0), ingotcast, 80); //Iron
+ tableCasting.addCastingRecipe(new ItemStack(Item.ingotGold), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 1), ingotcast, 80); //gold
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 9), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2), ingotcast, 80); //copper
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 10), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3), ingotcast, 80); //tin
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 11), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4), ingotcast, 80); //aluminum
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 3), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5), ingotcast, 80); //cobalt
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 4), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6), ingotcast, 80); //ardite
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 13), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7), ingotcast, 80); //bronze
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 14), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8), ingotcast, 80); //albrass
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 5), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9), ingotcast, 80); //manyullyn
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 15), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10), ingotcast, 80); //alumite
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 18), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 11), ingotcast, 80); //obsidian
+ tableCasting.addCastingRecipe(new ItemStack(materials, 1, 16), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12), ingotcast, 80); //steel
- //Buckets
- ItemStack bucket = new ItemStack(Item.bucketEmpty);
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 0), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 0), bucket, true, 10); //Iron
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 1), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 1), bucket, true, 10); //gold
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 2), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 2), bucket, true, 10); //copper
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 3), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 3), bucket, true, 10); //tin
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 4), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 4), bucket, true, 10); //aluminum
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 5), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 5), bucket, true, 10); //cobalt
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 6), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 6), bucket, true, 10); //ardite
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 7), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 7), bucket, true, 10); //bronze
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 8), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 8), bucket, true, 10); //albrass
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 9), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 9), bucket, true, 10); //manyullyn
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 10), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 10), bucket, true, 10); //alumite
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 11), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 11), bucket, true, 10);// obsidian
- tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 12), new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, 12), bucket, true, 10); //steel
+ //Buckets
+ ItemStack bucket = new ItemStack(Item.bucketEmpty);
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 0), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 0), bucket, true, 10); //Iron
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 1), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 1), bucket, true, 10); //gold
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 2), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 2), bucket, true, 10); //copper
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 3), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 3), bucket, true, 10); //tin
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 4), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 4), bucket, true, 10); //aluminum
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 5), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 5), bucket, true, 10); //cobalt
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 6), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 6), bucket, true, 10); //ardite
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 7), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 7), bucket, true, 10); //bronze
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 8), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 8), bucket, true, 10); //albrass
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 9), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 9), bucket, true, 10); //manyullyn
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 10), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 10), bucket, true, 10); //alumite
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 11), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 11), bucket, true, 10);// obsidian
+ tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 12), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 12), bucket, true, 10); //steel
- liquids = new LiquidStack[] { new LiquidStack(liquidMetalStill.blockID, 1, 0), new LiquidStack(liquidMetalStill.blockID, 1, 2), new LiquidStack(liquidMetalStill.blockID, 1, 5),
- new LiquidStack(liquidMetalStill.blockID, 1, 6), new LiquidStack(liquidMetalStill.blockID, 1, 9), new LiquidStack(liquidMetalStill.blockID, 1, 7),
- new LiquidStack(liquidMetalStill.blockID, 1, 10), new LiquidStack(liquidMetalStill.blockID, 1, 11), new LiquidStack(liquidMetalStill.blockID, 1, 12) };
- int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16 };
+ liquids = new LiquidStack[] { new LiquidStack(liquidMetalStill.blockID, 1, 0), new LiquidStack(liquidMetalStill.blockID, 1, 2), new LiquidStack(liquidMetalStill.blockID, 1, 5),
+ new LiquidStack(liquidMetalStill.blockID, 1, 6), new LiquidStack(liquidMetalStill.blockID, 1, 9), new LiquidStack(liquidMetalStill.blockID, 1, 7),
+ new LiquidStack(liquidMetalStill.blockID, 1, 10), new LiquidStack(liquidMetalStill.blockID, 1, 11), new LiquidStack(liquidMetalStill.blockID, 1, 12) };
+ int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16 };
- for (int iter = 0; iter < patternOutputs.length; iter++)
- {
- ItemStack cast = new ItemStack(metalPattern, 1, iter + 1);
- for (int iterTwo = 0; iterTwo < liquids.length; iterTwo++)
- {
- tableCasting.addCastingRecipe(new ItemStack(patternOutputs[iter], 1, liquidDamage[iterTwo]), new LiquidStack(liquids[iterTwo].itemID, ((IPattern) metalPattern).getPatternCost(iter)
- * TConstruct.ingotLiquidValue / 2, liquids[iterTwo].itemMeta), cast, 50);
- }
- }
+ for (int iter = 0; iter < patternOutputs.length; iter++)
+ {
+ ItemStack cast = new ItemStack(metalPattern, 1, iter + 1);
+ for (int iterTwo = 0; iterTwo < liquids.length; iterTwo++)
+ {
+ tableCasting.addCastingRecipe(new ItemStack(patternOutputs[iter], 1, liquidDamage[iterTwo]), new LiquidStack(liquids[iterTwo].itemID, ((IPattern) metalPattern).getPatternCost(iter)
+ * TConstruct.ingotLiquidValue / 2, liquids[iterTwo].itemMeta), cast, 50);
+ }
+ }
- LiquidCasting basinCasting = TConstructRegistry.getBasinCasting();
- basinCasting.addCastingRecipe(new ItemStack(Block.blockIron), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 0), null, true, 100); //Iron
- basinCasting.addCastingRecipe(new ItemStack(Block.blockGold), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 1), null, true, 100); //gold
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 3), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 2), null, true, 100); //copper
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 5), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 3), null, true, 100); //tin
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 6), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 4), null, true, 100); //aluminum
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 0), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 5), null, true, 100); //cobalt
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 1), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 6), null, true, 100); //ardite
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 4), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 7), null, true, 100); //bronze
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 7), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 8), null, true, 100); //albrass
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 2), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 9), null, true, 100); //manyullyn
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 8), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 10), null, true, 100); //alumite
- basinCasting.addCastingRecipe(new ItemStack(Block.obsidian), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 11), null, true, 100);// obsidian
- basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 9), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 12), null, true, 100); //steel
+ LiquidCasting basinCasting = TConstructRegistry.getBasinCasting();
+ basinCasting.addCastingRecipe(new ItemStack(Block.blockIron), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 0), null, true, 100); //Iron
+ basinCasting.addCastingRecipe(new ItemStack(Block.blockGold), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 1), null, true, 100); //gold
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 3), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 2), null, true, 100); //copper
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 5), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 3), null, true, 100); //tin
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 6), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 4), null, true, 100); //aluminum
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 0), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 5), null, true, 100); //cobalt
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 1), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 6), null, true, 100); //ardite
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 4), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 7), null, true, 100); //bronze
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 7), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 8), null, true, 100); //albrass
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 2), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 9), null, true, 100); //manyullyn
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 8), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 10), null, true, 100); //alumite
+ basinCasting.addCastingRecipe(new ItemStack(Block.obsidian), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 11), null, true, 100);// obsidian
+ basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 9), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 12), null, true, 100); //steel
- basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 3), new ItemStack(Block.gravel), true, 100); //brownstone
+ basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 3), new ItemStack(Block.gravel), true, 100); //brownstone
- //Ore
- Smeltery.addMelting(Block.oreIron, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0));
- Smeltery.addMelting(Block.oreGold, 0, 400, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 1));
- Smeltery.addMelting(oreGravel, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0));
- //Smeltery.addMelting(oreGravel, 1, 400, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 1));
+ //Ore
+ Smeltery.addMelting(Block.oreIron, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0));
+ Smeltery.addMelting(Block.oreGold, 0, 400, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 1));
+ Smeltery.addMelting(oreGravel, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 0));
+ //Smeltery.addMelting(oreGravel, 1, 400, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 1));
- //Items
- 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));
+ //Items
+ 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(Item.bucketEmpty), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 3, 0));
- Smeltery.addMelting(new ItemStack(Item.minecartEmpty), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 5, 0));
- Smeltery.addMelting(new ItemStack(materials, 1, 18), Block.obsidian.blockID, 0, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 11));//obsidian
+ 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, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 5, 0));
+ Smeltery.addMelting(new ItemStack(materials, 1, 18), Block.obsidian.blockID, 0, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 11));//obsidian
- //Blocks
- Smeltery.addMelting(Block.blockIron, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 0));
- Smeltery.addMelting(Block.blockGold, 0, 400, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 1));
- Smeltery.addMelting(Block.obsidian, 0, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 11));
- Smeltery.addMelting(Block.ice, 0, 75, new LiquidStack(Block.waterStill.blockID, 1000, 0));
+ //Blocks
+ Smeltery.addMelting(Block.blockIron, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 0));
+ Smeltery.addMelting(Block.blockGold, 0, 400, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 1));
+ Smeltery.addMelting(Block.obsidian, 0, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 11));
+ Smeltery.addMelting(Block.ice, 0, 75, new LiquidStack(Block.waterStill.blockID, 1000, 0));
- //Alloys
- Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 16, 7), new LiquidStack(liquidMetalStill.blockID, 24, 2), new LiquidStack(liquidMetalStill.blockID, 8, 3)); //Bronze
- Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 16, 8), new LiquidStack(liquidMetalStill.blockID, 24, 4), new LiquidStack(liquidMetalStill.blockID, 8, 2)); //Aluminum Brass
- Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 16, 9), new LiquidStack(liquidMetalStill.blockID, 32, 5), new LiquidStack(liquidMetalStill.blockID, 32, 6)); //Manyullyn
- Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 48, 10), new LiquidStack(liquidMetalStill.blockID, 80, 4), new LiquidStack(liquidMetalStill.blockID, 32, 0), new LiquidStack(
- liquidMetalStill.blockID, 32, 11)); //Alumite
+ //Alloys
+ Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 16, 7), new LiquidStack(liquidMetalStill.blockID, 24, 2), new LiquidStack(liquidMetalStill.blockID, 8, 3)); //Bronze
+ Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 16, 8), new LiquidStack(liquidMetalStill.blockID, 24, 4), new LiquidStack(liquidMetalStill.blockID, 8, 2)); //Aluminum Brass
+ Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 16, 9), new LiquidStack(liquidMetalStill.blockID, 32, 5), new LiquidStack(liquidMetalStill.blockID, 32, 6)); //Manyullyn
+ Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 48, 10), new LiquidStack(liquidMetalStill.blockID, 80, 4), new LiquidStack(liquidMetalStill.blockID, 32, 0), new LiquidStack(
+ liquidMetalStill.blockID, 32, 11)); //Alumite
- //Oreberries
- Smeltery.addMelting(new ItemStack(oreBerries, 4, 0), Block.blockIron.blockID, 0, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 0)); //Iron
- Smeltery.addMelting(new ItemStack(oreBerries, 4, 1), Block.blockGold.blockID, 0, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 1)); //Gold
- Smeltery.addMelting(new ItemStack(oreBerries, 4, 2), metalBlock.blockID, 3, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 2)); //Copper
- Smeltery.addMelting(new ItemStack(oreBerries, 4, 3), metalBlock.blockID, 5, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 3)); //Tin
- Smeltery.addMelting(new ItemStack(oreBerries, 4, 4), metalBlock.blockID, 6, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 4)); //Aluminum
+ //Oreberries
+ Smeltery.addMelting(new ItemStack(oreBerries, 4, 0), Block.blockIron.blockID, 0, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 0)); //Iron
+ Smeltery.addMelting(new ItemStack(oreBerries, 4, 1), Block.blockGold.blockID, 0, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 1)); //Gold
+ Smeltery.addMelting(new ItemStack(oreBerries, 4, 2), metalBlock.blockID, 3, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 2)); //Copper
+ Smeltery.addMelting(new ItemStack(oreBerries, 4, 3), metalBlock.blockID, 5, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 3)); //Tin
+ Smeltery.addMelting(new ItemStack(oreBerries, 4, 4), metalBlock.blockID, 6, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue / 9, 4)); //Aluminum
- //Vanilla Armor
- Smeltery.addMelting(new ItemStack(Item.helmetIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 5, 0));
- Smeltery.addMelting(new ItemStack(Item.plateIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 8, 0));
- Smeltery.addMelting(new ItemStack(Item.legsIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 7, 0));
- Smeltery.addMelting(new ItemStack(Item.bootsIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 4, 0));
+ //Vanilla Armor
+ Smeltery.addMelting(new ItemStack(Item.helmetIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 5, 0));
+ Smeltery.addMelting(new ItemStack(Item.plateIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 8, 0));
+ Smeltery.addMelting(new ItemStack(Item.legsIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 7, 0));
+ Smeltery.addMelting(new ItemStack(Item.bootsIron, 1, 0), Block.blockIron.blockID, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 4, 0));
- Smeltery.addMelting(new ItemStack(Item.helmetGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 5, 1));
- Smeltery.addMelting(new ItemStack(Item.plateGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 8, 1));
- Smeltery.addMelting(new ItemStack(Item.legsGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 7, 1));
- Smeltery.addMelting(new ItemStack(Item.bootsGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 4, 1));
+ Smeltery.addMelting(new ItemStack(Item.helmetGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 5, 1));
+ Smeltery.addMelting(new ItemStack(Item.plateGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 8, 1));
+ Smeltery.addMelting(new ItemStack(Item.legsGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 7, 1));
+ Smeltery.addMelting(new ItemStack(Item.bootsGold, 1, 0), Block.blockGold.blockID, 0, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 4, 1));
- Smeltery.addMelting(new ItemStack(Item.helmetChain, 1, 0), this.metalBlock.blockID, 9, 700, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12));
- 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));
+ Smeltery.addMelting(new ItemStack(Item.helmetChain, 1, 0), this.metalBlock.blockID, 9, 700, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12));
+ 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));
- /* Detailing */
- Detailing chiseling = TConstructRegistry.getChiselDetailing();
- chiseling.addDetailing(Block.stone, 0, Block.stoneBrick, 0, chisel);
- chiseling.addDetailing(speedBlock, 0, speedBlock, 1, chisel);
- chiseling.addDetailing(speedBlock, 2, speedBlock, 3, chisel);
- chiseling.addDetailing(speedBlock, 3, speedBlock, 4, chisel);
- chiseling.addDetailing(speedBlock, 4, speedBlock, 5, chisel);
- chiseling.addDetailing(speedBlock, 5, speedBlock, 6, chisel);
+ /* Detailing */
+ Detailing chiseling = TConstructRegistry.getChiselDetailing();
+ chiseling.addDetailing(Block.stone, 0, Block.stoneBrick, 0, chisel);
+ chiseling.addDetailing(speedBlock, 0, speedBlock, 1, chisel);
+ chiseling.addDetailing(speedBlock, 2, speedBlock, 3, chisel);
+ chiseling.addDetailing(speedBlock, 3, speedBlock, 4, chisel);
+ chiseling.addDetailing(speedBlock, 4, speedBlock, 5, chisel);
+ chiseling.addDetailing(speedBlock, 5, speedBlock, 6, chisel);
- chiseling.addDetailing(Block.obsidian, 0, multiBrick, 0, chisel);
- chiseling.addDetailing(Block.sandStone, 0, Block.sandStone, 2, chisel);
- chiseling.addDetailing(Block.sandStone, 2, Block.sandStone, 1, chisel);
- chiseling.addDetailing(Block.sandStone, 1, multiBrick, 1, chisel);
- //chiseling.addDetailing(Block.netherrack, 0, multiBrick, 2, chisel);
- //chiseling.addDetailing(Block.stone_refined, 0, multiBrick, 3, chisel);
- chiseling.addDetailing(Item.ingotIron, 0, multiBrick, 4, chisel);
- chiseling.addDetailing(Item.ingotGold, 0, multiBrick, 5, chisel);
- chiseling.addDetailing(Item.dyePowder, 4, multiBrick, 6, chisel);
- chiseling.addDetailing(Item.diamond, 0, multiBrick, 7, chisel);
- chiseling.addDetailing(Item.redstone, 0, multiBrick, 8, chisel);
- chiseling.addDetailing(Item.bone, 0, multiBrick, 9, chisel);
- chiseling.addDetailing(Item.slimeBall, 0, multiBrick, 10, chisel);
- chiseling.addDetailing(strangeFood, 0, multiBrick, 11, chisel);
- chiseling.addDetailing(Block.whiteStone, 0, multiBrick, 12, chisel);
- chiseling.addDetailing(materials, 18, multiBrick, 13, chisel);
+ chiseling.addDetailing(Block.obsidian, 0, multiBrick, 0, chisel);
+ chiseling.addDetailing(Block.sandStone, 0, Block.sandStone, 2, chisel);
+ chiseling.addDetailing(Block.sandStone, 2, Block.sandStone, 1, chisel);
+ chiseling.addDetailing(Block.sandStone, 1, multiBrick, 1, chisel);
+ //chiseling.addDetailing(Block.netherrack, 0, multiBrick, 2, chisel);
+ //chiseling.addDetailing(Block.stone_refined, 0, multiBrick, 3, chisel);
+ chiseling.addDetailing(Item.ingotIron, 0, multiBrick, 4, chisel);
+ chiseling.addDetailing(Item.ingotGold, 0, multiBrick, 5, chisel);
+ chiseling.addDetailing(Item.dyePowder, 4, multiBrick, 6, chisel);
+ chiseling.addDetailing(Item.diamond, 0, multiBrick, 7, chisel);
+ chiseling.addDetailing(Item.redstone, 0, multiBrick, 8, chisel);
+ chiseling.addDetailing(Item.bone, 0, multiBrick, 9, chisel);
+ chiseling.addDetailing(Item.slimeBall, 0, multiBrick, 10, chisel);
+ chiseling.addDetailing(strangeFood, 0, multiBrick, 11, chisel);
+ chiseling.addDetailing(Block.whiteStone, 0, multiBrick, 12, chisel);
+ chiseling.addDetailing(materials, 18, multiBrick, 13, chisel);
- GameRegistry.addRecipe(new ItemStack(toolForge, 1, 0), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', Block.blockIron);
- GameRegistry.addRecipe(new ItemStack(toolForge, 1, 1), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', Block.blockGold);
- GameRegistry.addRecipe(new ItemStack(toolForge, 1, 2), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', Block.blockDiamond);
- GameRegistry.addRecipe(new ItemStack(toolForge, 1, 3), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', Block.blockEmerald);
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 4), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockCobalt"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockArdite"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 6), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockManyullyn"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 7), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockCopper"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 8), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockBronze"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 9), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockTin"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 10), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockNaturalAluminum"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 11), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockAluminumBrass"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 12), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockAlumite"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 13), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0),
- 'm', "blockSteel"));
-
- /* Crafting */
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.workbench);
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 0));
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1));
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2));
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3));
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.chest);
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 0));
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1));
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2));
- GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 3));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "logWood"));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood"));
+ chiseling.addDetailing(multiBrick, 0, multiBrickFancy, 0, chisel);
+ chiseling.addDetailing(multiBrick, 1, multiBrickFancy, 1, chisel);
+ chiseling.addDetailing(multiBrick, 2, multiBrickFancy, 2, chisel);
+ chiseling.addDetailing(multiBrick, 3, multiBrickFancy, 3, chisel);
+ chiseling.addDetailing(multiBrick, 4, multiBrickFancy, 4, chisel);
+ chiseling.addDetailing(multiBrick, 5, multiBrickFancy, 5, chisel);
+ chiseling.addDetailing(multiBrick, 6, multiBrickFancy, 6, chisel);
+ chiseling.addDetailing(multiBrick, 7, multiBrickFancy, 7, chisel);
+ chiseling.addDetailing(multiBrick, 8, multiBrickFancy, 8, chisel);
+ chiseling.addDetailing(multiBrick, 9, multiBrickFancy, 9, chisel);
+ chiseling.addDetailing(multiBrick, 10, multiBrickFancy, 10, chisel);
+ chiseling.addDetailing(multiBrick, 11, multiBrickFancy, 11, chisel);
+ chiseling.addDetailing(multiBrick, 12, multiBrickFancy, 12, chisel);
+ chiseling.addDetailing(multiBrick, 13, multiBrickFancy, 13, chisel);
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood"));
- GameRegistry.addRecipe(new ItemStack(manualBook), "wp", 'w', new ItemStack(blankPattern, 1, 0), 'p', Item.paper);
- GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 0), new ItemStack(manualBook, 1, 0), Item.book);
- GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 1), new ItemStack(manualBook, 1, 0));
- GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 1), new ItemStack(manualBook, 1, 1), Item.book);
- GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 2), new ItemStack(manualBook, 1, 1));
- GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 2), new ItemStack(manualBook, 1, 2), Item.book);
+ chiseling.addDetailing(Block.stoneBrick, 0, multiBrickFancy, 15, chisel);
+ chiseling.addDetailing(multiBrickFancy, 15, multiBrickFancy, 14, chisel);
+ chiseling.addDetailing(multiBrickFancy, 14, Block.stoneBrick, 3, chisel);
+ /*chiseling.addDetailing(multiBrick, 14, multiBrickFancy, 14, chisel);
+ chiseling.addDetailing(multiBrick, 15, multiBrickFancy, 15, chisel);*/
- GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper); //Paper stack
- OreDictionary.registerOre("mossystone", new ItemStack(Block.stoneBrick, 1, 1));
- OreDictionary.registerOre("mossystone", new ItemStack(Block.cobblestoneMossy));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 6), "ppp", "ppp", "ppp", 'p', "mossystone")); //Moss ball
- GameRegistry.addRecipe(new ItemStack(materials, 1, 6), "ppp", "ppp", "ppp", 'p', new ItemStack(Block.stoneBrick, 1, 1)); //Moss ball
- GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'c', Item.fireballCharge, 'x', Item.blazeRod); //Auto-smelt
- GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'x', Item.fireballCharge, 'c', Item.blazeRod); //Auto-smelt
-
- GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 0), Item.slimeBall, Item.slimeBall, Item.slimeBall, Item.slimeBall, Block.sand, Block.dirt); //Slimy sand
- GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 2), strangeFood, strangeFood, strangeFood, strangeFood, Block.sand, Block.dirt); //Slimy sand
- GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 2, 1), Item.clay, Block.sand, Block.gravel); //Grout
- GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 8, 1), Block.blockClay, Block.sand, Block.gravel, Block.sand, Block.gravel, Block.sand, Block.gravel, Block.sand, Block.gravel); //Grout
+ GameRegistry.addRecipe(new ItemStack(toolForge, 1, 0), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', Block.blockIron);
+ GameRegistry.addRecipe(new ItemStack(toolForge, 1, 1), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', Block.blockGold);
+ GameRegistry.addRecipe(new ItemStack(toolForge, 1, 2), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', Block.blockDiamond);
+ GameRegistry.addRecipe(new ItemStack(toolForge, 1, 3), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', Block.blockEmerald);
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 4), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm',
+ "blockCobalt"));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm',
+ "blockArdite"));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 6), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm',
+ "blockManyullyn"));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 7), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm',
+ "blockCopper"));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 8), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm',
+ "blockBronze"));
+ GameRegistry
+ .addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 9), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', "blockTin"));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 10), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm',
+ "blockNaturalAluminum"));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 11), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm',
+ "blockAluminumBrass"));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 12), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm',
+ "blockAlumite"));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, 13), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm',
+ "blockSteel"));
+
+ /* Crafting */
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.workbench);
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 0));
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1));
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2));
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3));
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.chest);
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 0));
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1));
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2));
+ GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 3));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "logWood"));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood"));
+
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood"));
+ GameRegistry.addRecipe(new ItemStack(manualBook), "wp", 'w', new ItemStack(blankPattern, 1, 0), 'p', Item.paper);
+ GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 0), new ItemStack(manualBook, 1, 0), Item.book);
+ GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 1), new ItemStack(manualBook, 1, 0));
+ GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 1), new ItemStack(manualBook, 1, 1), Item.book);
+ GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 2), new ItemStack(manualBook, 1, 1));
+ GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 2), new ItemStack(manualBook, 1, 2), Item.book);
+
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper); //Paper stack
+ OreDictionary.registerOre("mossystone", new ItemStack(Block.stoneBrick, 1, 1));
+ OreDictionary.registerOre("mossystone", new ItemStack(Block.cobblestoneMossy));
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 6), "ppp", "ppp", "ppp", 'p', "mossystone")); //Moss ball
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 6), "ppp", "ppp", "ppp", 'p', new ItemStack(Block.stoneBrick, 1, 1)); //Moss ball
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'c', Item.fireballCharge, 'x', Item.blazeRod); //Auto-smelt
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'x', Item.fireballCharge, 'c', Item.blazeRod); //Auto-smelt
+
+ GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 0), Item.slimeBall, Item.slimeBall, Item.slimeBall, Item.slimeBall, Block.sand, Block.dirt); //Slimy sand
+ GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 2), strangeFood, strangeFood, strangeFood, strangeFood, Block.sand, Block.dirt); //Slimy sand
+ GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 2, 1), Item.clay, Block.sand, Block.gravel); //Grout
+ GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 8, 1), Block.blockClay, Block.sand, Block.gravel, Block.sand, Block.gravel, Block.sand, Block.gravel, Block.sand, Block.gravel); //Grout
GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 3), Block.dirt, Item.rottenFlesh, new ItemStack(Item.dyePowder, 1, 15)); //Graveyard Soil
FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 3, new ItemStack(craftedSoil, 1, 4), 0.2f); //Concecrated Soil
- FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 0, new ItemStack(materials, 1, 1), 2f); //Slime
- FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 1, new ItemStack(materials, 1, 2), 2f); //Seared brick item
- FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 2, new ItemStack(materials, 1, 17), 2f); //Blue Slime
- //GameRegistry.addRecipe(new ItemStack(oreSlag, 1, 0), "pp", "pp", 'p', new ItemStack(materials, 1, 2)); //Seared brick block
+ FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 0, new ItemStack(materials, 1, 1), 2f); //Slime
+ FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 1, new ItemStack(materials, 1, 2), 2f); //Seared brick item
+ FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 2, new ItemStack(materials, 1, 17), 2f); //Blue Slime
+ //GameRegistry.addRecipe(new ItemStack(oreSlag, 1, 0), "pp", "pp", 'p', new ItemStack(materials, 1, 2)); //Seared brick block
- GameRegistry.addRecipe(new ItemStack(materials, 1, 25), "sss", "sns", "sss", 'n', new ItemStack(materials, 1, 24), 's', new ItemStack(Item.silk)); //Silky Cloth
- GameRegistry.addRecipe(new ItemStack(materials, 1, 25), "sss", "sns", "sss", 'n', new ItemStack(Item.goldNugget), 's', new ItemStack(Item.silk));
- GameRegistry.addRecipe(new ItemStack(materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(materials, 1, 25), 'e', new ItemStack(Item.emerald)); //Silky Jewel
-
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 25), "sss", "sns", "sss", 'n', new ItemStack(materials, 1, 24), 's', new ItemStack(Item.silk)); //Silky Cloth
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 25), "sss", "sns", "sss", 'n', new ItemStack(Item.goldNugget), 's', new ItemStack(Item.silk));
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(materials, 1, 25), 'e', new ItemStack(Item.emerald)); //Silky Jewel
- //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f);
- //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f);
- FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f);
- FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 4, new ItemStack(materials, 1, 10), 0.5f);
- FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 12), 0.5f);
+ //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f);
+ //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f);
+ FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f);
+ FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 4, new ItemStack(materials, 1, 10), 0.5f);
+ FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 12), 0.5f);
- FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 0, new ItemStack(materials, 1, 19), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 2, new ItemStack(materials, 1, 20), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 3, new ItemStack(materials, 1, 21), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 4, new ItemStack(materials, 1, 22), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 5, new ItemStack(materials, 1, 23), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 0, new ItemStack(materials, 1, 19), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 2, new ItemStack(materials, 1, 20), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 3, new ItemStack(materials, 1, 21), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 4, new ItemStack(materials, 1, 22), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 5, new ItemStack(materials, 1, 23), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 0, new ItemStack(Item.ingotIron), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 1, new ItemStack(Item.ingotGold), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 2, new ItemStack(materials, 1, 9), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 3, new ItemStack(materials, 1, 10), 0.2f);
- FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 4, new ItemStack(materials, 1, 12), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 0, new ItemStack(Item.ingotIron), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 1, new ItemStack(Item.ingotGold), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 2, new ItemStack(materials, 1, 9), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 3, new ItemStack(materials, 1, 10), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 4, new ItemStack(materials, 1, 12), 0.2f);
- FurnaceRecipes.smelting().addSmelting(speedBlock.blockID, 0, new ItemStack(speedBlock, 1, 2), 0.2f);
+ FurnaceRecipes.smelting().addSmelting(speedBlock.blockID, 0, new ItemStack(speedBlock, 1, 2), 0.2f);
- //Metal conversion
- GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "m", 'm', new ItemStack(metalBlock, 1, 3)); //Copper
- GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "m", 'm', new ItemStack(metalBlock, 1, 5)); //Tin
- GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "m", 'm', new ItemStack(metalBlock, 1, 6)); //Aluminum
- GameRegistry.addRecipe(new ItemStack(materials, 9, 13), "m", 'm', new ItemStack(metalBlock, 1, 4)); //Bronze
- GameRegistry.addRecipe(new ItemStack(materials, 9, 14), "m", 'm', new ItemStack(metalBlock, 1, 7)); //AluBrass
- GameRegistry.addRecipe(new ItemStack(materials, 9, 3), "m", 'm', new ItemStack(metalBlock, 1, 0)); //Cobalt
- GameRegistry.addRecipe(new ItemStack(materials, 9, 4), "m", 'm', new ItemStack(metalBlock, 1, 1)); //Ardite
- GameRegistry.addRecipe(new ItemStack(materials, 9, 5), "m", 'm', new ItemStack(metalBlock, 1, 2)); //Manyullyn
- GameRegistry.addRecipe(new ItemStack(materials, 9, 15), "m", 'm', new ItemStack(metalBlock, 1, 8)); //Alumite
- GameRegistry.addRecipe(new ItemStack(materials, 9, 16), "m", 'm', new ItemStack(metalBlock, 1, 9)); //Steel
+ //Metal conversion
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "m", 'm', new ItemStack(metalBlock, 1, 3)); //Copper
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "m", 'm', new ItemStack(metalBlock, 1, 5)); //Tin
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "m", 'm', new ItemStack(metalBlock, 1, 6)); //Aluminum
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 13), "m", 'm', new ItemStack(metalBlock, 1, 4)); //Bronze
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 14), "m", 'm', new ItemStack(metalBlock, 1, 7)); //AluBrass
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 3), "m", 'm', new ItemStack(metalBlock, 1, 0)); //Cobalt
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 4), "m", 'm', new ItemStack(metalBlock, 1, 1)); //Ardite
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 5), "m", 'm', new ItemStack(metalBlock, 1, 2)); //Manyullyn
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 15), "m", 'm', new ItemStack(metalBlock, 1, 8)); //Alumite
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 16), "m", 'm', new ItemStack(metalBlock, 1, 9)); //Steel
- GameRegistry.addRecipe(new ItemStack(Item.ingotIron), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 19)); //Iron
- GameRegistry.addRecipe(new ItemStack(materials, 1, 9), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 20)); //Copper
- GameRegistry.addRecipe(new ItemStack(materials, 1, 10), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 21)); //Tin
- GameRegistry.addRecipe(new ItemStack(materials, 1, 12), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 22)); //Aluminum
- GameRegistry.addRecipe(new ItemStack(materials, 1, 14), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 24)); //Aluminum Brass
+ GameRegistry.addRecipe(new ItemStack(Item.ingotIron), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 19)); //Iron
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 9), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 20)); //Copper
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 10), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 21)); //Tin
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 12), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 22)); //Aluminum
+ GameRegistry.addRecipe(new ItemStack(materials, 1, 14), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 24)); //Aluminum Brass
- GameRegistry.addRecipe(new ItemStack(materials, 9, 24), "m", 'm', new ItemStack(materials, 1, 14)); //Aluminum Brass Nugget
+ GameRegistry.addRecipe(new ItemStack(materials, 9, 24), "m", 'm', new ItemStack(materials, 1, 14)); //Aluminum Brass Nugget
- /*OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(materials, 1, 14));
- OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(materials, 1, 24));*/
+ /*OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(materials, 1, 14));
+ OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(materials, 1, 24));*/
- //Smeltery
- ItemStack searedBrick = new ItemStack(materials, 1, 2);
- GameRegistry.addRecipe(new ItemStack(smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); //Controller
- GameRegistry.addRecipe(new ItemStack(smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); //Drain
- GameRegistry.addRecipe(new ItemStack(smeltery, 1, 2), "bb", "bb", 'b', searedBrick); //Bricks
+ //Smeltery
+ ItemStack searedBrick = new ItemStack(materials, 1, 2);
+ GameRegistry.addRecipe(new ItemStack(smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); //Controller
+ GameRegistry.addRecipe(new ItemStack(smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); //Drain
+ GameRegistry.addRecipe(new ItemStack(smeltery, 1, 2), "bb", "bb", 'b', searedBrick); //Bricks
- GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 0), "bbb", "bgb", "bbb", 'b', searedBrick, 'g', Block.glass); //Tank
- GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', Block.glass); //Glass
- GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', Block.glass); //Window
+ GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 0), "bbb", "bgb", "bbb", 'b', searedBrick, 'g', Block.glass); //Tank
+ GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', Block.glass); //Glass
+ GameRegistry.addRecipe(new ItemStack(lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', Block.glass); //Window
- GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); //Table
- GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); //Faucet
- GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); //Basin
-
- GameRegistry.addRecipe(new ItemStack(Block.pumpkinLantern, 1, 0), "p", "s", 'p', new ItemStack(Block.pumpkin), 'w', new ItemStack(toolRod, 1, 1));
- GameRegistry.addRecipe(new ItemStack(stoneTorch, 4), "p", "w", 'p', new ItemStack(Item.coal, 1, Short.MAX_VALUE), 'w', new ItemStack(toolRod, 1, 1));
- GameRegistry.addRecipe(new ItemStack(toolRod, 4, 1), "c", "c", 'c', new ItemStack(Block.stone));
- GameRegistry.addRecipe(new ItemStack(toolRod, 2, 1), "c", "c", 'c', new ItemStack(Block.cobblestone));
+ GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); //Table
+ GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); //Faucet
+ GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); //Basin
- ItemStack aluBrass = new ItemStack(materials, 1, 14);
- GameRegistry.addRecipe(new ItemStack(Item.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Item.redstone));
- GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass);
+ GameRegistry.addRecipe(new ItemStack(Block.pumpkinLantern, 1, 0), "p", "s", 'p', new ItemStack(Block.pumpkin), 'w', new ItemStack(toolRod, 1, 1));
+ GameRegistry.addRecipe(new ItemStack(stoneTorch, 4), "p", "w", 'p', new ItemStack(Item.coal, 1, Short.MAX_VALUE), 'w', new ItemStack(toolRod, 1, 1));
+ GameRegistry.addRecipe(new ItemStack(toolRod, 4, 1), "c", "c", 'c', new ItemStack(Block.stone));
+ GameRegistry.addRecipe(new ItemStack(toolRod, 2, 1), "c", "c", 'c', new ItemStack(Block.cobblestone));
- ItemStack necroticBone = new ItemStack(materials, 1, 8);
-
- //Accessories
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotNaturalAluminum"));
- GameRegistry.addRecipe(new ItemStack(diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Item.diamond), '#', new ItemStack(Item.appleRed));
- GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 2), new ItemStack(diamondApple), necroticBone, new ItemStack(heartCanister, 1, 0), new ItemStack(heartCanister, 1, 1));
+ ItemStack aluBrass = new ItemStack(materials, 1, 14);
+ GameRegistry.addRecipe(new ItemStack(Item.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Item.redstone));
+ GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass);
+
+ ItemStack necroticBone = new ItemStack(materials, 1, 8);
+
+ //Accessories
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotNaturalAluminum"));
+ GameRegistry.addRecipe(new ItemStack(diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Item.diamond), '#', new ItemStack(Item.appleRed));
+ GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 2), new ItemStack(diamondApple), necroticBone, new ItemStack(heartCanister, 1, 0), new ItemStack(heartCanister, 1, 1));
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));
- }
+ }
- void setupToolTabs ()
- {
- TConstructRegistry.materialTab.init(new ItemStack(titleIcon, 1, 255));
- TConstructRegistry.blockTab.init(new ItemStack(toolStationWood));
- ItemStack tool = new ItemStack(longsword, 1, 0);
+ void setupToolTabs ()
+ {
+ TConstructRegistry.materialTab.init(new ItemStack(titleIcon, 1, 255));
+ TConstructRegistry.blockTab.init(new ItemStack(toolStationWood));
+ ItemStack tool = new ItemStack(longsword, 1, 0);
- NBTTagCompound compound = new NBTTagCompound();
- compound.setCompoundTag("InfiTool", new NBTTagCompound());
- compound.getCompoundTag("InfiTool").setInteger("RenderHead", 2);
- compound.getCompoundTag("InfiTool").setInteger("RenderHandle", 0);
- compound.getCompoundTag("InfiTool").setInteger("RenderAccessory", 10);
- tool.setTagCompound(compound);
+ NBTTagCompound compound = new NBTTagCompound();
+ compound.setCompoundTag("InfiTool", new NBTTagCompound());
+ compound.getCompoundTag("InfiTool").setInteger("RenderHead", 2);
+ compound.getCompoundTag("InfiTool").setInteger("RenderHandle", 0);
+ compound.getCompoundTag("InfiTool").setInteger("RenderAccessory", 10);
+ tool.setTagCompound(compound);
- //TConstruct.
- TConstructRegistry.toolTab.init(tool);
- }
+ //TConstruct.
+ TConstructRegistry.toolTab.init(tool);
+ }
- public void addLoot ()
- {
- //Item, min, max, weight
- ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 5));
- ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10));
- ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10));
+ public void addLoot ()
+ {
+ //Item, min, max, weight
+ ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 5));
+ ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10));
+ ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10));
- tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27);
- tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 1));
- int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17};
- Item[] partTypes = { pickaxeHead, shovelHead, axeHead, binding, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, frypanHead, signHead, chiselHead};
-
- for (int partIter = 0; partIter < partTypes.length; partIter++)
- {
- for (int typeIter = 0; typeIter < validTypes.length; typeIter++)
- {
- tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15));
- }
- }
-
- tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30);
- for (int i = 0; i < 13; i++)
- {
- tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(woodPattern, 1, i+1), 1, 3, 20));
- }
+ tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27);
+ tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 1));
+ int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17 };
+ Item[] partTypes = { pickaxeHead, shovelHead, hatchetHead, binding, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, frypanHead, signHead, chiselHead };
+
+ for (int partIter = 0; partIter < partTypes.length; partIter++)
+ {
+ for (int typeIter = 0; typeIter < validTypes.length; typeIter++)
+ {
+ tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15));
+ }
+ }
+
+ tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30);
+ for (int i = 0; i < 13; i++)
+ {
+ tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(woodPattern, 1, i + 1), 1, 3, 20));
+ }
tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(woodPattern, 1, 22), 1, 3, 40));
- }
+ }
- public static LiquidStack[] liquidIcons = new LiquidStack[0];
- public static String[] liquidNames;
+ public static LiquidStack[] liquidIcons = new LiquidStack[0];
+ public static String[] liquidNames;
- public void oreRegistry ()
- {
- OreDictionary.registerOre("oreCobalt", new ItemStack(oreSlag, 1, 1));
- OreDictionary.registerOre("oreArdite", new ItemStack(oreSlag, 1, 2));
- OreDictionary.registerOre("oreCopper", new ItemStack(oreSlag, 1, 3));
- OreDictionary.registerOre("oreTin", new ItemStack(oreSlag, 1, 4));
- OreDictionary.registerOre("oreNaturalAluminum", new ItemStack(oreSlag, 1, 5));
+ public void oreRegistry ()
+ {
+ OreDictionary.registerOre("oreCobalt", new ItemStack(oreSlag, 1, 1));
+ OreDictionary.registerOre("oreArdite", new ItemStack(oreSlag, 1, 2));
+ OreDictionary.registerOre("oreCopper", new ItemStack(oreSlag, 1, 3));
+ OreDictionary.registerOre("oreTin", new ItemStack(oreSlag, 1, 4));
+ OreDictionary.registerOre("oreNaturalAluminum", new ItemStack(oreSlag, 1, 5));
- OreDictionary.registerOre("oreIron", new ItemStack(oreGravel, 1, 0));
- OreDictionary.registerOre("oreGold", new ItemStack(oreGravel, 1, 1));
- OreDictionary.registerOre("oreCobalt", new ItemStack(oreGravel, 1, 5));
- OreDictionary.registerOre("oreCopper", new ItemStack(oreGravel, 1, 2));
- OreDictionary.registerOre("oreTin", new ItemStack(oreGravel, 1, 3));
- OreDictionary.registerOre("oreNaturalAluminum", new ItemStack(oreGravel, 1, 4));
+ OreDictionary.registerOre("oreIron", new ItemStack(oreGravel, 1, 0));
+ OreDictionary.registerOre("oreGold", new ItemStack(oreGravel, 1, 1));
+ OreDictionary.registerOre("oreCobalt", new ItemStack(oreGravel, 1, 5));
+ OreDictionary.registerOre("oreCopper", new ItemStack(oreGravel, 1, 2));
+ OreDictionary.registerOre("oreTin", new ItemStack(oreGravel, 1, 3));
+ OreDictionary.registerOre("oreNaturalAluminum", new ItemStack(oreGravel, 1, 4));
- OreDictionary.registerOre("ingotCobalt", new ItemStack(materials, 1, 3));
- OreDictionary.registerOre("ingotArdite", new ItemStack(materials, 1, 4));
- OreDictionary.registerOre("ingotManyullyn", new ItemStack(materials, 1, 5));
- OreDictionary.registerOre("ingotCopper", new ItemStack(materials, 1, 9));
- OreDictionary.registerOre("ingotTin", new ItemStack(materials, 1, 10));
- OreDictionary.registerOre("ingotNaturalAluminum", new ItemStack(materials, 1, 11));
- OreDictionary.registerOre("naturalAluminum", new ItemStack(materials, 1, 12));
- OreDictionary.registerOre("ingotBronze", new ItemStack(materials, 1, 13));
- OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(materials, 1, 14));
- OreDictionary.registerOre("ingotAlumite", new ItemStack(materials, 1, 15));
- OreDictionary.registerOre("ingotSteel", new ItemStack(materials, 1, 16));
+ OreDictionary.registerOre("ingotCobalt", new ItemStack(materials, 1, 3));
+ OreDictionary.registerOre("ingotArdite", new ItemStack(materials, 1, 4));
+ OreDictionary.registerOre("ingotManyullyn", new ItemStack(materials, 1, 5));
+ OreDictionary.registerOre("ingotCopper", new ItemStack(materials, 1, 9));
+ OreDictionary.registerOre("ingotTin", new ItemStack(materials, 1, 10));
+ OreDictionary.registerOre("ingotNaturalAluminum", new ItemStack(materials, 1, 11));
+ OreDictionary.registerOre("naturalAluminum", new ItemStack(materials, 1, 12));
+ OreDictionary.registerOre("ingotBronze", new ItemStack(materials, 1, 13));
+ OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(materials, 1, 14));
+ OreDictionary.registerOre("ingotAlumite", new ItemStack(materials, 1, 15));
+ OreDictionary.registerOre("ingotSteel", new ItemStack(materials, 1, 16));
- OreDictionary.registerOre("blockCobalt", new ItemStack(metalBlock, 1, 0));
- OreDictionary.registerOre("blockArdite", new ItemStack(metalBlock, 1, 1));
- OreDictionary.registerOre("blockManyullyn", new ItemStack(metalBlock, 1, 2));
- OreDictionary.registerOre("blockCopper", new ItemStack(metalBlock, 1, 3));
- OreDictionary.registerOre("blockBronze", new ItemStack(metalBlock, 1, 4));
- OreDictionary.registerOre("blockTin", new ItemStack(metalBlock, 1, 5));
- OreDictionary.registerOre("blockNaturalAluminum", new ItemStack(metalBlock, 1, 6));
- OreDictionary.registerOre("blockAluminumBrass", new ItemStack(metalBlock, 1, 7));
- OreDictionary.registerOre("blockAlumite", new ItemStack(metalBlock, 1, 8));
- OreDictionary.registerOre("blockSteel", new ItemStack(metalBlock, 1, 9));
+ OreDictionary.registerOre("blockCobalt", new ItemStack(metalBlock, 1, 0));
+ OreDictionary.registerOre("blockArdite", new ItemStack(metalBlock, 1, 1));
+ OreDictionary.registerOre("blockManyullyn", new ItemStack(metalBlock, 1, 2));
+ OreDictionary.registerOre("blockCopper", new ItemStack(metalBlock, 1, 3));
+ OreDictionary.registerOre("blockBronze", new ItemStack(metalBlock, 1, 4));
+ OreDictionary.registerOre("blockTin", new ItemStack(metalBlock, 1, 5));
+ OreDictionary.registerOre("blockNaturalAluminum", new ItemStack(metalBlock, 1, 6));
+ OreDictionary.registerOre("blockAluminumBrass", new ItemStack(metalBlock, 1, 7));
+ OreDictionary.registerOre("blockAlumite", new ItemStack(metalBlock, 1, 8));
+ OreDictionary.registerOre("blockSteel", new ItemStack(metalBlock, 1, 9));
- OreDictionary.registerOre("nuggetIron", new ItemStack(materials, 1, 19));
- OreDictionary.registerOre("nuggetCopper", new ItemStack(materials, 1, 20));
- OreDictionary.registerOre("nuggetTin", new ItemStack(materials, 1, 21));
- OreDictionary.registerOre("nuggetNaturalAluminum", new ItemStack(materials, 1, 22));
- OreDictionary.registerOre("nuggetSilver", new ItemStack(materials, 1, 23));
- OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(materials, 1, 24));
+ OreDictionary.registerOre("nuggetIron", new ItemStack(materials, 1, 19));
+ OreDictionary.registerOre("nuggetCopper", new ItemStack(materials, 1, 20));
+ OreDictionary.registerOre("nuggetTin", new ItemStack(materials, 1, 21));
+ OreDictionary.registerOre("nuggetNaturalAluminum", new ItemStack(materials, 1, 22));
+ OreDictionary.registerOre("nuggetSilver", new ItemStack(materials, 1, 23));
+ OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(materials, 1, 24));
- String[] names = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "Brass", "Manyullyn", "Alumite", "Obsidian", "Steel" };
- liquidIcons = new LiquidStack[names.length];
- liquidNames = new String[names.length];
- for (int iter = 0; iter < names.length; iter++)
- {
- LiquidStack liquidstack = new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, iter);
- String name = "Molten " + names[iter];
- liquidIcons[iter] = liquidstack;
- liquidNames[iter] = name;
- LiquidDictionary.getOrCreateLiquid(name, liquidstack);
- LiquidContainerRegistry.registerLiquid(new LiquidContainerData(liquidstack, new ItemStack(buckets, 1, iter), new ItemStack(Item.bucketEmpty)));
- }
+ String[] names = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "Brass", "Manyullyn", "Alumite", "Obsidian", "Steel" };
+ liquidIcons = new LiquidStack[names.length];
+ liquidNames = new String[names.length];
+ for (int iter = 0; iter < names.length; iter++)
+ {
+ LiquidStack liquidstack = new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, iter);
+ String name = "Molten " + names[iter];
+ liquidIcons[iter] = liquidstack;
+ liquidNames[iter] = name;
+ LiquidDictionary.getOrCreateLiquid(name, liquidstack);
+ LiquidContainerRegistry.registerLiquid(new LiquidContainerData(liquidstack, new ItemStack(buckets, 1, iter), new ItemStack(Item.bucketEmpty)));
+ }
- //Vanilla stuff
- OreDictionary.registerOre("slimeball", new ItemStack(Item.slimeBall));
- OreDictionary.registerOre("slimeball", new ItemStack(strangeFood, 1, 0));
- RecipeRemover.removeShapedRecipe(new ItemStack(Block.pistonStickyBase));
- RecipeRemover.removeShapedRecipe(new ItemStack(Item.magmaCream));
- GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.pistonStickyBase), "slimeball", Block.pistonBase));
- GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Item.magmaCream), "slimeball", Item.blazePowder));
- }
+ //Vanilla stuff
+ OreDictionary.registerOre("slimeball", new ItemStack(Item.slimeBall));
+ OreDictionary.registerOre("slimeball", new ItemStack(strangeFood, 1, 0));
+ RecipeRemover.removeShapedRecipe(new ItemStack(Block.pistonStickyBase));
+ RecipeRemover.removeShapedRecipe(new ItemStack(Item.magmaCream));
+ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.pistonStickyBase), "slimeball", Block.pistonBase));
+ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Item.magmaCream), "slimeball", Item.blazePowder));
+ }
- public void intermodCommunication ()
- {
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 12));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 13));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 14));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 15));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 12));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 13));
- }
+ public void intermodCommunication ()
+ {
+ FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 12));
+ FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 13));
+ FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 14));
+ FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 15));
+ FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 12));
+ FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 13));
+ }
- public void modIntegration ()
- {
- ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), "");
- /* IC2 */
- ItemStack reBattery = ic2.api.item.Items.getItem("reBattery");
- if (reBattery != null)
- modE.batteries.add(reBattery);
- ItemStack chargedReBattery = ic2.api.item.Items.getItem("chargedReBattery");
- if (chargedReBattery != null)
- {
- modE.batteries.add(chargedReBattery);
- }
- ItemStack electronicCircuit = ic2.api.item.Items.getItem("electronicCircuit");
- if (electronicCircuit != null)
- modE.circuits.add(electronicCircuit);
+ public void modIntegration ()
+ {
+ ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), "");
+ /* IC2 */
+ ItemStack reBattery = ic2.api.item.Items.getItem("reBattery");
+ if (reBattery != null)
+ modE.batteries.add(reBattery);
+ ItemStack chargedReBattery = ic2.api.item.Items.getItem("chargedReBattery");
+ if (chargedReBattery != null)
+ {
+ modE.batteries.add(chargedReBattery);
+ }
+ ItemStack electronicCircuit = ic2.api.item.Items.getItem("electronicCircuit");
+ if (electronicCircuit != null)
+ modE.circuits.add(electronicCircuit);
- if (chargedReBattery != null && electronicCircuit != null)
- TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), chargedReBattery, electronicCircuit);
+ if (chargedReBattery != null && electronicCircuit != null)
+ TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), chargedReBattery, electronicCircuit);
- /* Thaumcraft */
- //Object obj = getItem("itemResource", "thaumcraft.common.Config");
- }
+ /* Thaumcraft */
+ //Object obj = getItem("itemResource", "thaumcraft.common.Config");
+ }
- public static Object getItem (String name, String classPackage)
- {
- try
- {
- Class c = Class.forName(classPackage);
- Object ret = c.getField(name);
- if (ret != null && (ret instanceof ItemStack || ret instanceof Item))
- return ret;
- return null;
- }
- catch (Exception e)
- {
- System.out.println("[TConstruct] Could not find item for " + name);
- return null;
- }
- }
+ public static Object getItem (String name, String classPackage)
+ {
+ try
+ {
+ Class c = Class.forName(classPackage);
+ Object ret = c.getField(name);
+ if (ret != null && (ret instanceof ItemStack || ret instanceof Item))
+ return ret;
+ return null;
+ }
+ catch (Exception e)
+ {
+ System.out.println("[TConstruct] Could not find item for " + name);
+ return null;
+ }
+ }
- @Override
- public int getBurnTime (ItemStack fuel)
- {
- if (fuel.itemID == materials.itemID && fuel.getItemDamage() == 7)
- return 26400;
- return 0;
- }
+ @Override
+ public int getBurnTime (ItemStack fuel)
+ {
+ if (fuel.itemID == materials.itemID && fuel.getItemDamage() == 7)
+ return 26400;
+ return 0;
+ }
}
\ No newline at end of file
diff --git a/mods/tinker/tconstruct/common/TProxyCommon.java b/mods/tinker/tconstruct/common/TProxyCommon.java
index f5c7cdd3..a1cfd808 100644
--- a/mods/tinker/tconstruct/common/TProxyCommon.java
+++ b/mods/tinker/tconstruct/common/TProxyCommon.java
@@ -27,6 +27,7 @@ public class TProxyCommon implements IGuiHandler
public static int frypanGuiID = 4;
public static int toolForge = 5;
public static int smelteryGuiID = 7;
+ public static int glowstoneAggregatorGui = 8;
public static int inventoryGui = 100;
public static int armorGuiID = 101;
@@ -147,7 +148,7 @@ public class TProxyCommon implements IGuiHandler
//LanguageRegistry.addName(TContent.blankPattern, "Blank Pattern");
LanguageRegistry.addName(TContent.pickaxe, "Pickaxe");
LanguageRegistry.addName(TContent.shovel, "Shovel");
- LanguageRegistry.addName(TContent.axe, "Hatchet");
+ LanguageRegistry.addName(TContent.hatchet, "Hatchet");
LanguageRegistry.addName(TContent.broadsword, "Broadsword");
LanguageRegistry.addName(TContent.longsword, "Longsword");
LanguageRegistry.addName(TContent.rapier, "Rapier");
@@ -164,6 +165,8 @@ public class TProxyCommon implements IGuiHandler
LanguageRegistry.addName(TContent.hammer, "Hammer");
LanguageRegistry.addName(TContent.battleaxe, "Battleaxe");
LanguageRegistry.addName(TContent.cutlass, "Cutlass");
+ LanguageRegistry.addName(TContent.aggregator, "Glowstone Aggregator");
+ LanguageRegistry.addName(TContent.knapsack, "Knapsack");
}
diff --git a/mods/tinker/tconstruct/inventory/AggregatorContainer.java b/mods/tinker/tconstruct/inventory/AggregatorContainer.java
new file mode 100644
index 00000000..8e8df416
--- /dev/null
+++ b/mods/tinker/tconstruct/inventory/AggregatorContainer.java
@@ -0,0 +1,82 @@
+package mods.tinker.tconstruct.inventory;
+
+import mods.tinker.tconstruct.blocks.logic.GlowstoneAggregator;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class AggregatorContainer extends Container
+{
+ public GlowstoneAggregator logic;
+ public int progress = 0;
+ public int fuel = 0;
+ public int fuelGague = 0;
+
+ public AggregatorContainer(InventoryPlayer inventoryplayer, GlowstoneAggregator logic)
+ {
+ this.logic = logic;
+
+ this.addSlotToContainer(new Slot(logic, 0, 45, 36));
+ this.addSlotToContainer(new Slot(logic, 1, 80, 36));
+ this.addSlotToContainer(new Slot(logic, 2, 123, 36));
+
+ /* Player inventory */
+ for (int column = 0; column < 3; column++)
+ {
+ for (int row = 0; row < 9; row++)
+ {
+ this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18));
+ }
+ }
+
+ for (int column = 0; column < 9; column++)
+ {
+ this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142));
+ }
+ }
+
+
+ @Override
+ public boolean canInteractWith(EntityPlayer entityplayer)
+ {
+ return logic.isUseableByPlayer(entityplayer);
+ }
+
+ @Override
+ public ItemStack transferStackInSlot(EntityPlayer player, int slotID)
+ {
+ ItemStack stack = null;
+ Slot slot = (Slot)this.inventorySlots.get(slotID);
+
+ if (slot != null && slot.getHasStack())
+ {
+ ItemStack slotStack = slot.getStack();
+ stack = slotStack.copy();
+
+ if (slotID < logic.getSizeInventory())
+ {
+ if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true))
+ {
+ return null;
+ }
+ }
+ else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory(), false))
+ {
+ return null;
+ }
+
+ if (slotStack.stackSize == 0)
+ {
+ slot.putStack((ItemStack)null);
+ }
+ else
+ {
+ slot.onSlotChanged();
+ }
+ }
+
+ return stack;
+ }
+}
diff --git a/mods/tinker/tconstruct/inventory/KnapsackContainer.java b/mods/tinker/tconstruct/inventory/KnapsackContainer.java
index 1a1b313f..6f9c0981 100644
--- a/mods/tinker/tconstruct/inventory/KnapsackContainer.java
+++ b/mods/tinker/tconstruct/inventory/KnapsackContainer.java
@@ -22,7 +22,7 @@ public class KnapsackContainer extends Container
{
for (int row = 0; row < 9; row++)
{
- this.addSlotToContainer(new Slot(knapsack, row + column * 9, 8 + row * 18, 18 + column * 18));
+ this.addSlotToContainer(new Slot(knapsack, row + column * 9, 8 + row * 18, 17 + column * 18));
}
}
@@ -83,13 +83,4 @@ public class KnapsackContainer extends Container
return stack;
}
-
- @Override
- protected boolean mergeItemStack(ItemStack stack, int inventorySize, int slotSize, boolean par4)
- {
- if (!(stack.getItem() instanceof IPattern))
- return false;
-
- return super.mergeItemStack(stack, inventorySize, slotSize, par4);
- }
}
diff --git a/mods/tinker/tconstruct/items/MetalPattern.java b/mods/tinker/tconstruct/items/MetalPattern.java
index 91504fa9..0dbebd48 100644
--- a/mods/tinker/tconstruct/items/MetalPattern.java
+++ b/mods/tinker/tconstruct/items/MetalPattern.java
@@ -15,7 +15,7 @@ public class MetalPattern extends Pattern
public void getSubItems (int id, CreativeTabs tab, List list)
{
- for (int i = 0; i < patternName.length; i++)
+ for (int i = 0; i < patternName.length-1; i++)
list.add(new ItemStack(id, 1, i));
}
}
diff --git a/mods/tinker/tconstruct/items/armor/Knapsack.java b/mods/tinker/tconstruct/items/armor/Knapsack.java
index a476b5c1..b5eb53b3 100644
--- a/mods/tinker/tconstruct/items/armor/Knapsack.java
+++ b/mods/tinker/tconstruct/items/armor/Knapsack.java
@@ -21,32 +21,6 @@ public class Knapsack extends CraftingItem
this.setMaxStackSize(10);
}
- @Override
- public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player)
- {
- /*if (!world.isRemote && stack.getItemDamage() == 2)
- {
- TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
- if (stats != null)
- {
- ArmorExtended armor = stats.armor;
- ItemStack slotStack = armor.getStackInSlot(6);
- if (slotStack == null)// || slotStack.getItem() == this)
- {
- armor.setInventorySlotContents(6, new ItemStack(this, 1, 2));
- stack.stackSize--;
- }
- else if (slotStack.getItem() == this && slotStack.stackSize < this.maxStackSize)
- {
- slotStack.stackSize++;
- stack.stackSize--;
- }
- armor.recalculateHealth(player, stats);
- }
- }*/
- return stack;
- }
-
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
diff --git a/mods/tinker/tconstruct/items/blocks/MultiBrickFancyItem.java b/mods/tinker/tconstruct/items/blocks/MultiBrickFancyItem.java
new file mode 100644
index 00000000..c19354da
--- /dev/null
+++ b/mods/tinker/tconstruct/items/blocks/MultiBrickFancyItem.java
@@ -0,0 +1,58 @@
+package mods.tinker.tconstruct.items.blocks;
+
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MathHelper;
+
+public class MultiBrickFancyItem extends ItemBlock
+{
+ static String blockType[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond",
+ "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone", "stone.road" };
+
+ public MultiBrickFancyItem(int id)
+ {
+ super(id);
+ setMaxDamage(0);
+ setHasSubtypes(true);
+ }
+
+ public int getMetadata(int meta)
+ {
+ return meta;
+ }
+
+ public String getUnlocalizedName(ItemStack itemstack)
+ {
+ int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1);
+ return (new StringBuilder()).append("block.fancybrick.").append(blockType[pos]).toString();
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
+ {
+ switch (stack.getItemDamage())
+ {
+ case 5:
+ case 6:
+ list.add("Somewhat expensive");
+ break;
+ case 7:
+ list.add("Quite expensive");
+ break;
+ case 8:
+ list.add("Emits Redstone signal up to");
+ list.add("4 blocks away");
+ break;
+ case 10:
+ case 11:
+ list.add("Bouncy!");
+ break;
+ }
+ }
+}
diff --git a/mods/tinker/tconstruct/items/blocks/MultiBrickItem.java b/mods/tinker/tconstruct/items/blocks/MultiBrickItem.java
index 94895176..263769bb 100644
--- a/mods/tinker/tconstruct/items/blocks/MultiBrickItem.java
+++ b/mods/tinker/tconstruct/items/blocks/MultiBrickItem.java
@@ -12,7 +12,7 @@ import net.minecraft.util.MathHelper;
public class MultiBrickItem extends ItemBlock
{
static String blockType[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond",
- "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot" };
+ "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone.road", "stone.refined.road" };
public MultiBrickItem(int id)
{
diff --git a/mods/tinker/tconstruct/items/tools/Battleaxe.java b/mods/tinker/tconstruct/items/tools/Battleaxe.java
index 28a68ca1..68f3ddac 100644
--- a/mods/tinker/tconstruct/items/tools/Battleaxe.java
+++ b/mods/tinker/tconstruct/items/tools/Battleaxe.java
@@ -78,6 +78,18 @@ public class Battleaxe extends HarvestTool
return TContent.toughBinding;
}
+ @Override
+ public int durabilityTypeAccessory ()
+ {
+ return 2;
+ }
+
+ @Override
+ public int durabilityTypeExtra ()
+ {
+ return 1;
+ }
+
@Override
public float getRepairCost ()
{
diff --git a/mods/tinker/tconstruct/items/tools/Chisel.java b/mods/tinker/tconstruct/items/tools/Chisel.java
index 350fb374..40b70be4 100644
--- a/mods/tinker/tconstruct/items/tools/Chisel.java
+++ b/mods/tinker/tconstruct/items/tools/Chisel.java
@@ -28,7 +28,18 @@ public class Chisel extends ToolCore
@Override
public ItemStack getContainerItemStack (ItemStack itemStack)
{
- AbilityHelper.damageTool(itemStack, 1, null, false);
+ //AbilityHelper.damageTool(itemStack, 1, null, false);
+
+ int reinforced = 0;
+ NBTTagCompound tags = itemStack.getTagCompound();
+
+ if (tags.getCompoundTag("InfiTool").hasKey("Unbreaking"))
+ reinforced = tags.getCompoundTag("InfiTool").getInteger("Unbreaking");
+
+ if (random.nextInt(10) < 10 - reinforced)
+ {
+ AbilityHelper.damageTool(itemStack, 1, null, false);
+ }
return itemStack;
}
@@ -43,7 +54,7 @@ public class Chisel extends ToolCore
boolean detailed = false;
return detailed;
}
-
+
public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ)
{
return false;
@@ -88,7 +99,18 @@ public class Chisel extends ToolCore
{
world.setBlock(x, y, z, details.outputID, details.outputMeta, 3);
if (!(entityplayer.capabilities.isCreativeMode))
- AbilityHelper.damageTool(itemstack, 1, entityplayer, false);
+ {
+ int reinforced = 0;
+ NBTTagCompound tags = itemstack.getTagCompound();
+
+ if (tags.getCompoundTag("InfiTool").hasKey("Unbreaking"))
+ reinforced = tags.getCompoundTag("InfiTool").getInteger("Unbreaking");
+
+ if (random.nextInt(10) < 10 - reinforced)
+ {
+ AbilityHelper.damageTool(itemstack, 1, null, false);
+ }
+ }
world.playAuxSFX(2001, x, y, z, blockID + (meta << 12));
entityplayer.swingItem();
}
@@ -101,13 +123,20 @@ public class Chisel extends ToolCore
@Override
public int getMaxItemUseDuration (ItemStack itemstack)
{
- return 15;
+ if (!itemstack.hasTagCompound())
+ return 20;
+
+ int speed = itemstack.getTagCompound().getCompoundTag("InfiTool").getInteger("MiningSpeed") / 100;
+ int truespeed = 20 - speed;
+ if (truespeed < 0)
+ truespeed = 0;
+ return truespeed;
}
@Override
public EnumAction getItemUseAction (ItemStack itemstack)
{
- return EnumAction.bow;
+ return EnumAction.eat;
}
@Override
diff --git a/mods/tinker/tconstruct/items/tools/Hatchet.java b/mods/tinker/tconstruct/items/tools/Hatchet.java
index c99e197c..4e57e597 100644
--- a/mods/tinker/tconstruct/items/tools/Hatchet.java
+++ b/mods/tinker/tconstruct/items/tools/Hatchet.java
@@ -53,7 +53,7 @@ public class Hatchet extends HarvestTool
@Override
public Item getHeadItem ()
{
- return TContent.axeHead;
+ return TContent.hatchetHead;
}
@Override
diff --git a/mods/tinker/tconstruct/items/tools/Mattock.java b/mods/tinker/tconstruct/items/tools/Mattock.java
index 291b488b..0b0851c7 100644
--- a/mods/tinker/tconstruct/items/tools/Mattock.java
+++ b/mods/tinker/tconstruct/items/tools/Mattock.java
@@ -48,7 +48,7 @@ public class Mattock extends DualHarvestTool
@Override
public Item getHeadItem ()
{
- return TContent.axeHead;
+ return TContent.hatchetHead;
}
@Override
diff --git a/mods/tinker/tconstruct/library/TConstructRegistry.java b/mods/tinker/tconstruct/library/TConstructRegistry.java
index 08e111f4..a945e3f1 100644
--- a/mods/tinker/tconstruct/library/TConstructRegistry.java
+++ b/mods/tinker/tconstruct/library/TConstructRegistry.java
@@ -3,14 +3,12 @@ package mods.tinker.tconstruct.library;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedList;
-import mods.tinker.tconstruct.library.crafting.Detailing;
-import mods.tinker.tconstruct.library.crafting.LiquidCasting;
-import mods.tinker.tconstruct.library.tools.ToolCore;
-import mods.tinker.tconstruct.library.tools.ToolMaterial;
-import mods.tinker.tconstruct.library.util.TabTools;
+import mods.tinker.tconstruct.library.crafting.*;
+import mods.tinker.tconstruct.library.tools.*;
+import mods.tinker.tconstruct.library.util.*;
import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
/** A registry to store any relevant API work
*
@@ -20,54 +18,210 @@ import net.minecraft.item.Item;
public class TConstructRegistry
{
public static TConstructRegistry instance = new TConstructRegistry();
- public static ArrayList tools = new ArrayList(20);
- public static HashMap toolMaterials = new HashMap(40);
- public static HashMap toolMaterialStrings = new HashMap(40);
- public static LinkedList activeModifiers = new LinkedList();
-
+ /* Creative tabs */
public static TabTools toolTab;
public static TabTools materialTab;
public static TabTools blockTab;
- @Deprecated
- public static Item toolRod;
-
+
+ /* Items */
+
+ /** A directory of crafting items and tools used by the mod.
+ *
+ * Tools:
+ * pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, cutlass
+ * frypan, battlesign, mattock, chisel
+ * lumberaxe, cleaver, scythe, excavator, hammer, battleaxe
+ *
+ * Tool crafting parts:
+ * toolRod, toolShard, binding, toughBinding, toughRod, heavyPlate
+ * pickaxeHead, shovelhead, hatchetHead, swordBlade, wideguard, handGuard, crossbar, knifeBlade,
+ * fullGuard, frypanHead, signHead, chiselHead
+ * scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead
+ */
+ public static HashMap itemDirectory = new HashMap();
+
+ /** Adds an item to the directory
+ *
+ * @param name Associates the name with the stack
+ * @param itemstack The stack to add to the directory
+ */
+
+ public static void addItemToDirectory(String name, Item itemstack)
+ {
+ Item add = itemDirectory.get(name);
+ if (add == null)
+ System.out.println("[TCon API] "+name+" is already present in the Item directory");
+
+ itemDirectory.put(name, itemstack);
+ }
+
+ /** Retrieves an itemstack from the directory
+ *
+ * @param name The name of the item to get
+ * @return Item associated with the name, or null if not present.
+ */
+
+ public static Item getItem(String name)
+ {
+ Item ret = itemDirectory.get(name);
+ if (ret == null)
+ System.out.println("[TCon API] Could not find "+name+" in the Item directory");
+
+ return ret;
+ }
+
+ /** A directory of ItemStacks. Contains mostly crafting items
+ *
+ * Materials:
+ * paperStack, greenSlimeCrystal, blueSlimeCrystal, searedBrick, mossBall, lavaCrystal, necroticBone, silkyCloth, silkyJewel
+ * ingotCobalt, ingotArdite, ingotManyullyn, ingotCopper, ingotTin, ingotAluminum, rawAluminum,
+ * ingotBronze, ingotAluminumBrass, ingotAlumite, ingotSteel, ingotObsidian
+ * nuggetIron, nuggetCopper, nuggetTin, nuggetAluminum, nuggetSilver, nuggetAluminumBrass
+ * oreberryIron, oreberryGold, oreberryCopper, oreberryTin, oreberryTin, oreberrySilver,
+ * diamondApple, blueSlimeFood, canisterEmpty, miniRedHeart, canisterRedHeart
+ *
+ */
+ static HashMap itemstackDirectory = new HashMap();
+
+ /** Adds an itemstack to the directory
+ *
+ * @param name Associates the name with the stack
+ * @param itemstack The stack to add to the directory
+ */
+
+ public static void addItemStackToDirectory(String name, ItemStack itemstack)
+ {
+ ItemStack add = itemstackDirectory.get(name);
+ if (add == null)
+ System.out.println("[TCon API] "+name+" is already present in the ItemStack directory");
+
+ itemstackDirectory.put(name, itemstack);
+ }
+
+ /** Retrieves an itemstack from the directory
+ *
+ * @param name The name of the item to get
+ * @return Item associated with the name, or null if not present.
+ */
+
+ public static ItemStack getItemStack(String name)
+ {
+ ItemStack ret = itemstackDirectory.get(name);
+ if (ret == null)
+ System.out.println("[TCon API] Could not find "+name+" in the ItemStack directory");
+
+ return ret;
+ }
+ public static ArrayList tools = new ArrayList(20);
+
//Tools
+
+ /** Internal tool mapping, used for adding textures
+ *
+ * @param tool
+ */
+
public static void addToolMapping (ToolCore tool)
{
tools.add(tool);
}
+
+ /** Internal tool mapping, used for adding textures
+ *
+ * @return List of tools
+ */
public static ArrayList getToolMapping ()
{
return tools;
}
-
- //Materials
- public static void addToolMaterial (int materialID, String materialName, int craftingTier, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced,
- float shoddy)
+
+ /** Registers a tool to its crafting parts.
+ * If an output is registered multiple times the parts are added to the recipe's input list
+ * Valid part amounts are 1, 2, and 4. Part counts of 1 and 2 assume a Tool Rod as a handle.
+ * Null items are valid as placeholders. ex: Hatchet
+ *
+ * @see ToolBuidler
+ * @param output The ToolCore to craft
+ * @param parts Pieces to make the tool with
+ */
+ public static void addToolRecipe(ToolCore output, Item... parts)
{
- addToolMaterial(materialID, materialName, craftingTier, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, shoddy, "", "");
+ ToolBuilder tb = ToolBuilder.instance;
+ if (parts.length < 1 || parts.length > 4 || parts.length == 3)
+ System.out.println("[TCon API] Wrong amount of items to craft into a tool");
+
+ tb.addToolRecipe(output, parts);
}
- public static void addToolMaterial (int materialID, String materialName, int craftingTier, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced,
- float shoddy, String style, String ability)
+ //Materials
+ public static HashMap toolMaterials = new HashMap(40);
+ public static HashMap toolMaterialStrings = new HashMap(40);
+
+ /** 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 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, 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, craftingTier, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, shoddy, style, ability);
+ mat = new ToolMaterial(materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, unbreaking, style, ability);
toolMaterials.put(materialID, mat);
toolMaterialStrings.put(materialName, mat);
}
else
- throw new RuntimeException("[TConstruct] Material ID " + materialID + " is already occupied by " + mat.materialName);
+ 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 material Complete tool material to add. Uses the name in the material for lookup purposes.
+ */
+
+ public static void addtoolMaterial(int materialID, ToolMaterial material)
+ {
+ ToolMaterial mat = toolMaterials.get(materialID);
+ if (mat == null)
+ {
+ toolMaterials.put(materialID, mat);
+ toolMaterialStrings.put(material.name(), mat);
+ }
+ else
+ throw new IllegalArgumentException("[TCon API] Material ID " + materialID + " is already occupied by " + mat.materialName);
+ }
+
+ /** Looks up a tool material by ID
+ *
+ * @param key The ID to look up
+ * @return Tool Material
+ */
public static ToolMaterial getMaterial (int key)
{
return (toolMaterials.get(key));
}
+
+ /** Looks up a tool material by name
+ *
+ * @param key the name to look up
+ * @return Tool Material
+ */
public static ToolMaterial getMaterial (String key)
{
@@ -136,9 +290,31 @@ public class TConstructRegistry
return null;
}
}
-
+
+ public static ArrayList activeModifiers = new ArrayList();
public static void registerActiveToolMod(ActiveToolMod mod)
{
activeModifiers.add(mod);
}
+
+ /** Default Material Index
+ * 0: Wood
+ * 1: Stone
+ * 2: Iron
+ * 3: Flint
+ * 4: Cactus
+ * 5: Bone
+ * 6: Obsidian
+ * 7: Netherrack
+ * 8: Green Slime
+ * 9: Paper
+ * 10: Cobalt
+ * 11: Ardite
+ * 12: Manyullyn
+ * 13: Copper
+ * 14: Bronze
+ * 15: Alumite
+ * 16: Steel
+ * 17: Blue Slime
+ */
}
diff --git a/mods/tinker/tconstruct/library/crafting/ShapelessToolRecipe.java b/mods/tinker/tconstruct/library/crafting/ShapelessToolRecipe.java
index 5fc818a3..ab45ab30 100644
--- a/mods/tinker/tconstruct/library/crafting/ShapelessToolRecipe.java
+++ b/mods/tinker/tconstruct/library/crafting/ShapelessToolRecipe.java
@@ -39,7 +39,8 @@ public class ShapelessToolRecipe extends ShapelessRecipes
{
ItemStack itemstack1 = (ItemStack)iterator.next();
- if (itemstack.itemID == itemstack1.itemID && (itemstack1.getItemDamage() == 32767 || itemstack.getItemDamage() == itemstack1.getItemDamage()))
+ //System.out.println("Rawr! "+itemstack1.getItemDamage());
+ if (itemstack.itemID == itemstack1.itemID && (itemstack1.getItemDamage() == Short.MAX_VALUE || itemstack.getItemDamage() == itemstack1.getItemDamage()))
{
if (itemstack.getItem() instanceof ToolCore)
{
diff --git a/mods/tinker/tconstruct/library/crafting/ToolBuilder.java b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java
index 9f8047d6..dbd58c23 100644
--- a/mods/tinker/tconstruct/library/crafting/ToolBuilder.java
+++ b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java
@@ -26,7 +26,7 @@ public class ToolBuilder
public List toolMods = new ArrayList();
/* Build tools */
- public static void addToolRecipe (ToolCore output, Item head)
+ public static void addNormalToolRecipe (ToolCore output, Item head)
{
ToolRecipe recipe = instance.recipeList.get(output.getToolName());
if (recipe != null)
@@ -41,7 +41,7 @@ public class ToolBuilder
}
}
- public static void addToolRecipe (ToolCore output, Item head, Item accessory)
+ public static void addNormalToolRecipe (ToolCore output, Item head, Item accessory)
{
//instance.combos.add(new ToolRecipe(head, accessory, output));
ToolRecipe recipe = instance.recipeList.get(output.getToolName());
@@ -57,26 +57,8 @@ public class ToolBuilder
instance.recipeList.put(output.getToolName(), recipe);
}
}
-
- public static void addToolRecipe (ToolCore output, Item head, Item accessory, Item extra)
- {
- //instance.combos.add(new ToolRecipe(head, accessory, extra, output));
- ToolRecipe recipe = instance.recipeList.get(output.getToolName());
- if (recipe != null)
- {
- recipe.addHeadItem(head);
- recipe.addAccessoryItem(accessory);
- recipe.addExtraItem(accessory);
- }
- else
- {
- recipe = new ToolRecipe(head, accessory, extra, output);
- instance.combos.add(recipe);
- instance.recipeList.put(output.getToolName(), recipe);
- }
- }
- public static void addCustomToolRecipe (ToolCore output, Item head, Item handle, Item accessory, Item extra)
+ public static void addNormalToolRecipe (ToolCore output, Item head, Item handle, Item accessory, Item extra)
{
ToolRecipe recipe = instance.recipeList.get(output.getToolName());
if (recipe != null)
@@ -93,6 +75,23 @@ public class ToolBuilder
instance.recipeList.put(output.getToolName(), recipe);
}
}
+
+ public static void addCustomToolRecipe(ToolRecipe recipe)
+ {
+ instance.combos.add(recipe);
+ }
+
+ public static void addToolRecipe (ToolCore output, Item... items)
+ {
+ if (items.length == 1)
+ addNormalToolRecipe(output, items[0]);
+ if (items.length == 2)
+ addNormalToolRecipe(output, items[0], items[1]);
+ if (items.length == 3)
+ addToolRecipe(output, items[0], items[1], items[2]);
+ if (items.length == 4)
+ addNormalToolRecipe(output, items[0], items[1], items[2], items[3]);
+ }
public ToolCore getMatchingRecipe (Item head, Item handle, Item accessory, Item extra)
{
diff --git a/mods/tinker/tconstruct/library/crafting/ToolRecipe.java b/mods/tinker/tconstruct/library/crafting/ToolRecipe.java
index 09043c1a..060d2a5d 100644
--- a/mods/tinker/tconstruct/library/crafting/ToolRecipe.java
+++ b/mods/tinker/tconstruct/library/crafting/ToolRecipe.java
@@ -21,17 +21,17 @@ public class ToolRecipe
public ToolRecipe(Item head, ToolCore tool)
{
- this(head, TConstructRegistry.toolRod, null, null, tool);
+ this(head, TContent.toolRod, null, null, tool);
}
public ToolRecipe(Item head, Item accessory, ToolCore tool)
{
- this(head, TConstructRegistry.toolRod, accessory, null, tool);
+ this(head, TContent.toolRod, accessory, null, tool);
}
public ToolRecipe(Item head, Item accessory, Item extra, ToolCore tool)
{
- this(head, TConstructRegistry.toolRod, accessory, extra, tool);
+ this(head, TContent.toolRod, accessory, extra, tool);
}
public ToolRecipe(Item head, Item handle, Item accessory, Item extra, ToolCore tool)
diff --git a/mods/tinker/tconstruct/library/tools/AbilityHelper.java b/mods/tinker/tconstruct/library/tools/AbilityHelper.java
index d34e4964..980547c1 100644
--- a/mods/tinker/tconstruct/library/tools/AbilityHelper.java
+++ b/mods/tinker/tconstruct/library/tools/AbilityHelper.java
@@ -48,13 +48,13 @@ public class AbilityHelper
if (!stack.hasTagCompound())
return false;
- int durability = 0;
+ int reinforced = 0;
NBTTagCompound tags = stack.getTagCompound();
if (tags.getCompoundTag("InfiTool").hasKey("Unbreaking"))
- durability = tags.getCompoundTag("InfiTool").getInteger("Unbreaking");
+ reinforced = tags.getCompoundTag("InfiTool").getInteger("Unbreaking");
- if (random.nextInt(10) < 10 - durability)
+ if (random.nextInt(10) < 10 - reinforced)
{
damageTool(stack, 1, tags, player, false);
}
diff --git a/mods/tinker/tconstruct/library/tools/ToolCore.java b/mods/tinker/tconstruct/library/tools/ToolCore.java
index 79df01fd..a1b1e0f8 100644
--- a/mods/tinker/tconstruct/library/tools/ToolCore.java
+++ b/mods/tinker/tconstruct/library/tools/ToolCore.java
@@ -228,8 +228,16 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
emptyIcon = iconRegister.registerIcon("tinker:blankface");
}
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public Icon getIconFromDamage(int meta)
+ {
+ return blankSprite;
+ }
@Override
+ @SideOnly(Side.CLIENT)
public Icon getIcon (ItemStack stack, int renderPass)
{
NBTTagCompound tags = stack.getTagCompound();
@@ -535,7 +543,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
public Item getHandleItem ()
{
- return TConstructRegistry.toolRod;
+ return TConstructRegistry.getItem("toolRod");//TContent.toolRod;
}
/* Updating */
@@ -630,15 +638,8 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
//Right-click
public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ)
{
- //Workaround for impossible crash?
- if (!player.isSneaking())
- {
- Block block = Block.blocksList[world.getBlockId(x, y, z)];
- if (block.hasTileEntity(world.getBlockMetadata(x, y, z)))
- {
- return false;
- }
- }
+ /*if (world.isRemote)
+ return true;*/
int posX = x;
int posY = y;
@@ -682,26 +683,28 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
boolean used = false;
int hotbarSlot = player.inventory.currentItem;
- if (hotbarSlot == 0)
+ int itemSlot = hotbarSlot == 0 ? 8 : hotbarSlot + 1;
+ ItemStack nearbyStack = null;
+
+ if (hotbarSlot < 8)
{
- ItemStack nearbyStack = player.inventory.getStackInSlot(8);
+ nearbyStack = player.inventory.getStackInSlot(itemSlot);
if (nearbyStack != null && nearbyStack.getItem() instanceof ItemBlock)
{
used = nearbyStack.getItem().onItemUse(nearbyStack, player, world, x, y, z, side, clickX, clickY, clickZ);
if (nearbyStack.stackSize < 1)
- player.inventory.setInventorySlotContents(8, null);
+ {
+ nearbyStack = null;
+ player.inventory.setInventorySlotContents(itemSlot, null);
+ }
}
}
- else if (hotbarSlot < 8)
+
+ /*if (used) //Update client
{
- ItemStack nearbyStack = player.inventory.getStackInSlot(hotbarSlot + 1);
- if (nearbyStack != null && nearbyStack.getItem() instanceof ItemBlock)
- {
- used = nearbyStack.getItem().onItemUse(nearbyStack, player, world, x, y, z, side, clickX, clickY, clickZ);
- if (nearbyStack.stackSize < 1)
- player.inventory.setInventorySlotContents(hotbarSlot + 1, null);
- }
- }
+ Packet103SetSlot packet = new Packet103SetSlot(player.openContainer.windowId, itemSlot, nearbyStack);
+ ((EntityPlayerMP)player).playerNetServerHandler.sendPacketToPlayer(packet);
+ }*/
return used;
}
@@ -876,6 +879,8 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
/* Proper stack damage */
public int getItemDamageFromStack (ItemStack stack)
{
+ if (stack.itemDamage == Short.MAX_VALUE )
+ return Short.MAX_VALUE;
NBTTagCompound tags = stack.getTagCompound();
if (tags == null)
{
diff --git a/mods/tinker/tconstruct/library/tools/ToolMaterial.java b/mods/tinker/tconstruct/library/tools/ToolMaterial.java
index 28ab7c76..5e213879 100644
--- a/mods/tinker/tconstruct/library/tools/ToolMaterial.java
+++ b/mods/tinker/tconstruct/library/tools/ToolMaterial.java
@@ -1,39 +1,32 @@
package mods.tinker.tconstruct.library.tools;
-/**
- * This class is temporary. A full material registry is planned
+/*
+ * Dynamic substitute for an enum. It carries a lot of information
*/
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 int craftingTier; //Not used
public final int harvestLevel;
public final int durability;
public final int miningspeed; // <-- divided by 100
public final int attack;
public final float handleModifier;
public final int reinforced;
- public final float shoddy;
+ public final float stonebound;
public final String tipStyle;
public final String ability;
-
- public ToolMaterial(String name, int tier, int level, int durability, int speed, int damage, float handle, int reinforced, float shoddy)
- {
- this(name, reinforced, reinforced, reinforced, reinforced, reinforced, shoddy, reinforced, shoddy, "", "");
- }
- public ToolMaterial(String name, int tier, int level, int durability, int speed, int damage, float handle, int reinforced, float shoddy, String style, String ability)
+ 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.craftingTier = tier;
this.harvestLevel = level;
this.durability = durability;
this.miningspeed = speed;
this.attack = damage;
this.handleModifier = handle;
this.reinforced = reinforced;
- this.shoddy = shoddy;
+ this.stonebound = stonebound;
this.tipStyle = style;
this.ability = ability;
}
@@ -43,11 +36,6 @@ public class ToolMaterial
return materialName;
}
- public int tier()
- {
- return craftingTier;
- }
-
public int durability()
{
return this.durability;
@@ -80,7 +68,7 @@ public class ToolMaterial
public float shoddy()
{
- return this.shoddy;
+ return this.stonebound;
}
public String style()
diff --git a/mods/tinker/tconstruct/library/util/IToolPart.java b/mods/tinker/tconstruct/library/util/IToolPart.java
index 0ff2f1ea..1c13f93d 100644
--- a/mods/tinker/tconstruct/library/util/IToolPart.java
+++ b/mods/tinker/tconstruct/library/util/IToolPart.java
@@ -4,5 +4,10 @@ import net.minecraft.item.ItemStack;
public interface IToolPart
{
+ /** Parts to build tools from. ex: Pickaxe Head
+ *
+ * @param stack This item
+ * @return Proper material ID. -1 for invalid
+ */
public int getMaterialID(ItemStack stack);
}
diff --git a/mods/tinker/tconstruct/modifiers/ModAttack.java b/mods/tinker/tconstruct/modifiers/ModAttack.java
index 77f37c03..2b7e8e10 100644
--- a/mods/tinker/tconstruct/modifiers/ModAttack.java
+++ b/mods/tinker/tconstruct/modifiers/ModAttack.java
@@ -26,8 +26,11 @@ public class ModAttack extends ToolMod
@Override
protected boolean canModify (ItemStack tool, ItemStack[] input)
{
-
- NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+ ToolCore toolItem = (ToolCore) tool.getItem();
+ if (!validType(toolItem))
+ return false;
+
+ NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
if (!tags.hasKey(key))
return tags.getInteger("Modifiers") > 0;
@@ -51,7 +54,7 @@ public class ModAttack extends ToolMod
{
int amount = 24;
ToolCore toolItem = (ToolCore) tool.getItem();
- if (toolItem.pierceArmor() || !validType(toolItem))
+ if (toolItem.pierceArmor() || !nerfType(toolItem))
amount = 36;
int[] keyPair = tags.getIntArray(key);
@@ -107,7 +110,13 @@ public class ModAttack extends ToolMod
tags.setString(tip, modName);
}
- public boolean validType(ToolCore tool)
+ public boolean validType(ToolCore tool)
+ {
+ List list = Arrays.asList(tool.toolCategories());
+ return list.contains("melee") || list.contains("harvest");
+ }
+
+ public boolean nerfType(ToolCore tool)
{
List list = Arrays.asList(tool.toolCategories());
return list.contains("throwing");
diff --git a/mods/tinker/tconstruct/modifiers/ModRedstone.java b/mods/tinker/tconstruct/modifiers/ModRedstone.java
index bba9f032..f8af1831 100644
--- a/mods/tinker/tconstruct/modifiers/ModRedstone.java
+++ b/mods/tinker/tconstruct/modifiers/ModRedstone.java
@@ -103,6 +103,6 @@ public class ModRedstone extends ToolMod
public boolean validType(ToolCore tool)
{
List list = Arrays.asList(tool.toolCategories());
- return list.contains("harvest");
+ return list.contains("harvest") || list.contains("utility");
}
}
diff --git a/mods/tinker/tconstruct/util/PHConstruct.java b/mods/tinker/tconstruct/util/PHConstruct.java
index 37813eb4..e9ee6752 100644
--- a/mods/tinker/tconstruct/util/PHConstruct.java
+++ b/mods/tinker/tconstruct/util/PHConstruct.java
@@ -85,6 +85,9 @@ public class PHConstruct
landmine = config.getBlock("Landmine", 1470).getInt(1470);
barricade = config.getBlock("Barricade", 1469).getInt(1469);
toolForge = config.getBlock("Tool Forge", 1468).getInt(1468);
+ multiBrickFancy = config.getBlock("Multi Brick Fancy", 1467).getInt(1467);
+
+ aggregator = config.getBlock("Aggregator", 3221).getInt(3221);
/*golemCore = config.getBlock("Golem Core", 1481).getInt(1481);
golemHead = config.getBlock("Golem Head", 1482).getInt(1482);*/
@@ -280,6 +283,8 @@ public class PHConstruct
//InfiBlocks
public static int speedBlock;
+
+ public static int aggregator;
//Liquids
public static int metalFlowing;
@@ -288,6 +293,7 @@ public class PHConstruct
//Decoration
public static int stoneTorch;
public static int multiBrick;
+ public static int multiBrickFancy;
public static int redstoneBallRepeater;
//Patterns and misc
diff --git a/mods/tinker/textures/blocks/bricks/fancybrick_blueslime.png b/mods/tinker/textures/blocks/bricks/fancybrick_blueslime.png
new file mode 100644
index 00000000..6aa7a4a0
Binary files /dev/null and b/mods/tinker/textures/blocks/bricks/fancybrick_blueslime.png differ
diff --git a/mods/tinker/textures/blocks/bricks/fancybrick_bone.png b/mods/tinker/textures/blocks/bricks/fancybrick_bone.png
new file mode 100644
index 00000000..37d3e3fb
Binary files /dev/null and b/mods/tinker/textures/blocks/bricks/fancybrick_bone.png differ
diff --git a/mods/tinker/textures/blocks/bricks/fancybrick_endstone.png b/mods/tinker/textures/blocks/bricks/fancybrick_endstone.png
new file mode 100644
index 00000000..d941ac55
Binary files /dev/null and b/mods/tinker/textures/blocks/bricks/fancybrick_endstone.png differ
diff --git a/mods/tinker/textures/blocks/bricks/fancybrick_obsidian_ingot.png b/mods/tinker/textures/blocks/bricks/fancybrick_obsidian_ingot.png
new file mode 100644
index 00000000..9186e3c5
Binary files /dev/null and b/mods/tinker/textures/blocks/bricks/fancybrick_obsidian_ingot.png differ
diff --git a/mods/tinker/textures/blocks/glass/glass_clear.png b/mods/tinker/textures/blocks/glass/glass_clear.png
new file mode 100644
index 00000000..580e2cee
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/glass_clear.png differ
diff --git a/mods/tinker/textures/blocks/glass/glass_clear_side.png b/mods/tinker/textures/blocks/glass/glass_clear_side.png
new file mode 100644
index 00000000..55e3d96a
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/glass_clear_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/soulglass.png b/mods/tinker/textures/blocks/glass/soulglass.png
new file mode 100644
index 00000000..6dc0e13f
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soulglass.png differ
diff --git a/mods/tinker/textures/blocks/glass/soulglass_clear.png b/mods/tinker/textures/blocks/glass/soulglass_clear.png
new file mode 100644
index 00000000..853233e4
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soulglass_clear.png differ
diff --git a/mods/tinker/textures/blocks/glass/soulglass_clear_side.png b/mods/tinker/textures/blocks/glass/soulglass_clear_side.png
new file mode 100644
index 00000000..d9ff3d50
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soulglass_clear_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/soulglass_side.png b/mods/tinker/textures/blocks/glass/soulglass_side.png
new file mode 100644
index 00000000..1467c2e4
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/soulglass_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_black.png b/mods/tinker/textures/blocks/glass/stainedglass_black.png
new file mode 100644
index 00000000..be84ebb4
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_black.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_black_side.png b/mods/tinker/textures/blocks/glass/stainedglass_black_side.png
new file mode 100644
index 00000000..b1005af4
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_black_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_blue.png b/mods/tinker/textures/blocks/glass/stainedglass_blue.png
new file mode 100644
index 00000000..1a1696c3
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_blue.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_blue_side.png b/mods/tinker/textures/blocks/glass/stainedglass_blue_side.png
new file mode 100644
index 00000000..5e3ed001
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_blue_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_brown_side.png b/mods/tinker/textures/blocks/glass/stainedglass_brown_side.png
new file mode 100644
index 00000000..46d156c0
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_brown_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_cyan.png b/mods/tinker/textures/blocks/glass/stainedglass_cyan.png
new file mode 100644
index 00000000..9cc86426
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_cyan.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_cyan_side.png b/mods/tinker/textures/blocks/glass/stainedglass_cyan_side.png
new file mode 100644
index 00000000..40f46490
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_cyan_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_gray.png b/mods/tinker/textures/blocks/glass/stainedglass_gray.png
new file mode 100644
index 00000000..30508ffc
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_gray.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_gray_side.png b/mods/tinker/textures/blocks/glass/stainedglass_gray_side.png
new file mode 100644
index 00000000..60df141c
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_gray_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_green.png b/mods/tinker/textures/blocks/glass/stainedglass_green.png
new file mode 100644
index 00000000..2e2f2f68
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_green.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_green_side.png b/mods/tinker/textures/blocks/glass/stainedglass_green_side.png
new file mode 100644
index 00000000..6e2e10e2
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_green_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_lightblue.png b/mods/tinker/textures/blocks/glass/stainedglass_lightblue.png
new file mode 100644
index 00000000..d8ce1df6
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_lightblue.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_lightblue_side.png b/mods/tinker/textures/blocks/glass/stainedglass_lightblue_side.png
new file mode 100644
index 00000000..301684b9
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_lightblue_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_lightgray.png b/mods/tinker/textures/blocks/glass/stainedglass_lightgray.png
new file mode 100644
index 00000000..92572d58
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_lightgray.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_lightgray_side.png b/mods/tinker/textures/blocks/glass/stainedglass_lightgray_side.png
new file mode 100644
index 00000000..676a8da4
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_lightgray_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_lime.png b/mods/tinker/textures/blocks/glass/stainedglass_lime.png
new file mode 100644
index 00000000..1b9e7666
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_lime.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_lime_side.png b/mods/tinker/textures/blocks/glass/stainedglass_lime_side.png
new file mode 100644
index 00000000..1af9cff1
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_lime_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_magenta.png b/mods/tinker/textures/blocks/glass/stainedglass_magenta.png
new file mode 100644
index 00000000..3651ba19
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_magenta.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_magenta_side.png b/mods/tinker/textures/blocks/glass/stainedglass_magenta_side.png
new file mode 100644
index 00000000..8d9bbe6d
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_magenta_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_orange.png b/mods/tinker/textures/blocks/glass/stainedglass_orange.png
new file mode 100644
index 00000000..e18f092e
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_orange.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_orange_side.png b/mods/tinker/textures/blocks/glass/stainedglass_orange_side.png
new file mode 100644
index 00000000..2f94ca0c
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_orange_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_pink.png b/mods/tinker/textures/blocks/glass/stainedglass_pink.png
new file mode 100644
index 00000000..ba686206
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_pink.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_pink_side.png b/mods/tinker/textures/blocks/glass/stainedglass_pink_side.png
new file mode 100644
index 00000000..88120bc9
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_pink_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_purple.png b/mods/tinker/textures/blocks/glass/stainedglass_purple.png
new file mode 100644
index 00000000..15b41ce6
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_purple.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_purple_side.png b/mods/tinker/textures/blocks/glass/stainedglass_purple_side.png
new file mode 100644
index 00000000..b0549216
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_purple_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_red.png b/mods/tinker/textures/blocks/glass/stainedglass_red.png
new file mode 100644
index 00000000..65c7fb05
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_red.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_red_side.png b/mods/tinker/textures/blocks/glass/stainedglass_red_side.png
new file mode 100644
index 00000000..a9ed175d
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_red_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_white.png b/mods/tinker/textures/blocks/glass/stainedglass_white.png
new file mode 100644
index 00000000..c1aa0683
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_white.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_white_side.png b/mods/tinker/textures/blocks/glass/stainedglass_white_side.png
new file mode 100644
index 00000000..a47b320f
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_white_side.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_yellow.png b/mods/tinker/textures/blocks/glass/stainedglass_yellow.png
new file mode 100644
index 00000000..c1253ba3
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_yellow.png differ
diff --git a/mods/tinker/textures/blocks/glass/stainedglass_yellow_side.png b/mods/tinker/textures/blocks/glass/stainedglass_yellow_side.png
new file mode 100644
index 00000000..fa589846
Binary files /dev/null and b/mods/tinker/textures/blocks/glass/stainedglass_yellow_side.png differ
diff --git a/mods/tinker/textures/blocks/liquid_glass.png b/mods/tinker/textures/blocks/liquid_glass.png
new file mode 100644
index 00000000..50859c4f
Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_glass.png differ
diff --git a/mods/tinker/textures/blocks/liquid_glass.txt b/mods/tinker/textures/blocks/liquid_glass.txt
new file mode 100644
index 00000000..d8fe765a
--- /dev/null
+++ b/mods/tinker/textures/blocks/liquid_glass.txt
@@ -0,0 +1,32 @@
+0*2
+1*2
+2*2
+3*2
+4*2
+5*2
+6*2
+7*2
+8*2
+9*2
+10*2
+11*2
+12*2
+13*2
+14*2
+15*2
+16*2
+17*2
+18*2
+19*2
+20*2
+21*2
+22*2
+23*2
+24*2
+25*2
+26*2
+27*2
+28*2
+29*2
+30*2
+31*2
diff --git a/mods/tinker/textures/blocks/liquid_glass_flow.png b/mods/tinker/textures/blocks/liquid_glass_flow.png
new file mode 100644
index 00000000..db415098
Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_glass_flow.png differ
diff --git a/mods/tinker/textures/blocks/liquid_glass_flow.txt b/mods/tinker/textures/blocks/liquid_glass_flow.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/mods/tinker/textures/blocks/machines/aggregator_glowstone_bottom.png b/mods/tinker/textures/blocks/machines/aggregator_glowstone_bottom.png
new file mode 100644
index 00000000..4bb12be4
Binary files /dev/null and b/mods/tinker/textures/blocks/machines/aggregator_glowstone_bottom.png differ
diff --git a/mods/tinker/textures/blocks/machines/aggregator_glowstone_side.png b/mods/tinker/textures/blocks/machines/aggregator_glowstone_side.png
new file mode 100644
index 00000000..0e2a3104
Binary files /dev/null and b/mods/tinker/textures/blocks/machines/aggregator_glowstone_side.png differ
diff --git a/mods/tinker/textures/blocks/machines/aggregator_glowstone_top.png b/mods/tinker/textures/blocks/machines/aggregator_glowstone_top.png
new file mode 100644
index 00000000..fae5eb92
Binary files /dev/null and b/mods/tinker/textures/blocks/machines/aggregator_glowstone_top.png differ
diff --git a/mods/tinker/textures/blocks/machines/aggregator_glowstone_top_inactive.png b/mods/tinker/textures/blocks/machines/aggregator_glowstone_top_inactive.png
new file mode 100644
index 00000000..a6485890
Binary files /dev/null and b/mods/tinker/textures/blocks/machines/aggregator_glowstone_top_inactive.png differ
diff --git a/mods/tinker/textures/gui/aggregator.png b/mods/tinker/textures/gui/aggregator.png
new file mode 100644
index 00000000..7abfcf16
Binary files /dev/null and b/mods/tinker/textures/gui/aggregator.png differ