diff --git a/.classpath b/.classpath index 770a4f99..c3151cc0 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 e4a2f7df..61aba48d 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 1f03cfc6..43b36c2a 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 6d0e09eb..65bb8b24 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 b1fab307..87d37a73 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 8f8d8f0e..aa42b6bb 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -12,4 +12,4 @@ BUILD SUCCESSFUL -Total time: 32.468 secs +Total time: 23.466 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index eef10e3b..d8bebadd 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Sat Jul 04 01:18:36 EDT 2015 +#Sat Jul 04 12:17:04 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/item/craftingtools/ForgeHammer.class b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class index d37738ec..39b68e1b 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/ClayForms.class b/bin/com/kitsu/medievalcraft/item/forms/clay/ClayForms.class index 93ea9de4..d283d8fb 100644 Binary files a/bin/com/kitsu/medievalcraft/item/forms/clay/ClayForms.class and b/bin/com/kitsu/medievalcraft/item/forms/clay/ClayForms.class differ 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 0dec4eda..96df6e24 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java @@ -23,9 +23,9 @@ 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.MsgPacketLocX; 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; @@ -108,7 +108,7 @@ public class ForgeHammer extends Item implements IronFormNames{ } } } - if((tileEnt.getStackInSlot(0).getItem() instanceof ClayForms)&&(tile.hot==true)){ + if((tileEnt.getStackInSlot(0).getItem() instanceof ClayForms)&&(tile.hot==true)&&(block!=ModBlocks.ironPlate)){ p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); Main.sNet.sendToAll(new MsgPacket(true)); Main.sNet.sendToAll(new MsgPacketLocX(x)); 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 index f184d502..f6affc49 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/forms/clay/ClayForms.java +++ b/src/main/java/com/kitsu/medievalcraft/item/forms/clay/ClayForms.java @@ -18,5 +18,6 @@ public abstract class ClayForms extends Item { setHasSubtypes(false); item = this; GameRegistry.registerItem(this, name); + } }