EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 12:35:27 +02:00
Code Issues Projects Releases Wiki Activity

Cleaning up mcMMO.java

Browse Source
This commit is contained in:
nossr50
2019-05-13 01:15:53 -07:00
parent 72fc3efa78
commit 80163c0d8f
25 changed files with 365 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java
View File

@@ -1,5 +1,6 @@
package com.gmail.nossr50.runnables;
import com.gmail.nossr50.core.MetadataConstants;
import com.gmail.nossr50.mcMMO;
import org.bukkit.entity.LivingEntity;
import org.bukkit.scheduler.BukkitRunnable;
@@ -12,8 +13,8 @@ public class MobHealthDisplayUpdaterTask extends BukkitRunnable {
public MobHealthDisplayUpdaterTask(LivingEntity target) {
if (target.isValid()) {
this.target = target;
this.oldName = target.getMetadata(mcMMO.CUSTOM_NAME_METAKEY).get(0).asString();
this.oldNameVisible = target.getMetadata(mcMMO.NAME_VISIBILITY_METAKEY).get(0).asBoolean();
this.oldName = target.getMetadata(MetadataConstants.CUSTOM_NAME_METAKEY).get(0).asString();
this.oldNameVisible = target.getMetadata(MetadataConstants.NAME_VISIBILITY_METAKEY).get(0).asBoolean();
}
}
@@ -22,8 +23,8 @@ public class MobHealthDisplayUpdaterTask extends BukkitRunnable {
if (target != null && target.isValid()) {
target.setCustomNameVisible(oldNameVisible);
target.setCustomName(oldName);
target.removeMetadata(mcMMO.CUSTOM_NAME_METAKEY, mcMMO.p);
target.removeMetadata(mcMMO.NAME_VISIBILITY_METAKEY, mcMMO.p);
target.removeMetadata(MetadataConstants.CUSTOM_NAME_METAKEY, mcMMO.p);
target.removeMetadata(MetadataConstants.NAME_VISIBILITY_METAKEY, mcMMO.p);
}
}
}

5
src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java
View File

@@ -1,5 +1,6 @@
package com.gmail.nossr50.runnables;
import com.gmail.nossr50.core.MetadataConstants;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.BlockUtils;
import org.bukkit.block.Block;
@@ -33,9 +34,9 @@ public class PistonTrackerTask extends BukkitRunnable {
for (Block b : blocks) {
Block nextBlock = b.getRelative(direction);
if (nextBlock.hasMetadata(mcMMO.PISTON_TRACKING_METAKEY)) {
if (nextBlock.hasMetadata(MetadataConstants.PISTON_TRACKING_METAKEY)) {
mcMMO.getPlaceStore().setTrue(nextBlock);
nextBlock.removeMetadata(mcMMO.PISTON_TRACKING_METAKEY, mcMMO.p);
nextBlock.removeMetadata(MetadataConstants.PISTON_TRACKING_METAKEY, mcMMO.p);
} else if (mcMMO.getPlaceStore().isTrue(nextBlock)) {
// Block doesn't have metadatakey but isTrue - set it to false
mcMMO.getPlaceStore().setFalse(nextBlock);

3
src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java
View File

@@ -1,5 +1,6 @@
package com.gmail.nossr50.runnables.commands;
import com.gmail.nossr50.core.MetadataConstants;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
@@ -36,7 +37,7 @@ public class McrankCommandDisplayTask extends BukkitRunnable {
if (useChat) {
displayChat();
}
((Player) sender).removeMetadata(mcMMO.DATABASE_PROCESSING_COMMAND_METAKEY, mcMMO.p);
((Player) sender).removeMetadata(MetadataConstants.DATABASE_PROCESSING_COMMAND_METAKEY, mcMMO.p);
}
private void displayChat() {

3
src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java
View File

@@ -1,5 +1,6 @@
package com.gmail.nossr50.runnables.commands;
import com.gmail.nossr50.core.MetadataConstants;
import com.gmail.nossr50.datatypes.database.PlayerStat;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader;
@@ -42,7 +43,7 @@ public class MctopCommandDisplayTask extends BukkitRunnable {
}
if (sender instanceof Player) {
((Player) sender).removeMetadata(mcMMO.DATABASE_PROCESSING_COMMAND_METAKEY, mcMMO.p);
((Player) sender).removeMetadata(MetadataConstants.DATABASE_PROCESSING_COMMAND_METAKEY, mcMMO.p);
}
if (sender instanceof Player)
sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));