EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-29 16:46:46 +01:00
Code Issues Projects Releases Wiki Activity

Version 1.0.36

Browse Source
This commit is contained in:
nossr50 2011-07-18 12:22:41 -07:00
parent feb1d17ba4
commit 177758f61e
6 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mcMMO/Changelog.txt
View File

@ -1,5 +1,14 @@
Changelog: Changelog:
#Versions without changelogs probably had very small misc fixes, like tweaks to the source code #Versions without changelogs probably had very small misc fixes, like tweaks to the source code
Versions 1.0.36
mcMMO now properly supports Bukkit/PEX/Permissions for Permissions
Config.yml will no longer generate Performance Debugging nodes
Registered permission nodes to plugin.yml
Some more changes to Permissions code
Fixed bug where Super Breaker activated where it shouldn't
Fixed bug with enabling/disabling mcgod in config.yml
Fixed bug with Excavation not kicking in until 1 level higher
Version 1.0.35 Version 1.0.35
Added a Toggle for Chimaera Wing in config.yml Added a Toggle for Chimaera Wing in config.yml
Added customization of what item is used for Chimaera Wing in config.yml Added customization of what item is used for Chimaera Wing in config.yml

3
mcMMO/com/gmail/nossr50/config/LoadProperties.java
View File

@ -98,7 +98,6 @@ public class LoadProperties
write("General.MOTD.Enabled", true); write("General.MOTD.Enabled", true);
write("General.MySpawn.Enabled", true); write("General.MySpawn.Enabled", true);
write("General.HP_Regeneration.Enabled", true); write("General.HP_Regeneration.Enabled", true);
write("General.Performance.Print_Reports", false);
write("Items.Chimaera_Wing.Enabled", true); write("Items.Chimaera_Wing.Enabled", true);
write("Items.Chimaera_Wing.Feather_Cost", 10); write("Items.Chimaera_Wing.Feather_Cost", 10);
@ -386,7 +385,7 @@ public class LoadProperties
mccEnable = readBoolean("Commands.mcc.Enabled"); mccEnable = readBoolean("Commands.mcc.Enabled");
mcgod = readString("Commands.mcgod.Name"); mcgod = readString("Commands.mcgod.Name");
mcgodEnable = readBoolean("Commands.mcgodEnable.Enabled"); mcgodEnable = readBoolean("Commands.mcgod.Enabled");
stats = readString("Commands.stats.Name"); stats = readString("Commands.stats.Name");
statsEnable = readBoolean("Commands.stats.Enabled"); statsEnable = readBoolean("Commands.stats.Enabled");

8
mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java
View File

