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 2a9e5a25..a976c386 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 ed95cf89..69b96b89 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 0e7f60bd..c820cd63 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 1041809a..ed6df8f8 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 d455d3c1..06b35f0b 100644
--- a/.gradle/gradle.log
+++ b/.gradle/gradle.log
@@ -12,4 +12,4 @@
BUILD SUCCESSFUL
-Total time: 20.183 secs
+Total time: 18.262 secs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index de427fdc..e9fd7947 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
#
-#Wed Jul 08 13:16:19 EDT 2015
+#Thu Jul 09 02:11: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/block/machines/Firebox.class b/bin/com/kitsu/medievalcraft/block/machines/Firebox.class
index d1cc82e3..c27aa7fe 100644
Binary files a/bin/com/kitsu/medievalcraft/block/machines/Firebox.class and b/bin/com/kitsu/medievalcraft/block/machines/Firebox.class differ
diff --git a/bin/com/kitsu/medievalcraft/block/machines/Forge.class b/bin/com/kitsu/medievalcraft/block/machines/Forge.class
index 3e4fafb3..36871b7f 100644
Binary files a/bin/com/kitsu/medievalcraft/block/machines/Forge.class and b/bin/com/kitsu/medievalcraft/block/machines/Forge.class differ
diff --git a/bin/com/kitsu/medievalcraft/item/ModItems.class b/bin/com/kitsu/medievalcraft/item/ModItems.class
index 1db15d59..3cbed531 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/tools/CustomIronPick.class b/bin/com/kitsu/medievalcraft/item/tools/CustomIronPick.class
index 9249e2ad..5e301063 100644
Binary files a/bin/com/kitsu/medievalcraft/item/tools/CustomIronPick.class and b/bin/com/kitsu/medievalcraft/item/tools/CustomIronPick.class differ
diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class
index 8c6cdc74..2898798b 100644
Binary files a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class and b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class differ
diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class
index 3079569f..22b83ba0 100644
Binary files a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class and b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class differ
diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java
index 59802efc..05010756 100644
--- a/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java
+++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java
@@ -59,23 +59,6 @@ public class Firebox extends BlockContainer{
1.0F, 1.00F, 1.0F);
}
- @Override
- public void updateTick(World world, int x, int y, int z, Random rand) {
- if(!world.isRemote){
- if(world.getBlockMetadata(x, y, z)==1){
- //this.setLightLevel(9999);
- this.setLightLevel(1F);
- //this.setLightOpacity(0);
- //System.out.println(this.getLightValue()+" "+this.getLightOpacity());
- }
- if(world.getBlockMetadata(x, y, z)==0){
- //this.setLightLevel(9999);
- this.setLightLevel(0F);
- //this.setLightOpacity(0);
- //System.out.println(this.getLightValue()+" "+this.getLightOpacity());
- }
- }
- }
@Override
public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face){
@@ -122,9 +105,8 @@ public class Firebox extends BlockContainer{
(player.inventory.getCurrentItem().getItem()==Items.flint_and_steel)||
(player.inventory.getCurrentItem().getItem()==ModItems.fireBow)
){
- world.setBlockMetadataWithNotify(x, y, z, 1, 2);
- //world.notifyBlockChange(x, y, z, this);
- world.scheduleBlockUpdate(x, y, z, this, 10);
+ world.setBlockMetadataWithNotify(x, y, z, 1, 3);
+ this.setLightLevel(1f);
player.inventory.getCurrentItem().damageItem(1, player);
if(world.getBlock(x, y, z).equals(Blocks.air)){
world.setBlock(x, y+1, z, Blocks.fire, 0, 2);
diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java
index 1d6df06e..586ed260 100644
--- a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java
+++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java
@@ -162,7 +162,8 @@ public class Forge extends BlockContainer implements TileForgePlaceables{
(player.inventory.getCurrentItem().getItem()==Items.flint_and_steel)||
(player.inventory.getCurrentItem().getItem()==ModItems.fireBow)){
if(world.getBlockMetadata(x, y, z)<=3){
- world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)+4, 2);
+ world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)+4, 3);
+ this.setLightLevel(1f);
}
tileEnt.markForUpdate();
if(tileEnt.getStackInSlot(1)!=null){
diff --git a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java
index 7ff3e725..c4dd49e0 100644
--- a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java
+++ b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java
@@ -756,11 +756,16 @@ public final class ModItems {
GameRegistry.registerItem(battleAxe = new ItemBattleAxe("battleAxe", heavymacemat), "battleAxe");
GameRegistry.registerItem(customIronPick = new CustomIronPick("customIronPick", customWoodNormal), "customIronPick");
- GameRegistry.registerItem(customStrongIronPick = new CustomStrongIronPick("customStrongIronPick", customWoodStrong), "customStrongIronPick");
+ GameRegistry.registerItem(customStrongIronPick = new CustomIronPick("customStrongIronPick", customWoodStrong), "customStrongIronPick");
+ GameRegistry.registerItem(customWeakIronPick = new CustomIronPick("customWeakIronPick", customWoodWeak), "customWeakIronPick");
+ GameRegistry.registerItem(customHandleIronPick = new CustomIronPick("customHandleIronPick", customIronToolRodNormal), "customHandleIronPick");
+ GameRegistry.registerItem(customHandleStrongIronPick = new CustomIronPick("customHandleStrongIronPick", customIronToolRodStrong), "customHandleStrongIronPick");
+
+/* GameRegistry.registerItem(customStrongIronPick = new CustomStrongIronPick("customStrongIronPick", customWoodStrong), "customStrongIronPick");
GameRegistry.registerItem(customWeakIronPick = new CustomWeakIronPick("customWeakIronPick", customWoodWeak), "customWeakIronPick");
GameRegistry.registerItem(customHandleIronPick = new CustomHandleIronPick("customHandleIronPick", customIronToolRodNormal), "customHandleIronPick");
GameRegistry.registerItem(customHandleStrongIronPick = new CustomHandleStrongIronPick("customHandleStrongIronPick", customIronToolRodStrong), "customHandleStrongIronPick");
-
+ */
GameRegistry.registerItem(customIronShovel = new CustomIronShovel("customIronShovel", customWoodNormal), "customIronShovel");
GameRegistry.registerItem(customStrongIronShovel = new CustomStrongIronShovel("customStrongIronShovel", customWoodStrong), "customStrongIronShovel");
GameRegistry.registerItem(customWeakIronShovel = new CustomWeakIronShovel("customWeakIronShovel", customWoodWeak), "customWeakIronShovel");
diff --git a/src/main/java/com/kitsu/medievalcraft/item/tools/CustomIronPick.java b/src/main/java/com/kitsu/medievalcraft/item/tools/CustomIronPick.java
index 7d133a07..b6213986 100644
--- a/src/main/java/com/kitsu/medievalcraft/item/tools/CustomIronPick.java
+++ b/src/main/java/com/kitsu/medievalcraft/item/tools/CustomIronPick.java
@@ -1,5 +1,8 @@
package com.kitsu.medievalcraft.item.tools;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemPickaxe;
@@ -14,18 +17,26 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class CustomIronPick extends ItemPickaxe{
- private String name = "customIronPick";
- private Item item;
+ //private String name = "customIronPick";
+ //private Item item;
public CustomIronPick(String name, ToolMaterial mat) {
super(mat);
- item = this;
+ //item = this;
setUnlocalizedName(name);
setCreativeTab(CustomTab.MedievalCraftTab);
setTextureName(Main.MODID + ":" + name);
- this.toolMaterial = ModItems.customWoodNormal;
- GameRegistry.registerItem(this, name);
+ //this.toolMaterial = ModItems.customWoodNormal;
+ //GameRegistry.registerItem(this, name);
}
+
+ @Override
+ public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
+ {
+ list.add("");
+ }
+
+
@Override
public int getItemEnchantability () {
return 0;
diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java
index 9e3ef071..a7cd2c31 100644
--- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java
+++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java
@@ -220,22 +220,13 @@ public class TileEntityFirebox extends TileEntity implements IInventory{
}
private void fireboxMaint(World world, int x, int y, int z){
- if(world.getBlockMetadata(x, y, z)==0&&world.getBlock(x, y+1, z).equals(Blocks.fire)){
- //world.setBlock(x, y+1, z, Blocks.air, 0, 2);
-
- world.scheduleBlockUpdate(x, y, z, world.getBlock(x,y,z), 10);
- }
- if((this.getStackInSlot(0)==null)){
- world.setBlockMetadataWithNotify(x, y, z, 0, 2);
- world.scheduleBlockUpdate(x, y, z, world.getBlock(x, y, z), 10);
+ if((this.getStackInSlot(0)==null)&&(world.getBlockMetadata(x, y, z)==1)){
+ world.setBlockMetadataWithNotify(x, y, z, 0, 3);
+ world.getBlock(x, y, z).setLightLevel(0f);
}
if(world.getBlockMetadata(x, y, z)==1 && world.getBlock(x, y+1, z).equals(Blocks.air)){
world.setBlock(x, y+1, z, Blocks.fire, 0, 2);
}
- if(world.getBlockMetadata(x, y, z)==1){
- //this.worldObj.markBlockForUpdate(x, y, z);
- world.scheduleBlockUpdate(x, y, z, world.getBlock(x,y,z), 10);
- }
}
private void fireboxFuelDec(World world, int x, int y, int z, ItemStack stack, int time){
if(world.getBlock(x, y+1, z).equals(Blocks.fire)){
diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java
index d4646424..7b66a334 100644
--- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java
+++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java
@@ -335,12 +335,14 @@ public class TileForge extends TileEntity implements IInventory{
private void forgeMaint(World world, int x, int y, int z){
if(this.getStackInSlot(0)==null){
if(world.getBlockMetadata(x, y, z)>=4&&world.getBlockMetadata(x, y, z)<=7){
- world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-4, 2);
+ world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-4, 3);
+ world.getBlock(x, y, z).setLightLevel(0f);
}
}
if(this.getStackInSlot(0)==null){
if(world.getBlockMetadata(x, y, z)>7){
- world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-8, 2);
+ world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-8, 3);
+ world.getBlock(x, y, z).setLightLevel(0f);
}
}
if(this.getStackInSlot(1)==null){