Merge pull request #31 from gmcferrin/master

Repair & Fishing Fixes

src/main/java/com/gmail/nossr50/skills/Fishing.java

@@ -4,15 +4,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.entity.CraftItem;
 import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Chicken;
+import org.bukkit.entity.*
-import org.bukkit.entity.Cow;
-import org.bukkit.entity.Creeper;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Pig;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Sheep;
-import org.bukkit.entity.Skeleton;
-import org.bukkit.entity.Spider;
 import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Wool;
@@ -48,105 +40,6 @@ public class Fishing {
 		}
 	}
 
-	public static short getItemMaxDurability(Material mat)
-	{
-		switch(mat)
-		{
-		case LEATHER_BOOTS:
-			return (short) 40;
-		case LEATHER_LEGGINGS:
-			return (short) 46;
-		case LEATHER_HELMET:
-			return (short) 34;
-		case LEATHER_CHESTPLATE:
-			return (short) 49;
-		case CHAINMAIL_BOOTS:
-			return (short) 79;
-		case CHAINMAIL_LEGGINGS:
-			return (short) 92;
-		case CHAINMAIL_HELMET:
-			return (short) 67;
-		case CHAINMAIL_CHESTPLATE:
-			return (short) 96;
-		case GOLD_BOOTS:
-			return (short) 80;
-		case GOLD_LEGGINGS:
-			return (short) 92;
-		case GOLD_HELMET:
-			return (short) 68;
-		case GOLD_CHESTPLATE:
-			return (short) 96;
-		case IRON_BOOTS:
-			return (short) 160;
-		case IRON_LEGGINGS:
-			return (short) 184;
-		case IRON_HELMET:
-			return (short) 136;
-		case IRON_CHESTPLATE:
-			return (short) 192;
-		case DIAMOND_BOOTS:
-			return (short) 320;
-		case DIAMOND_LEGGINGS:
-			return (short) 368;
-		case DIAMOND_HELMET:
-			return (short) 272;
-		case DIAMOND_CHESTPLATE:
-			return (short) 384;
-		case GOLD_AXE:
-			return (short) 33;
-		case GOLD_SWORD:
-			return (short) 33;
-		case GOLD_HOE:
-			return (short) 33;
-		case GOLD_SPADE:
-			return (short) 33;
-		case GOLD_PICKAXE:
-			return (short) 33;
-		case WOOD_AXE:
-			return (short) 60;
-		case WOOD_SWORD:
-			return (short) 60;
-		case WOOD_HOE:
-			return (short) 60;
-		case WOOD_SPADE:
-			return (short) 60;
-		case WOOD_PICKAXE:
-			return (short) 60;
-		case STONE_AXE:
-			return (short) 132;
-		case STONE_SWORD:
-			return (short) 132;
-		case STONE_HOE:
-			return (short) 132;
-		case STONE_SPADE:
-			return (short) 132;
-		case STONE_PICKAXE:
-			return (short) 132;
-		case IRON_AXE:
-			return (short) 251;
-		case IRON_SWORD:
-			return (short) 251;
-		case IRON_HOE:
-			return (short) 251;
-		case IRON_SPADE:
-			return (short) 251;
-		case IRON_PICKAXE:
-			return (short) 251;
-		case DIAMOND_AXE:
-			return (short) 1562;
-		case DIAMOND_SWORD:
-			return (short) 1562;
-		case DIAMOND_HOE:
-			return (short) 1562;
-		case DIAMOND_SPADE:
-			return (short) 1562;
-		case DIAMOND_PICKAXE:
-			return (short) 1562;
-		default:
-			return (short) 0;
-		}
-	}
-	
 	public static void getFishingResults(Player player, PlayerFishEvent event)
 	{
 		switch(getFishingLootTier(Users.getProfile(player)))
@@ -174,7 +67,7 @@ public class Fishing {
 
 	private static void getFishingResultsTier1(Player player, PlayerFishEvent event)
 	{
-		int randomNum = (int)(Math.random() * 14);
+		int randomNum = (int)(Math.random() * 15);
 		CraftItem theCatch = (CraftItem)event.getCaught();
 
 		if(Math.random() * 100 < 20)
@@ -229,13 +122,13 @@ public class Fishing {
 			theCatch.setItemStack(new ItemStack(Material.RAW_FISH));
 		}
 		//Change durability to random value
-		theCatch.getItemStack().setDurability((short) (Math.random() * Fishing.getItemMaxDurability(theCatch.getItemStack().getType()))); //Change the damage value
+		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value
 
 	}
 
 	private static void getFishingResultsTier2(Player player, PlayerFishEvent event)
 	{
-		int randomNum = (int)(Math.random() * 19);
+		int randomNum = (int)(Math.random() * 20);
 		CraftItem theCatch = (CraftItem)event.getCaught();
 
 		if(Math.random() * 100 < 25)
@@ -306,12 +199,12 @@ public class Fishing {
 		}
 
 		//Change durability to random value
-		theCatch.getItemStack().setDurability((short) (Math.random() * Fishing.getItemMaxDurability(theCatch.getItemStack().getType())));
+		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value
 	}
 
 	private static void getFishingResultsTier3(Player player, PlayerFishEvent event)
 	{
-		int randomNum = (int)(Math.random() * 23);
+		int randomNum = (int)(Math.random() * 24);
 		CraftItem theCatch = (CraftItem)event.getCaught();
 
 		if(Math.random() * 100 < 30)
@@ -394,12 +287,12 @@ public class Fishing {
 			theCatch.setItemStack(new ItemStack(Material.RAW_FISH, 1));
 		}
 		//Change durability to random value
-		theCatch.getItemStack().setDurability((short) (Math.random() * Fishing.getItemMaxDurability(theCatch.getItemStack().getType())));
+		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value
 	}
 
 	private static void getFishingResultsTier4(Player player, PlayerFishEvent event)
 	{
-		int randomNum = (int)(Math.random() * 40);
+		int randomNum = (int)(Math.random() * 41);
 		CraftItem theCatch = (CraftItem)event.getCaught();
 
 		if(Math.random() * 100 < 35)
@@ -521,7 +414,7 @@ public class Fishing {
 				theCatch.setItemStack(new ItemStack(Material.RECORD_11, 1));
 				break;
 			case 39:
-				theCatch.setItemStack(new ItemStack(Material.REDSTONE_WIRE, 64));
+				theCatch.setItemStack(new ItemStack(Material.GLOWSTONE_DUST, 16));
 				break;
 			case 40:
 				theCatch.setItemStack(new ItemStack(Material.DIAMOND, (int)(Math.random() * 10)));
@@ -532,12 +425,12 @@ public class Fishing {
 			theCatch.setItemStack(new ItemStack(Material.RAW_FISH, 1));
 		}
 		//Change durability to random value
-		theCatch.getItemStack().setDurability((short) (Math.random() * Fishing.getItemMaxDurability(theCatch.getItemStack().getType())));
+		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value
 	}
 
 	private static void getFishingResultsTier5(Player player, PlayerFishEvent event)
 	{
-		int randomNum = (int)(Math.random() * 49);
+		int randomNum = (int)(Math.random() * 50);
 		CraftItem theCatch = (CraftItem)event.getCaught();
 
 		if(Math.random() * 100 < 40)
@@ -659,7 +552,7 @@ public class Fishing {
 				theCatch.setItemStack(new ItemStack(Material.RECORD_11, 1));
 				break;
 			case 39:
-				theCatch.setItemStack(new ItemStack(Material.REDSTONE_WIRE, 64));
+				theCatch.setItemStack(new ItemStack(Material.GLOWSTONE_DUST, 16));
 				break;
 			case 40:
 				theCatch.setItemStack(new ItemStack(Material.DIAMOND, (int)(Math.random() * 20)));
@@ -696,7 +589,7 @@ public class Fishing {
 			theCatch.setItemStack(new ItemStack(Material.RAW_FISH, 1));
 		}
 		//Change durability to random value
-		theCatch.getItemStack().setDurability((short) (Math.random() * Fishing.getItemMaxDurability(theCatch.getItemStack().getType())));
+		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value
 	}
 	public static void processResults(PlayerFishEvent event)
 	{
@@ -724,11 +617,31 @@ public class Fishing {
 					{
 						if(x.canEnchantItem(fishingResults))
 						{
+							//Prevent impossible enchantment combinations
+							if((fishingResults.containsEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL) || fishingResults.containsEnchantment(Enchantment.PROTECTION_EXPLOSIONS) || 
+									fishingResults.containsEnchantment(Enchantment.PROTECTION_FIRE) || fishingResults.containsEnchantment(Enchantment.PROTECTION_PROJECTILE)) && 
+									(x.equals(Enchantment.PROTECTION_EXPLOSIONS) || x.equals(Enchantment.PROTECTION_PROJECTILE) || x.equals(Enchantment.PROTECTION_FIRE) || x.equals(Enchantment.PROTECTION_ENVIRONMENTAL))){
+								return;
+							}
+							
+							//More impossible enchantment combinations
+							else if((fishingResults.containsEnchantment(Enchantment.DAMAGE_ALL) || fishingResults.containsEnchantment(Enchantment.DAMAGE_ARTHROPODS) || fishingResults.containsEnchantment(Enchantment.DAMAGE_UNDEAD)) && 
+									(x.equals(Enchantment.DAMAGE_ALL) || x.equals(Enchantment.DAMAGE_ARTHROPODS) || x.equals(Enchantment.DAMAGE_UNDEAD))){
+								return;
+							}
+							
+							//Even more impossible enchantment combinations
+							else if((fishingResults.containsEnchantment(Enchantment.SILK_TOUCH) || fishingResults.containsEnchantment(Enchantment.LOOT_BONUS_BLOCKS)) &&
+									(x.equals(Enchantment.SILK_TOUCH) || x.equals(Enchantment.LOOT_BONUS_BLOCKS))){
+								return;
+							}
+							
+							else{		
 								//Actual chance to have an enchantment is related to your fishing skill
 								if(Math.random() * 15 < Fishing.getFishingLootTier(PP))
 								{
 									enchanted = true;
-								int randomEnchantLevel = (int) Math.random() * x.getMaxLevel();
+									int randomEnchantLevel = (int)(Math.random() * x.getMaxLevel());
 									
 									if(randomEnchantLevel == 0)
 										randomEnchantLevel = 1;
@@ -741,6 +654,8 @@ public class Fishing {
 						}
 					}
 				}
+			}
+			
 			//Inform the player of magical properties
 			if(enchanted)
 			{
@@ -751,11 +666,15 @@ public class Fishing {
 	public static void shakeMob(PlayerFishEvent event)
 	{
 		LivingEntity le = (LivingEntity)event.getCaught();
+		
+		//Do nothing to players
 		if(le instanceof Player)
 			return;
+		
 		le.damage(1);
 		World world = le.getWorld();
 
+		/* Neutral Mobs */
 		if(le instanceof Sheep)
 		{
 			Sheep sheep = (Sheep)le;
@@ -768,33 +687,148 @@ public class Fishing {
 				world.dropItemNaturally(le.getLocation(), theWool);
 				sheep.setSheared(true);
 			}
-		} else if(le instanceof Pig)
+		} 
+		
+		else if(le instanceof Pig)
 		{
 			world.dropItemNaturally(le.getLocation(), new ItemStack(Material.PORK, 1));
-		} else if(le instanceof Skeleton)
+		} 
+		
+		else if(le instanceof Cow)
+		{
+			if(Math.random() * 100 < 99){
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.MILK_BUCKET, 1)); //rare chance to drop milk
+			}
+			else if(Math.random() * 10 < 5){
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.LEATHER, 1));
+			}
+			else{
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.RAW_BEEF, 1));)
+			}
+		}
+		
+		else if(le instanceof Chicken)
+		{
+			if(Math.random() * 10 <= 7){
+				if(Math.random() * 10 < 5){
+					world.dropItemNaturally(le.getLocation(), new ItemStack(Material.FEATHER, 1));
+				}
+				else{
+					world.dropItemNaturally(le.getLocation(), new ItemStack(Material.RAW_CHICKEN, 1));
+				}
+			}
+			else{
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.EGG, 1));
+			}
+		}
+		
+		else if(le instanceof MushroomCow)
+		{
+			if(Math.random() * 100 < 99){
+				if(Math.random() * 10 < 5){
+					world.dropItemNaturally(le.getLocation(), new ItemStack(Material.MILK_BUCKET, 1)); //rare chance to drop milk
+				}
+				else{
+					world.dropItemNaturally(le.getLocation(), new ItemStack(Material.MUSHROOM_SOUP, 1)); //rare chance to drop soup
+				}
+			}
+			else if(Math.random() * 10 <= 7){
+				if(Math.random() * 10 < 5){
+					world.dropItemNaturally(le.getLocation(), new ItemStack(Material.LEATHER, 1));
+				}
+				else{
+					world.dropItemNaturally(le.getLocation(), new ItemStack(Material.RAW_BEEF, 1));)
+				}
+			}
+			else{
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.RED_MUSHROOM, 3));
+				//need some way to remove MushroomCow & replace with regular cow when sheared
+			}
+		}
+		
+		else if(le instanceof Squid)
+		{
+			world.dropItemNaturally(le.getLocation(), new ItemStack(Material.getMaterial(351), 1, (byte)0, (byte)0)));
+		}
+		
+		else if(le instanceof Snowman){
+			if(Math.random() * 100 < 99){
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.PUMPKIN, 1)); //rare chance to drop pumpkin
+			}
+			else{
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.SNOW_BALL, 5));
+			}
+		}
+		
+		/* Hostile Mobs */
+		else if(le instanceof Skeleton)
 		{
 			if(Math.random() * 10 < 5)
 				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.BONE, 1));
 			else
 				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.ARROW, 3));