@ -84,8 +84,10 @@ public class mcBlockListener extends BlockListener {
/* /*
* MINING * MINING
*/ */
if(mcPermissions.getInstance().mining(player)){ if(mcPermissions.getInstance().mining(player))
if(LoadProperties.miningrequirespickaxe){ {
if(LoadProperties.miningrequirespickaxe)
{
if(m.isMiningPick(inhand)) if(m.isMiningPick(inhand))
Mining.miningBlockCheck(player, block, plugin); Mining.miningBlockCheck(player, block, plugin);
} else { } else {
@ -226,7 +228,7 @@ public class mcBlockListener extends BlockListener {
Herbalism.greenTerraCheck(player, block, plugin); Herbalism.greenTerraCheck(player, block, plugin);
if(PP.getAxePreparationMode() && block.getTypeId() == 17) if(PP.getAxePreparationMode() && block.getTypeId() == 17)
WoodCutting.treeFellerCheck(player, block, plugin); WoodCutting.treeFellerCheck(player, block, plugin);
if(PP.getPickaxePreparationMode()) if(PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(block))
Mining.superBreakerCheck(player, block, plugin); Mining.superBreakerCheck(player, block, plugin);
if(PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(block)) if(PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(block))
Excavation.gigaDrillBreakerActivationCheck(player, block, plugin); Excavation.gigaDrillBreakerActivationCheck(player, block, plugin);

2
mcMMO/com/gmail/nossr50/m.java
View File

@ -75,6 +75,8 @@ public class m
{ {
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
int x = 0; int x = 0;
if(mcPermissions.getInstance().taming(player))
x+=PP.getSkill("taming");
if(mcPermissions.getInstance().mining(player)) if(mcPermissions.getInstance().mining(player))
x+=PP.getSkill("mining"); x+=PP.getSkill("mining");
if(mcPermissions.getInstance().woodcutting(player)) if(mcPermissions.getInstance().woodcutting(player))

27
mcMMO/com/gmail/nossr50/skills/Excavation.java
View File

@ -63,7 +63,8 @@ public class Excavation {
return; return;
} }
if(type == 2){ if(type == 2){
if(PP.getSkill("excavation") > 250){ if(PP.getSkill("excavation") >= 250)
{
//CHANCE TO GET EGGS //CHANCE TO GET EGGS
if(LoadProperties.eggs == true && Math.random() * 100 > 99){ if(LoadProperties.eggs == true && Math.random() * 100 > 99){
PP.addExcavationXP(LoadProperties.meggs * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.meggs * LoadProperties.xpGainMultiplier);
@ -83,7 +84,7 @@ public class Excavation {
//DIRT SAND OR GRAVEL //DIRT SAND OR GRAVEL
if(type == 3 || type == 13 || type == 2 || type == 12){ if(type == 3 || type == 13 || type == 2 || type == 12){
PP.addExcavationXP(LoadProperties.mbase * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mbase * LoadProperties.xpGainMultiplier);
if(PP.getSkill("excavation") > 750){ if(PP.getSkill("excavation") >= 750){
//CHANCE TO GET CAKE //CHANCE TO GET CAKE
if(LoadProperties.cake == true && Math.random() * 2000 > 1999){ if(LoadProperties.cake == true && Math.random() * 2000 > 1999){
PP.addExcavationXP(LoadProperties.mcake * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mcake * LoadProperties.xpGainMultiplier);
@ -92,7 +93,7 @@ public class Excavation {
loc.getWorld().dropItemNaturally(loc, is); loc.getWorld().dropItemNaturally(loc, is);
} }
} }
if(PP.getSkill("excavation") > 350){ if(PP.getSkill("excavation") >= 350){
//CHANCE TO GET DIAMOND //CHANCE TO GET DIAMOND
if(LoadProperties.diamond == true && Math.random() * 750 > 749){ if(LoadProperties.diamond == true && Math.random() * 750 > 749){
PP.addExcavationXP(LoadProperties.mdiamond2 * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mdiamond2 * LoadProperties.xpGainMultiplier);
@ -101,7 +102,7 @@ public class Excavation {
loc.getWorld().dropItemNaturally(loc, is); loc.getWorld().dropItemNaturally(loc, is);
} }
} }
if(PP.getSkill("excavation") > 250){ if(PP.getSkill("excavation") >= 250){
//CHANCE TO GET YELLOW MUSIC //CHANCE TO GET YELLOW MUSIC
if(LoadProperties.music == true && Math.random() * 2000 > 1999){ if(LoadProperties.music == true && Math.random() * 2000 > 1999){
PP.addExcavationXP(LoadProperties.mmusic * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mmusic * LoadProperties.xpGainMultiplier);
@ -111,7 +112,7 @@ public class Excavation {
} }
} }
if(PP.getSkill("excavation") > 350){ if(PP.getSkill("excavation") >= 350){
//CHANCE TO GET GREEN MUSIC //CHANCE TO GET GREEN MUSIC
if(LoadProperties.music == true && Math.random() * 2000 > 1999){ if(LoadProperties.music == true && Math.random() * 2000 > 1999){
PP.addExcavationXP(LoadProperties.mmusic * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mmusic * LoadProperties.xpGainMultiplier);
@ -124,14 +125,14 @@ public class Excavation {
//SAND //SAND
if(type == 12){ if(type == 12){
//CHANCE TO GET GLOWSTONE //CHANCE TO GET GLOWSTONE
if(LoadProperties.glowstone == true && PP.getSkill("excavation") > 50 && Math.random() * 100 > 95){ if(LoadProperties.glowstone == true && PP.getSkill("excavation") >= 50 && Math.random() * 100 > 95){
PP.addExcavationXP(LoadProperties.mglowstone2 * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mglowstone2 * LoadProperties.xpGainMultiplier);
mat = Material.getMaterial(348); mat = Material.getMaterial(348);
is = new ItemStack(mat, 1, (byte)0, (byte)0); is = new ItemStack(mat, 1, (byte)0, (byte)0);
loc.getWorld().dropItemNaturally(loc, is); loc.getWorld().dropItemNaturally(loc, is);
} }
//CHANCE TO GET SLOWSAND //CHANCE TO GET SLOWSAND
if(LoadProperties.slowsand == true && PP.getSkill("excavation") > 650 && Math.random() * 200 > 199){ if(LoadProperties.slowsand == true && PP.getSkill("excavation") >= 650 && Math.random() * 200 > 199){
PP.addExcavationXP(LoadProperties.mslowsand * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mslowsand * LoadProperties.xpGainMultiplier);
mat = Material.getMaterial(88); mat = Material.getMaterial(88);
is = new ItemStack(mat, 1, (byte)0, (byte)0); is = new ItemStack(mat, 1, (byte)0, (byte)0);
@ -140,7 +141,7 @@ public class Excavation {
} }
//GRASS OR DIRT //GRASS OR DIRT
if(type == 2 || type == 3){ if(type == 2 || type == 3){
if(PP.getSkill("excavation") > 50){ if(PP.getSkill("excavation") >= 50){
//CHANCE FOR COCOA BEANS //CHANCE FOR COCOA BEANS
if(LoadProperties.cocoabeans == true && Math.random() * 75 > 74){ if(LoadProperties.cocoabeans == true && Math.random() * 75 > 74){
PP.addExcavationXP(LoadProperties.mcocoa * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mcocoa * LoadProperties.xpGainMultiplier);
@ -151,7 +152,7 @@ public class Excavation {
} }
} }
//CHANCE FOR SHROOMS //CHANCE FOR SHROOMS
if(LoadProperties.mushrooms == true && PP.getSkill("excavation") > 500 && Math.random() * 200 > 199){ if(LoadProperties.mushrooms == true && PP.getSkill("excavation") >= 500 && Math.random() * 200 > 199){
PP.addExcavationXP(LoadProperties.mmushroom2 * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mmushroom2 * LoadProperties.xpGainMultiplier);
if(Math.random() * 10 > 5){ if(Math.random() * 10 > 5){
mat = Material.getMaterial(39); mat = Material.getMaterial(39);
@ -162,7 +163,7 @@ public class Excavation {
loc.getWorld().dropItemNaturally(loc, is); loc.getWorld().dropItemNaturally(loc, is);
} }
//CHANCE TO GET GLOWSTONE //CHANCE TO GET GLOWSTONE
if(LoadProperties.glowstone == true && PP.getSkill("excavation") > 25 && Math.random() * 100 > 95){ if(LoadProperties.glowstone == true && PP.getSkill("excavation") >= 25 && Math.random() * 100 > 95){
PP.addExcavationXP(LoadProperties.mglowstone2 * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mglowstone2 * LoadProperties.xpGainMultiplier);
mat = Material.getMaterial(348); mat = Material.getMaterial(348);
is = new ItemStack(mat, 1, (byte)0, (byte)0); is = new ItemStack(mat, 1, (byte)0, (byte)0);
@ -172,14 +173,14 @@ public class Excavation {
//GRAVEL //GRAVEL
if(type == 13){ if(type == 13){
//CHANCE TO GET NETHERRACK //CHANCE TO GET NETHERRACK
if(LoadProperties.netherrack == true && PP.getSkill("excavation") > 850 && Math.random() * 200 > 199){ if(LoadProperties.netherrack == true && PP.getSkill("excavation") >= 850 && Math.random() * 200 > 199){
PP.addExcavationXP(LoadProperties.mnetherrack * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mnetherrack * LoadProperties.xpGainMultiplier);
mat = Material.getMaterial(87); mat = Material.getMaterial(87);
is = new ItemStack(mat, 1, (byte)0, (byte)0); is = new ItemStack(mat, 1, (byte)0, (byte)0);
loc.getWorld().dropItemNaturally(loc, is); loc.getWorld().dropItemNaturally(loc, is);
} }
//CHANCE TO GET SULPHUR //CHANCE TO GET SULPHUR
if(LoadProperties.sulphur == true && PP.getSkill("excavation") > 75){ if(LoadProperties.sulphur == true && PP.getSkill("excavation") >= 75){
if(Math.random() * 10 > 9){ if(Math.random() * 10 > 9){
PP.addExcavationXP(LoadProperties.msulphur * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.msulphur * LoadProperties.xpGainMultiplier);
mat = Material.getMaterial(289); mat = Material.getMaterial(289);
@ -188,7 +189,7 @@ public class Excavation {
} }
} }
//CHANCE TO GET BONES //CHANCE TO GET BONES
if(LoadProperties.bones == true && PP.getSkill("excavation") > 175){ if(LoadProperties.bones == true && PP.getSkill("excavation") >= 175){
if(Math.random() * 10 > 9){ if(Math.random() * 10 > 9){
PP.addExcavationXP(LoadProperties.mbones * LoadProperties.xpGainMultiplier); PP.addExcavationXP(LoadProperties.mbones * LoadProperties.xpGainMultiplier);
mat = Material.getMaterial(352); mat = Material.getMaterial(352);

2
mcMMO/plugin.yml
View File

@ -1,6 +1,6 @@
name: mcMMO name: mcMMO
main: com.gmail.nossr50.mcMMO main: com.gmail.nossr50.mcMMO
version: 1.0.35 version: 1.0.36
commands: commands:
mcc: mcc:
description: Lists mcMMO commands description: Lists mcMMO commands