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

MCPC+ checks, notify server owners that they're missing out.

Browse Source
This commit is contained in:
GJ 2013-10-04 09:41:01 -04:00
parent a0e37a4a09
commit 3365da7f8d
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -78,6 +78,7 @@ public class mcMMO extends JavaPlugin {
/* Plugin Checks */ /* Plugin Checks */
private static boolean combatTagEnabled; private static boolean combatTagEnabled;
private static boolean healthBarPluginEnabled; private static boolean healthBarPluginEnabled;
private static boolean mcpcEnabled;
// Config Validation Check // Config Validation Check
public boolean noErrorsInConfigFiles = true; public boolean noErrorsInConfigFiles = true;
@ -111,6 +112,7 @@ public class mcMMO extends JavaPlugin {
metadataValue = new FixedMetadataValue(this, true); metadataValue = new FixedMetadataValue(this, true);
setupFilePaths(); setupFilePaths();
loadConfigFiles(); loadConfigFiles();
if (!noErrorsInConfigFiles) { if (!noErrorsInConfigFiles) {
@ -119,6 +121,11 @@ public class mcMMO extends JavaPlugin {
combatTagEnabled = getServer().getPluginManager().getPlugin("CombatTag") != null; combatTagEnabled = getServer().getPluginManager().getPlugin("CombatTag") != null;
healthBarPluginEnabled = getServer().getPluginManager().getPlugin("HealthBar") != null; healthBarPluginEnabled = getServer().getPluginManager().getPlugin("HealthBar") != null;
mcpcEnabled = getServer().getName().equals("MCPC+");
if (mcpcEnabled) {
checkModConfigs();
}
if (healthBarPluginEnabled) { if (healthBarPluginEnabled) {
getLogger().info("HealthBar plugin found, mcMMO's healthbars are automatically disabled."); getLogger().info("HealthBar plugin found, mcMMO's healthbars are automatically disabled.");
@ -270,6 +277,10 @@ public class mcMMO extends JavaPlugin {
return healthBarPluginEnabled; return healthBarPluginEnabled;
} }
public static boolean isMCPCEnabled() {
return mcpcEnabled;
}
/** /**
* Setup the various storage file paths * Setup the various storage file paths
*/ */
@ -381,4 +392,26 @@ public class mcMMO extends JavaPlugin {
new PartyAutoKickTask().runTaskTimer(this, kickIntervalTicks, kickIntervalTicks); new PartyAutoKickTask().runTaskTimer(this, kickIntervalTicks, kickIntervalTicks);
} }
} }
private void checkModConfigs() {
if (!Config.getInstance().getToolModsEnabled()) {
getLogger().info("MCPC+ implementation found, but the custom tool config for mcMMO is disabled!");
getLogger().info("To enable, set Mods.Tool_Mods_Enabled to TRUE in config.yml.");
}
if (!Config.getInstance().getArmorModsEnabled()) {
getLogger().info("MCPC+ implementation found, but the custom armor config for mcMMO is disabled!");
getLogger().info("To enable, set Mods.Armor_Mods_Enabled to TRUE in config.yml.");
}
if (!Config.getInstance().getBlockModsEnabled()) {
getLogger().info("MCPC+ implementation found, but the custom block config for mcMMO is disabled!");
getLogger().info("To enable, set Mods.Block_Mods_Enabled to TRUE in config.yml.");
}
if (!Config.getInstance().getEntityModsEnabled()) {
getLogger().info("MCPC+ implementation found, but the custom entity config for mcMMO is disabled!");
getLogger().info("To enable, set Mods.Entity_Mods_Enabled to TRUE in config.yml.");
}
}
} }

2
src/main/java/com/gmail/nossr50/skills/repair/Repair.java
View File

@ -86,7 +86,7 @@ public class Repair {
protected static int getSalvagedAmount(ItemStack inHand) { protected static int getSalvagedAmount(ItemStack inHand) {
// Temporary workaround until they get their stuff fixed. // Temporary workaround until they get their stuff fixed.
if (mcMMO.p.getServer().getName().equals("MCPC+")) { if (mcMMO.isMCPCEnabled()) {
if (ItemUtils.isPickaxe(inHand) || ItemUtils.isAxe(inHand) || ItemUtils.isBow(inHand) || inHand.getType() == Material.BUCKET) { if (ItemUtils.isPickaxe(inHand) || ItemUtils.isAxe(inHand) || ItemUtils.isBow(inHand) || inHand.getType() == Material.BUCKET) {
return 3; return 3;
} }