-		} else if(le instanceof Cow)
+		} 
-		{
+		
-			world.dropItemNaturally(le.getLocation(), new ItemStack(Material.LEATHER, 1));
+		else if(le instanceof Spider)
-		} else if(le instanceof Spider)
 		{
 			if(Math.random() * 10 < 5)
 				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.SPIDER_EYE, 1));
 			else
 				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.STRING, 1));
-		} else if(le instanceof Chicken)
+		} 
-		{
+		
-			if(Math.random() * 10 < 5)
+		else if(le instanceof Creeper)
-				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.FEATHER, 1));
-			else
-				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.EGG, 1));
-		} else if(le instanceof Creeper)
 		{
 			world.dropItemNaturally(le.getLocation(), new ItemStack(Material.SULPHUR, 1));
 		}
+		
+		else if(le instanceof Enderman)
+		{
+			world.dropItemNaturally(le.getLocation(), new ItemStack(Material.ENDER_PEARL, 1));
+		}
+		
+		else if(le instanceof PigZombie)
+		{
+			if(Math.random() * 10 < 5)
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.ROTTEN_FLESH, 1));
+			else
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.GOLD_NUGGET, 1));
+		}
+		
+		else if(le instanceof Blaze)
+		{
+			world.dropItemNaturally(le.getLocation(), new ItemStack(Material.BLAZE_ROD, 1));
+		}
+		
+		else if(le instanceof CaveSpider)
+		{
+			if(Math.random() * 10 < 5)
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.SPIDER_EYE, 1));
+			else
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.STRING, 1));
+		}
+		
+		else if(le instanceof Ghast)
+		{
+			if(Math.random() * 10 < 5)
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.SULPHUR, 1));
+			else
+				world.dropItemNaturally(le.getLocation(), new ItemStack(Material.GHAST_TEAR, 1));
+		}
+		
+		else if(le instanceof MagmaCube)
+		{
+			world.dropItemNaturally(le.getLocation(), new ItemStack(Material.MAGMA_CREAM, 1));
+		}
+		
+		else if(le instanceof Slime)
+		{
+			world.dropItemNaturally(le.getLocation(), new ItemStack(Material.SLIME_BALL, 1));
+		}
+		
+		else if(le instanceof Zombie)
+		{
+			world.dropItemNaturally(le.getLocation(), new ItemStack(Material.ROTTEN_FLESH, 1));
+		}
 	}
 }

