diff --git a/.classpath b/.classpath index c3151cc0..770a4f99 100644 --- a/.classpath +++ b/.classpath @@ -4,63 +4,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock index feb5f161..e4a2f7df 100644 Binary files a/.gradle/2.0/taskArtifacts/cache.properties.lock and b/.gradle/2.0/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin index 687e3ef3..1f03cfc6 100644 Binary files a/.gradle/2.0/taskArtifacts/fileHashes.bin and b/.gradle/2.0/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin index 2b82bd13..6d0e09eb 100644 Binary files a/.gradle/2.0/taskArtifacts/fileSnapshots.bin and b/.gradle/2.0/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin index d445db6a..b1fab307 100644 Binary files a/.gradle/2.0/taskArtifacts/taskArtifacts.bin and b/.gradle/2.0/taskArtifacts/taskArtifacts.bin differ diff --git a/.gradle/gradle.log b/.gradle/gradle.log index 97208674..8f8d8f0e 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -12,4 +12,4 @@ BUILD SUCCESSFUL -Total time: 25.229 secs +Total time: 32.468 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 83151a95..eef10e3b 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Fri Jul 03 08:09:18 EDT 2015 +#Sat Jul 04 01:18:36 EDT 2015 org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class index 4940351d..161f04d8 100644 Binary files a/bin/com/kitsu/medievalcraft/Main.class and b/bin/com/kitsu/medievalcraft/Main.class differ diff --git a/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class b/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class index ef23560f..2c08b318 100644 Binary files a/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class and b/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class differ diff --git a/bin/com/kitsu/medievalcraft/item/ModItems.class b/bin/com/kitsu/medievalcraft/item/ModItems.class index bf7dca84..1db15d59 100644 Binary files a/bin/com/kitsu/medievalcraft/item/ModItems.class and b/bin/com/kitsu/medievalcraft/item/ModItems.class differ diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class index 278e454a..d37738ec 100644 Binary files a/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class and b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClayAxeForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayAxeForm.class new file mode 100644 index 00000000..c287413d Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayAxeForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClayBattleAxeForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayBattleAxeForm.class new file mode 100644 index 00000000..990fedc7 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayBattleAxeForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClayDaggerForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayDaggerForm.class new file mode 100644 index 00000000..bd3bafcd Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayDaggerForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClayHoeForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayHoeForm.class new file mode 100644 index 00000000..09672a81 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayHoeForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClayLongswordForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayLongswordForm.class new file mode 100644 index 00000000..0c43fef2 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayLongswordForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClayMaceHeadForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayMaceHeadForm.class new file mode 100644 index 00000000..55fd543e Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayMaceHeadForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClayPickaxeForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayPickaxeForm.class new file mode 100644 index 00000000..0f97844e Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayPickaxeForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClayRingForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayRingForm.class new file mode 100644 index 00000000..3e131fd5 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayRingForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySawBladeForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySawBladeForm.class new file mode 100644 index 00000000..d796a5b5 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySawBladeForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySharpTipForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySharpTipForm.class new file mode 100644 index 00000000..eceb4cdd Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySharpTipForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClayShortSwordForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayShortSwordForm.class new file mode 100644 index 00000000..e2bd9e7a Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClayShortSwordForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySpadeForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySpadeForm.class new file mode 100644 index 00000000..262163a9 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySpadeForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySpearTipForm.class b/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySpearTipForm.class new file mode 100644 index 00000000..850406a5 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/CClaySpearTipForm.class differ diff --git a/bin/com/kitsu/medievalcraft/item/forms/clay/ClayForms.class b/bin/com/kitsu/medievalcraft/item/forms/clay/ClayForms.class new file mode 100644 index 00000000..93ea9de4 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/item/forms/clay/ClayForms.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandle.class b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandle.class index f613a17e..9fe3a0e7 100644 Binary files a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandle.class and b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandle.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.class b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.class new file mode 100644 index 00000000..1fa69e05 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocY.class b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocY.class index 5bb32b60..88d630c9 100644 Binary files a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocY.class and b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocY.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocZ.class b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocZ.class index e6a5dd78..9c4a277c 100644 Binary files a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocZ.class and b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocZ.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandlelTicks.class b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandlelTicks.class deleted file mode 100644 index ea590c06..00000000 Binary files a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandlelTicks.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketlTicks.class b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketLocX.class similarity index 51% rename from bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketlTicks.class rename to bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketLocX.class index f8603381..fd20a7dd 100644 Binary files a/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketlTicks.class and b/bin/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketLocX.class differ diff --git a/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeAnvilRenderer.class b/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeAnvilRenderer.class index f567ce4a..1f3a9bd3 100644 Binary files a/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeAnvilRenderer.class and b/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeAnvilRenderer.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.class index 91f29366..3beed000 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.class and b/bin/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityAnvilForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityAnvilForge.class index 4f71c4f6..aa4be226 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityAnvilForge.class and b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityAnvilForge.class differ diff --git a/bin/com/kitsu/medievalcraft/util/IronFormNames$1.class b/bin/com/kitsu/medievalcraft/util/IronFormNames$1.class index 462c5ac7..3d424c90 100644 Binary files a/bin/com/kitsu/medievalcraft/util/IronFormNames$1.class and b/bin/com/kitsu/medievalcraft/util/IronFormNames$1.class differ diff --git a/bin/com/kitsu/medievalcraft/util/IronFormNames$2.class b/bin/com/kitsu/medievalcraft/util/IronFormNames$2.class new file mode 100644 index 00000000..dd805b29 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/util/IronFormNames$2.class differ diff --git a/bin/com/kitsu/medievalcraft/util/IronFormNames.class b/bin/com/kitsu/medievalcraft/util/IronFormNames.class index dd43b885..65fbfdc6 100644 Binary files a/bin/com/kitsu/medievalcraft/util/IronFormNames.class and b/bin/com/kitsu/medievalcraft/util/IronFormNames.class differ diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java index 71a1477f..ccd4b5a0 100644 --- a/src/main/java/com/kitsu/medievalcraft/Main.java +++ b/src/main/java/com/kitsu/medievalcraft/Main.java @@ -24,11 +24,11 @@ import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForge; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandle; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocY; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocZ; -import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandlelTicks; +import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocX; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacket; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocY; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocZ; -import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketlTicks; +import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocX; import com.kitsu.medievalcraft.packethandle.sandFilterRender.MsgHandleSandFilterRender; import com.kitsu.medievalcraft.packethandle.sandFilterRender.MsgPacketSandFilterRender; import com.kitsu.medievalcraft.packethandle.shelf.MsgHandleShelfCase; @@ -76,7 +76,7 @@ public class Main { sNet = NetworkRegistry.INSTANCE.newSimpleChannel(MODID); sNet.registerMessage(MsgHandle.class, MsgPacket.class, 1, Side.CLIENT); - sNet.registerMessage(MsgHandlelTicks.class, MsgPacketlTicks.class, 2, Side.CLIENT); + sNet.registerMessage(MsgHandleLocX.class, MsgPacketLocX.class, 2, Side.CLIENT); sNet.registerMessage(MsgHandleLocY.class, MsgPacketLocY.class, 3, Side.CLIENT); sNet.registerMessage(MsgHandleLocZ.class, MsgPacketLocZ.class, 4, Side.CLIENT); sNet.registerMessage(MsgHandleSandFilterRender.class, MsgPacketSandFilterRender.class, 5, Side.CLIENT); diff --git a/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java b/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java index 5ae35926..61b21232 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java @@ -4,6 +4,7 @@ import java.util.Random; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -11,8 +12,15 @@ import net.minecraft.world.World; import com.kitsu.medievalcraft.Main; import com.kitsu.medievalcraft.util.CustomTab; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public abstract class IngotBase extends BlockContainer { + private final Random random = new Random(); + public static boolean makeParts; + public static int locX, locY, locZ; + public IngotBase(String unlocalizedName, Material material) { super(material); this.setBlockName(unlocalizedName); @@ -43,8 +51,21 @@ public abstract class IngotBase extends BlockContainer { { return 1; } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) + { + super.randomDisplayTick(world, x, y, z, random); + if(makeParts == true){ + parts(world, locX, locY, locZ); + makeParts = false; + } + - private void makeParts(World world, int x, int y, int z){ + } + + private void parts(World world, int x, int y, int z){ world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); diff --git a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java index beebe659..7ff3e725 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java +++ b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java @@ -20,6 +20,19 @@ import com.kitsu.medievalcraft.item.craftingtools.WorkBlade; import com.kitsu.medievalcraft.item.craftingtools.filters.CoarseFilter; import com.kitsu.medievalcraft.item.craftingtools.filters.FineFilter; import com.kitsu.medievalcraft.item.craftingtools.filters.MediumFilter; +import com.kitsu.medievalcraft.item.forms.clay.CClayAxeForm; +import com.kitsu.medievalcraft.item.forms.clay.CClayBattleAxeForm; +import com.kitsu.medievalcraft.item.forms.clay.CClayDaggerForm; +import com.kitsu.medievalcraft.item.forms.clay.CClayHoeForm; +import com.kitsu.medievalcraft.item.forms.clay.CClayLongswordForm; +import com.kitsu.medievalcraft.item.forms.clay.CClayMaceHeadForm; +import com.kitsu.medievalcraft.item.forms.clay.CClayPickaxeForm; +import com.kitsu.medievalcraft.item.forms.clay.CClayRingForm; +import com.kitsu.medievalcraft.item.forms.clay.CClaySawBladeForm; +import com.kitsu.medievalcraft.item.forms.clay.CClaySharpTipForm; +import com.kitsu.medievalcraft.item.forms.clay.CClayShortSwordForm; +import com.kitsu.medievalcraft.item.forms.clay.CClaySpadeForm; +import com.kitsu.medievalcraft.item.forms.clay.CClaySpearTipForm; import com.kitsu.medievalcraft.item.forms.iron.IronAxeForm; import com.kitsu.medievalcraft.item.forms.iron.IronBattleAxeForm; import com.kitsu.medievalcraft.item.forms.iron.IronDaggerForm; @@ -497,53 +510,20 @@ public final class ModItems { //-----------------------COOKED CLAY FORMS-----------------------// - cookedpickaxeClayForm = new Item().setUnlocalizedName("cookedpickaxeClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedpickaxeClayForm"); - GameRegistry.registerItem(cookedpickaxeClayForm, "cookedpickaxeClayForm"); - - cookedspadeHeadClayForm = new Item().setUnlocalizedName("cookedspadeHeadClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedspadeHeadClayForm"); - GameRegistry.registerItem(cookedspadeHeadClayForm, "cookedspadeHeadClayForm"); - - cookedhoeHeadClayForm = new Item().setUnlocalizedName("cookedhoeHeadClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedhoeHeadClayForm"); - GameRegistry.registerItem(cookedhoeHeadClayForm, "cookedhoeHeadClayForm"); - - cookedaxeHeadClayForm = new Item().setUnlocalizedName("cookedaxeHeadClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedaxeHeadClayForm"); - GameRegistry.registerItem(cookedaxeHeadClayForm, "cookedaxeHeadClayForm"); - - cookedlongswordClayForm = new Item().setUnlocalizedName("cookedlongswordClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedlongswordClayForm"); - GameRegistry.registerItem(cookedlongswordClayForm, "cookedlongswordClayForm"); - - cookedshortswordClayForm = new Item().setUnlocalizedName("cookedshortswordClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedshortswordClayForm"); - GameRegistry.registerItem(cookedshortswordClayForm, "cookedshortswordClayForm"); - - cookeddaggerClayForm = new Item().setUnlocalizedName("cookeddaggerClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookeddaggerClayForm"); - GameRegistry.registerItem(cookeddaggerClayForm, "cookeddaggerClayForm"); - - //cookedhalberdClayForm = new Item().setUnlocalizedName("cookedhalberdClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedhalberdClayForm"); - //GameRegistry.registerItem(cookedhalberdClayForm, "cookedhalberdClayForm"); - - cookedspeartipClayForm = new Item().setUnlocalizedName("cookedspeartipClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedspeartipClayForm"); - GameRegistry.registerItem(cookedspeartipClayForm, "cookedspeartipClayForm"); - - cookedmaceheadClayForm = new Item().setUnlocalizedName("cookedmaceheadClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedmaceheadClayForm"); - GameRegistry.registerItem(cookedmaceheadClayForm, "cookedmaceheadClayForm"); - - cookedsharptipClayForm = new Item().setUnlocalizedName("cookedsharptipClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedsharptipClayForm"); - GameRegistry.registerItem(cookedsharptipClayForm, "cookedsharptipClayForm"); - - cookedbattleaxeClayForm = new Item().setUnlocalizedName("cookedbattleaxeClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedbattleaxeClayForm"); - GameRegistry.registerItem(cookedbattleaxeClayForm, "cookedbattleaxeClayForm"); - - cookedringClayForm = new Item().setUnlocalizedName("cookedringClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedringClayForm"); - GameRegistry.registerItem(cookedringClayForm, "cookedringClayForm"); - - //cookedplateClayForm = new Item().setUnlocalizedName("cookedplateClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedplateClayForm"); - //GameRegistry.registerItem(cookedplateClayForm, "cookedplateClayForm"); - - cookedsawbladeClayForm = new Item().setUnlocalizedName("cookedsawbladeClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedsawbladeClayForm"); - GameRegistry.registerItem(cookedsawbladeClayForm, "cookedsawbladeClayForm"); - - - + cookedpickaxeClayForm = new CClayPickaxeForm("cookedpickaxeClayForm", cookedpickaxeClayForm); + cookedspadeHeadClayForm = new CClaySpadeForm("cookedspadeHeadClayForm", cookedspadeHeadClayForm); + cookedhoeHeadClayForm = new CClayHoeForm("cookedhoeHeadClayForm", cookedhoeHeadClayForm); + cookedaxeHeadClayForm = new CClayAxeForm("cookedaxeHeadClayForm", cookedaxeHeadClayForm); + cookedlongswordClayForm = new CClayLongswordForm("cookedlongswordClayForm", cookedlongswordClayForm); + cookedshortswordClayForm = new CClayShortSwordForm("cookedshortswordClayForm", cookedshortswordClayForm); + cookeddaggerClayForm = new CClayDaggerForm("cookeddaggerClayForm", cookeddaggerClayForm); + cookedspeartipClayForm = new CClaySpearTipForm("cookedspeartipClayForm", cookedspeartipClayForm); + cookedmaceheadClayForm = new CClayMaceHeadForm("cookedmaceheadClayForm", cookedmaceheadClayForm); + cookedsharptipClayForm = new CClaySharpTipForm("cookedsharptipClayForm", cookedsharptipClayForm); + cookedbattleaxeClayForm = new CClayBattleAxeForm("cookedbattleaxeClayForm", cookedbattleaxeClayForm); + cookedringClayForm = new CClayRingForm("cookedringClayForm", cookedringClayForm); + cookedsawbladeClayForm = new CClaySawBladeForm("cookedsawbladeClayForm", cookedsawbladeClayForm); + //-----------------------IRON PARTS-----------------------// ironpickaxeHead = new Item().setUnlocalizedName("ironpickaxeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironpickaxeHead").setMaxStackSize(1); GameRegistry.registerItem(ironpickaxeHead, "ironpickaxeHead"); @@ -793,6 +773,4 @@ public final class ModItems { GameRegistry.registerItem(customHandleIronLumberAxe = new CustomHandleIronLumberAxe("customHandleIronLumberAxe", customIronToolRodNormal), "customHandleIronLumberAxe"); GameRegistry.registerItem(customHandleStrongIronLumberAxe = new CustomHandleStrongIronLumberAxe("customHandleStrongIronLumberAxe", customIronToolRodStrong), "customHandleStrongIronLumberAxe"); } - - } diff --git a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java index 62b35ed2..0dec4eda 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java @@ -20,7 +20,13 @@ import com.kitsu.medievalcraft.block.ModBlocks; import com.kitsu.medievalcraft.block.ingots.IngotBase; import com.kitsu.medievalcraft.crafting.ForgeAnvilCrafting; import com.kitsu.medievalcraft.crafting.TestForgeCrafting; +import com.kitsu.medievalcraft.item.forms.clay.ClayForms; import com.kitsu.medievalcraft.item.forms.iron.IronForms; +import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacket; +import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocY; +import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocZ; +import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocX; +import com.kitsu.medievalcraft.tileents.ingots.TileIngotBase; import com.kitsu.medievalcraft.tileents.ingots.TileIronPlate; import com.kitsu.medievalcraft.tileents.ingots.TileMyIronIngot; import com.kitsu.medievalcraft.tileents.machine.TileEntityAnvilForge; @@ -79,21 +85,53 @@ public class ForgeHammer extends Item implements IronFormNames{ tilePlate = (TileIronPlate) world.getTileEntity(x, y, z); } - if((block instanceof IngotBase)&&(blockSub == ModBlocks.forgeAnvil) && (p.isSwingInProgress == false)){ + if((block instanceof IngotBase)&&(blockSub == ModBlocks.forgeAnvil) && (p.isSwingInProgress == false)&&(block!=ModBlocks.ironPlate)){ TileEntityAnvilForge tileEnt = (TileEntityAnvilForge) world.getTileEntity(x, y-1, z); - if(tileEnt.getStackInSlot(0).getItem() instanceof IronForms){ - if(){ - + TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y, z); + if((tileEnt.getStackInSlot(0).getItem() instanceof IronForms)&&(tile.hot==true)){ + p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); + Main.sNet.sendToAll(new MsgPacket(true)); + Main.sNet.sendToAll(new MsgPacketLocX(x)); + Main.sNet.sendToAll(new MsgPacketLocY(y)); + Main.sNet.sendToAll(new MsgPacketLocZ(z)); + tile.hits++; + if(tile.hits >= 3 + rand.nextInt(3)){ + world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, forms.get(tileEnt.getStackInSlot(0).getItem()))); + stack.damageItem(1, p); + world.setBlock(x, y, z, Blocks.air, 0, 2); + if(tileEnt.getStackInSlot(0).getMaxStackSize() == 1){ + if(tileEnt.getStackInSlot(0).getItemDamage() == tileEnt.getStackInSlot(0).getMaxDamage()-1){ + tileEnt.decrStackSize(0, 1); + } + else {tileEnt.getStackInSlot(0).setItemDamage(tileEnt.getStackInSlot(0).getItemDamage()+1); + } + } + } + } + if((tileEnt.getStackInSlot(0).getItem() instanceof ClayForms)&&(tile.hot==true)){ + p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); + Main.sNet.sendToAll(new MsgPacket(true)); + Main.sNet.sendToAll(new MsgPacketLocX(x)); + Main.sNet.sendToAll(new MsgPacketLocY(y)); + Main.sNet.sendToAll(new MsgPacketLocZ(z)); + tile.hits++; + if(tile.hits >= 3 + rand.nextInt(3)){ + world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsClay.get(tileEnt.getStackInSlot(0).getItem()))); + stack.damageItem(1, p); + world.setBlock(x, y, z, Blocks.air, 0, 2); + tileEnt.decrStackSize(0, 1); + tile.markForUpdate(); + } } } - } - - - + + + + /*if((block == blockToRun(block)) && (blockSub == ModBlocks.forgeAnvil) && (p.isSwingInProgress == false)){ TileEntityAnvilForge tileEnt = (TileEntityAnvilForge) world.getTileEntity(x, y-1, z); - + if((tileEnt.getStackInSlot(0) == null) && (blockKey == 0)){ if (rand.nextInt(2) == 0 ) { tileRefIngot.hits++; @@ -171,7 +209,7 @@ public class ForgeHammer extends Item implements IronFormNames{ Main.sNet.sendToAll(new MsgPacketlTicks(x)); Main.sNet.sendToAll(new MsgPacketLocY(y)); Main.sNet.sendToAll(new MsgPacketLocZ(z)); - + if (rand.nextInt(2) == 0 ) { tilePlate.hits++; } @@ -251,7 +289,7 @@ public class ForgeHammer extends Item implements IronFormNames{ } } } - */ + */ } /* diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayAxeForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayAxeForm.java new file mode 100644 index 00000000..40a00cf5 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayAxeForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClayAxeForm extends ClayForms{ + + public CClayAxeForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayBattleAxeForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayBattleAxeForm.java new file mode 100644 index 00000000..3a3d9bf7 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayBattleAxeForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClayBattleAxeForm extends ClayForms{ + + public CClayBattleAxeForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayDaggerForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayDaggerForm.java new file mode 100644 index 00000000..845338e8 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayDaggerForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClayDaggerForm extends ClayForms{ + + public CClayDaggerForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayHoeForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayHoeForm.java new file mode 100644 index 00000000..edb48b28 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayHoeForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClayHoeForm extends ClayForms{ + + public CClayHoeForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayLongswordForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayLongswordForm.java new file mode 100644 index 00000000..01373875 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayLongswordForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClayLongswordForm extends ClayForms{ + + public CClayLongswordForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayMaceHeadForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayMaceHeadForm.java new file mode 100644 index 00000000..d423cf6f --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayMaceHeadForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClayMaceHeadForm extends ClayForms{ + + public CClayMaceHeadForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayPickaxeForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayPickaxeForm.java new file mode 100644 index 00000000..71037b02 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayPickaxeForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClayPickaxeForm extends ClayForms{ + + public CClayPickaxeForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayRingForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayRingForm.java new file mode 100644 index 00000000..e2555b59 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayRingForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClayRingForm extends ClayForms{ + + public CClayRingForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySawBladeForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySawBladeForm.java new file mode 100644 index 00000000..7da5004b --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySawBladeForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClaySawBladeForm extends ClayForms{ + + public CClaySawBladeForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySharpTipForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySharpTipForm.java new file mode 100644 index 00000000..06731252 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySharpTipForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClaySharpTipForm extends ClayForms{ + + public CClaySharpTipForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayShortSwordForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayShortSwordForm.java new file mode 100644 index 00000000..04791dfd --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayShortSwordForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClayShortSwordForm extends ClayForms{ + + public CClayShortSwordForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySpadeForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySpadeForm.java new file mode 100644 index 00000000..a2ec3d70 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySpadeForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClaySpadeForm extends ClayForms{ + + public CClaySpadeForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySpearTipForm.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySpearTipForm.java new file mode 100644 index 00000000..6867276d --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySpearTipForm.java @@ -0,0 +1,12 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; + +public class CClaySpearTipForm extends ClayForms{ + + public CClaySpearTipForm(String name, Item item) { + super(name, item); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/ClayForms.java b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/ClayForms.java new file mode 100644 index 00000000..f184d502 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/ClayForms.java @@ -0,0 +1,22 @@ +package com.kitsu.medievalcraft.item.forms.clay; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import com.kitsu.medievalcraft.Main; +import com.kitsu.medievalcraft.util.CustomTab; + +import cpw.mods.fml.common.registry.GameRegistry; + +public abstract class ClayForms extends Item { + + protected ClayForms(String name, Item item){ + setMaxStackSize(1); + setUnlocalizedName(name); + setCreativeTab(CustomTab.MedievalCraftTab); + setTextureName(Main.MODID + ":" + name); + setHasSubtypes(false); + item = this; + GameRegistry.registerItem(this, name); + } +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandle.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandle.java index b32530fe..ccd53b1a 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandle.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandle.java @@ -1,5 +1,7 @@ package com.kitsu.medievalcraft.packethandle.forgeHammerParticles; +import com.kitsu.medievalcraft.block.ingots.IngotBase; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -8,7 +10,7 @@ public class MsgHandle implements IMessageHandler{ @Override public IMessage onMessage(MsgPacket message, MessageContext ctx) { - //HotIronBlock.makeParts = message.useme; + IngotBase.makeParts = message.useme; //HotIronPlate.makeParts = message.useme; //System.out.println(message.useme); //ctx.getClientHandler().addToSendQueue(new MsgPacket(message.useme)); diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandlelTicks.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.java similarity index 66% rename from src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandlelTicks.java rename to src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.java index fadafe53..e44cdac0 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandlelTicks.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocX.java @@ -1,15 +1,17 @@ package com.kitsu.medievalcraft.packethandle.forgeHammerParticles; +import com.kitsu.medievalcraft.block.ingots.IngotBase; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public class MsgHandlelTicks implements IMessageHandler{ +public class MsgHandleLocX implements IMessageHandler{ @Override - public IMessage onMessage(MsgPacketlTicks message, MessageContext ctx) { + public IMessage onMessage(MsgPacketLocX message, MessageContext ctx) { - //HotIronBlock.locX = message.locx; + IngotBase.locX = message.locx; //HotIronPlate.locX = message.locx; //ItemRendererLongbow.tick = message.lTick; diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocY.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocY.java index 2d1dfb15..492e25ab 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocY.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocY.java @@ -1,5 +1,7 @@ package com.kitsu.medievalcraft.packethandle.forgeHammerParticles; +import com.kitsu.medievalcraft.block.ingots.IngotBase; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -9,7 +11,7 @@ public class MsgHandleLocY implements IMessageHandler{ @Override public IMessage onMessage(MsgPacketLocY message, MessageContext ctx) { - //HotIronBlock.locY = message.locy; + IngotBase.locY = message.locy; //HotIronPlate.locY = message.locy; //ItemRendererLongbow.tick = message.lTick; diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocZ.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocZ.java index 08a15a8e..25481191 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocZ.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgHandleLocZ.java @@ -1,5 +1,7 @@ package com.kitsu.medievalcraft.packethandle.forgeHammerParticles; +import com.kitsu.medievalcraft.block.ingots.IngotBase; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -9,7 +11,7 @@ public class MsgHandleLocZ implements IMessageHandler{ @Override public IMessage onMessage(MsgPacketLocZ message, MessageContext ctx) { - //HotIronBlock.locZ = message.locz; + IngotBase.locZ = message.locz; //HotIronPlate.locZ = message.locz; //ItemRendererLongbow.tick = message.lTick; diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketlTicks.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketLocX.java similarity index 76% rename from src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketlTicks.java rename to src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketLocX.java index 5e6b21fe..a618312c 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketlTicks.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forgeHammerParticles/MsgPacketLocX.java @@ -3,13 +3,13 @@ package com.kitsu.medievalcraft.packethandle.forgeHammerParticles; import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; -public class MsgPacketlTicks implements IMessage { +public class MsgPacketLocX implements IMessage { public int locx; - public MsgPacketlTicks() {} + public MsgPacketLocX() {} - public MsgPacketlTicks(int x){ + public MsgPacketLocX(int x){ this.locx = x; } diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeAnvilRenderer.java b/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeAnvilRenderer.java index f3796d92..18b31eae 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeAnvilRenderer.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeAnvilRenderer.java @@ -42,6 +42,7 @@ public class ForgeAnvilRenderer extends TileEntitySpecialRenderer { RenderManager.instance.renderEntityWithPosYaw(this.entItem, 0.48D, 0.25D, -1.0D, 0.0F, 0.0F); RenderItem.renderInFrame = false; GL11.glPopMatrix(); + tileEntity.markForUpdate(); } renderBlock(tileEntity, tile.getWorldObj(), tile.xCoord,tile.yCoord, tile.zCoord, ModBlocks.forgeAnvil); GL11.glPopMatrix(); diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.java b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.java index 67321e98..c890a1a6 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.java @@ -9,7 +9,7 @@ public class TileMyIronIngot extends TileIngotBase{ this.hits = 0; this.hot = false; - this.heatTicks = 450; + this.heatTicks = 300; } } diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityAnvilForge.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityAnvilForge.java index 380c95e2..a0fb6a2b 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityAnvilForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityAnvilForge.java @@ -43,6 +43,7 @@ public class TileEntityAnvilForge extends TileEntity implements IInventory { this.inv[p_70304_1_] = null; return itemstack; } + this.markForUpdate(); return null; } @@ -55,6 +56,7 @@ public class TileEntityAnvilForge extends TileEntity implements IInventory { { stack.stackSize = this.getInventoryStackLimit(); } + this.markForUpdate(); this.markDirty(); } @@ -70,7 +72,7 @@ public class TileEntityAnvilForge extends TileEntity implements IInventory { @Override public int getInventoryStackLimit() { - return 64; + return 1; } @Override @@ -147,9 +149,10 @@ public class TileEntityAnvilForge extends TileEntity implements IInventory { { this.inv[p_70298_1_] = null; } - + this.markForUpdate(); return itemstack; } + this.markForUpdate(); return null; } diff --git a/src/main/java/com/kitsu/medievalcraft/util/IronFormNames.java b/src/main/java/com/kitsu/medievalcraft/util/IronFormNames.java index c7e23857..4b5e8330 100644 --- a/src/main/java/com/kitsu/medievalcraft/util/IronFormNames.java +++ b/src/main/java/com/kitsu/medievalcraft/util/IronFormNames.java @@ -14,19 +14,38 @@ public interface IronFormNames { put(ModItems.ironAxeForm, new ItemStack(ModItems.ironaxeHead, 1)); put(ModItems.ironBattleAxeForm, new ItemStack(ModItems.ironbattleaxeHead, 1)); - put(ModItems.ironDaggerForm, new ItemStack(ModItems.irondaggerBlade, 1)); - put(ModItems.ironHandleForm, new ItemStack(ModItems.ironweaponHandle, 1)); + put(ModItems.ironDaggerForm, new ItemStack(ModItems.irondaggerBlade, 3)); + put(ModItems.ironHandleForm, new ItemStack(ModItems.ironweaponHandle, 2)); put(ModItems.ironHoeForm, new ItemStack(ModItems.ironhoeHead, 1)); put(ModItems.ironLongswordForm, new ItemStack(ModItems.ironlongswordBlade, 1)); put(ModItems.ironMaceHeadForm, new ItemStack(ModItems.ironmaceHead, 1)); put(ModItems.ironPickaxeForm, new ItemStack(ModItems.ironpickaxeHead, 1)); - put(ModItems.ironRingForm, new ItemStack(ModItems.ironRing, 1)); + put(ModItems.ironRingForm, new ItemStack(ModItems.ironRing, 9)); put(ModItems.ironSawBladeForm, new ItemStack(ModItems.ironsawBlade, 1)); - put(ModItems.ironSharpTipForm, new ItemStack(ModItems.ironsharpTip, 1)); - put(ModItems.ironShortSwordForm, new ItemStack(ModItems.ironshortswordBlade, 1)); + put(ModItems.ironSharpTipForm, new ItemStack(ModItems.ironsharpTip, 9)); + put(ModItems.ironShortSwordForm, new ItemStack(ModItems.ironshortswordBlade, 2)); put(ModItems.ironSpadForm, new ItemStack(ModItems.ironspadeHead, 1)); put(ModItems.ironSpearTipForm, new ItemStack(ModItems.ironspearTip, 1)); }}; + static final Hashtable formsClay = new Hashtable (){{ + + put(ModItems.cookedaxeHeadClayForm, new ItemStack(ModItems.ironaxeHead, 1)); + put(ModItems.cookedbattleaxeClayForm, new ItemStack(ModItems.ironbattleaxeHead, 1)); + put(ModItems.cookeddaggerClayForm, new ItemStack(ModItems.irondaggerBlade, 3)); + //put(ModItems., new ItemStack(ModItems.ironweaponHandle, 1)); + put(ModItems.cookedhoeHeadClayForm, new ItemStack(ModItems.ironhoeHead, 1)); + put(ModItems.cookedlongswordClayForm, new ItemStack(ModItems.ironlongswordBlade, 1)); + put(ModItems.cookedmaceheadClayForm, new ItemStack(ModItems.ironmaceHead, 1)); + put(ModItems.cookedpickaxeClayForm, new ItemStack(ModItems.ironpickaxeHead, 1)); + put(ModItems.cookedringClayForm, new ItemStack(ModItems.ironRing, 9)); + put(ModItems.cookedsawbladeClayForm, new ItemStack(ModItems.ironsawBlade, 1)); + put(ModItems.cookedsharptipClayForm, new ItemStack(ModItems.ironsharpTip, 9)); + put(ModItems.cookedshortswordClayForm, new ItemStack(ModItems.ironshortswordBlade, 2)); + put(ModItems.cookedspadeHeadClayForm, new ItemStack(ModItems.ironspadeHead, 1)); + put(ModItems.cookedspeartipClayForm, new ItemStack(ModItems.ironspearTip, 1)); + + }}; + }