Removed more old stuff relating to Excavation drops Addresses MCCORE-1

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

@@ -57,11 +57,8 @@ public class LoadProperties {
 			MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone, 
 			nIron, nGold, nDiamond, locale, nString, nLeather;
 
-	public static int mfishing, mwatch, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
-			mstring, mbucket, mweb, chimaeraId, msandstone, mcocoa,
-			water_thunder, cure_self, cure_other, mslimeballs, mbones,
-			msulphur, mslowsand, mmushroom2, mglowstone2, mmelon, mmusic,
-			mdiamond2, mbase, mapple, meggs, mcake, mpine, mbirch, mspruce,
+	public static int mfishing, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
+			chimaeraId, msandstone, mbase, mpine, mbirch, mspruce, mmelon,
 			mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold,
 			mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack,
 			mglowstone, mcoal, mstone, MySQLport, xpGainMultiplier,
@@ -236,23 +233,7 @@ public class LoadProperties {
 		xpbackground_g = readDouble("Spout.HUD.Retro.Colors.Background.GREEN", 0.75);
 		xpbackground_b = readDouble("Spout.HUD.Retro.Colors.Background.BLUE", 0.75);
 
-		msulphur = readInteger("Experience.Excavation.Sulphur", 30);
-		mbones = readInteger("Experience.Excavation.Bones", 30);
 		mbase = readInteger("Experience.Excavation.Base", 40);
-		mmushroom2 = readInteger("Experience.Excavation.Mushroom", 80);
-		mslowsand = readInteger("Experience.Excavation.Slowsand", 80);
-		mglowstone2 = readInteger("Experience.Excavation.Glowstone", 80);
-		mmusic = readInteger("Experience.Excavation.Music", 3000);
-		mdiamond2 = readInteger("Experience.Excavation.Diamond", 1000);
-		mapple = readInteger("Experience.Excavation.Apple", 100);
-		meggs = readInteger("Experience.Excavation.Eggs", 100);
-		mcake = readInteger("Experience.Excavation.Cake", 3000);
-		mcocoa = readInteger("Experience.Excavation.Cocoa_Beans", 100);
-		mslimeballs = readInteger("Experience.Excavation.Slimeballs", 100);
-		mstring = readInteger("Experience.Excavation.String", 200);
-		mbucket = readInteger("Experience.Excavation.Bucket", 100);
-		mweb = readInteger("Experience.Excavation.Web", 150);
-		mwatch = readInteger("Experience.Excavation.Watch", 200);
 
 		msugar = readInteger("Experience.Herbalism.Sugar_Cane", 30);
 		mwheat = readInteger("Experience.Herbalism.Wheat", 50);

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

@@ -187,165 +187,6 @@ public class Excavation
     		break;
     	}
     	
-    	
-//    	switch(type)
-//    	{
-//    	case GRASS:
-//    		if(skillLevel >= 250)
-//    		{
-//	    		//CHANCE TO GET EGGS
-//	    		if(LoadProperties.eggs && Math.random() * 100 > 99)
-//	    		{
-//	    			xp+= LoadProperties.meggs;
-//					is.add(new ItemStack(Material.EGG, 1, (byte)0, (byte)0));
-//	    		}
-//	    		//CHANCE TO GET APPLES
-//	    		if(LoadProperties.apples && Math.random() * 100 > 99)
-//	    		{
-//	    			xp+= LoadProperties.mapple;
-//					is.add(new ItemStack(Material.APPLE, 1, (byte)0, (byte)0));
-//	    		}
-//    		}
-//    		break;
-//    	case GRAVEL:
-//    		//CHANCE TO GET NETHERRACK
-//    		if(LoadProperties.netherrack && skillLevel >= 850 && Math.random() * 200 > 199)
-//    		{
-//    			xp+= LoadProperties.mnetherrack;
-//				is.add(new ItemStack(Material.NETHERRACK, 1, (byte)0, (byte)0));
-//				
-//    		}
-//    		//CHANCE TO GET SULPHUR
-//    		if(LoadProperties.sulphur && skillLevel >= 75 && Math.random() * 10 > 9)
-//    		{
-//    			xp+= LoadProperties.msulphur;
-//				is.add(new ItemStack(Material.SULPHUR, 1, (byte)0, (byte)0));
-//    		}
-//    		//CHANCE TO GET BONES
-//    		if(LoadProperties.bones && skillLevel >= 175 && Math.random() * 10 > 9)
-//    		{
-//        		xp+= LoadProperties.mbones;
-//    			is.add(new ItemStack(Material.BONE, 1, (byte)0, (byte)0));
-//        	}
-//    		break;
-//    	case SAND:
-//    		//CHANCE TO GET GLOWSTONE
-//    		if(LoadProperties.glowstone && skillLevel >= 50 && Math.random() * 100 > 95)
-//    		{
-//    			xp+= LoadProperties.mglowstone2;
-//				is.add(new ItemStack(Material.GLOWSTONE_DUST, 1, (byte)0, (byte)0));
-//				
-//    		}
-//    		//CHANCE TO GET SOUL SAND
-//    		if(LoadProperties.slowsand && skillLevel >= 650 && Math.random() * 200 > 199)
-//    		{
-//    			xp+= LoadProperties.mslowsand;
-//				is.add(new ItemStack(Material.SOUL_SAND, 1, (byte)0, (byte)0));
-//    		}
-//    		break;
-//    	case CLAY:
-//    		//CHANCE TO GET SLIMEBALLS
-//    		if(LoadProperties.slimeballs && skillLevel >= 50 && Math.random() * 20 > 19)
-//    		{
-//   				xp+= LoadProperties.mslimeballs;
-//   				is.add(new ItemStack(Material.SLIME_BALL, 1, (byte)0, (byte)0));
-//      		}
-//    		//CHANCE TO GET STRING
-//    		if(LoadProperties.string && skillLevel >= 250 && Math.random() * 20 > 19)
-//    		{
-//    			xp+= LoadProperties.mstring;
-//    			is.add(new ItemStack(Material.STRING, 1, (byte)0, (byte)0));
-//    		}
-//    		if(skillLevel >= 500)
-//    		{
-//    			//CHANCE TO GET CLOCK
-//        		if(LoadProperties.watch && Math.random() * 100 > 99)
-//        		{
-//        			xp+= LoadProperties.mwatch;
-//        			is.add(new ItemStack(Material.WATCH, 1, (byte)0));
-//        		
-//        		}
-//        		//CHANCE TO GET BUCKET
-//        		if(LoadProperties.bucket && Math.random() * 100 > 99)
-//        		{
-//       				xp+= LoadProperties.mbucket;
-//       				is.add(new ItemStack(Material.BUCKET, 1, (byte)0, (byte)0));
-//        		}
-//    		}
-//    		//CHANCE TO GET COBWEB
-//    		if(LoadProperties.web && skillLevel >= 750 && Math.random() * 20 > 19)
-//    		{
-//   				xp+= LoadProperties.mweb;
-//   				is.add(new ItemStack(Material.WEB, 1, (byte)0, (byte)0));
-//    		}
-//    		break;
-//    	}
-//    	
-//    	//ALL MATERIALS
-//    	if(type == Material.GRASS || type == Material.DIRT || type == Material.GRAVEL || type == Material.SAND || type == Material.CLAY || type == Material.MYCEL || type == Material.SOUL_SAND)
-//    	{
-//    		xp+= LoadProperties.mbase;
-//			//CHANCE TO GET CAKE
-//			if(LoadProperties.cake && skillLevel >= 750 && Math.random() * 2000 > 1999)
-//			{
-//				xp+= LoadProperties.mcake;
-//				is.add(new ItemStack(Material.CAKE, 1, (byte)0, (byte)0));
-//			}
-//    		if(skillLevel >= 350)
-//    		{
-//    			//CHANCE TO GET DIAMOND
-//    			if(LoadProperties.diamond && Math.random() * 750 > 749)
-//    			{
-//    				xp+= LoadProperties.mdiamond2;
-//        			is.add(new ItemStack(Material.DIAMOND, 1, (byte)0, (byte)0));
-//    			}
-//    			//CHANCE TO GET GREEN MUSIC
-//    			if(LoadProperties.music && Math.random() * 2000 > 1999)
-//    			{
-//    				xp+= LoadProperties.mmusic;
-//    				is.add(new ItemStack(Material.GREEN_RECORD, 1, (byte)0, (byte)0));
-//    			}
-//    		}
-//			//CHANCE TO GET YELLOW MUSIC
-//			if(LoadProperties.music && skillLevel >= 250 && Math.random() * 2000 > 1999)
-//			{
-//				xp+= LoadProperties.mmusic;
-//				is.add(new ItemStack(Material.GOLD_RECORD, 1, (byte)0, (byte)0));
-//			}
-//    	}
-//    	
-//    	//GRASS OR DIRT OR MYCEL
-//    	if(type == Material.DIRT || type == Material.GRASS || type == Material.MYCEL)
-//    	{
-//    		//CHANCE FOR COCOA BEANS
-//    		if(LoadProperties.cocoabeans && skillLevel >= 50 && Math.random() * 75 > 74)
-//    		{
-//    			xp+= LoadProperties.mcocoa;
-//				is.add(new ItemStack(Material.getMaterial(351), 1, (byte)0, (byte)3));
-//    		}
-//    		//CHANCE FOR SHROOMS
-//    		if(LoadProperties.mushrooms && skillLevel >= 500 && Math.random() * 200 > 199)
-//    		{
-//    			xp+= LoadProperties.mmushroom2;
-//    			switch((int)(Math.random() * 2))
-//    			{
-//    			case 0:
-//    				is.add(new ItemStack(Material.BROWN_MUSHROOM, 1, (byte)0, (byte)0));
-//    				break;
-//    			case 1:
-//    				is.add(new ItemStack(Material.RED_MUSHROOM, 1, (byte)0, (byte)0));
-//    				break;
-//    			}
-//				
-//    		}
-//    		//CHANCE TO GET GLOWSTONE
-//    		if(LoadProperties.glowstone && skillLevel >= 25 && Math.random() * 100 > 95)
-//    		{
-//    			xp+= LoadProperties.mglowstone2;
-//				is.add(new ItemStack(Material.GLOWSTONE_DUST, 1, (byte)0, (byte)0));
-//    		}
-//    	}
-    	
     	//Drop items
     	for(ItemStack x : is)
     	{