src/main/java/com/gmail/nossr50/skills/Mining.java

@@ -394,7 +394,7 @@ public class Mining
     		block.setType(Material.AIR);
     	}
     	//REDSTONE
-    	if((block.getTypeId() == 73 || block.getTypeId() == 74) && m.getTier(player) >= 4)
+    	if((block.getTypeId() == 73 || block.getTypeId() == 74) && m.getTier(player) >= 3)
     	{
     		if(!plugin.misc.blockWatchList.contains(block)&& block.getData() != (byte) 5)
     		{

src/main/java/com/gmail/nossr50/skills/Repair.java

@@ -16,6 +16,7 @@
  */
 package com.gmail.nossr50.skills;
 
+import org.bukkit.Material;
 import org.bukkit.ChatColor;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
@@ -66,16 +67,15 @@ public class Repair {
 			pos++;
 		}
 
-    	if(block != null && mcPermissions.getInstance().repair(player))
+		if(block != null && mcPermissions.getInstance().repair(player)){
-    	{
 			if(player.getItemInHand().getDurability() > 0 && player.getItemInHand().getAmount() < 2){
+
 				/*
-        		 * ARMOR
+				 * REPAIR ARMOR
 				 */
 				if(isArmor(is)){
-        			/*
+
-        			 * DIAMOND ARMOR
+					//DIAMOND ARMOR
-        			 */
 					if(isDiamondArmor(is) && hasItem(player, rDiamond) && PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.repairdiamondlevel){
 						removeItem(player, rDiamond);
 						repairItem(player, enchants, enchantsLevel);
@@ -89,10 +89,9 @@ public class Repair {
 						if(LoadProperties.spoutEnabled)
 							SpoutStuff.playRepairNoise(player);
 					}
+
+					//IRON ARMOR
 					else if (isIronArmor(is) && hasItem(player, rIron)){
-        			/*
-        			 * IRON ARMOR
-        			 */
 						removeItem(player, rIron);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -104,27 +103,35 @@ public class Repair {
 						//CLANG CLANG
 						if(LoadProperties.spoutEnabled)
 							SpoutStuff.playRepairNoise(player);
+					}
+
 					//GOLD ARMOR
-        			} else if (isGoldArmor(is) && hasItem(player, rGold)){
+					else if (isGoldArmor(is) && hasItem(player, rGold)){
 						removeItem(player, rGold);
 						repairItem(player, enchants, enchantsLevel);
 
 						durabilityAfter = player.getItemInHand().getDurability();
 						dif = (short) (durabilityBefore - durabilityAfter);
-	            		dif = (short) (dif * 4); //Boost XP of Gold to around Iron
+						dif = (short) (dif * 4); //Boost XP
 						PP.addXP(SkillType.REPAIR, dif*10, player);
 
 						//CLANG CLANG
 						if(LoadProperties.spoutEnabled)
 							SpoutStuff.playRepairNoise(player);
-        			} else {
+					} 
+
+					//UNABLE TO REPAIR
+					else {
 						needMoreVespeneGas(is, player);
 					}
 				}
+
 				/*
-        		 * TOOLS
+				 * REPAIR TOOLS
 				 */
 				if(isTools(is)){
+
+					//STONE TOOLS
 					if(isStoneTools(is) && hasItem(player, rStone)){
 						removeItem(player, rStone);
 						repairItem(player, enchants, enchantsLevel);
@@ -141,7 +148,10 @@ public class Repair {
 						dif = (short) (dif / 2);
 
 						PP.addXP(SkillType.REPAIR, dif*10, player);
-        			} else if(isWoodTools(is) && hasItem(player,rWood)){
+					} 
+
+					//WOOD TOOLS
+					else if(isWoodTools(is) && hasItem(player,rWood)){
 						removeItem(player,rWood);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -157,7 +167,10 @@ public class Repair {
 						dif = (short) (dif / 2);
 
 						PP.addXP(SkillType.REPAIR, dif*10, player);
-        			} else if(isIronTools(is) && hasItem(player, rIron)){
+					}
+
+					//IRON TOOLS
+					else if(isIronTools(is) && hasItem(player, rIron)){
 						removeItem(player, rIron);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -169,12 +182,17 @@ public class Repair {
 							dif = (short) (dif / 2);
 						if(m.isHoe(is))
 							dif = (short) (dif / 2);
+
 						PP.addXP(SkillType.REPAIR, dif*10, player);
 
 						//CLANG CLANG
 						if(LoadProperties.spoutEnabled)
 							SpoutStuff.playRepairNoise(player);
-            		} else if (isDiamondTools(is) && hasItem(player, rDiamond) && PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.repairdiamondlevel){
+
+					}
+
+					//DIAMOND TOOLS
+					else if (isDiamondTools(is) && hasItem(player, rDiamond) && PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.repairdiamondlevel){
 						removeItem(player, rDiamond);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -191,7 +209,11 @@ public class Repair {
 						//CLANG CLANG
 						if(LoadProperties.spoutEnabled)
 							SpoutStuff.playRepairNoise(player);
-            		} else if(isGoldTools(is) && hasItem(player, rGold)){
+
+					}
+					
+					//GOLD TOOLS
+					else if(isGoldTools(is) && hasItem(player, rGold)){
 						removeItem(player, rGold);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -209,42 +231,45 @@ public class Repair {
 						//CLANG CLANG
 						if(LoadProperties.spoutEnabled)
 							SpoutStuff.playRepairNoise(player);
-            		} else {
+					} 
+
+					//UNABLE TO REPAIR
+					else {
 						needMoreVespeneGas(is, player);
 					}
 				}
+			}
 
-        	} else {
+			else {
 				player.sendMessage(mcLocale.getString("Skills.FullDurability"));
 			}
-        	//player.updateInventory();
+
 			/*
 			 * GIVE SKILL IF THERE IS ENOUGH XP
 			 */
 			Skills.XpCheckSkill(SkillType.REPAIR, player);
 		}
 	}
-	public static int getArcaneForgingRank(PlayerProfile PP)
+	
-	{
+	public static int getArcaneForgingRank(PlayerProfile PP){
 		int rank = 0;
 
 		if(PP.getSkillLevel(SkillType.REPAIR) >= 750)
-		{
 			rank = 4;
-		} else if (PP.getSkillLevel(SkillType.REPAIR) >= 500)
+		
-		{
+		else if (PP.getSkillLevel(SkillType.REPAIR) >= 500)
 			rank = 3;
-		} else if(PP.getSkillLevel(SkillType.REPAIR) >= 250)
+		
-		{
+		else if(PP.getSkillLevel(SkillType.REPAIR) >= 250)
 			rank = 2;
-		} else if (PP.getSkillLevel(SkillType.REPAIR) >= 100)
+		
-		{
+		else if (PP.getSkillLevel(SkillType.REPAIR) >= 100)
 			rank = 1;
-		}
+		
 		return rank;
 	}
-	public static void addEnchants(ItemStack is, Enchantment[] enchants, int[] enchantsLvl, PlayerProfile PP, Player player)
+	
-	{
+	public static void addEnchants(ItemStack is, Enchantment[] enchants, int[] enchantsLvl, PlayerProfile PP, Player player){
 		if(is.getEnchantments().keySet().size() == 0)
 			return;
 
@@ -303,8 +328,7 @@ public class Repair {
 				player.sendMessage(mcLocale.getString("Repair.Downgraded"));
 		}
 	}
-	public static int getEnchantChance(int rank)
+	public static int getEnchantChance(int rank){
-	{
 		switch(rank)
 		{
 		case 4:
@@ -336,9 +360,9 @@ public class Repair {
 		}
 	}
 	public static boolean isArmor(ItemStack is){
-    	return is.getTypeId() == 306 || is.getTypeId() == 307 ||is.getTypeId() == 308 ||is.getTypeId() == 309 ||
+		return is.getTypeId() == 306 || is.getTypeId() == 307 ||is.getTypeId() == 308 ||is.getTypeId() == 309 || //IRON
-    			is.getTypeId() == 310 ||is.getTypeId() == 311 ||is.getTypeId() == 312 ||is.getTypeId() == 313 ||
+				is.getTypeId() == 310 ||is.getTypeId() == 311 ||is.getTypeId() == 312 ||is.getTypeId() == 313 || //DIAMOND
-    			is.getTypeId() == 314 || is.getTypeId() == 315 || is.getTypeId() == 316 || is.getTypeId() == 317;
+				is.getTypeId() == 314 || is.getTypeId() == 315 || is.getTypeId() == 316 || is.getTypeId() == 317; //GOLD
 	}
 	public static boolean isGoldArmor(ItemStack is){
 		return is.getTypeId() == 314 || is.getTypeId() == 315 || is.getTypeId() == 316 || is.getTypeId() == 317;
@@ -353,7 +377,7 @@ public class Repair {
 	{
 		return is.getTypeId() == 359 || is.getTypeId() == 256 || is.getTypeId() == 257 || is.getTypeId() == 258 || is.getTypeId() == 267 || is.getTypeId() == 292 || //IRON
 				is.getTypeId() == 276 || is.getTypeId() == 277 || is.getTypeId() == 278 || is.getTypeId() == 279 || is.getTypeId() == 293 || //DIAMOND
-    			is.getTypeId() == 283 || is.getTypeId() == 285 || is.getTypeId() == 286 || is.getTypeId() == 284 || //GOLD
+				is.getTypeId() == 283 || is.getTypeId() == 285 || is.getTypeId() == 286 || is.getTypeId() == 284 || is.getTypeId() == 294 || //GOLD
 				is.getTypeId() == 268 || is.getTypeId() == 269 || is.getTypeId() == 270 || is.getTypeId() == 271 || is.getTypeId() == 290 ||//WOOD
 				is.getTypeId() == 272 || is.getTypeId() == 273 || is.getTypeId() == 274 || is.getTypeId() == 275|| is.getTypeId() == 291;  //STONE
 	}
@@ -369,14 +393,8 @@ public class Repair {
 	public static boolean isIronTools(ItemStack is){
 		return is.getTypeId() == 359 || is.getTypeId() == 256 || is.getTypeId() == 257 || is.getTypeId() == 258 || is.getTypeId() == 267 || is.getTypeId() == 292;
 	}
-    
 	public static boolean isDiamondTools(ItemStack is){
-    	if(is.getTypeId() == 276 || is.getTypeId() == 277 || is.getTypeId() == 278 || is.getTypeId() == 279 || is.getTypeId() == 293)
+		return is.getTypeId() == 276 || is.getTypeId() == 277 || is.getTypeId() == 278 || is.getTypeId() == 279 || is.getTypeId() == 293;
-    	{
-    		return true;
-    	} else {
-    		return false;
-    	}
 	}
 	public static void removeItem(Player player, int typeid)
 	{
@@ -412,9 +430,7 @@ public class Repair {
 		if(checkPlayerProcRepair(player)){
 			ramt = (short) (ramt * 2);
 		}
-        //player.sendMessage(ChatColor.DARK_RED + "test " +ChatColor.BLUE+ );
 		durability-=ramt;
-       // player.sendMessage(ChatColor.DARK_RED + "durability " +ChatColor.BLUE+ durability);
 		if(durability < 0){
 			durability = 0;
 		}
@@ -428,152 +444,191 @@ public class Repair {
 		/*
 		 * TOOLS
 		 */
+		
 		//SHEARS
 		case 359:
-    		ramt = 119;
+			ramt = Material.SHEARS.getMaxDurability() / 2;
 			break;
+			
+		/* WOOD TOOLS */
+			
 		//WOOD SWORD
 		case 268:
-    		ramt = 30;
+			ramt = Material.WOOD_SWORD.getMaxDurability() / 2;
 			break;
 		//WOOD SHOVEL
 		case 269:
-    		ramt = 60;
+			ramt = Material.WOOD_SPADE.getMaxDurability();
 			break;
 		//WOOD PICKAXE
 		case 270:
-    		ramt = 20;
+			ramt = Material.WOOD_PICKAXE.getMaxDurability() / 3;
 			break;
 		//WOOD AXE
 		case 271:
-    		ramt = 20;
+			ramt = Material.WOOD_AXE.getMaxDurability() / 3;
 			break;
 		//WOOD HOE
 		case 290:
-			ramt = 30;
+			ramt = Material.WOOD_HOE.getMaxDurability() / 2;
 			break;
+			
+		/* STONE TOOLS */
+			
 		//STONE SWORD
 		case 272:
-    		ramt = 66;
+			ramt = Material.STONE_SWORD.getMaxDurability() / 2;
 			break;
 		//STONE SHOVEL
 		case 273:
-    		ramt = 132;
+			ramt = Material.STONE_SPADE.getMaxDurability();
 			break;
 		//STONE PICKAXE
 		case 274:
-    		ramt = 44;
+			ramt = Material.STONE_PICKAXE.getMaxDurability() / 3;
 			break;
 		//STONE AXE
 		case 275:
-    		ramt = 44;
+			ramt = Material.STONE_AXE.getMaxDurability() / 3;
 			break;
 		//STONE HOE
 		case 291:
-			ramt = 66;
+			ramt = Material.STONE_HOE.getMaxDurability() / 2;
 			break;
-    	//GOLD SHOVEL
+			
-    	case 284:
+		/* IRON TOOLS */
-    		ramt = 33;
+			
+		//IRON SWORD
+		case 267:
+			ramt = Material.IRON_SWORD.getMaxDurability() / 2;
 			break;
 		//IRON SHOVEL
 		case 256:
-    		ramt = 251;
+			ramt = Material.IRON_SPADE.getMaxDurability();
-    		break;
-    	//DIAMOND SHOVEL
-    	case 277:
-    		ramt = 1562;
 			break;
 		//IRON PICK
 		case 257:
-    		ramt = 84;
+			ramt = Material.IRON_PICKAXE.getMaxDurability() / 3;
 			break;
 		//IRON AXE
 		case 258:
-    		ramt = 84;
+			ramt = Material.IRON_AXE.getMaxDurability() / 3;
-    		break;
-    	//IRON SWORD
-    	case 267:
-    		ramt = 126;
 			break;
 		//IRON HOE
 		case 292:
-    		ramt = 126;
+			ramt = Material.IRON_HOE.getMaxDurability() / 2;
 			break;
+		
+		/* DIAMOND TOOLS */
+			
 		//DIAMOND SWORD
 		case 276:
-    		ramt = 781;
+			ramt = Material.DIAMOND_SWORD.getMaxDurability() / 2;
+			break;
+		//DIAMOND SHOVEL
+		case 277:
+			ramt = Material.DIAMOND_SPADE.getMaxDurability();
 			break;
 		//DIAMOND PICK
 		case 278:
-    		ramt = 521;
+			ramt = Material.DIAMOND_PICKAXE.getMaxDurability() / 3;
 			break;
 		//DIAMOND AXE
 		case 279:
-    		ramt = 521;
+			ramt = Material.DIAMOND_AXE.getMaxDurability() / 3;
 			break;
 		//DIAMOND HOE
 		case 293:
-    		ramt = 781;
+			ramt = Material.DIAMOND_HOE.getMaxDurability() / 2;
 			break;
+			
+		/* GOLD TOOLS */
+			
 		//GOLD SWORD
 		case 283:
-    		ramt = 17;
+			ramt = Material.GOLD_SWORD.getMaxDurability() / 2;
+			break;
+		//GOLD SHOVEL
+		case 284:
+			ramt = Material.GOLD_SPADE.getMaxDurability();
 			break;
 		//GOLD PICK
 		case 285:
-    		ramt = 11;
+			ramt = Material.GOLD_PICKAXE.getMaxDurability() / 3;
 			break;
 		//GOLD AXE
 		case 286:
-    		ramt = 11;
+			ramt = Material.GOLD_AXE.getMaxDurability() / 3;
 			break;
 		//GOLD HOE
 		case 294:
-    		ramt = 17;
+			ramt = Material.GOLD_HOE.getMaxDurability() / 2;
 			break;
 		/*
 		 * ARMOR
 		 */
+			
+		/* IRON ARMOR */
+
+		//IRON HELMET
 		case 306:
-			ramt = 27;
+			ramt = Material.IRON_HELMET.getMaxDurability() / 5;
-			break;
-		case 310:
-			ramt = 55;
 			break;
+		//IRON CHESTPLATE
 		case 307:
-			ramt = 24;
+			ramt = Material.IRON_CHESTPLATE.getMaxDurability() / 8;
-    		break;
-		case 311:
-			ramt = 48;
 			break;
+		//IRON LEGGINGS
 		case 308:
-			ramt = 27;
+			ramt = Material.IRON_LEGGINGS.getMaxDurability() / 7;
-    		break;
-		case 312:
-			ramt = 53;
 			break;
+		//IRON BOOTS
 		case 309:
-			ramt = 40;
+			ramt = Material.IRON_BOOTS.getMaxDurability() / 4;
 			break;
+			
+		/* DIAMOND ARMOR */
+
+		//DIAMOND HELMET
+		case 310:
+			ramt = Material.DIAMOND_HELMET.getMaxDurability() / 5;
+			break;
+		//DIAMOND CHESTPLATE
+		case 311:
+			ramt = Material.DIAMOND_CHESTPLATE.getMaxDurability() / 8;
+			break;
+		//DIAMOND LEGGINGS
+		case 312:
+			ramt = Material.DIAMOND_LEGGINGS.getMaxDurability() / 7;
+			break;
+		//DIAMOND BOOTS
 		case 313:
-			ramt = 80;
+			ramt = Material.DIAMOND_BOOTS.getMaxDurability() / 4;
 			break;
+			
+		/* GOLD ARMOR */
+
+		//GOLD HELMET
 		case 314:
-    		ramt = 13;
+			ramt = Material.GOLD_HELMET.getMaxDurability() / 5;
 			break;
+		//GOLD CHESTPLATE
 		case 315:
-    		ramt = 12;
+			ramt = Material.GOLD_CHESTPLATE.getMaxDurability() / 8;
 			break;
+		//GOLD LEGGINGS
 		case 316:
-    		ramt = 14;
+			ramt = Material.GOLD_LEGGINGS.getMaxDurability() / 7;
 			break;
+		//GOLD BOOTS
 		case 317:
-    		ramt = 20;
+			ramt = Material.GOLD_BOOTS.getMaxDurability() / 4;
 			break;			
 		}
+		
 		return repairCalculate(player, durability, ramt);
 	}
+	
 	public static void needMoreVespeneGas(ItemStack is, Player player)
 	{
 		PlayerProfile PP = Users.getProfile(player);