Merge branch 'master' of github.com:mcMMO-Dev/mcMMO

Changelog.txt

@@ -3,6 +3,7 @@ Changelog:
 
 Version 1.3.00-dev
  - Added ability to customize drops for Excavation skill
+ - Added ability to customize drops for Fishing skill
  - Added player notification for when they stop Bleeding
  - Added configuration option to control mcMMO reporting damage events
  - Added hunger regain bonuses to Herbalism skill

src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java

@@ -45,8 +45,6 @@ public class RepairCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.ArcaneForgingRank", new Object[] { Repair.getArcaneForgingRank(PP) }));
 		player.sendMessage(mcLocale.getString("m.ArcaneEnchantKeepChance", new Object[] { Repair.getEnchantChance(Repair.getArcaneForgingRank(PP)) }));
 		player.sendMessage(mcLocale.getString("m.ArcaneEnchantDowngradeChance", new Object[] { Repair.getDowngradeChance(Repair.getArcaneForgingRank(PP)) }));
-		player.sendMessage(mcLocale.getString("m.ArcaneForgingMilestones"));
-		player.sendMessage(mcLocale.getString("m.ArcaneForgingMilestones2"));
 
 		return true;
 	}

src/main/java/com/gmail/nossr50/config/LoadProperties.java

@@ -48,11 +48,9 @@ public class LoadProperties {
 			enableCobbleToMossy, useMySQL, toolsLoseDurabilityFromAbilities,
 			pvpxp, miningrequirespickaxe, excavationRequiresShovel,
 			woodcuttingrequiresaxe, anvilmessages, mayDowngradeEnchants,
-			mayLoseEnchants, fishingDrops, leatherArmor, ironArmor, goldArmor,
+			mayLoseEnchants, fishingDrops, aDisplayNames, pDisplayNames, enableSmoothToMossy,
-			diamondArmor, woodenTools, stoneTools, ironTools, goldTools,
+			enableDirtToGrass, statsTracking, eventCallback, herbalismHungerBonus,
-			diamondTools, enderPearl, blazeRod, records, glowstoneDust,
+			repairArmor, repairTools;
-			fishingDiamonds, aDisplayNames, pDisplayNames, enableSmoothToMossy,
-			enableDirtToGrass, statsTracking, eventCallback, herbalismHungerBonus;
 
 	public static String MySQLtablePrefix, MySQLuserName,
 			MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone, 
@@ -70,14 +68,13 @@ public class LoadProperties {
 			repairdiamondlevel, rWood, rStone, rIron, rGold, rDiamond, rString,
 			rLeather, downgradeRank1, downgradeRank2, downgradeRank3,
 			downgradeRank4, keepEnchantsRank1, keepEnchantsRank2,
-			keepEnchantsRank3, keepEnchantsRank4, fishingDropChanceTier1,
+			keepEnchantsRank3, keepEnchantsRank4, mnetherwart,
-			fishingDropChanceTier2, fishingDropChanceTier3,
-			fishingDropChanceTier4, fishingDropChanceTier5, mnetherwart,
 			mvines, mlilypad, mendstone, mmossstone,
 			levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation,
 			levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair,
 			levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting,
-			anvilID, saveInterval, fishingTier1, fishingTier2, fishingTier3, fishingTier4, fishingTier5;
+			anvilID, saveInterval, fishingTier1, fishingTier2, fishingTier3, fishingTier4, fishingTier5,
+			repairStoneLevel, repairIronLevel, repairGoldLevel, arcaneRank1, arcaneRank2, arcaneRank3, arcaneRank4;
 
 	public static double xpbackground_r, xpbackground_g, xpbackground_b,
 			xpborder_r, xpborder_g, xpborder_b, fishing_r, fishing_g,
@@ -89,7 +86,7 @@ public class LoadProperties {
 			unarmed_r, unarmed_g, unarmed_b, woodcutting_r, woodcutting_g,
 			woodcutting_b, pvpxprewardmodifier, tamingxpmodifier,
 			miningxpmodifier, repairxpmodifier, woodcuttingxpmodifier,
-			sorceryxpmodifier, unarmedxpmodifier, herbalismxpmodifier,
+			fishingxpmodifier, unarmedxpmodifier, herbalismxpmodifier,
 			excavationxpmodifier, archeryxpmodifier, swordsxpmodifier,
 			axesxpmodifier, acrobaticsxpmodifier;
 
@@ -323,9 +320,13 @@ public class LoadProperties {
 		miningrequirespickaxe = readBoolean("Skills.Mining.Requires_Pickaxe", true);
 		excavationRequiresShovel = readBoolean("Skills.Excavation.Requires_Shovel", true);
 		woodcuttingrequiresaxe = readBoolean("Skills.Woodcutting.Requires_Axe", true);
+		repairArmor = readBoolean("Skills.Repair.Can_Repair_Armor", true);
+		repairTools = readBoolean("Skills.Repair.Can_Repair_Tools", true);
 		repairdiamondlevel = readInteger("Skills.Repair.Diamond.Level_Required", 50);
+		repairIronLevel = readInteger("Skills.Repair.Iron.Level_Required", 0);
+		repairGoldLevel = readInteger("Skills.Repair.Gold.Level_Required", 0);
+		repairStoneLevel = readInteger("Skills.Repair.Stone.Level_Required", 0);
 
-		sorceryxpmodifier = readDouble("Experience.Formula.Multiplier.Sorcery", 1.0);
 		tamingxpmodifier = readDouble("Experience.Formula.Multiplier.Taming", 1.0);
 		miningxpmodifier = readDouble("Experience.Formula.Multiplier.Mining", 1.0);
 		repairxpmodifier = readDouble("Experience.Formula.Multiplier.Repair", 1.0);
@@ -337,6 +338,7 @@ public class LoadProperties {
 		swordsxpmodifier = readDouble("Experience.Formula.Multiplier.Swords", 1.0);
 		axesxpmodifier = readDouble("Experience.Formula.Multiplier.Axes", 1.0);
 		acrobaticsxpmodifier = readDouble("Experience.Formula.Multiplier.Acrobatics", 1.0);
+		fishingxpmodifier = readDouble("Experience.Forumla.Multiplier.Fishing", 1.0);
 
 		anvilmessages = readBoolean("Skills.Repair.Anvil_Messages", true);
 		anvilID = readInteger("Skills.Repair.Anvil_ID", 42);
@@ -374,37 +376,22 @@ public class LoadProperties {
 		downgradeRank2 = readInteger("Arcane_Forging.Downgrades.Chance.Rank_2", 50);
 		downgradeRank3 = readInteger("Arcane_Forging.Downgrades.Chance.Rank_3", 25);
 		downgradeRank4 = readInteger("Arcane_Forging.Downgrades.Chance.Rank_4", 15);
-		mayLoseEnchants = readBoolean("Arcane_Forging.May_Lose_Enchants.Enabled", true);
+		mayLoseEnchants = readBoolean("Arcane_Forging.May_Lose_Enchants", true);
 		keepEnchantsRank1 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10);
 		keepEnchantsRank2 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20);
 		keepEnchantsRank3 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30);
 		keepEnchantsRank4 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40);
+		arcaneRank1 = readInteger("Arcane_Forging.Rank_Levels.Rank_1", 100);
+		arcaneRank2 = readInteger("Arcane_Forging.Rank_Levels.Rank_2", 250);
+		arcaneRank3 = readInteger("Arcane_Forging.Rank_Levels.Rank_3", 500);
+		arcaneRank4 = readInteger("Arcane_Forging.Rank_Levels.Rank_4", 750);
 
-		fishingDrops = readBoolean("Fishing.Drops.Item_Drops_Enabled", true);
+		fishingDrops = readBoolean("Fishing.Drops_Enabled", true);
-		fishingTier1 = readInteger("Fishing.Drop_Level.Tier1", 0);
+		fishingTier1 = readInteger("Fishing.Tier_Levels.Tier1", 0);
-		fishingTier2 = readInteger("Fishing.Drop_Level.Tier2", 200);
+		fishingTier2 = readInteger("Fishing.Tier_Levels.Tier2", 200);
-		fishingTier3 = readInteger("Fishing.Drop_Level.Tier3", 400);
+		fishingTier3 = readInteger("Fishing.Tier_Levels.Tier3", 400);
-		fishingTier4 = readInteger("Fishing.Drop_Level.Tier4", 600);
+		fishingTier4 = readInteger("Fishing.Tier_Levels.Tier4", 600);
-		fishingTier5 = readInteger("Fishing.Drop_Level.Tier5", 800);
+		fishingTier5 = readInteger("Fishing.Tier_Levels.Tier5", 800);
-		fishingDropChanceTier1 = readInteger("Fishing.Drops.Drop_Chance.Tier_1", 20);
-		fishingDropChanceTier2 = readInteger("Fishing.Drops.Drop_Chance.Tier_2", 25);
-		fishingDropChanceTier3 = readInteger("Fishing.Drops.Drop_Chance.Tier_3", 30);
-		fishingDropChanceTier4 = readInteger("Fishing.Drops.Drop_Chance.Tier_4", 35);
-		fishingDropChanceTier5 = readInteger("Fishing.Drops.Drop_Chance.Tier_5", 40);
-		leatherArmor = readBoolean("Fishing.Drops.Leather_Armor", true);
-		ironArmor = readBoolean("Fishing.Drops.Iron_Armor", true);
-		goldArmor = readBoolean("Fishing.Drops.Gold_Armor", true);
-		diamondArmor = readBoolean("Fishing.Drops.Diamond_Armor", true);
-		woodenTools = readBoolean("Fishing.Drops.Wooden_Tools", true);
-		stoneTools = readBoolean("Fishing.Drops.Stone_Tools", true);
-		ironTools = readBoolean("Fishing.Drops.Iron_Tools", true);
-		goldTools = readBoolean("Fishing.Drops.Gold_Tools", true);
-		diamondTools = readBoolean("Fishing.Drops.Diamond_Tools", true);
-		enderPearl = readBoolean("Fishing.Drops.Ender_Pearl", true);
-		blazeRod = readBoolean("Fishing.Drops.Blaze_Rod", true);
-		records = readBoolean("Fishing.Drops.Records", true);
-		glowstoneDust = readBoolean("Fishing.Drops.Glowstone_Dust", true);
-		fishingDiamonds = readBoolean("Fishing.Drops.Diamonds", true);
 
 		xplockEnable = readBoolean("Commands.xplock.Enabled", true);
 		xprateEnable = readBoolean("Commands.xprate.Enabled", true);
@@ -473,11 +460,10 @@ public class LoadProperties {
 				if(config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1)
 					reason.add("Fishing drops cannot also be excavation drops");
 
-				if(!config.contains("Treasures." + treasureName + ".Max_Levels")) reason.add("Missing Max_Levels");
+				if(!config.contains("Treasures." + treasureName + ".Max_Level")) reason.add("Missing Max_Level");
+				int maxLevel = config.getInt("Treasures." + treasureName + ".Max_Level");
 
-				int maxLevel = config.getInt("Treasures." + treasureName + ".Max_Levels");
+				if(maxLevel < 0) reason.add("Invalid Max_Level: " + maxLevel);
-
-				if(maxLevel < 0) reason.add("Invalid Max_Levels: " + maxLevel);
 
 				if(noErrorsInTreasure(reason)) {
 					FishingTreasure fTreasure = new FishingTreasure(item, xp, dropChance, dropLevel, maxLevel);
@@ -511,7 +497,7 @@ public class LoadProperties {
 		}
 
 		List<String> excavationTreasures = config.getStringList("Excavation.Treasure");
-		List<String> fishingTreasures = config.getStringList("Excavation.Treasure");
+		List<String> fishingTreasures = config.getStringList("Fishing.Treasure");
 
 		Iterator<String> treasureIterator = treasures.keySet().iterator();
 		while(treasureIterator.hasNext()) {

src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java

@@ -985,6 +985,9 @@ public class PlayerProfile
 			case AXES:
 				xp=(int) (xp/LoadProperties.axesxpmodifier);
 				break;
+			case FISHING:
+				xp=(int) (xp/LoadProperties.fishingxpmodifier);
+				break;
 			}
 			xp=xp*LoadProperties.xpGainMultiplier;
 			

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

@@ -76,7 +76,7 @@ public class Repair {
 				/*
 				 * REPAIR ARMOR
 				 */
-				if(isArmor(is)){
+				if(isArmor(is) && LoadProperties.repairArmor){
 
 					//DIAMOND ARMOR
 					if(isDiamondArmor(is) && hasItem(player, rDiamond) && PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.repairdiamondlevel){
@@ -94,7 +94,7 @@ public class Repair {
 					}
 
 					//IRON ARMOR
-					else if (isIronArmor(is) && hasItem(player, rIron)){
+					else if (isIronArmor(is) && hasItem(player, rIron) && PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.repairIronLevel){
 						removeItem(player, rIron);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -109,7 +109,7 @@ public class Repair {
 					}
 
 					//GOLD ARMOR
-					else if (isGoldArmor(is) && hasItem(player, rGold)){
+					else if (isGoldArmor(is) && hasItem(player, rGold) && PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.repairGoldLevel){
 						removeItem(player, rGold);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -147,10 +147,10 @@ public class Repair {
 				/*
 				 * REPAIR TOOLS
 				 */
-				if(isTools(is)){
+				if(isTools(is) && LoadProperties.repairTools){
 
 					//STONE TOOLS
-					if(isStoneTools(is) && hasItem(player, rStone)){
+					if(isStoneTools(is) && hasItem(player, rStone) && PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.repairStoneLevel){
 						removeItem(player, rStone);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -188,7 +188,7 @@ public class Repair {
 					}
 
 					//IRON TOOLS
-					else if(isIronTools(is) && hasItem(player, rIron)){
+					else if(isIronTools(is) && hasItem(player, rIron) && PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.repairIronLevel){
 						removeItem(player, rIron);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -231,7 +231,7 @@ public class Repair {
 					}
 					
 					//GOLD TOOLS
-					else if(isGoldTools(is) && hasItem(player, rGold)){
+					else if(isGoldTools(is) && hasItem(player, rGold) && PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.repairGoldLevel){
 						removeItem(player, rGold);
 						repairItem(player, enchants, enchantsLevel);
 
@@ -291,16 +291,16 @@ public class Repair {
 	public static int getArcaneForgingRank(PlayerProfile PP){
 		int rank = 0;
 
-		if(PP.getSkillLevel(SkillType.REPAIR) >= 750)
+		if(PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.arcaneRank4)
 			rank = 4;
 		
-		else if (PP.getSkillLevel(SkillType.REPAIR) >= 500)
+		else if (PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.arcaneRank3)
 			rank = 3;
 		
-		else if(PP.getSkillLevel(SkillType.REPAIR) >= 250)
+		else if(PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.arcaneRank2)
 			rank = 2;
 		
-		else if (PP.getSkillLevel(SkillType.REPAIR) >= 100)
+		else if (PP.getSkillLevel(SkillType.REPAIR) >= LoadProperties.arcaneRank1)
 			rank = 1;
 		
 		return rank;

src/main/resources/config.yml

@@ -48,14 +48,18 @@ Items:
 #  Settings for Arcane Forging
 ###
 Arcane_Forging:
+    May_Lose_Enchants: true
+    Rank_Levels:
+        Rank_1: 100
+        Rank_2: 250
+        Rank_3: 500
+        Rank_4: 750
     Keep_Enchants:
         Chance:
             Rank_4: 40
             Rank_3: 30
             Rank_2: 20
             Rank_1: 10
-    May_Lose_Enchants:
-        Enabled: true
     Downgrades:
         Enabled: true
         Chance:
@@ -113,6 +117,8 @@ Skills:
         Level_Cap: 0
         Anvil_Messages: true
         Anvil_ID: 42
+        Can_Repair_Armor: true
+        Can_Repair_Tools: true
         Leather:
             Name: Leather
             ID: 334
@@ -121,15 +127,18 @@ Skills:
             ID: 287
         Stone:
             Name: Cobblestone
+            Level_Required: 0
             ID: 4
         Wood:
             Name: Wood Planks
             ID: 5
         Gold:
             Name: Gold Bars
+            Level_Required: 0
             ID: 266
         Iron:
             Name: Iron Bars
+            Level_Required: 0
             ID: 265
         Diamond:
             Name: Diamond
@@ -164,7 +173,6 @@ Experience:
             Swords: 1.0
             Taming: 1.0
             Acrobatics: 1.0
-            Sorcery: 1.0
             Excavation: 1.0
             Herbalism: 1.0
             Unarmed: 1.0
@@ -173,6 +181,7 @@ Experience:
             Archery: 1.0
             Axes: 1.0
             Repair: 1.0
+            Fishing: 1.0
     Fishing:
         Base: 800
     Excavation:
@@ -215,34 +224,71 @@ Experience:
 #  Settings for Fishing
 ###
 Fishing:
-    Drop_Level:
+    Drops_Enabled: true
-        Tier1: 200
+    Tier_Levels:
-        Tier2: 400
+        Tier1: 0
-        Tier3: 600
+        Tier2: 200
-        Tier4: 800
+        Tier3: 400
-    Drops:
+        Tier4: 600
-        Item_Drops_Enabled: true
+        Tier5: 800
-        Drop_Chance:
+    Treasure:
-            Tier_1: 20
+        - Leather_Boots
-            Tier_2: 25
+        - Leather_Helmet
-            Tier_3: 30
+        - Leather_Leggings
-            Tier_4: 35
+        - Leather_Chestplate
-            Tier_5: 40
+        - Wooden_Sword
-        Gold_Tools: true
+        - Wooden_Shovel
-        Diamond_Armor: true
+        - Wooden_Pickaxe
-        Stone_Tools: true
+        - Wooden_Axe
-        Diamonds: true
+        - Wooden_Hoe
-        Iron_Armor: true
+        - Stone_Sword
-        Iron_Tools: true
+        - Stone_Shovel
-        Diamond_Tools: true
+        - Stone_Pickaxe
-        Records: true
+        - Stone_Axe
-        Blaze_Rod: true
+        - Stone_Hoe
-        Leather_Armor: true
+        - Iron_Sword
-        Gold_Armor: true
+        - Iron_Shovel
-        Glowstone_Dust: true
+        - Iron_Pickaxe
-        Ender_Pearl: true
+        - Iron_Axe
-        Wooden_Tools: true
+        - Iron_Hoe
-
+        - Iron_Boots
+        - Iron_Helmet
+        - Iron_Leggings
+        - Iron_Chestplate
+        - Ender_Pearl
+        - Gold_Sword
+        - Gold_Shovel
+        - Gold_Pickaxe
+        - Gold_Axe
+        - Gold_Hoe
+        - Gold_Boots
+        - Gold_Helmet
+        - Gold_Leggings
+        - Gold_Chestplate
+        - Blaze_Rod
+        - Record_3
+        - Record_4
+        - Record_5
+        - Record_6
+        - Record_7
+        - Record_8
+        - Record_9
+        - Record_10
+        - Record_11
+        - Diamond_Sword
+        - Diamond_Shovel
+        - Diamond_Pickaxe
+        - Diamond_Axe
+        - Diamond_Hoe
+        - Diamond_Boots
+        - Diamond_Helmet
+        - Diamond_Leggings
+        - Diamond_Chestplate
+        - Ghast_Tear
+        - Diamonds
+        - Iron_Ingots
+        - Gold_Ingots
+        - Lapis_Lazuli
 #
 #  Settings for Excavation
 ###
@@ -476,12 +522,577 @@ Treasures:
         Drops_From:
             Dirt: true
             Grass: true
-            Sand: true
-            Gravel: true
-            Clay: true
             Mycelium: true
-            Soul_Sand: true
+    Leather_Boots:
-
+        ID: 301
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 400
+        Drops_From:
+            Fishing: true
+    Leather_Helmet:
+        ID: 298
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 400
+        Drops_From:
+            Fishing: true
+    Leather_Leggings:
+        ID: 300
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 400
+        Drops_From:
+            Fishing: true
+    Leather_Chestplate:
+        ID: 299
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 400
+        Drops_From:
+            Fishing: true
+    Wooden_Sword:
+        ID: 268
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 200
+        Drops_From:
+            Fishing: true
+    Wooden_Shovel:
+        ID: 269
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 200
+        Drops_From:
+            Fishing: true
+    Wooden_Pickaxe:
+        ID: 270
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 200
+        Drops_From:
+            Fishing: true
+    Wooden_Axe:
+        ID: 271
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 200
+        Drops_From:
+            Fishing: true
+    Wooden_Hoe:
+        ID: 290
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 200
+        Drops_From:
+            Fishing: true
+    Stone_Sword:
+        ID: 272
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 400
+        Drops_From:
+            Fishing: true
+    Stone_Shovel:
+        ID: 273
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 400
+        Drops_From:
+            Fishing: true
+    Stone_Pickaxe:
+        ID: 274
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 400
+        Drops_From:
+            Fishing: true
+    Stone_Axe:
+        ID: 275
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 400
+        Drops_From:
+            Fishing: true
+    Stone_Hoe:
+        ID: 291
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 20.0
+        Drop_Level: 0
+        Max_Level: 400
+        Drops_From:
+            Fishing: true
+    Iron_Sword:
+        ID: 267
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Iron_Shovel:
+        ID: 256
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Iron_Pickaxe:
+        ID: 257
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Iron_Axe:
+        ID: 258
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Iron_Hoe:
+        ID: 292
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Iron_Boots:
+        ID: 309
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Iron_Helmet:
+        ID: 306
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Iron_Leggings:
+        ID: 308
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Iron_Chestplate:
+        ID: 307
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Ender_Pearl:
+        ID: 368
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 25.0
+        Drop_Level: 200
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Sword:
+        ID: 283
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Shovel:
+        ID: 284
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Pickaxe:
+        ID: 285
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Axe:
+        ID: 286
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Hoe:
+        ID: 294
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Boots:
+        ID: 317
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Helmet:
+        ID: 314
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Leggings:
+        ID: 316
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Chestplate:
+        ID: 315
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Blaze_Rod:
+        ID: 369
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Record_3:
+        ID: 2258
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Record_4:
+        ID: 2259
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Record_5:
+        ID: 2260
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 30.0
+        Drop_Level: 400
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamond_Sword:
+        ID: 276
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamond_Shovel:
+        ID: 277
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamond_Pickaxe:
+        ID: 278
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamond_Axe:
+        ID: 279
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamond_Hoe:
+        ID: 293
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamond_Boots:
+        ID: 313
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamond_Helmet:
+        ID: 310
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamond_Leggings:
+        ID: 312
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamond_Chestplate:
+        ID: 311
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Record_6:
+        ID: 2261
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Record_7:
+        ID: 2262
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Record_8:
+        ID: 2263
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Record_9:
+        ID: 2264
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Record_10:
+        ID: 2265
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Record_11:
+        ID: 2266
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Ghast_Tear:
+        ID: 370
+        Data: 0
+        Amount: 1
+        XP: 200
+        Drop_Chance: 35.0
+        Drop_Level: 600
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Diamonds:
+        ID: 264
+        Data: 0
+        Amount: 5
+        XP: 200
+        Drop_Chance: 40.0
+        Drop_Level: 800
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Iron_Ingots:
+        ID: 265
+        Data: 0
+        Amount: 5
+        XP: 200
+        Drop_Chance: 40.0
+        Drop_Level: 800
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Gold_Ingots:
+        ID: 266
+        Data: 0
+        Amount: 5
+        XP: 200
+        Drop_Chance: 40.0
+        Drop_Level: 800
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
+    Lapis_Lazuli:
+        ID: 351
+        Data: 4
+        Amount: 20
+        XP: 200
+        Drop_Chance: 40.0
+        Drop_Level: 800
+        Max_Level: 1000
+        Drops_From:
+            Fishing: true
 #
 #  Settings for commands
 ###

src/main/resources/locale/locale_de.properties

@@ -374,8 +374,6 @@ m.EffectsRepair5_1=[[AQUA]]Verzauberte Gegenstaende reparieren
 m.ArcaneForgingRank=[[YELLOW]]Arkanes Schmieden: [[GREEN]]Rang {0}/4
 m.ArcaneEnchantKeepChance=[[AQUA]]AS Erfolgs-Chance: [[GREEN]]{0}%
 m.ArcaneEnchantDowngradeChance=[[AQUA]]AS Downgrade-Chance: [[GREEN]]{0}%
-m.ArcaneForgingMilestones=[[YELLOW]][TIP]Arkanes Schmieden: [[AQUA]]Rang 1 = 100+, Rang 2 = 250+,
-m.ArcaneForgingMilestones2=[[AQUA]] Rang 3 = 500+, Rang 4 = 750+
 Fishing.MagicFound=[[AQUA]]Du hast etwas magisches gefunden...
 Fishing.ItemFound=[[AQUA]]Du hast einen Schatz gefunden!
 m.SkillFishing=Angeln (Fishing)

src/main/resources/locale/locale_en_us.properties

@@ -367,8 +367,6 @@ m.EffectsRepair5_1=Repair magic items
 m.ArcaneForgingRank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/4
 m.ArcaneEnchantKeepChance=[[GRAY]]AF Success Rate: [[YELLOW]]{0}%
 m.ArcaneEnchantDowngradeChance=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%
-m.ArcaneForgingMilestones=[[GOLD]][TIP] AF Rank Ups: [[GRAY]]Rank 1 = 100+, Rank 2 = 250+,
-m.ArcaneForgingMilestones2=[[GRAY]] Rank 3 = 500+, Rank 4 = 750+
 Fishing.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
 Fishing.ItemFound=[[GRAY]]Treasure found!
 m.SkillFishing=FISHING

src/main/resources/locale/locale_es_es.properties

@@ -367,8 +367,6 @@ m.EffectsRepair5_1=Repair magic items
 m.ArcaneForgingRank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/4
 m.ArcaneEnchantKeepChance=[[GRAY]]AF Success Rate: [[YELLOW]]{0}%
 m.ArcaneEnchantDowngradeChance=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%
-m.ArcaneForgingMilestones=[[GOLD]][TIP] AF Rank Ups: [[GRAY]]Rank 1 = 100+, Rank 2 = 250+,
-m.ArcaneForgingMilestones2=[[GRAY]] Rank 3 = 500+, Rank 4 = 750+
 Fishing.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
 Fishing.ItemFound=[[GRAY]]Treasure found!
 m.SkillFishing=FISHING

src/main/resources/locale/locale_fi.properties

@@ -346,8 +346,6 @@ m.EffectsRepair5_1=Repair magic items
 m.ArcaneForgingRank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/4
 m.ArcaneEnchantKeepChance=[[GRAY]]AF Success Rate: [[YELLOW]]{0}%
 m.ArcaneEnchantDowngradeChance=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%
-m.ArcaneForgingMilestones=[[GOLD]][TIP] AF Rank Ups: [[GRAY]]Rank 1 = 100+, Rank 2 = 250+,
-m.ArcaneForgingMilestones2=[[GRAY]] Rank 3 = 500+, Rank 4 = 750+
 Fishing.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
 Fishing.ItemFound=[[GRAY]]Treasure found!
 m.SkillFishing=FISHING

src/main/resources/locale/locale_fr.properties

@@ -367,8 +367,6 @@ m.EffectsRepair5_1=Repair magic items
 m.ArcaneForgingRank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/4
 m.ArcaneEnchantKeepChance=[[GRAY]]AF Success Rate: [[YELLOW]]{0}%
 m.ArcaneEnchantDowngradeChance=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%
-m.ArcaneForgingMilestones=[[GOLD]][TIP] AF Rank Ups: [[GRAY]]Rank 1 = 100+, Rank 2 = 250+,
-m.ArcaneForgingMilestones2=[[GRAY]] Rank 3 = 500+, Rank 4 = 750+
 Fishing.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
 Fishing.ItemFound=[[GRAY]]Treasure found!
 m.SkillFishing=FISHING

src/main/resources/locale/locale_nl.properties

@@ -373,8 +373,6 @@ m.EffectsRepair5_1=Repair magic items
 m.ArcaneForgingRank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/4
 m.ArcaneEnchantKeepChance=[[GRAY]]AF Success Rate: [[YELLOW]]{0}%
 m.ArcaneEnchantDowngradeChance=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%
-m.ArcaneForgingMilestones=[[GOLD]][TIP] AF Rank Ups: [[GRAY]]Rank 1 = 100+, Rank 2 = 250+,
-m.ArcaneForgingMilestones2=[[GRAY]] Rank 3 = 500+, Rank 4 = 750+
 Fishing.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
 Fishing.ItemFound=[[GRAY]]Treasure found!
 m.SkillFishing=FISHING

src/main/resources/locale/locale_pl.properties

@@ -367,8 +367,6 @@ m.EffectsRepair5_1=Repair magic items
 m.ArcaneForgingRank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/4
 m.ArcaneEnchantKeepChance=[[GRAY]]AF Success Rate: [[YELLOW]]{0}%
 m.ArcaneEnchantDowngradeChance=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%
-m.ArcaneForgingMilestones=[[GOLD]][TIP] AF Rank Ups: [[GRAY]]Rank 1 = 100+, Rank 2 = 250+,
-m.ArcaneForgingMilestones2=[[GRAY]] Rank 3 = 500+, Rank 4 = 750+
 Fishing.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
 Fishing.ItemFound=[[GRAY]]Treasure found!
 m.SkillFishing=FISHING

src/main/resources/locale/locale_pt_br.properties

@@ -377,8 +377,6 @@ m.EffectsRepair5_1=Repair magic items
 m.ArcaneForgingRank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/4
 m.ArcaneEnchantKeepChance=[[GRAY]]AF Success Rate: [[YELLOW]]{0}%
 m.ArcaneEnchantDowngradeChance=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%
-m.ArcaneForgingMilestones=[[GOLD]][TIP] AF Rank Ups: [[GRAY]]Rank 1 = 100+, Rank 2 = 250+,
-m.ArcaneForgingMilestones2=[[GRAY]] Rank 3 = 500+, Rank 4 = 750+
 Fishing.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
 Fishing.ItemFound=[[GRAY]]Treasure found!
 m.SkillFishing=FISHING

src/main/resources/locale/locale_ru.properties

@@ -359,8 +359,6 @@ m.EffectsRepair5_1=Repair magic items
 m.ArcaneForgingRank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/4
 m.ArcaneEnchantKeepChance=[[GRAY]]AF Success Rate: [[YELLOW]]{0}%
 m.ArcaneEnchantDowngradeChance=[[GRAY]]AF Downgrade Chance: [[YELLOW]]{0}%
-m.ArcaneForgingMilestones=[[GOLD]][TIP] AF Rank Ups: [[GRAY]]Rank 1 = 100+, Rank 2 = 250+,
-m.ArcaneForgingMilestones2=[[GRAY]] Rank 3 = 500+, Rank 4 = 750+
 Fishing.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
 Fishing.ItemFound=[[GRAY]]Treasure found!
 m.SkillFishing=FISHING