summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2013-12-21 21:13:44 +0200
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2013-12-21 21:13:44 +0200
commit6e9f023d2a5d272640149c85a36c7aa05845a984 (patch)
tree56c91d4cd927e780f72e47d5412270db8c47605c /common
parentcaff6f5dc8c11632b88c54995cbd44eeb8eb856f (diff)
Fixed a bug!
Diffstat (limited to 'common')
-rw-r--r--common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java2
-rw-r--r--common/darkknight/jewelrycraft/config/ConfigHandler.java2
-rw-r--r--common/darkknight/jewelrycraft/item/ItemThiefGloves.java2
-rw-r--r--common/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java1
-rw-r--r--common/darkknight/jewelrycraft/worldGen/Generation.java1
5 files changed, 3 insertions, 5 deletions
diff --git a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
index 4d40d5c..282e483 100644
--- a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
+++ b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
@@ -68,6 +68,7 @@ public class BlockJewelrsCraftingTable extends BlockContainer
if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize;
entityPlayer.inventory.onInventoryChanged();
}
+ if(te.timer == 0 && !te.hasEndItem && te.hasJewel && te.hasModifier) te.timer = ConfigHandler.jewelryCraftingTime;
if(te.hasEndItem && item != null) entityPlayer.addChatMessage(StatCollector.translateToLocal("chatmessage.jewelrycraft.table.hasenditem"));
if (te.hasModifier && entityPlayer.isSneaking())
@@ -145,7 +146,6 @@ public class BlockJewelrsCraftingTable extends BlockContainer
player.addChatMessage(StatCollector.translateToLocal("chatmessage.jewelrycraft.table.misingjewelry"));
else if (!te.hasModifier)
player.addChatMessage(StatCollector.translateToLocal("chatmessage.jewelrycraft.table.missingmodifier"));
- if(te.timer == 0 && !te.hasEndItem) te.timer = ConfigHandler.jewelryCraftingTime;
te.isDirty = true;
}
}
diff --git a/common/darkknight/jewelrycraft/config/ConfigHandler.java b/common/darkknight/jewelrycraft/config/ConfigHandler.java
index 6a62ac6..e4b87f5 100644
--- a/common/darkknight/jewelrycraft/config/ConfigHandler.java
+++ b/common/darkknight/jewelrycraft/config/ConfigHandler.java
@@ -18,7 +18,7 @@ public class ConfigHandler
public static int idJewelCraftingTable = 1753;
public static int ingotCoolingTime = 200;
- public static int ingotMeltingTime = 1500;
+ public static int ingotMeltingTime = 1500;
public static int jewelryCraftingTime = 2000;
private static boolean isInitialized = false;
diff --git a/common/darkknight/jewelrycraft/item/ItemThiefGloves.java b/common/darkknight/jewelrycraft/item/ItemThiefGloves.java
index 5edd297..705a81c 100644
--- a/common/darkknight/jewelrycraft/item/ItemThiefGloves.java
+++ b/common/darkknight/jewelrycraft/item/ItemThiefGloves.java
@@ -76,7 +76,7 @@ public class ItemThiefGloves extends ItemBase
@Override
@SuppressWarnings("unchecked")
- public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
+ public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List list, boolean par4)
{
if (!shouldAddAdditionalInfo())
list.add(EnumChatFormatting.GRAY + additionalInfoInstructions());
diff --git a/common/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java b/common/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java
index 2242804..10fd05d 100644
--- a/common/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java
+++ b/common/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java
@@ -81,7 +81,6 @@ public class TileEntityJewelrsCraftingTable extends TileEntity
if(this.getBlockMetadata() == 3) this.worldObj.spawnParticle("witchMagic", xCoord + 0.2F, (double) yCoord + 0.8F, zCoord + 0.5F, 0.0D, 0.0D, 0.0D);
}
}
- System.out.println(timer);
if (timer == 0)
{
this.hasEndItem = true;
diff --git a/common/darkknight/jewelrycraft/worldGen/Generation.java b/common/darkknight/jewelrycraft/worldGen/Generation.java
index 8e7c45b..64a33d4 100644
--- a/common/darkknight/jewelrycraft/worldGen/Generation.java
+++ b/common/darkknight/jewelrycraft/worldGen/Generation.java
@@ -37,7 +37,6 @@ public class Generation implements IWorldGenerator
int y = 5 + random.nextInt(4);
int z = j + random.nextInt(16);
world.setBlock(x, y, z, ConfigHandler.idShadowOre);
- System.out.println(x + " " + y + " " + z);
}
}