EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-31 19:45:26 +02:00
Code Issues Projects Releases Wiki Activity

Fixing Java naming conventions for constants in mcMMO.java also added

Browse Source 
some Javadocs
This commit is contained in:
nossr50
2019-05-03 23:39:49 -07:00
parent 8a312da0f5
commit a919c45b09
24 changed files with 146 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/util/BlockUtils.java
View File

@@ -29,7 +29,7 @@ public final class BlockUtils {
if (triple)
blockState.setMetadata(mcMMO.tripleDrops, mcMMO.metadataValue);
else
blockState.setMetadata(mcMMO.doubleDrops, mcMMO.metadataValue);
blockState.setMetadata(mcMMO.BONUS_DROPS_METAKEY, mcMMO.metadataValue);
}
/**

10
src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java
View File

@@ -69,11 +69,11 @@ public final class MobHealthbarUtils {
boolean updateName = !ChatColor.stripColor(oldName).equalsIgnoreCase(ChatColor.stripColor(newName));
if (updateName) {
target.setMetadata(mcMMO.customNameKey, new FixedMetadataValue(mcMMO.p, oldName));
target.setMetadata(mcMMO.customVisibleKey, new FixedMetadataValue(mcMMO.p, oldNameVisible));
} else if (!target.hasMetadata(mcMMO.customNameKey)) {
target.setMetadata(mcMMO.customNameKey, new FixedMetadataValue(mcMMO.p, ""));
target.setMetadata(mcMMO.customVisibleKey, new FixedMetadataValue(mcMMO.p, false));
target.setMetadata(mcMMO.CUSTOM_NAME_METAKEY, new FixedMetadataValue(mcMMO.p, oldName));
target.setMetadata(mcMMO.NAME_VISIBILITY_METAKEY, new FixedMetadataValue(mcMMO.p, oldNameVisible));
} else if (!target.hasMetadata(mcMMO.CUSTOM_NAME_METAKEY)) {
target.setMetadata(mcMMO.CUSTOM_NAME_METAKEY, new FixedMetadataValue(mcMMO.p, ""));
target.setMetadata(mcMMO.NAME_VISIBILITY_METAKEY, new FixedMetadataValue(mcMMO.p, false));
}
new MobHealthDisplayUpdaterTask(target).runTaskLater(mcMMO.p, displayTime * Misc.TICK_CONVERSION_FACTOR); // Clear health display after 3 seconds

2
src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
View File

@@ -124,7 +124,7 @@ public final class CommandUtils {
return false;
}
boolean hasPlayerDataKey = ((Player) sender).hasMetadata(mcMMO.playerDataKey);
boolean hasPlayerDataKey = ((Player) sender).hasMetadata(mcMMO.PLAYER_DATA_METAKEY);
if (!hasPlayerDataKey) {
sender.sendMessage(LocaleLoader.getString("Commands.NotLoaded"));

10
src/main/java/com/gmail/nossr50/util/player/UserManager.java
View File

@@ -22,7 +22,7 @@ public final class UserManager {
* @param mcMMOPlayer the player profile to start tracking
*/
public static void track(McMMOPlayer mcMMOPlayer) {
mcMMOPlayer.getPlayer().setMetadata(mcMMO.playerDataKey, new FixedMetadataValue(mcMMO.p, mcMMOPlayer));
mcMMOPlayer.getPlayer().setMetadata(mcMMO.PLAYER_DATA_METAKEY, new FixedMetadataValue(mcMMO.p, mcMMOPlayer));
}
/**
@@ -31,7 +31,7 @@ public final class UserManager {
* @param player The Player object
*/
public static void remove(Player player) {
player.removeMetadata(mcMMO.playerDataKey, mcMMO.p);
player.removeMetadata(mcMMO.PLAYER_DATA_METAKEY, mcMMO.p);
}
/**
@@ -101,8 +101,8 @@ public final class UserManager {
*/
public static McMMOPlayer getPlayer(Player player) {
//Avoid Array Index out of bounds
if (player != null && player.hasMetadata(mcMMO.playerDataKey))
return (McMMOPlayer) player.getMetadata(mcMMO.playerDataKey).get(0).value();
if (player != null && player.hasMetadata(mcMMO.PLAYER_DATA_METAKEY))
return (McMMOPlayer) player.getMetadata(mcMMO.PLAYER_DATA_METAKEY).get(0).value();
else
return null;
}
@@ -122,6 +122,6 @@ public final class UserManager {
}
public static boolean hasPlayerDataKey(Entity entity) {
return entity != null && entity.hasMetadata(mcMMO.playerDataKey);
return entity != null && entity.hasMetadata(mcMMO.PLAYER_DATA_METAKEY);
}
}

10
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@@ -213,7 +213,7 @@ public final class CombatUtils {
finalDamage += archeryManager.daze((Player) target);
}
if (!arrow.hasMetadata(mcMMO.infiniteArrowKey) && archeryManager.canRetrieveArrows()) {
if (!arrow.hasMetadata(mcMMO.INFINITE_ARROW_METAKEY) && archeryManager.canRetrieveArrows()) {
archeryManager.retrieveArrows(target);
}
@@ -224,7 +224,7 @@ public final class CombatUtils {
double distanceMultiplier = archeryManager.distanceXpBonusMultiplier(target, arrow);
applyScaledModifiers(initialDamage, finalDamage, event);
startGainXp(mcMMOPlayer, target, PrimarySkillType.ARCHERY, arrow.getMetadata(mcMMO.bowForceKey).get(0).asDouble() * distanceMultiplier);
startGainXp(mcMMOPlayer, target, PrimarySkillType.ARCHERY, arrow.getMetadata(mcMMO.BOW_FORCE_METAKEY).get(0).asDouble() * distanceMultiplier);
}
/**
@@ -573,11 +573,11 @@ public final class CombatUtils {
}
}
if (target.hasMetadata(mcMMO.entityMetadataKey)) {
if (target.hasMetadata(mcMMO.UNNATURAL_MOB_METAKEY)) {
baseXP *= mcMMO.getConfigManager().getConfigExperience().getSpawnedMobXPMult();
}
if (target.hasMetadata(mcMMO.bredMetadataKey)) {
if (target.hasMetadata(mcMMO.BRED_ANIMAL_TRACKING_METAKEY)) {
baseXP *= mcMMO.getConfigManager().getConfigExperience().getPlayerBredMobsXPMult();
}
@@ -814,7 +814,7 @@ public final class CombatUtils {
return;
}
if (!player.hasMetadata(mcMMO.playerDataKey)) {
if (!player.hasMetadata(mcMMO.PLAYER_DATA_METAKEY)) {
return;
}

2
src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java
View File

@@ -97,7 +97,7 @@ public final class ParticleEffectUtils {
location.setPitch(-90);
Firework firework = (Firework) player.getWorld().spawnEntity(location, EntityType.FIREWORK);
firework.setMetadata(mcMMO.funfettiMetadataKey, new FixedMetadataValue(mcMMO.p, null));
firework.setMetadata(mcMMO.SPAWNED_FIREWORKS_METAKEY, new FixedMetadataValue(mcMMO.p, null));
FireworkMeta fireworkMeta = firework.getFireworkMeta();
FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(color).with((MainConfig.getInstance().getLargeFireworks() ? Type.BALL_LARGE : Type.BALL)).trail(true).build();
fireworkMeta.addEffect(effect);