From 3c853a266a018626961737e3d00efd34d0bcb706 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 3 Jul 2025 15:11:41 -0700 Subject: [PATCH] change enum format back to old style --- .../nossr50/api/FakeBlockBreakEventType.java | 3 +- .../gmail/nossr50/api/ItemSpawnReason.java | 3 +- .../config/skills/alchemy/PotionConfig.java | 4 +- .../config/treasure/TreasureConfig.java | 4 +- .../runnables/skills/BleedTimerTask.java | 214 ---------- .../gmail/nossr50/util/HolidayManager.java | 387 ------------------ .../util/experience/ExperienceBarManager.java | 7 +- 7 files changed, 16 insertions(+), 606 deletions(-) delete mode 100644 src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java delete mode 100644 src/main/java/com/gmail/nossr50/util/HolidayManager.java diff --git a/src/main/java/com/gmail/nossr50/api/FakeBlockBreakEventType.java b/src/main/java/com/gmail/nossr50/api/FakeBlockBreakEventType.java index dd7c309e3..3476b294f 100644 --- a/src/main/java/com/gmail/nossr50/api/FakeBlockBreakEventType.java +++ b/src/main/java/com/gmail/nossr50/api/FakeBlockBreakEventType.java @@ -1,5 +1,6 @@ package com.gmail.nossr50.api; public enum FakeBlockBreakEventType { - FAKE, TREE_FELLER + FAKE, + TREE_FELLER } diff --git a/src/main/java/com/gmail/nossr50/api/ItemSpawnReason.java b/src/main/java/com/gmail/nossr50/api/ItemSpawnReason.java index 838384bcf..29fdc1d29 100644 --- a/src/main/java/com/gmail/nossr50/api/ItemSpawnReason.java +++ b/src/main/java/com/gmail/nossr50/api/ItemSpawnReason.java @@ -12,5 +12,6 @@ public enum ItemSpawnReason { UNARMED_DISARMED_ITEM, //When you disarm an opponent and they drop their weapon SALVAGE_ENCHANTMENT_BOOK, //When you salvage an enchanted item and get the enchantment back in book form SALVAGE_MATERIALS, //When you salvage an item and get materials back - TREE_FELLER_DISPLACED_BLOCK, BONUS_DROPS, //Can be from Mining, Woodcutting, Herbalism, etc + TREE_FELLER_DISPLACED_BLOCK, + BONUS_DROPS, //Can be from Mining, Woodcutting, Herbalism, etc } diff --git a/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java b/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java index de202e5e3..2f03d2623 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java +++ b/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java @@ -58,7 +58,9 @@ public class PotionConfig extends LegacyConfigLoader { } enum AlchemyPotionConfigResultType { - LOADED, INCOMPATIBLE, ERROR + LOADED, + INCOMPATIBLE, + ERROR } /** diff --git a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java index be7fdc6dd..707afb92b 100755 --- a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java +++ b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java @@ -407,6 +407,8 @@ public class TreasureConfig extends BukkitConfig { } private enum DropLevelKeyConversionType { - LEGACY, WRONG_KEY_STANDARD, WRONG_KEY_RETRO + LEGACY, + WRONG_KEY_STANDARD, + WRONG_KEY_RETRO } } diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java deleted file mode 100644 index a38560292..000000000 --- a/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java +++ /dev/null @@ -1,214 +0,0 @@ -//package com.gmail.nossr50.runnables.skills; -// -//import com.gmail.nossr50.config.AdvancedConfig; -//import com.gmail.nossr50.datatypes.interactions.NotificationType; -//import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent; -//import com.gmail.nossr50.mcMMO; -//import com.gmail.nossr50.util.MobHealthbarUtils; -//import com.gmail.nossr50.util.player.NotificationManager; -//import com.gmail.nossr50.util.skills.CombatUtils; -//import com.gmail.nossr50.util.skills.ParticleEffectUtils; -//import com.gmail.nossr50.util.sounds.SoundManager; -//import com.gmail.nossr50.util.sounds.SoundType; -//import org.bukkit.Bukkit; -//import org.bukkit.entity.LivingEntity; -//import org.bukkit.entity.Player; -//import org.bukkit.event.entity.EntityDamageEvent; -//import org.bukkit.inventory.ItemStack; -//import com.gmail.nossr50.util.CancellableRunnable; -//import org.jetbrains.annotations.NotNull; -// -//import java.util.HashMap; -//import java.util.Iterator; -//import java.util.Map; -//import java.util.Map.Entry; -// -//public class BleedTimerTask extends CancellableRunnable { -// private static final @NotNull Map bleedList = new HashMap<>(); -// private static boolean isIterating = false; -// -// @Override -// public void run() { -// isIterating = true; -// Iterator> bleedIterator = bleedList.entrySet().iterator(); -// -// while (bleedIterator.hasNext()) { -// Entry containerEntry = bleedIterator.next(); -// LivingEntity target = containerEntry.getKey(); -// int toolTier = containerEntry.getValue().toolTier; -// -/// / String debugMessage = ""; / debugMessage += ChatColor.GOLD + "Target -/// ["+target.getName()+"]: " + ChatColor.RESET; -// -//// debugMessage+="RemainingTicks=["+containerEntry.getValue().bleedTicks+"], "; -// -// if (containerEntry.getValue().bleedTicks <= 0 || !target.isValid()) { -// if (target instanceof Player) -// { -// NotificationManager.sendPlayerInformation((Player) target, NotificationType.SUBSKILL_MESSAGE, "Swords.Combat.Bleeding.Stopped"); -// } -// -// bleedIterator.remove(); -// continue; -// } -// -// int armorCount = 0; -// -// double damage; -// -// if (target instanceof Player) { -// damage = mcMMO.p.getAdvancedConfig().getRuptureDamagePlayer(); -// -// //Above Bleed Rank 3 deals 50% more damage -// if (containerEntry.getValue().toolTier >= 4 && containerEntry.getValue().bleedRank >= 3) -// damage = damage * 1.5; -// -// final Player player = (Player) target; -// -// if (!player.isOnline()) { -// continue; -// } -// -// //Count Armor -// for (ItemStack armorPiece : ((Player) target).getInventory().getArmorContents()) { -// //We only want to count slots that contain armor. -// if (armorPiece != null) { -// armorCount++; -// } -// } -// -// } else { -// damage = mcMMO.p.getAdvancedConfig().getRuptureDamageMobs(); -// -//// debugMessage+="BaseDMG=["+damage+"], "; -// -// //Above Bleed Rank 3 deals 50% more damage -// if (containerEntry.getValue().bleedRank >= 3) -// { -// damage = damage * 1.5; -// } -// -//// debugMessage+="Rank4Bonus=["+String.valueOf(containerEntry.getValue().bleedRank >= 3)+"], "; -// -// -// MobHealthbarUtils.handleMobHealthbars(target, damage, mcMMO.p); //Update health bars -// } -// -//// debugMessage+="FullArmor=["+String.valueOf(armorCount > 3)+"], "; -// -// if (armorCount > 3) -// { -// damage = damage * .75; -// } -// -//// debugMessage+="AfterRankAndArmorChecks["+damage+"], "; -// -// //Weapons below Diamond get damage cut in half -// if (toolTier < 4) -// damage = damage / 2; -// -//// debugMessage+="AfterDiamondCheck=["+String.valueOf(damage)+"], "; -// -// //Wood weapons get damage cut in half again -// if (toolTier < 2) -// damage = damage / 2; -// -//// debugMessage+="AfterWoodenCheck=["+String.valueOf(damage)+"], "; -// -// double victimHealth = target.getHealth(); -// -//// debugMessage+="TargetHealthBeforeDMG=["+String.valueOf(target.getHealth())+"], "; -// -// //Fire a fake event -// FakeEntityDamageByEntityEvent fakeEntityDamageByEntityEvent = (FakeEntityDamageByEntityEvent) CombatUtils.sendEntityDamageEvent(containerEntry.getValue().damageSource, target, EntityDamageEvent.DamageCause.CUSTOM, damage); -// Bukkit.getPluginManager().callEvent(fakeEntityDamageByEntityEvent); -// -// CombatUtils.dealNoInvulnerabilityTickDamageRupture(target, damage, containerEntry.getValue().damageSource, toolTier); -// -// double victimHealthAftermath = target.getHealth(); -// -//// debugMessage+="TargetHealthAfterDMG=["+String.valueOf(target.getHealth())+"], "; -// -// if (victimHealthAftermath <= 0 || victimHealth != victimHealthAftermath) -// { -// //Play Bleed Sound -// SoundManager.worldSendSound(target.getWorld(), target.getLocation(), SoundType.BLEED); -// -// ParticleEffectUtils.playBleedEffect(target); -// } -// -// //Lower Bleed Ticks -// BleedContainer loweredBleedContainer = copyContainer(containerEntry.getValue()); -// loweredBleedContainer.bleedTicks -= 1; -// -//// debugMessage+="RemainingTicks=["+loweredBleedContainer.bleedTicks+"]"; -// containerEntry.setValue(loweredBleedContainer); -// -//// Bukkit.broadcastMessage(debugMessage); -// } -// isIterating = false; -// } -// -// public static @NotNull BleedContainer copyContainer(@NotNull BleedContainer container) -// { -// LivingEntity target = container.target; -// LivingEntity source = container.damageSource; -// int bleedTicks = container.bleedTicks; -// int bleedRank = container.bleedRank; -// int toolTier = container.toolTier; -// -// return new BleedContainer(target, bleedTicks, bleedRank, toolTier, source); -// } -// -// /** -// * Instantly Bleed out a LivingEntity -// * -// * @param entity LivingEntity to bleed out -// */ -// public static void bleedOut(@NotNull LivingEntity entity) { -// /* -// * Don't remove anything from the list outside of run() -// */ -// -// if (bleedList.containsKey(entity)) { -// CombatUtils.dealNoInvulnerabilityTickDamage(entity, bleedList.get(entity).bleedTicks * 2, bleedList.get(entity).damageSource); -// } -// } -// -// /** -// * Add a LivingEntity to the bleedList if it is not in it. -// * -// * @param entity LivingEntity to add -// * @param attacker source of the bleed/rupture -// * @param ticks Number of bleeding ticks -// */ -// public static void add(@NotNull LivingEntity entity, @NotNull LivingEntity attacker, int ticks, int bleedRank, int toolTier) { -// if (!Bukkit.isPrimaryThread()) { -// throw new IllegalStateException("Cannot add bleed task async!"); -// } -// -// if (isIterating) { -// //Used to throw an error here, but in reality all we are really doing is preventing concurrency issues from other plugins being naughty and its not really needed -// //I'm not really a fan of silent errors, but I'm sick of seeing people using crazy enchantments come in and report this "bug" -// return; -// } -// -//// if (isIterating) throw new IllegalStateException("Cannot add task while iterating timers!"); -// -// if (toolTier < 4) -// ticks = Math.max(1, (ticks / 3)); -// -// ticks+=1; -// -// BleedContainer newBleedContainer = new BleedContainer(entity, ticks, bleedRank, toolTier, attacker); -// bleedList.put(entity, newBleedContainer); -// } -// -// public static boolean isBleedOperationAllowed() { -// return !isIterating && Bukkit.isPrimaryThread(); -// } -// -// public static boolean isBleeding(@NotNull LivingEntity entity) { -// return bleedList.containsKey(entity); -// } -//} diff --git a/src/main/java/com/gmail/nossr50/util/HolidayManager.java b/src/main/java/com/gmail/nossr50/util/HolidayManager.java deleted file mode 100644 index fab896915..000000000 --- a/src/main/java/com/gmail/nossr50/util/HolidayManager.java +++ /dev/null @@ -1,387 +0,0 @@ -//package com.gmail.nossr50.util; -// -//import com.gmail.nossr50.commands.skills.AprilCommand; -//import com.gmail.nossr50.config.Config; -//import com.gmail.nossr50.datatypes.interactions.NotificationType; -//import com.gmail.nossr50.datatypes.player.McMMOPlayer; -//import com.gmail.nossr50.datatypes.skills.PrimarySkillType; -//import com.gmail.nossr50.locale.LocaleLoader; -//import com.gmail.nossr50.mcMMO; -//import com.gmail.nossr50.util.player.NotificationManager; -//import com.gmail.nossr50.util.player.UserManager; -//import com.gmail.nossr50.util.sounds.SoundManager; -//import com.gmail.nossr50.util.sounds.SoundType; -//import com.gmail.nossr50.util.text.StringUtils; -//import com.google.common.collect.ImmutableList; -//import org.bukkit.ChatColor; -//import org.bukkit.Color; -//import org.bukkit.Statistic; -//import org.bukkit.command.CommandSender; -//import org.bukkit.command.PluginCommand; -//import org.bukkit.entity.Player; -//import org.bukkit.event.player.PlayerStatisticIncrementEvent; -// -//import java.io.*; -//import java.util.*; -//import java.util.regex.Pattern; -// -//public final class HolidayManager { -// private final ArrayList hasCelebrated; -// private final int currentYear; -// private static final int START_YEAR = 2011; -// -// private static final List ALL_COLORS; -// private static final List ALL_CHAT_COLORS; -// private static final List CHAT_FORMATS; -// -// public enum FakeSkillType { -// MACHO, -// JUMPING, -// THROWING, -// WRECKING, -// CRAFTING, -// WALKING, -// SWIMMING, -// FALLING, -// CLIMBING, -// FLYING, -// DIVING, -// PIGGY, -// UNKNOWN; -// -// public static FakeSkillType getByName(String skillName) { -// for (FakeSkillType type : values()) { -// if (type.name().equalsIgnoreCase(skillName)) { -// return type; -// } -// } -// return null; -// } -// -// public static FakeSkillType getByStatistic(Statistic statistic) { -// switch (statistic) { -// case DAMAGE_TAKEN: -// return FakeSkillType.MACHO; -// case JUMP: -// return FakeSkillType.JUMPING; -// case DROP: -// return FakeSkillType.THROWING; -// case MINE_BLOCK: -// case BREAK_ITEM: -// return FakeSkillType.WRECKING; -// case CRAFT_ITEM: -// return FakeSkillType.CRAFTING; -// case WALK_ONE_CM: -// return FakeSkillType.WALKING; -// case SWIM_ONE_CM: -// return FakeSkillType.SWIMMING; -// case FALL_ONE_CM: -// return FakeSkillType.FALLING; -// case CLIMB_ONE_CM: -// return FakeSkillType.CLIMBING; -// case FLY_ONE_CM: -// return FakeSkillType.FLYING; -// case WALK_UNDER_WATER_ONE_CM: -// return FakeSkillType.DIVING; -// case PIG_ONE_CM: -// return FakeSkillType.PIGGY; -// default: -// return FakeSkillType.UNKNOWN; -// } -// } -// } -// -// public final Set movementStatistics = EnumSet.of( -// Statistic.WALK_ONE_CM, Statistic.SWIM_ONE_CM, Statistic.FALL_ONE_CM, -// Statistic.CLIMB_ONE_CM, Statistic.FLY_ONE_CM, Statistic.WALK_UNDER_WATER_ONE_CM, -// Statistic.PIG_ONE_CM); -// -// static { -// List colors = new ArrayList<>(); -// List chatColors = new ArrayList<>(); -// List chatFormats = new ArrayList<>(); -// -// for (ChatColor color : ChatColor.values()) { -// if (color.isColor()) { -// chatColors.add(color); -// } -// else { -// chatFormats.add(color); -// } -// } -// -/// / for (DyeColor color : DyeColor.values()) { / -/// colors.add(color.getFireworkColor()); / } -// -// Collections.shuffle(chatColors, Misc.getRandom()); -// Collections.shuffle(colors, Misc.getRandom()); -// Collections.shuffle(chatFormats, Misc.getRandom()); -// -// ALL_CHAT_COLORS = ImmutableList.copyOf(chatColors); -// ALL_COLORS = ImmutableList.copyOf(colors); -// CHAT_FORMATS = ImmutableList.copyOf(chatFormats); -// } -// -// // This gets called onEnable -// public HolidayManager() { -// currentYear = Calendar.getInstance().get(Calendar.YEAR); -// -// File anniversaryFile = new File(mcMMO.getFlatFileDirectory(), "anniversary." + currentYear + ".yml"); -// -// if (!anniversaryFile.exists()) { -// try { -// anniversaryFile.createNewFile(); -// } -// catch (IOException ex) { -// mcMMO.p.getLogger().severe(ex.toString()); -// } -// } -// -// hasCelebrated = new ArrayList<>(); -// -// try { -// hasCelebrated.clear(); -// BufferedReader reader = new BufferedReader(new FileReader(anniversaryFile.getPath())); -// String line = reader.readLine(); -// -// while (line != null) { -// hasCelebrated.add(line); -// line = reader.readLine(); -// } -// -// reader.close(); -// } -// catch (Exception ex) { -// mcMMO.p.getLogger().severe(ex.toString()); -// } -// -// cleanupFiles(); -// } -// -// private void cleanupFiles() { -// File FlatFileDir = new File(mcMMO.getFlatFileDirectory()); -// File legacy = new File(FlatFileDir, "anniversary.yml"); -// List toDelete = new ArrayList<>(); -// -// if (legacy.exists()) { -// toDelete.add(legacy); -// } -// -// Pattern pattern = Pattern.compile("anniversary\\.(?:.+)\\.yml"); -// -// for (String fileName : FlatFileDir.list()) { -// if (!pattern.matcher(fileName).matches() || fileName.equals("anniversary." + currentYear + ".yml")) { -// continue; -// } -// -// File file = new File(FlatFileDir, fileName); -// -// if (file.isDirectory()) { -// continue; -// } -// -// toDelete.add(file); -// } -// -// for (File file : toDelete) { -// if (file.delete()) { -// LogUtils.debug(mcMMO.p.getLogger(), "Deleted: " + file.getName()); -// } -// } -// } -// -// // This gets called onDisable -// public void saveAnniversaryFiles() { -// LogUtils.debug(mcMMO.p.getLogger(), "Saving anniversary files..."); -// String anniversaryFilePath = mcMMO.getFlatFileDirectory() + "anniversary." + currentYear + ".yml"; -// -// try { -// BufferedWriter writer = new BufferedWriter(new FileWriter(anniversaryFilePath)); -// for (String player : hasCelebrated) { -// writer.write(player); -// writer.newLine(); -// } -// writer.close(); -// } -// catch (Exception ex) { -// mcMMO.p.getLogger().severe(ex.toString()); -// } -// } -// -// // This gets called from /mcmmo command -// public void anniversaryCheck(final CommandSender sender) { -// GregorianCalendar anniversaryStart = new GregorianCalendar(currentYear, Calendar.FEBRUARY, 3); -// GregorianCalendar anniversaryEnd = new GregorianCalendar(currentYear, Calendar.FEBRUARY, 6); -// GregorianCalendar day = new GregorianCalendar(); -// -// if (hasCelebrated.contains(sender.getName())) { -// return; -// } -// -// if (!getDateRange(day.getTime(), anniversaryStart.getTime(), anniversaryEnd.getTime())) { -// return; -// } -// -// sender.sendMessage(LocaleLoader.getString("Holiday.Anniversary", (currentYear - START_YEAR))); -// /*if (sender instanceof Player) { -// final int firework_amount = 10; -// for (int i = 0; i < firework_amount; i++) { -// int delay = (int) (Misc.getRandom().nextDouble() * 3 * Misc.TICK_CONVERSION_FACTOR) + 4; -// mcMMO.p.getServer().getScheduler().runTaskLater(mcMMO.p, new Runnable() { -// @Override -// public void run() { -// spawnFireworks((Player) sender); -// } -// }, delay); -// } -// }*/ -//// else { -// /* -// * Credit: http://www.geocities.com/spunk1111/ -// * (good luck finding that in 3 years heh) -// * .''. . *''* :_\/_: . -// * :_\/_: _\(/_ .:.*_\/_* : /\ : .'.:.'. -// * .''.: /\ : /)\ ':'* /\ * : '..'. -=:o:=- -// * :_\/_:'.:::. ' *''* * '.\'/.'_\(/_ '.':'.' -// * : /\ : ::::: *_\/_* -= o =- /)\ ' -// * '..' ':::' * /\ * .'/.\'. ' * -// * * *..* : * -// * * * * -// * * * * -// */ -// -// /* -// * Color map -// * AAAA D GGGG JJJJJJ K -// * AAAAAA DDDDD EEEGGGGGG JJJJJJ KKKKKKK -// * BBBBAAAAAA DDD EEEGGGGGG I JJJJJ KKKKKKK -// * BBBBBBACCCCC D FFFF G IIIIIIIHHHHH KKKKKKK -// * BBBBBB CCCCC FFFFFF IIIIIII HHH K -// * BBBB CCCCC FFFFFF IIIIIII H k -// * b FFFF I k -// * b i k -// * b i k -// */ -// Object[] colorParams = new Object[]{chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose()}; -// sender.sendMessage(String.format(" %1$s.''. %4$s. %7$s*''* %10$s:_\\/_: %11$s.", colorParams)); -// sender.sendMessage(String.format(" %1$s:_\\/_: %4$s_\\(/_ %5$s.:.%7$s*_\\/_* %10$s: /\\ : %11$s.'.:.'.", colorParams)); -// sender.sendMessage(String.format(" %2$s.''.%1$s: /\\ : %4$s/)\\ %5$s':'%7$s* /\\ * %9$s: %10$s'..'. %11$s-=:o:=-", colorParams)); -// sender.sendMessage(String.format("%2$s:_\\/_:%1$s'%3$s.:::. %4$s' %6$s*''* %7$s* %9$s'.\\'/.'%8$s_\\(/_ %11$s'.':'.'", colorParams)); -// sender.sendMessage(String.format("%2$s: /\\ : %3$s::::: %6$s*_\\/_* %9$s-= o =-%8$s /)\\ %11$s'", colorParams)); -// sender.sendMessage(String.format(" %2$s'..' %3$s':::' %6$s* /\\ * %9$s.'/.\\'. %8$s' %11$s*", colorParams)); -// sender.sendMessage(String.format(" %2$s* %6$s*..* %9$s: %11$s*", colorParams)); -// sender.sendMessage(String.format(" %2$s* %9$s* %11$s*", colorParams)); -// sender.sendMessage(String.format(" %2$s* %9$s* %11$s*", colorParams)); -//// } -// -// hasCelebrated.add(sender.getName()); -// } -// -// public boolean getDateRange(Date date, Date start, Date end) { -// return !(date.before(start) || date.after(end)); -// } -// -//// public void spawnFireworks(Player player) { -//// int power = Misc.getRandom().nextInt(3) + 1; -//// Type fireworkType = Type.values()[Misc.getRandom().nextInt(Type.values().length)]; -//// double varX = Misc.getRandom().nextGaussian() * 3; -//// double varZ = Misc.getRandom().nextGaussian() * 3; -//// -//// Firework fireworks = (Firework) player.getWorld().spawnEntity(player.getLocation().add(varX, 0, varZ), EntityType.FIREWORK); -//// FireworkMeta fireworkmeta = fireworks.getFireworkMeta(); -//// FireworkEffect effect = FireworkEffect.builder().flicker(Misc.getRandom().nextBoolean()).withColor(colorChoose()).withFade(colorChoose()).with(fireworkType).trail(Misc.getRandom().nextBoolean()).build(); -//// fireworkmeta.addEffect(effect); -//// fireworkmeta.setPower(power); -//// fireworks.setFireworkMeta(fireworkmeta); -//// } -// -// private static List colorChoose() { -// return ALL_COLORS.subList(0, Math.max(Misc.getRandom().nextInt(ALL_COLORS.size() + 1), 1)); -// } -// -// private static String chatColorChoose() { -// StringBuilder ret = new StringBuilder(ALL_CHAT_COLORS.get(Misc.getRandom().nextInt(ALL_CHAT_COLORS.size())).toString()); -// -// for (ChatColor chatFormat : CHAT_FORMATS) { -// if (Misc.getRandom().nextInt(CHAT_FORMATS.size()) == 0) { -// ret.append(chatFormat); -// } -// } -// -// return ret.toString(); -// } -// -// public boolean isAprilFirst() { -// if (!Config.getInstance().isAprilFoolsAllowed()) -// return false; -// -// GregorianCalendar aprilFirst = new GregorianCalendar(currentYear, Calendar.APRIL, 1); -// GregorianCalendar aprilSecond = new GregorianCalendar(currentYear, Calendar.APRIL, 2); -// GregorianCalendar day = new GregorianCalendar(); -// return getDateRange(day.getTime(), aprilFirst.getTime(), aprilSecond.getTime()); -// } -// -// public boolean nearingAprilFirst() { -// if (!Config.getInstance().isAprilFoolsAllowed()) -// return false; -// -// GregorianCalendar start = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.MARCH, 28); -// GregorianCalendar end = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.APRIL, 2); -// GregorianCalendar day = new GregorianCalendar(); -// -// return mcMMO.getHolidayManager().getDateRange(day.getTime(), start.getTime(), end.getTime()); -// } -// -// public void handleStatisticEvent(PlayerStatisticIncrementEvent event) { -// Player player = event.getPlayer(); -// Statistic statistic = event.getStatistic(); -// int newValue = event.getNewValue(); -// -// int modifier; -// switch (statistic) { -// case DAMAGE_TAKEN: -// modifier = 500; -// break; -// case JUMP: -// modifier = 500; -// break; -// case DROP: -// modifier = 200; -// break; -// case MINE_BLOCK: -// case BREAK_ITEM: -// modifier = 500; -// break; -// case CRAFT_ITEM: -// modifier = 100; -// break; -// default: -// return; -// } -// -// if (newValue % modifier == 0) { -// mcMMO.getHolidayManager().levelUpApril(player, FakeSkillType.getByStatistic(statistic)); -// } -// } -// -// public void levelUpApril(Player player, FakeSkillType fakeSkillType) { -// if (!Config.getInstance().isAprilFoolsAllowed()) -// return; -// -// final McMMOPlayer mmoPlayer = UserManager.getPlayer(player); -// if (mmoPlayer == null) return; -// -// int levelTotal = Misc.getRandom().nextInt(1 + mmoPlayer.getSkillLevel(PrimarySkillType.MINING)) + 1; -// SoundManager.sendSound(player, player.getLocation(), SoundType.LEVEL_UP); -// NotificationManager.sendPlayerInformation(player, NotificationType.HOLIDAY, "Holiday.AprilFools.Levelup", StringUtils.getCapitalized(fakeSkillType.toString()), String.valueOf(levelTotal)); -//// ParticleEffectUtils.fireworkParticleShower(player, ALL_COLORS.get(Misc.getRandom().nextInt(ALL_COLORS.size()))); -// } -// -// public void registerAprilCommand() { -// if (!Config.getInstance().isAprilFoolsAllowed()) -// return; -// -// PluginCommand command = mcMMO.p.getCommand("crafting"); -// command.setExecutor(new AprilCommand()); -// } -//} diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java index 34948abc7..dc155fcdc 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java +++ b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java @@ -167,5 +167,10 @@ public class ExperienceBarManager { } } - public enum XPBarSettingTarget {SHOW, HIDE, RESET, DISABLE} + public enum XPBarSettingTarget { + SHOW, + HIDE, + RESET, + DISABLE + } }