diff --git a/Changelog.txt b/Changelog.txt index 738af1499..8199c5c4e 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -53,6 +53,7 @@ Version 1.4.07-dev ! When using "Super Breaker" or "Giga Driller" abilities extra tool durability is used (again) - The /mmoupdate command has been removed. It is replaced by /mcconvert database - Removed Abilities.Tools.Durability_Loss_Enabled, set Abilities.Tools.Durability_Loss to 0 to disable instead. + - Removed SpoutPlugin support Version 1.4.06 + Added "Ice Fishing" ability to Fishing diff --git a/README.md b/README.md index 531689ae4..919a28eae 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Our latest development builds are available [here](http://ci.mcmmo.info). ### Brief Description -The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds thirteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Additionally, when run in conjuction with SpoutPlugin, mcMMO also has a custom XP bar to allow for easy tracking of progress towards leveling up. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update. +The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds thirteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update. ## About the Team @@ -37,7 +37,6 @@ mcMMO uses Maven 3 to manage dependancies, packaging, and shading of necessary c The typical command used to build mcMMO is: mvn clean package install Required Libraries: -* Spout API * JUnit * EMetrics * Bukkit diff --git a/pom.xml b/pom.xml index 2d7247e8d..c03b5cc90 100755 --- a/pom.xml +++ b/pom.xml @@ -22,38 +22,6 @@ .jenkins - - resources - false - ${basedir}/src/main/resources/xpbar/ - - xpbar*.png - - - - resources - false - ${basedir}/src/main/resources/healthbar/ - - health*.png - - - - resources - false - ${basedir}/src/main/resources/skillicon/ - - *.png - - - - resources - false - ${basedir}/src/main/resources/sound/ - - *.wav - - com/gmail/nossr50/locale true @@ -132,10 +100,6 @@ bukkit-repo http://repo.bukkit.org/content/groups/public/ - - spout-repo - http://nexus.spout.org/content/groups/public/ - Plugin MetricsExtension http://repo.turt2live.com @@ -149,13 +113,6 @@ jar compile - - org.getspout - spoutplugin - LATEST - jar - compile - junit junit-dep diff --git a/src/main/java/com/gmail/nossr50/api/SpoutHudAPI.java b/src/main/java/com/gmail/nossr50/api/SpoutHudAPI.java deleted file mode 100644 index f7231bd95..000000000 --- a/src/main/java/com/gmail/nossr50/api/SpoutHudAPI.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.gmail.nossr50.api; - -import org.bukkit.entity.Player; - -import com.gmail.nossr50.config.spout.SpoutConfig; -import com.gmail.nossr50.datatypes.spout.huds.HudType; -import com.gmail.nossr50.util.player.UserManager; - -public class SpoutHudAPI { - private SpoutHudAPI() {} - - /** - * Disable the mcMMO XP bar for a player. - *
- * This function is designed for API usage. - */ - public static void disableXpBar(Player player) { - UserManager.getPlayer(player).getProfile().setHudType(HudType.DISABLED); - } - - /** - * Disable the mcMMO XP bar for the server. - *
- * This function is designed for API usage. - */ - public static void disableXpBar() { - SpoutConfig.getInstance().setXPBarEnabled(false); - } -} diff --git a/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java b/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java deleted file mode 100644 index f737aee85..000000000 --- a/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.gmail.nossr50.api; - -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.inventory.ItemStack; - -import com.gmail.nossr50.datatypes.skills.ToolType; - -public final class SpoutToolsAPI { - public static final List spoutSwords = new ArrayList(); - public static final List spoutAxes = new ArrayList(); - public static final List spoutPickaxes = new ArrayList(); - public static final List spoutHoes = new ArrayList(); - public static final List spoutShovels = new ArrayList(); - - private SpoutToolsAPI() {} - - /** - * Add a custom Spout tool to mcMMO for XP gain & ability use. - *
- * This function is designed for API usage. - * - * @param spoutTool The tool to add - * @param type The type of tool to add - */ - public static void addCustomTool(ItemStack spoutTool, ToolType type) { - switch (type) { - case AXE: - spoutAxes.add(spoutTool); - break; - - case HOE: - spoutHoes.add(spoutTool); - break; - - case PICKAXE: - spoutPickaxes.add(spoutTool); - break; - - case SHOVEL: - spoutShovels.add(spoutTool); - break; - - case SWORD: - spoutSwords.add(spoutTool); - break; - - default: - break; - } - } -} diff --git a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java b/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java index d3feb64c8..bb15db26c 100644 --- a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java @@ -4,14 +4,12 @@ import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.commands.party.PartySubcommandType; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.spout.SpoutUtils; public class McmmoCommand implements CommandExecutor { @Override @@ -28,13 +26,8 @@ public class McmmoCommand implements CommandExecutor { sender.sendMessage(mcSplit); if (Config.getInstance().getDonateMessageEnabled()) { - if (mcMMO.isSpoutEnabled() && sender instanceof Player) { - SpoutUtils.sendDonationNotification((Player) sender); - } - else { - sender.sendMessage(LocaleLoader.getString("MOTD.Donate")); - sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal"); - } + sender.sendMessage(LocaleLoader.getString("MOTD.Donate")); + sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal"); } sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion())); diff --git a/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java deleted file mode 100644 index 06dbea47e..000000000 --- a/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gmail.nossr50.commands.spout; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.util.StringUtil; - -import com.gmail.nossr50.datatypes.spout.huds.HudType; -import com.gmail.nossr50.locale.LocaleLoader; - -import com.google.common.collect.ImmutableList; - -public class MchudCommand extends SpoutCommand { - private static final List HUD_TYPES; - - static { - ArrayList types = new ArrayList(); - - for (HudType type : HudType.values()) { - types.add(type.toString()); - } - - Collections.sort(types); - HUD_TYPES = ImmutableList.copyOf(types); - } - - @Override - public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { - switch (args.length) { - case 1: - return StringUtil.copyPartialMatches(args[0], HUD_TYPES, new ArrayList(HUD_TYPES.size())); - default: - return ImmutableList.of(); - } - } - - @Override - protected boolean noArguments(Command command, CommandSender sender, String[] args) { - return false; - } - - @Override - protected boolean oneArgument(Command command, CommandSender sender, String[] args) { - try { - playerProfile.setHudType(HudType.valueOf(args[0].toUpperCase().trim())); - spoutHud.initializeXpBar(); - spoutHud.updateXpBar(); - return true; - } - catch (IllegalArgumentException ex) { - sender.sendMessage(LocaleLoader.getString("Commands.mchud.Invalid")); - return true; - } - } -} diff --git a/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java deleted file mode 100644 index f63af0fb4..000000000 --- a/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.gmail.nossr50.commands.spout; - -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.command.TabExecutor; -import org.bukkit.entity.Player; - -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.config.spout.SpoutConfig; -import com.gmail.nossr50.datatypes.player.PlayerProfile; -import com.gmail.nossr50.datatypes.spout.huds.McMMOHud; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.util.commands.CommandUtils; -import com.gmail.nossr50.util.player.UserManager; - -public abstract class SpoutCommand implements TabExecutor { - protected PlayerProfile playerProfile; - protected McMMOHud spoutHud; - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (CommandUtils.noConsoleUsage(sender)) { - return true; - } - - if (!mcMMO.isSpoutEnabled() || !SpoutConfig.getInstance().getXPBarEnabled()) { - sender.sendMessage(LocaleLoader.getString("Commands.Disabled")); - return true; - } - - playerProfile = UserManager.getPlayer((Player) sender).getProfile(); - spoutHud = playerProfile.getSpoutHud(); - - if (spoutHud == null) { - sender.sendMessage(LocaleLoader.getString("Commands.Disabled")); - return true; - } - - switch (args.length) { - case 0: - return noArguments(command, sender, args); - - case 1: - return oneArgument(command, sender, args); - - default: - return false; - } - } - - protected abstract boolean noArguments(Command command, CommandSender sender, String[] args); - - protected abstract boolean oneArgument(Command command, CommandSender sender, String[] args); -} diff --git a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java deleted file mode 100644 index a3f13a64e..000000000 --- a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.gmail.nossr50.commands.spout; - -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.util.StringUtil; - -import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.commands.CommandUtils; -import com.gmail.nossr50.util.skills.SkillUtils; - -import com.google.common.collect.ImmutableList; - -public class XplockCommand extends SpoutCommand { - @Override - public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { - switch (args.length) { - case 1: - List matches = StringUtil.copyPartialMatches(args[0], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList(CommandUtils.TRUE_FALSE_OPTIONS.size())); - - if (matches.size() == 0) { - return StringUtil.copyPartialMatches(args[0], SkillType.SKILL_NAMES, new ArrayList(SkillType.SKILL_NAMES.size())); - } - - return matches; - default: - return ImmutableList.of(); - } - } - - @Override - protected boolean noArguments(Command command, CommandSender sender, String[] args) { - if (spoutHud.getXpBarLocked()) { - unlockXpBar(sender); - return true; - } - - lockXpBar(sender, spoutHud.getLastGained()); - return true; - } - - @Override - protected boolean oneArgument(Command command, CommandSender sender, String[] args) { - if (CommandUtils.shouldEnableToggle(args[0])) { - lockXpBar(sender, spoutHud.getLastGained()); - return true; - } - - if (CommandUtils.shouldDisableToggle(args[0])) { - unlockXpBar(sender); - return true; - } - - if (CommandUtils.isInvalidSkill(sender, args[0])) { - return true; - } - - SkillType skill = SkillType.getSkill(args[0]); - - if (CommandUtils.isChildSkill(sender, skill)) { - return true; - } - - if (!Permissions.xplock(sender, skill)) { - sender.sendMessage(command.getPermissionMessage()); - return true; - } - - lockXpBar(sender, skill); - return true; - } - - private void lockXpBar(CommandSender sender, SkillType skill) { - if (skill != null) { - spoutHud.setXpBarLocked(true); - spoutHud.setSkillLock(skill); - spoutHud.updateXpBar(); - sender.sendMessage(LocaleLoader.getString("Commands.xplock.locked", SkillUtils.getSkillName(skill))); - } - } - - private void unlockXpBar(CommandSender sender) { - spoutHud.setXpBarLocked(false); - sender.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked")); - } -} diff --git a/src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java b/src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java deleted file mode 100644 index 433a76438..000000000 --- a/src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gmail.nossr50.config.spout; - -import com.gmail.nossr50.config.ConfigLoader; -import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.datatypes.spout.huds.HudType; - -import org.getspout.spoutapi.keyboard.Keyboard; - -public class SpoutConfig extends ConfigLoader { - private static SpoutConfig instance; - - private SpoutConfig() { - super("spout.yml"); - } - - public static SpoutConfig getInstance() { - if (instance == null) { - instance = new SpoutConfig(); - } - - return instance; - } - - @Override - protected void loadKeys() { - // Setup default HUD - } - - public HudType getDefaultHudType() { - try { - return HudType.valueOf(config.getString("Spout.HUD.Default", "STANDARD").toUpperCase().trim()); - } - catch (IllegalArgumentException ex) { - return HudType.STANDARD; - } - } - - public boolean getShowPowerLevel() { return config.getBoolean("HUD.Show_Power_Level", true); } - public Keyboard getMenuKey() { - try { - return Keyboard.valueOf(config.getString("Menu.Key", "KEY_M").toUpperCase().trim()); - } - catch (IllegalArgumentException ex) { - return Keyboard.KEY_M; - } - } - - /* XP Bar */ - public boolean getXPBarEnabled() { return config.getBoolean("XP.Bar.Enabled", true); } - public void setXPBarEnabled(boolean enabled) { config.set("XP.Bar.Enabled", enabled); } - - public boolean getXPBarIconEnabled() { return config.getBoolean("XP.Icon.Enabled", true); } - public int getXPBarXPosition() { return config.getInt("XP.Bar.X_POS", 95); } - public int getXPBarYPosition() { return config.getInt("XP.Bar.Y_POS", 6); } - public int getXPIconXPosition() { return config.getInt("XP.Icon.X_POS", 78); } - public int getXPIconYPosition() { return config.getInt("XP.Icon.Y_POS", 2); } - - /* HUD Colors */ - public double getRetroHUDXPBorderRed() { return config.getDouble("HUD.Retro.Colors.Border.RED", 0.0); } - public double getRetroHUDXPBorderGreen() { return config.getDouble("HUD.Retro.Colors.Border.GREEN", 0.0); } - public double getRetroHUDXPBorderBlue() { return config.getDouble("HUD.Retro.Colors.Border.BLUE", 0.0); } - public double getRetroHUDXPBackgroundRed() { return config.getDouble("HUD.Retro.Colors.Background.RED", 0.75); } - public double getRetroHUDXPBackgroundGreen() { return config.getDouble("HUD.Retro.Colors.Background.GREEN", 0.75); } - public double getRetroHUDXPBackgroundBlue() { return config.getDouble("HUD.Retro.Colors.Background.BLUE", 0.75); } - - public double getRetroHUDRed(SkillType skill) { return config.getDouble("HUD.Retro.Colors." + skill.toString().toLowerCase() +".RED", 0.3); } - public double getRetroHUDGreen(SkillType skill) { return config.getDouble("HUD.Retro.Colors." + skill.toString().toLowerCase() +".RED", 0.3); } - public double getRetroHUDBlue(SkillType skill) { return config.getDouble("HUD.Retro.Colors." + skill.toString().toLowerCase() +".RED", 0.3); } - - /* Notification Tiers */ - public int getNotificationTier1() { return config.getInt("Notifications.Tier1", 200); } - public int getNotificationTier2() { return config.getInt("Notifications.Tier2", 400); } - public int getNotificationTier3() { return config.getInt("Notifications.Tier3", 600); } - public int getNotificationTier4() { return config.getInt("Notifications.Tier4", 800); } -} diff --git a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java index 2e29b965b..ae2dbd75b 100644 --- a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java @@ -26,7 +26,6 @@ import com.gmail.nossr50.datatypes.database.PlayerStat; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.AbilityType; import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.datatypes.spout.huds.HudType; import com.gmail.nossr50.util.Misc; public final class FlatfileDatabaseManager implements DatabaseManager { @@ -259,8 +258,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager { writer.append((int) profile.getSkillDATS(AbilityType.SERRATED_STRIKES)).append(":"); writer.append((int) profile.getSkillDATS(AbilityType.SKULL_SPLITTER)).append(":"); writer.append((int) profile.getSkillDATS(AbilityType.SUPER_BREAKER)).append(":"); - HudType hudType = profile.getHudType(); - writer.append(hudType == null ? "STANDARD" : hudType.toString()).append(":"); + writer.append(":"); writer.append(profile.getSkillLevel(SkillType.FISHING)).append(":"); writer.append(profile.getSkillXpLevel(SkillType.FISHING)).append(":"); writer.append((int) profile.getSkillDATS(AbilityType.BLAST_MINING)).append(":"); @@ -728,7 +726,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager { Map skills = getSkillMapFromLine(character); // Skill levels Map skillsXp = new HashMap(); // Skill & XP Map skillsDATS = new HashMap(); // Ability & Cooldown - HudType hudType; MobHealthbarType mobHealthbarType; // TODO on updates, put new values in a try{} ? @@ -759,13 +756,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager { // Acrobatics - Unused skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(character[36])); - try { - hudType = HudType.valueOf(character[33]); - } - catch (Exception e) { - hudType = HudType.STANDARD; // Shouldn't happen unless database is being tampered with - } - try { mobHealthbarType = MobHealthbarType.valueOf(character[38]); } @@ -773,7 +763,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager { mobHealthbarType = Config.getInstance().getMobHealthbarDefault(); } - return new PlayerProfile(character[0], skills, skillsXp, skillsDATS, hudType, mobHealthbarType); + return new PlayerProfile(character[0], skills, skillsXp, skillsDATS, mobHealthbarType); } private Map getSkillMapFromLine(String[] character) { diff --git a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java index a7faa2462..93bef8b3a 100644 --- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java @@ -23,7 +23,6 @@ import com.gmail.nossr50.datatypes.database.PlayerStat; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.datatypes.skills.AbilityType; import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.datatypes.spout.huds.HudType; import com.gmail.nossr50.runnables.database.SQLReconnectTask; import com.gmail.nossr50.util.Misc; @@ -129,10 +128,8 @@ public final class SQLDatabaseManager implements DatabaseManager { } } MobHealthbarType mobHealthbarType = profile.getMobHealthbarType(); - HudType hudType = profile.getHudType(); saveLogin(userId, ((int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR))); - saveHuds(userId, (hudType == null ? "STANDARD" : hudType.toString()), (mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString())); saveLongs( "UPDATE " + tablePrefix + "cooldowns SET " + " mining = ?, woodcutting = ?, unarmed = ?" @@ -1150,7 +1147,6 @@ public final class SQLDatabaseManager implements DatabaseManager { Map skills = new HashMap(); // Skill & Level Map skillsXp = new HashMap(); // Skill & XP Map skillsDATS = new HashMap(); // Ability & Cooldown - HudType hudType; MobHealthbarType mobHealthbarType; final int OFFSET_SKILLS = 0; // TODO update these numbers when the query changes (a new skill is added) @@ -1197,13 +1193,6 @@ public final class SQLDatabaseManager implements DatabaseManager { // Acrobatics - Unused - result.getInt(OFFSET_DATS + 11) skillsDATS.put(AbilityType.BLAST_MINING, result.getInt(OFFSET_DATS + 12)); - try { - hudType = HudType.valueOf(result.getString(OFFSET_OTHER + 1)); - } - catch (Exception e) { - hudType = HudType.STANDARD; // Shouldn't happen unless database is being tampered with - } - try { mobHealthbarType = MobHealthbarType.valueOf(result.getString(OFFSET_OTHER + 2)); } @@ -1211,7 +1200,7 @@ public final class SQLDatabaseManager implements DatabaseManager { mobHealthbarType = Config.getInstance().getMobHealthbarDefault(); } - return new PlayerProfile(playerName, skills, skillsXp, skillsDATS, hudType, mobHealthbarType); + return new PlayerProfile(playerName, skills, skillsXp, skillsDATS, mobHealthbarType); } private void printErrors(SQLException ex) { diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java index 3f906796b..04cd8db18 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -17,7 +17,6 @@ import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.skills.AbilityType; import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.datatypes.skills.ToolType; -import com.gmail.nossr50.datatypes.spout.huds.McMMOHud; import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.party.PartyManager; @@ -531,12 +530,6 @@ public class McMMOPlayer { profile.setSkillXpLevel(skillType, profile.getSkillXpLevelRaw(skillType) + event.getRawXpGained()); - McMMOHud spoutHud = profile.getSpoutHud(); - - if (spoutHud != null) { - spoutHud.setLastGained(skillType); - } - isUsingUnarmed = (skillType == SkillType.UNARMED); SkillUtils.xpCheckSkill(skillType, player, profile); } diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java index b0f1a7d22..30d74a628 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java @@ -9,13 +9,10 @@ import org.bukkit.scoreboard.Scoreboard; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.config.spout.SpoutConfig; import com.gmail.nossr50.datatypes.MobHealthbarType; import com.gmail.nossr50.datatypes.experience.FormulaType; import com.gmail.nossr50.datatypes.skills.AbilityType; import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.datatypes.spout.huds.HudType; -import com.gmail.nossr50.datatypes.spout.huds.McMMOHud; import com.gmail.nossr50.skills.child.FamilyTree; import com.gmail.nossr50.util.player.UserManager; @@ -25,9 +22,7 @@ public class PlayerProfile { private boolean changed; /* HUDs */ - private HudType hudType; private MobHealthbarType mobHealthbarType; - private McMMOHud spoutHud; private Scoreboard playerStatsScoreboard; /* Skill Data */ @@ -38,7 +33,6 @@ public class PlayerProfile { public PlayerProfile(String playerName) { this.playerName = playerName; - hudType = mcMMO.isSpoutEnabled() ? SpoutConfig.getInstance().getDefaultHudType() : HudType.DISABLED; mobHealthbarType = Config.getInstance().getMobHealthbarDefault(); for (AbilityType abilityType : AbilityType.values()) { @@ -59,10 +53,9 @@ public class PlayerProfile { /** * Calling this constructor is considered loading the profile. */ - public PlayerProfile(String playerName, Map argSkills, Map argSkillsXp, Map argSkillsDats, HudType hudType, MobHealthbarType mobHealthbarType) { + public PlayerProfile(String playerName, Map argSkills, Map argSkillsXp, Map argSkillsDats, MobHealthbarType mobHealthbarType) { this(playerName, true); - this.hudType = hudType; this.mobHealthbarType = mobHealthbarType; this.skills.putAll(argSkills); @@ -89,26 +82,6 @@ public class PlayerProfile { return loaded; } - /* - * HUD Stuff - */ - - public HudType getHudType() { - return hudType; - } - - public McMMOHud getSpoutHud() { - return spoutHud; - } - - public void setSpoutHud(McMMOHud spoutHud) { - this.spoutHud = spoutHud; - } - - public void setHudType(HudType hudType) { - this.hudType = hudType; - } - /* * Mob Healthbars */ diff --git a/src/main/java/com/gmail/nossr50/datatypes/spout/buttons/McMMOButton.java b/src/main/java/com/gmail/nossr50/datatypes/spout/buttons/McMMOButton.java deleted file mode 100644 index 72748eb6f..000000000 --- a/src/main/java/com/gmail/nossr50/datatypes/spout/buttons/McMMOButton.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gmail.nossr50.datatypes.spout.buttons; - -import org.getspout.spoutapi.gui.GenericButton; - -public class McMMOButton extends GenericButton { - private Slot slot; - - public McMMOButton(String text, String toolTip) { - this.setText(text); - this.setTooltip(toolTip); - } - - public void connect(Slot slot) { - this.slot = slot; - } - - public void activate() { - slot.activate(); - } - - public interface Slot { - public void activate(); - } -} diff --git a/src/main/java/com/gmail/nossr50/datatypes/spout/huds/HudType.java b/src/main/java/com/gmail/nossr50/datatypes/spout/huds/HudType.java deleted file mode 100644 index 5095755b9..000000000 --- a/src/main/java/com/gmail/nossr50/datatypes/spout/huds/HudType.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gmail.nossr50.datatypes.spout.huds; - -public enum HudType { - DISABLED, - STANDARD, - SMALL, - RETRO; - - public HudType getNext() { - return values()[(ordinal() + 1) % values().length]; - } -} diff --git a/src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java b/src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java deleted file mode 100644 index 4b6d64874..000000000 --- a/src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.gmail.nossr50.datatypes.spout.huds; - -import org.bukkit.entity.Player; - -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.config.spout.SpoutConfig; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.player.PlayerProfile; -import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.datatypes.spout.popups.McMMOMenu; -import com.gmail.nossr50.datatypes.spout.popups.McMMOXpBar; - -import org.getspout.spoutapi.SpoutManager; - -public class McMMOHud { - private Player player; - private PlayerProfile profile; - - private SkillType lastGained; - private SkillType skillLock; - private boolean xpBarLocked; - - private McMMOMenu menu; - private McMMOXpBar xpBar; - - public McMMOHud(McMMOPlayer mcMMOPlayer) { - this.player = mcMMOPlayer.getPlayer(); - this.profile = mcMMOPlayer.getProfile(); - - initializeXpBar(); - } - - /** - * Initialize the HUD. - */ - public void initializeXpBar() { - if (SpoutConfig.getInstance().getXPBarEnabled()) { - if (xpBar != null) { - xpBar.removeWidgets(); - } - - xpBar = new McMMOXpBar(SpoutManager.getPlayer(player), profile.getHudType()); - } - } - - /** - * Update the XP bar. - */ - public void updateXpBar() { - SkillType skillType = xpBarLocked ? skillLock : lastGained; - - if (skillType == null) { - return; - } - - xpBar.update(skillType, profile); - } - - public boolean isMenuOpened() { - return (menu != null); - } - - public void openMenu() { - menu = new McMMOMenu(SpoutManager.getPlayer(player), profile); - } - - public void onMenuClose() { - menu = null; - } - - public void removeWidgets() { - if (menu != null) { - menu.close(); - } - - SpoutManager.getPlayer(player).getMainScreen().removeWidgets(mcMMO.p); - } - - public SkillType getLastGained() { - return lastGained; - } - - public void setLastGained(SkillType type) { - this.lastGained = type; - } - - public boolean getXpBarLocked() { - return xpBarLocked; - } - - public void setXpBarLocked(boolean locked) { - this.xpBarLocked = locked; - } - - public void toggleXpBarLocked() { - xpBarLocked = !xpBarLocked; - } - - public SkillType getSkillLock() { - return skillLock; - } - - public void setSkillLock(SkillType type) { - this.skillLock = type; - } -} diff --git a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java b/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java deleted file mode 100644 index 8930e486c..000000000 --- a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.gmail.nossr50.datatypes.spout.popups; - -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.datatypes.player.PlayerProfile; -import com.gmail.nossr50.datatypes.spout.buttons.McMMOButton; -import com.gmail.nossr50.datatypes.spout.buttons.McMMOButton.Slot; -import com.gmail.nossr50.datatypes.spout.huds.HudType; -import com.gmail.nossr50.datatypes.spout.huds.McMMOHud; -import com.gmail.nossr50.locale.LocaleLoader; - -import org.getspout.spoutapi.gui.GenericLabel; -import org.getspout.spoutapi.gui.GenericPopup; -import org.getspout.spoutapi.gui.InGameHUD; -import org.getspout.spoutapi.player.SpoutPlayer; - -public class McMMOMenu extends GenericPopup { - private McMMOButton hudButton; - private McMMOButton escapeButton; - - private GenericLabel titleLabel = new GenericLabel(); - private GenericLabel escapeLabel = new GenericLabel(); - - private static int centerX = 427 / 2; - private static int centerY = 240 / 2; - - public McMMOMenu(final SpoutPlayer spoutPlayer, final PlayerProfile playerProfile) { - // 240, 427 are the bottom right - titleLabel.setText(LocaleLoader.getString("Spout.Menu.Title")); - titleLabel.setWidth(100); - titleLabel.setHeight(100); - titleLabel.setX(centerX - 35); - titleLabel.setY((centerY / 2) - 20); - - escapeLabel.setText(LocaleLoader.getString("Spout.Menu.Exit")); - escapeLabel.setWidth(100); - escapeLabel.setHeight(100); - escapeLabel.setX(titleLabel.getX() - 15); - escapeLabel.setY(titleLabel.getY() + 10); - - hudButton = new McMMOButton(LocaleLoader.getString("Spout.Menu.HudButton.1", playerProfile.getHudType().toString()), LocaleLoader.getString("Spout.Menu.HudButton.2")); - hudButton.setWidth(120); - hudButton.setHeight(20); - hudButton.setX(centerX - (hudButton.getWidth() / 2)); - hudButton.setY(centerY / 2); - hudButton.connect(new Slot() { - @Override - public void activate() { - HudType nextHudType = playerProfile.getHudType().getNext(); - McMMOHud spoutHud = playerProfile.getSpoutHud(); - - playerProfile.setHudType(nextHudType); - spoutHud.initializeXpBar(); - spoutHud.updateXpBar(); - - hudButton.setText("HUD Type: " + nextHudType.toString()); - hudButton.setDirty(true); - } - }); - - escapeButton = new McMMOButton(LocaleLoader.getString("Spout.Menu.ExitButton"), null); - escapeButton.setWidth(60); - escapeButton.setHeight(20); - escapeButton.setX(centerX - (escapeButton.getWidth() / 2)); - escapeButton.setY((centerY / 2) + (escapeButton.getHeight() * 2) + 5); - escapeButton.connect(new Slot() { - @Override - public void activate() { - spoutPlayer.getMainScreen().closePopup(); - } - }); - - attachWidget(mcMMO.p, hudButton); - attachWidget(mcMMO.p, titleLabel); - attachWidget(mcMMO.p, escapeLabel); - attachWidget(mcMMO.p, escapeButton); - - InGameHUD inGameHud = spoutPlayer.getMainScreen(); - - inGameHud.attachPopupScreen(this); - inGameHud.setDirty(true); - } -} diff --git a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java b/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java deleted file mode 100644 index e3f062cb8..000000000 --- a/src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.gmail.nossr50.datatypes.spout.popups; - -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.config.spout.SpoutConfig; -import com.gmail.nossr50.datatypes.player.PlayerProfile; -import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.datatypes.spout.huds.HudType; -import com.gmail.nossr50.util.StringUtils; - -import org.getspout.spoutapi.gui.Color; -import org.getspout.spoutapi.gui.GenericGradient; -import org.getspout.spoutapi.gui.GenericTexture; -import org.getspout.spoutapi.gui.InGameHUD; -import org.getspout.spoutapi.gui.RenderPriority; -import org.getspout.spoutapi.gui.Widget; -import org.getspout.spoutapi.player.SpoutPlayer; - -public class McMMOXpBar { - private SpoutPlayer spoutPlayer; - private Widget xpBar; - - private GenericGradient xpFill; - private GenericGradient xpBackground; - private GenericGradient xpIconBackground; - private GenericGradient xpIconBorder; - private GenericTexture xpIcon; - - public McMMOXpBar(SpoutPlayer spoutPlayer, HudType hudType) { - this.spoutPlayer = spoutPlayer; - - switch (hudType) { - case RETRO: - initializeXpBarRetro(); - break; - - case STANDARD: - initializeXpBarStandard(); - break; - - case SMALL: - initializeXpBarSmall(); - break; - - case DISABLED: - break; - - default: - break; - } - - spoutPlayer.getMainScreen().setDirty(true); - } - - public void removeWidgets() { - InGameHUD inGameHud = spoutPlayer.getMainScreen(); - - if (xpBar != null) { - inGameHud.removeWidget(xpBar); - } - - if (xpFill != null) { - inGameHud.removeWidget(xpFill); - } - - if (xpBackground != null) { - inGameHud.removeWidget(xpBackground); - } - - if (xpIconBackground != null) { - inGameHud.removeWidget(xpIconBackground); - } - - if (xpIconBorder != null) { - inGameHud.removeWidget(xpIconBorder); - } - - if (xpIcon != null) { - inGameHud.removeWidget(xpIcon); - } - } - - /** - * Initialize Retro XP bar. - */ - private void initializeXpBarRetro() { - Color border = new Color((float) SpoutConfig.getInstance().getRetroHUDXPBorderRed(), (float) SpoutConfig.getInstance().getRetroHUDXPBorderGreen(), (float) SpoutConfig.getInstance().getRetroHUDXPBorderBlue(), 1f); - Color green = new Color(0f, 1f, 0f, 1f); - Color background = new Color((float) SpoutConfig.getInstance().getRetroHUDXPBackgroundRed(), (float) SpoutConfig.getInstance().getRetroHUDXPBackgroundGreen(), (float) SpoutConfig.getInstance().getRetroHUDXPBackgroundBlue(), 1f); - - xpBar = new GenericGradient(); - xpFill = new GenericGradient(); - xpBackground = new GenericGradient(); - - xpBar.setWidth(128); - xpBar.setHeight(4); - xpBar.setX(149); - xpBar.setY(10); - ((GenericGradient) xpBar).setBottomColor(border); - ((GenericGradient) xpBar).setTopColor(border); - xpBar.setPriority(RenderPriority.Highest); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBar); - - xpFill.setWidth(0); - xpFill.setHeight(2); - xpFill.setX(150); - xpFill.setY(11); - xpFill.setBottomColor(green); - xpFill.setTopColor(green); - xpFill.setPriority(RenderPriority.Lowest); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpFill); - - xpBackground.setWidth(126); - xpBackground.setHeight(2); - xpBackground.setX(150); - xpBackground.setY(11); - xpBackground.setBottomColor(background); - xpBackground.setTopColor(background); - xpBackground.setPriority(RenderPriority.Low); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBackground); - - if (SpoutConfig.getInstance().getXPBarIconEnabled()) { - Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f); - - xpIconBackground = new GenericGradient(); - xpIconBorder = new GenericGradient(); - xpIcon = new GenericTexture(); - - xpIconBackground.setBottomColor(darkbg); - xpIconBackground.setTopColor(darkbg); - xpIconBackground.setWidth(4); - xpIconBackground.setHeight(4); - xpIconBackground.setPriority(RenderPriority.High); - xpIconBackground.setX(142); - xpIconBackground.setY(10); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIconBackground); - - xpIconBorder.setBottomColor(border); - xpIconBorder.setTopColor(border); - xpIconBorder.setWidth(6); - xpIconBorder.setHeight(6); - xpIconBorder.setPriority(RenderPriority.Highest); - xpIconBorder.setX(141); - xpIconBorder.setY(9); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIconBorder); - - xpIcon.setWidth(6); - xpIcon.setHeight(6); - xpIcon.setX(141); - xpIcon.setY(9); - xpIcon.setPriority(RenderPriority.Normal); - xpIcon.setUrl("Icon_r.png"); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIcon); - } - } - - /** - * Initialize Standard XP bar. - */ - private void initializeXpBarStandard() { - xpBar = new GenericTexture(); - - ((GenericTexture) xpBar).setUrl("xpbar_inc000.png"); - xpBar.setX(SpoutConfig.getInstance().getXPBarXPosition()); - xpBar.setY(SpoutConfig.getInstance().getXPBarYPosition()); - xpBar.setHeight(8); - xpBar.setWidth(256); - xpBar.setPriority(RenderPriority.Lowest); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBar); - - if (SpoutConfig.getInstance().getXPBarIconEnabled()) { - xpIcon = new GenericTexture(); - - xpIcon.setUrl("Icon.png"); - xpIcon.setHeight(16); - xpIcon.setWidth(32); - xpIcon.setX(SpoutConfig.getInstance().getXPIconXPosition()); - xpIcon.setY(SpoutConfig.getInstance().getXPIconYPosition()); - xpIcon.setPriority(RenderPriority.High); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIcon); - } - } - - /** - * Initialize Small XP bar. - */ - private void initializeXpBarSmall() { - xpBar = new GenericTexture(); - - ((GenericTexture) xpBar).setUrl("xpbar_inc000.png"); - xpBar.setX(427 / 2 - 64); - xpBar.setY(SpoutConfig.getInstance().getXPBarYPosition()); - xpBar.setHeight(4); - xpBar.setWidth(128); - xpBar.setPriority(RenderPriority.Lowest); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBar); - - if (SpoutConfig.getInstance().getXPBarIconEnabled()) { - xpIcon = new GenericTexture(); - - xpIcon.setUrl("Icon.png"); - xpIcon.setHeight(8); - xpIcon.setWidth(16); - xpIcon.setX(427 / 2 - (8 + 64)); - xpIcon.setY(SpoutConfig.getInstance().getXPIconYPosition() + 2); - xpIcon.setPriority(RenderPriority.High); - spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIcon); - } - } - - /** - * Update the XP bar. - * - * @param skillType The skill last used - * @param playerProfile The profile of the player whose XP bar should be updated - */ - public void update(SkillType skillType, PlayerProfile playerProfile) { - switch (playerProfile.getHudType()) { - case RETRO: - updateXpBarRetro(skillType, playerProfile); - break; - - case STANDARD: - case SMALL: - updateXpBarStandard(skillType, playerProfile); - break; - - case DISABLED: - break; - - default: - break; - } - } - - /** - * Update XP bar for Standard & Small styles. - * - * @param skillType The skill last used - * @param playerProfile The profile of the player whose XP bar should be updated - */ - private void updateXpBarStandard(SkillType skillType, PlayerProfile playerProfile) { - xpIcon.setUrl(StringUtils.getCapitalized(skillType.toString()) + ".png"); - - ((GenericTexture) xpBar).setUrl(getUrlBar(getXpInc(playerProfile.getSkillXpLevel(skillType), playerProfile.getXpToLevel(skillType), HudType.STANDARD))); - - spoutPlayer.getMainScreen().setDirty(true); - } - - /** - * Update XP bar for Retro styles. - * - * @param skillType The skill last used - * @param playerProfile The profile of the player whose XP bar should be updated - */ - private void updateXpBarRetro(SkillType skillType, PlayerProfile playerProfile) { - Color color = getRetroColor(skillType); - - xpIcon.setUrl(StringUtils.getCapitalized(skillType.toString()) + "_r.png"); - - xpFill.setBottomColor(color); - xpFill.setTopColor(color); - xpFill.setWidth(getXpInc(playerProfile.getSkillXpLevel(skillType), playerProfile.getXpToLevel(skillType), HudType.RETRO)); - - spoutPlayer.getMainScreen().setDirty(true); - } - - private static Color getRetroColor(SkillType type) { - return new Color((float) SpoutConfig.getInstance().getRetroHUDRed(type), (float) SpoutConfig.getInstance().getRetroHUDGreen(type), (float) SpoutConfig.getInstance().getRetroHUDBlue(type), 1f); - } - - private static String getUrlBar(Integer number) { - char[] num = number.toString().toCharArray(); - - switch (num.length) { - case 1: - return "xpbar_inc00" + number + ".png"; - - case 2: - return "xpbar_inc0" + number + ".png"; - - default: - return "xpbar_inc" + number + ".png"; - } - } - - private static Integer getXpInc(int skillXp, int xpToLevel, HudType hudType) { - double percentage = (double) skillXp / xpToLevel; - double inc; - - switch (hudType) { - case RETRO: - inc = 0.0079365079365079; - break; - - case STANDARD: - inc = 0.0039370078740157; - break; - - default: - return 1; - } - - return (int) (percentage / inc); - } -} diff --git a/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java b/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java deleted file mode 100644 index 382f677f3..000000000 --- a/src/main/java/com/gmail/nossr50/listeners/SpoutListener.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.gmail.nossr50.listeners; - -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; - -import com.gmail.nossr50.config.spout.SpoutConfig; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.spout.buttons.McMMOButton; -import com.gmail.nossr50.datatypes.spout.huds.McMMOHud; -import com.gmail.nossr50.datatypes.spout.popups.McMMOMenu; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.util.player.UserManager; - -import org.getspout.spoutapi.event.input.KeyPressedEvent; -import org.getspout.spoutapi.event.screen.ButtonClickEvent; -import org.getspout.spoutapi.event.screen.ScreenCloseEvent; -import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; -import org.getspout.spoutapi.gui.Button; -import org.getspout.spoutapi.gui.ScreenType; -import org.getspout.spoutapi.player.SpoutPlayer; - -public class SpoutListener implements Listener { - - /** - * Monitor SpoutCraftEnable events. - * - * @param event The event to watch - */ - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onSpoutCraftEnable(SpoutCraftEnableEvent event) { - SpoutPlayer spoutPlayer = event.getPlayer(); - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(spoutPlayer); - - // TODO: Add custom titles based on skills - if (SpoutConfig.getInstance().getShowPowerLevel()) { - spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", spoutPlayer.getTitle(), mcMMOPlayer.getPowerLevel())); - } - - mcMMOPlayer.getProfile().setSpoutHud(new McMMOHud(mcMMOPlayer)); // Setup Party HUD stuff - } - - /** - * Monitor Spout ButtonClick events. - * - * @param event The event to watch - */ - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onButtonClick(ButtonClickEvent event) { - Button button = event.getButton(); - - if (button instanceof McMMOButton) { - ((McMMOButton) button).activate(); - } - } - - /** - * Monitor Spout ScreenClose events. - * - * @param event The event to watch - */ - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onScreenClose(ScreenCloseEvent event) { - if (event.getScreen() instanceof McMMOMenu) { - SpoutPlayer spoutPlayer = event.getPlayer(); - - UserManager.getPlayer(spoutPlayer).getProfile().getSpoutHud().onMenuClose(); - spoutPlayer.getMainScreen().setDirty(true); - } - } - - /** - * Monitor Spout KeyPressed events. - * - * @param event The event to watch - */ - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onKeyPressedEvent(KeyPressedEvent event) { - SpoutPlayer spoutPlayer = event.getPlayer(); - - if (spoutPlayer.getMainScreen().getActivePopup() != null || event.getScreenType() != ScreenType.GAME_SCREEN) { - return; - } - - if (event.getKey() == SpoutConfig.getInstance().getMenuKey()) { - McMMOHud spoutHud = UserManager.getPlayer(spoutPlayer).getProfile().getSpoutHud(); - - if (!spoutHud.isMenuOpened()) { - spoutHud.openMenu(); - } - } - } -} diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index ccaea6895..817c1369c 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -18,7 +18,6 @@ import com.gmail.nossr50.config.mods.CustomArmorConfig; import com.gmail.nossr50.config.mods.CustomBlockConfig; import com.gmail.nossr50.config.mods.CustomEntityConfig; import com.gmail.nossr50.config.mods.CustomToolConfig; -import com.gmail.nossr50.config.spout.SpoutConfig; import com.gmail.nossr50.config.treasure.TreasureConfig; import com.gmail.nossr50.database.DatabaseManager; import com.gmail.nossr50.database.DatabaseManagerFactory; @@ -27,7 +26,6 @@ import com.gmail.nossr50.listeners.EntityListener; import com.gmail.nossr50.listeners.InventoryListener; import com.gmail.nossr50.listeners.PlayerListener; import com.gmail.nossr50.listeners.SelfListener; -import com.gmail.nossr50.listeners.SpoutListener; import com.gmail.nossr50.listeners.WorldListener; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.metrics.MetricsManager; @@ -50,12 +48,10 @@ import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory; import com.gmail.nossr50.util.commands.CommandRegistrationManager; import com.gmail.nossr50.util.experience.FormulaManager; import com.gmail.nossr50.util.player.UserManager; -import com.gmail.nossr50.util.spout.SpoutUtils; import net.h31ix.updater.Updater; import net.h31ix.updater.Updater.UpdateResult; import net.h31ix.updater.Updater.UpdateType; - import net.shatteredlands.shatt.backup.ZipLibrary; public class mcMMO extends JavaPlugin { @@ -115,7 +111,6 @@ public class mcMMO extends JavaPlugin { metadataValue = new FixedMetadataValue(this, true); setupFilePaths(); - setupSpout(); loadConfigFiles(); if (!noErrorsInConfigFiles) { @@ -335,19 +330,6 @@ public class mcMMO extends JavaPlugin { repairableManager.registerRepairables(repairables); } - private void setupSpout() { - if (!getServer().getPluginManager().isPluginEnabled("Spout")) { - return; - } - - spoutEnabled = true; - - SpoutConfig.getInstance(); - getServer().getPluginManager().registerEvents(new SpoutListener(), this); - SpoutUtils.preCacheFiles(); - SpoutUtils.reloadSpoutPlayers(); // Handle spout players after a /reload - } - private void registerEvents() { PluginManager pluginManager = getServer().getPluginManager(); diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java index 612a904df..b01950fb4 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -25,7 +25,6 @@ import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.skills.SkillUtils; -import com.gmail.nossr50.util.spout.SpoutUtils; public class RepairManager extends SkillManager { public RepairManager(McMMOPlayer mcMMOPlayer) { @@ -44,12 +43,7 @@ public class RepairManager extends SkillManager { return; } - if (mcMMO.isSpoutEnabled()) { - SpoutUtils.sendRepairNotifications(player, anvilType); - } - else { - player.sendMessage(Repair.getAnvilMessage(anvilType)); - } + player.sendMessage(Repair.getAnvilMessage(anvilType)); player.playSound(player.getLocation(), Sound.ANVIL_LAND, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH); mcMMOPlayer.togglePlacedAnvil(anvilType); diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/src/main/java/com/gmail/nossr50/util/ItemUtils.java index c09de1630..ca6031f4f 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java +++ b/src/main/java/com/gmail/nossr50/util/ItemUtils.java @@ -7,8 +7,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.material.Dye; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.api.SpoutToolsAPI; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.mods.CustomArmorConfig; import com.gmail.nossr50.config.mods.CustomToolConfig; @@ -32,7 +30,7 @@ public class ItemUtils { return true; default: - return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customSwordIDs.contains(item.getTypeId())) || (mcMMO.isSpoutEnabled() && SpoutToolsAPI.spoutSwords.contains(item)); + return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customSwordIDs.contains(item.getTypeId())); } } @@ -52,7 +50,7 @@ public class ItemUtils { return true; default: - return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customHoeIDs.contains(item.getTypeId())) || (mcMMO.isSpoutEnabled() && SpoutToolsAPI.spoutHoes.contains(item)); + return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customHoeIDs.contains(item.getTypeId())); } } @@ -72,7 +70,7 @@ public class ItemUtils { return true; default: - return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customShovelIDs.contains(item.getTypeId())) || (mcMMO.isSpoutEnabled() && SpoutToolsAPI.spoutShovels.contains(item)); + return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customShovelIDs.contains(item.getTypeId())); } } @@ -92,7 +90,7 @@ public class ItemUtils { return true; default: - return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customAxeIDs.contains(item.getTypeId())) || (mcMMO.isSpoutEnabled() && SpoutToolsAPI.spoutAxes.contains(item)); + return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customAxeIDs.contains(item.getTypeId())); } } @@ -112,7 +110,7 @@ public class ItemUtils { return true; default: - return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customPickaxeIDs.contains(item.getTypeId())) || (mcMMO.isSpoutEnabled() && SpoutToolsAPI.spoutPickaxes.contains(item)); + return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().customPickaxeIDs.contains(item.getTypeId())); } } diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java index 88bbb499e..51d95c36a 100644 --- a/src/main/java/com/gmail/nossr50/util/Misc.java +++ b/src/main/java/com/gmail/nossr50/util/Misc.java @@ -23,10 +23,8 @@ import org.bukkit.metadata.MetadataValue; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.spout.huds.McMMOHud; import com.gmail.nossr50.events.items.McMMOItemSpawnEvent; import com.gmail.nossr50.util.player.UserManager; -import com.gmail.nossr50.util.spout.SpoutUtils; public final class Misc { private static Random random = new Random(); @@ -186,20 +184,11 @@ public final class Misc { public static void profileCleanup(String playerName) { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName); Player player = mcMMOPlayer.getPlayer(); - McMMOHud spoutHud = mcMMOPlayer.getProfile().getSpoutHud(); - - if (spoutHud != null) { - spoutHud.removeWidgets(); - } UserManager.remove(playerName); if (player.isOnline()) { UserManager.addUser(player); - - if (mcMMO.isSpoutEnabled()) { - SpoutUtils.reloadSpoutPlayer(player); - } } } diff --git a/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java b/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java index 2a449f20a..3860dfda1 100644 --- a/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java +++ b/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java @@ -46,8 +46,6 @@ import com.gmail.nossr50.commands.skills.SwordsCommand; import com.gmail.nossr50.commands.skills.TamingCommand; import com.gmail.nossr50.commands.skills.UnarmedCommand; import com.gmail.nossr50.commands.skills.WoodcuttingCommand; -import com.gmail.nossr50.commands.spout.MchudCommand; -import com.gmail.nossr50.commands.spout.XplockCommand; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.locale.LocaleLoader; @@ -314,26 +312,6 @@ public final class CommandRegistrationManager { command.setExecutor(new PartyChatCommand()); } - private static void registerMchudCommand() { - PluginCommand command = mcMMO.p.getCommand("mchud"); - command.setDescription(LocaleLoader.getString("Commands.Description.mchud")); - command.setPermission("mcmmo.commands.mchud"); - command.setPermissionMessage(permissionsMessage); - command.setUsage(LocaleLoader.getString("Commands.Usage.1", "mchud", "")); - command.setExecutor(new MchudCommand()); - } - - private static void registerXplockCommand() { - PluginCommand command = mcMMO.p.getCommand("xplock"); - command.setDescription(LocaleLoader.getString("Commands.Description.xplock")); - command.setPermission("mcmmo.commands.xplock"); - command.setPermissionMessage(permissionsMessage); - command.setUsage(LocaleLoader.getString("Commands.Usage.0", "xplock")); - command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "xplock", "")); - command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "xplock", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">")); - command.setExecutor(new XplockCommand()); - } - private static void registerPartyCommand() { PluginCommand command = mcMMO.p.getCommand("party"); command.setDescription(LocaleLoader.getString("Commands.Description.party")); @@ -456,9 +434,5 @@ public final class CommandRegistrationManager { // Skill Commands registerSkillCommands(); - - // Spout Commands - registerXplockCommand(); - registerMchudCommand(); } } diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java index 98cbd4439..ef0b97cf4 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java @@ -38,7 +38,6 @@ import com.gmail.nossr50.util.ModUtils; import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.player.UserManager; -import com.gmail.nossr50.util.spout.SpoutUtils; public class SkillUtils { public static int handleFoodSkills(Player player, SkillType skill, int eventFoodLevel, int baseLevel, int maxLevel, int rankChange) { @@ -163,17 +162,8 @@ public class SkillUtils { String capitalized = StringUtils.getCapitalized(skillType.toString()); - if (mcMMO.isSpoutEnabled()) { - SpoutUtils.processLevelup(mcMMOPlayer, skillType, levelsGained); - } - else { - player.playSound(player.getLocation(), Sound.LEVEL_UP, Misc.LEVELUP_VOLUME, Misc.LEVELUP_PITCH); - player.sendMessage(LocaleLoader.getString(capitalized + ".Skillup", levelsGained, profile.getSkillLevel(skillType))); - } - } - - if (mcMMO.isSpoutEnabled()) { - SpoutUtils.processXpGain(player, profile); + player.playSound(player.getLocation(), Sound.LEVEL_UP, Misc.LEVELUP_VOLUME, Misc.LEVELUP_PITCH); + player.sendMessage(LocaleLoader.getString(capitalized + ".Skillup", levelsGained, profile.getSkillLevel(skillType))); } } diff --git a/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java b/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java deleted file mode 100644 index 3317e19a4..000000000 --- a/src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java +++ /dev/null @@ -1,475 +0,0 @@ -package com.gmail.nossr50.util.spout; - -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.jar.JarFile; - -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.plugin.PluginManager; - -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.config.spout.SpoutConfig; -import com.gmail.nossr50.datatypes.player.McMMOPlayer; -import com.gmail.nossr50.datatypes.player.PlayerProfile; -import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.locale.LocaleLoader; -import com.gmail.nossr50.skills.repair.Repair; -import com.gmail.nossr50.util.StringUtils; -import com.gmail.nossr50.util.player.UserManager; -import com.gmail.nossr50.util.skills.SkillUtils; - -import org.getspout.spoutapi.SpoutManager; -import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent; -import org.getspout.spoutapi.player.SpoutPlayer; - -public class SpoutUtils { - // The order of the values is extremely important, a few methods depend on it to work properly - protected enum Tier { - FOUR(4) { - @Override public int getLevel() { return SpoutConfig.getInstance().getNotificationTier4(); } - @Override protected Material getAcrobaticsNotificationItem() { return Material.DIAMOND_BOOTS; } - @Override protected Material getArcheryNotificationItem() { return Material.BOW; } - @Override protected Material getAxesNotificationItem() { return Material.DIAMOND_AXE; } - @Override protected Material getExcavationNotificationItem() { return Material.CLAY; } - @Override protected Material getFishingNotificationItem() { return Material.FISHING_ROD; } - @Override protected Material getHerbalismNotificationItem() { return Material.WATER_LILY; } - @Override protected Material getMiningNotificationItem() { return Material.EMERALD_ORE; } - @Override protected Material getSwordsNotificationItem() { return Material.DIAMOND_SWORD; } - @Override protected Material getTamingNotificationItem() { return Material.BONE; } - @Override protected Material getUnarmedNotificationItem() { return Material.DIAMOND_HELMET; } - @Override protected Material getWoodcuttingNotificationItem() { return Material.LOG; }}, - THREE(3) { - @Override public int getLevel() { return SpoutConfig.getInstance().getNotificationTier3(); } - @Override protected Material getAcrobaticsNotificationItem() { return Material.GOLD_BOOTS; } - @Override protected Material getArcheryNotificationItem() { return Material.ARROW; } - @Override protected Material getAxesNotificationItem() { return Material.GOLD_AXE; } - @Override protected Material getExcavationNotificationItem() { return Material.SAND; } - @Override protected Material getFishingNotificationItem() { return Material.COOKED_FISH; } - @Override protected Material getHerbalismNotificationItem() { return Material.RED_ROSE; } - @Override protected Material getMiningNotificationItem() { return Material.DIAMOND_ORE; } - @Override protected Material getSwordsNotificationItem() { return Material.GOLD_SWORD; } - @Override protected Material getTamingNotificationItem() { return Material.GRILLED_PORK; } - @Override protected Material getUnarmedNotificationItem() { return Material.GOLD_HELMET; } - @Override protected Material getWoodcuttingNotificationItem() { return Material.WOOD; }}, - TWO(2) { - @Override public int getLevel() { return SpoutConfig.getInstance().getNotificationTier2(); } - @Override protected Material getAcrobaticsNotificationItem() { return Material.IRON_BOOTS; } - @Override protected Material getArcheryNotificationItem() { return Material.ARROW; } - @Override protected Material getAxesNotificationItem() { return Material.IRON_AXE; } - @Override protected Material getExcavationNotificationItem() { return Material.GRAVEL; } - @Override protected Material getFishingNotificationItem() { return Material.COOKED_FISH; } - @Override protected Material getHerbalismNotificationItem() { return Material.YELLOW_FLOWER; } - @Override protected Material getMiningNotificationItem() { return Material.GOLD_ORE; } - @Override protected Material getSwordsNotificationItem() { return Material.IRON_SWORD; } - @Override protected Material getTamingNotificationItem() { return Material.GRILLED_PORK; } - @Override protected Material getUnarmedNotificationItem() { return Material.IRON_HELMET; } - @Override protected Material getWoodcuttingNotificationItem() { return Material.LEAVES; }}, - ONE(1) { - @Override public int getLevel() { return SpoutConfig.getInstance().getNotificationTier1(); } - @Override protected Material getAcrobaticsNotificationItem() { return Material.CHAINMAIL_BOOTS; } - @Override protected Material getArcheryNotificationItem() { return Material.FLINT; } - @Override protected Material getAxesNotificationItem() { return Material.STONE_AXE; } - @Override protected Material getExcavationNotificationItem() { return Material.GRASS; } - @Override protected Material getFishingNotificationItem() { return Material.RAW_FISH; } - @Override protected Material getHerbalismNotificationItem() { return Material.CACTUS; } - @Override protected Material getMiningNotificationItem() { return Material.IRON_ORE; } - @Override protected Material getSwordsNotificationItem() { return Material.STONE_SWORD; } - @Override protected Material getTamingNotificationItem() { return Material.PORK; } - @Override protected Material getUnarmedNotificationItem() { return Material.CHAINMAIL_HELMET; } - @Override protected Material getWoodcuttingNotificationItem() { return Material.SAPLING; }}; - - int numerical; - - private Tier(int numerical) { - this.numerical = numerical; - } - - public int toNumerical() { - return numerical; - } - - abstract protected int getLevel(); - abstract protected Material getAcrobaticsNotificationItem(); - abstract protected Material getArcheryNotificationItem(); - abstract protected Material getAxesNotificationItem(); - abstract protected Material getExcavationNotificationItem(); - abstract protected Material getFishingNotificationItem(); - abstract protected Material getHerbalismNotificationItem(); - abstract protected Material getMiningNotificationItem(); - abstract protected Material getSwordsNotificationItem(); - abstract protected Material getTamingNotificationItem(); - abstract protected Material getUnarmedNotificationItem(); - abstract protected Material getWoodcuttingNotificationItem(); - } - - private final static String spoutDirectory = mcMMO.getMainDirectory() + "Resources" + File.separator; - private final static String hudDirectory = spoutDirectory + "HUD" + File.separator; - private final static String hudStandardDirectory = hudDirectory + "Standard" + File.separator; - private final static String hudRetroDirectory = hudDirectory + "Retro" + File.separator; - private final static String soundDirectory = spoutDirectory + "Sound" + File.separator; - - /** - * Write file to disk. - * - * @param fileName The name of the file - * @param filePath The name of the file path - */ - private static File writeFile(String fileName, String filePath) { - File currentFile = new File(filePath + fileName); - BufferedOutputStream os = null; - JarFile jar = null; - - // No point in writing the file again if it already exists. - if (currentFile.exists()) { - return currentFile; - } - - try { - jar = new JarFile(mcMMO.mcmmo); - - @SuppressWarnings("resource") - InputStream is = jar.getInputStream(jar.getJarEntry("resources/" + fileName)); - - byte[] buf = new byte[2048]; - int nbRead; - - os = new BufferedOutputStream(new FileOutputStream(currentFile)); - - while ((nbRead = is.read(buf)) != -1) { - os.write(buf, 0, nbRead); - } - } - catch (FileNotFoundException e) { - e.printStackTrace(); - } - catch (IOException e) { - e.printStackTrace(); - } - finally { - if (jar != null) { - try { - jar.close(); - } - catch (IOException ex) { - ex.printStackTrace(); - } - } - if (os != null) { - try { - os.close(); - } - catch (IOException ex) { - ex.printStackTrace(); - } - } - } - - return currentFile; - } - - /** - * Extract Spout files to the Resources directory. - */ - public static ArrayList extractFiles() { - ArrayList files = new ArrayList(); - - // Setup directories - new File(spoutDirectory).mkdir(); - new File(hudDirectory).mkdir(); - new File(hudStandardDirectory).mkdir(); - new File(hudRetroDirectory).mkdir(); - new File(soundDirectory).mkdir(); - - // XP Bar images - for (int x = 0; x < 255; x++) { - String fileName; - - if (x < 10) { - fileName = "xpbar_inc00" + x + ".png"; - } - else if (x < 100) { - fileName = "xpbar_inc0" + x + ".png"; - } - else { - fileName = "xpbar_inc" + x + ".png"; - } - - files.add(writeFile(fileName, hudStandardDirectory)); - } - - // Standard XP Icons - for (SkillType skillType : SkillType.nonChildSkills()) { - String skillName = StringUtils.getCapitalized(skillType.toString()); - - files.add(writeFile(skillName + ".png", hudStandardDirectory)); - files.add(writeFile(skillName + "_r.png", hudRetroDirectory)); - } - - // Blank icons - files.add(writeFile("Icon.png", hudStandardDirectory)); - files.add(writeFile("Icon_r.png", hudRetroDirectory)); - - // Sound FX - files.add(writeFile("level.wav", soundDirectory)); - - return files; - } - - /** - * Handle level-up notifications through Spout. - * - * @param skillType The skill that leveled up - * @param spoutPlayer The player that leveled up - */ - public static void levelUpNotification(SkillType skillType, SpoutPlayer spoutPlayer) { - PlayerProfile profile = UserManager.getPlayer(spoutPlayer).getProfile(); - int skillLevel = profile.getSkillLevel(skillType); - Material notificationItem; - - switch (skillType) { - case ACROBATICS: - notificationItem = getAcrobaticsNotificationItem(skillLevel); - break; - - case ARCHERY: - notificationItem = getArcheryNotificationItem(skillLevel); - break; - - case AXES: - notificationItem = getAxesNotificationItem(skillLevel); - break; - - case EXCAVATION: - notificationItem = getExcavationNotificationItem(skillLevel); - break; - - case FISHING: - notificationItem = getFishingNotificationItem(skillLevel); - break; - - case HERBALISM: - notificationItem = getHerbalismNotificationItem(skillLevel); - break; - - case MINING: - notificationItem = getMiningNotificationItem(skillLevel); - break; - - case REPAIR: - notificationItem = Material.ANVIL; - break; - - case SWORDS: - notificationItem = getSwordsNotificationItem(skillLevel); - break; - - case TAMING: - notificationItem = getTamingNotificationItem(skillLevel); - break; - - case UNARMED: - notificationItem = getUnarmedNotificationItem(skillLevel); - break; - - case WOODCUTTING: - notificationItem = getWoodcuttingNotificationItem(skillLevel); - break; - - default: - notificationItem = Material.MAP; - break; - } - - spoutPlayer.sendNotification(LocaleLoader.getString("Spout.LevelUp.1"), LocaleLoader.getString("Spout.LevelUp.2", SkillUtils.getSkillName(skillType), skillLevel), notificationItem); - SpoutManager.getSoundManager().playCustomSoundEffect(mcMMO.p, spoutPlayer, "level.wav", false); - } - - private static Material getAcrobaticsNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getAcrobaticsNotificationItem(); - } - } - - return Material.LEATHER_BOOTS; - } - - private static Material getArcheryNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getArcheryNotificationItem(); - } - } - - return Material.FEATHER; - } - - private static Material getAxesNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getAxesNotificationItem(); - } - } - - return Material.WOOD_AXE; - } - - private static Material getExcavationNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getExcavationNotificationItem(); - } - } - - return Material.DIRT; - } - - private static Material getFishingNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getFishingNotificationItem(); - } - } - - return Material.RAW_FISH; - } - - private static Material getHerbalismNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getHerbalismNotificationItem(); - } - } - - return Material.VINE; - } - - private static Material getMiningNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getMiningNotificationItem(); - } - } - - return Material.COAL_ORE; - } - - private static Material getSwordsNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getSwordsNotificationItem(); - } - } - - return Material.WOOD_SWORD; - } - - private static Material getTamingNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getTamingNotificationItem(); - } - } - - return Material.PORK; - } - - private static Material getUnarmedNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getUnarmedNotificationItem(); - } - } - - return Material.LEATHER_HELMET; - } - - private static Material getWoodcuttingNotificationItem(int skillLevel) { - for (Tier tier : Tier.values()) { - if (skillLevel >= tier.getLevel()) { - return tier.getWoodcuttingNotificationItem(); - } - } - - return Material.STICK; - } - - /** - * Re-enable SpoutCraft for players after a /reload - */ - public static void reloadSpoutPlayers() { - PluginManager pluginManager = mcMMO.p.getServer().getPluginManager(); - - for (SpoutPlayer spoutPlayer : SpoutManager.getPlayerChunkMap().getOnlinePlayers()) { - pluginManager.callEvent(new SpoutCraftEnableEvent(spoutPlayer)); - } - } - - public static void reloadSpoutPlayer(Player player) { - SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player); - - if (spoutPlayer != null) { - mcMMO.p.getServer().getPluginManager().callEvent(new SpoutCraftEnableEvent(spoutPlayer)); - } - } - - public static void preCacheFiles() { - SpoutManager.getFileManager().addToPreLoginCache(mcMMO.p, extractFiles()); - } - - public static void processLevelup(McMMOPlayer mcMMOPlayer, SkillType skillType, int levelsGained) { - Player player = mcMMOPlayer.getPlayer(); - SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player); - - if (spoutPlayer.isSpoutCraftEnabled()) { - levelUpNotification(skillType, spoutPlayer); - - /* Update custom titles */ - if (SpoutConfig.getInstance().getShowPowerLevel()) { - spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", spoutPlayer.getName(), mcMMOPlayer.getPowerLevel())); - } - } - else { - player.sendMessage(LocaleLoader.getString(StringUtils.getCapitalized(skillType.toString()) + ".Skillup", levelsGained, mcMMOPlayer.getProfile().getSkillLevel(skillType))); - } - } - - public static void processXpGain(Player player, PlayerProfile profile) { - SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player); - - if (spoutPlayer.isSpoutCraftEnabled() && SpoutConfig.getInstance().getXPBarEnabled()) { - profile.getSpoutHud().updateXpBar(); - } - } - - public static void sendRepairNotifications(Player player, Material anvilType) { - SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player); - - if (spoutPlayer.isSpoutCraftEnabled()) { - String[] spoutMessages = Repair.getSpoutAnvilMessages(anvilType); - spoutPlayer.sendNotification(spoutMessages[0], spoutMessages[1], anvilType); - } - else { - player.sendMessage(Repair.getAnvilMessage(anvilType)); - } - } - - public static void sendDonationNotification(Player player) { - SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player); - - if (spoutPlayer.isSpoutCraftEnabled()) { - spoutPlayer.sendNotification(LocaleLoader.getString("Spout.Donate"), ChatColor.GREEN + "gjmcferrin@gmail.com", Material.DIAMOND); - } - else { - player.sendMessage(LocaleLoader.getString("MOTD.Donate")); - player.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal"); - } - } -} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ea78a57e2..417c6822c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,30 +1,24 @@ name: mcMMO version: ${project.version}-b${BUILD_NUMBER} description: > - mcMMO takes core Minecraft game mechanics and expands them to add an extensive - RPG experience, the goal of the project has always been a quality RPG - experience. Everything in mcMMO is carefully thought out and is constantly - improving. mcMMO adds eleven skills to train in and level in, while also - offering a high level of customization for server admins. There are countless - features, including custom sounds, graphical elements, and more added when - running mcMMO in conjunction with Spout. I carefully read feedback and - evaluate the mechanics of mcMMO in every update to provide an ever-evolving - experience. + The goal of mcMMO is to take core Minecraft game mechanics and expand them into + add an extensive and quality RPG experience. Everything in mcMMO has been carefully + thought out and is constantly being improved upon. Currently, mcMMO adds thirteen + unique skills to train and level in. Each of these skills is highly customizable + through our configuration files, allowing server admins to tweak mcMMO to best suit + the needs of his or her server. Know that the mcMMO team is dedicated to providing + an ever-evolving experience, and that we carefully read all feedback and bug reports + in order to evaluate and balance the mechanics of mcMMO in every update. author: nossr50 authors: [GJ, NuclearW, bm01, Glitchfinder, TfT_02, t00thpick1] website: http://dev.bukkit.org/server-mods/mcmmo/ main: com.gmail.nossr50.mcMMO -softdepend: [Spout, CombatTag] +softdepend: [CombatTag] load: STARTUP commands: - mchud: - description: Change your HUD - xplock: - aliases: [mcxplock] - description: Lock your mcMMO XP bar xprate: aliases: [mcxprate] description: Modify the xp rate or start an event @@ -698,7 +692,6 @@ permissions: mcmmo.commands.herbalism: true mcmmo.commands.inspect: true mcmmo.commands.mcability: true - mcmmo.commands.mchud: true mcmmo.commands.mcmmo.all: true mcmmo.commands.mcnotify: true mcmmo.commands.mcrank: true @@ -715,7 +708,6 @@ permissions: mcmmo.commands.taming: true mcmmo.commands.unarmed: true mcmmo.commands.woodcutting: true - mcmmo.commands.xplock.all: true mcmmo.commands.defaultsop: description: Implies all default op mcmmo.commands permissions. children: @@ -840,8 +832,6 @@ permissions: description: Allows access to the mcgod command mcmmo.commands.mcgod.others: description: Allows access to the mcgod command for other players - mcmmo.commands.mchud: - description: Allows access to the mchud command mcmmo.commands.mcmmo.*: default: false description: Implies access to all mcmmo.commands.mcmmo permissions @@ -1185,56 +1175,6 @@ permissions: description: Allows access to the vampirism command to toggle vampirism on/off mcmmo.commands.woodcutting: description: Allows access to the woodcutting command - mcmmo.commands.xplock.*: - default: false - description: Implies access to all mcmmo.commands.xplock permissions - children: - mcmmo.commands.xplock.all: true - mcmmo.commands.xplock.all: - description: Implies access to all mcmmo.commands.xplock permissions - children: - mcmmo.commands.xplock: true - mcmmo.commands.xplock.acrobatics: true - mcmmo.commands.xplock.archery: true - mcmmo.commands.xplock.axes: true - mcmmo.commands.xplock.excavation: true - mcmmo.commands.xplock.fishing: true - mcmmo.commands.xplock.herbalism: true - mcmmo.commands.xplock.mining: true - mcmmo.commands.xplock.repair: true - mcmmo.commands.xplock.smelting: true - mcmmo.commands.xplock.swords: true - mcmmo.commands.xplock.taming: true - mcmmo.commands.xplock.unarmed: true - mcmmo.commands.xplock.woodcutting: true - mcmmo.commands.xplock: - description: Allows access to the xplock command - mcmmo.commands.xplock.acrobatics: - description: Allows access to the xplock command for acrobatics - mcmmo.commands.xplock.archery: - description: Allows access to the xplock command for archery - mcmmo.commands.xplock.axes: - description: Allows access to the xplock command for axes - mcmmo.commands.xplock.excavation: - description: Allows access to the xplock command for excavation - mcmmo.commands.xplock.fishing: - description: Allows access to the xplock command for fishing - mcmmo.commands.xplock.herbalism: - description: Allows access to the xplock command for herbalism - mcmmo.commands.xplock.mining: - description: Allows access to the xplock command for mining - mcmmo.commands.xplock.repair: - description: Allows access to the xplock command for repair - mcmmo.commands.xplock.smelting: - description: Allows access to the xplock command for smelting - mcmmo.commands.xplock.swords: - description: Allows access to the xplock command for swords - mcmmo.commands.xplock.taming: - description: Allows access to the xplock command for taming - mcmmo.commands.xplock.unarmed: - description: Allows access to the xplock command for unarmed - mcmmo.commands.xplock.woodcutting: - description: Allows access to the xplock command for woodcutting mcmmo.commands.xprate.*: default: false description: Implies access to all mcmmo.commands.xprate permissions @@ -1789,79 +1729,66 @@ permissions: children: mcmmo.ability.acrobatics.all: true mcmmo.commands.acrobatics: true - mcmmo.commands.xplock.acrobatics: true mcmmo.skills.archery: description: Allows access to the Archery skill children: mcmmo.ability.archery.all: true mcmmo.commands.archery: true - mcmmo.commands.xplock.archery: true mcmmo.skills.axes: description: Allows access to the Axes skill children: mcmmo.ability.axes.all: true mcmmo.commands.axes: true - mcmmo.commands.xplock.axes: true mcmmo.skills.excavation: description: Allows access to the Excavation skill children: mcmmo.ability.excavation.all: true mcmmo.commands.excavation: true - mcmmo.commands.xplock.excavation: true mcmmo.skills.fishing: description: Allows access to the Fishing skill children: mcmmo.ability.fishing.all: true mcmmo.commands.fishing: true - mcmmo.commands.xplock.fishing: true mcmmo.skills.herbalism: description: Allows access to the Herbalism skill children: mcmmo.ability.herbalism.all: true mcmmo.commands.herbalism: true - mcmmo.commands.xplock.herbalism: true mcmmo.skills.mining: description: Allows access to the Mining skill children: mcmmo.ability.mining.all: true mcmmo.commands.mining: true - mcmmo.commands.xplock.mining: true mcmmo.skills.repair: description: Allows access to the Repair skill children: mcmmo.ability.repair.all: true mcmmo.commands.repair: true - mcmmo.commands.xplock.repair: true mcmmo.skills.smelting: description: Allows access to the Smelting skill children: mcmmo.ability.smelting.all: true mcmmo.commands.smelting: true - mcmmo.commands.xplock.smelting: true mcmmo.skills.swords: description: Allows access to the Swords skill children: mcmmo.ability.swords.all: true mcmmo.commands.swords: true - mcmmo.commands.xplock.swords: true mcmmo.skills.taming: description: Allows access to the Taming skill children: mcmmo.ability.taming.all: true mcmmo.commands.taming: true - mcmmo.commands.xplock.taming: true mcmmo.skills.unarmed: description: Allows access to the Unarmed skill children: mcmmo.ability.unarmed.all: true mcmmo.commands.unarmed: true - mcmmo.commands.xplock.unarmed: true mcmmo.skills.woodcutting: description: Allows access to the Woodcutting skill children: mcmmo.ability.woodcutting.all: true mcmmo.commands.woodcutting: true - mcmmo.commands.xplock.woodcutting: true mcmmo.tools.*: default: false description: Implies all mcmmo.tools permissions. diff --git a/src/main/resources/skillicon/Acrobatics.png b/src/main/resources/skillicon/Acrobatics.png deleted file mode 100644 index 45ed57530..000000000 Binary files a/src/main/resources/skillicon/Acrobatics.png and /dev/null differ diff --git a/src/main/resources/skillicon/Acrobatics_r.png b/src/main/resources/skillicon/Acrobatics_r.png deleted file mode 100644 index a2106d7e4..000000000 Binary files a/src/main/resources/skillicon/Acrobatics_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Archery.png b/src/main/resources/skillicon/Archery.png deleted file mode 100644 index 1f17f3b47..000000000 Binary files a/src/main/resources/skillicon/Archery.png and /dev/null differ diff --git a/src/main/resources/skillicon/Archery_r.png b/src/main/resources/skillicon/Archery_r.png deleted file mode 100644 index 5bba593ca..000000000 Binary files a/src/main/resources/skillicon/Archery_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Axe_r.png b/src/main/resources/skillicon/Axe_r.png deleted file mode 100644 index a6984ca47..000000000 Binary files a/src/main/resources/skillicon/Axe_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Axes.png b/src/main/resources/skillicon/Axes.png deleted file mode 100644 index a7d24870e..000000000 Binary files a/src/main/resources/skillicon/Axes.png and /dev/null differ diff --git a/src/main/resources/skillicon/Axes_r.png b/src/main/resources/skillicon/Axes_r.png deleted file mode 100644 index d90c62808..000000000 Binary files a/src/main/resources/skillicon/Axes_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Excavation.png b/src/main/resources/skillicon/Excavation.png deleted file mode 100644 index c3f7a8b9f..000000000 Binary files a/src/main/resources/skillicon/Excavation.png and /dev/null differ diff --git a/src/main/resources/skillicon/Excavation_r.png b/src/main/resources/skillicon/Excavation_r.png deleted file mode 100644 index d7d30b3e6..000000000 Binary files a/src/main/resources/skillicon/Excavation_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Fishing.png b/src/main/resources/skillicon/Fishing.png deleted file mode 100644 index bf277c808..000000000 Binary files a/src/main/resources/skillicon/Fishing.png and /dev/null differ diff --git a/src/main/resources/skillicon/Fishing_r.png b/src/main/resources/skillicon/Fishing_r.png deleted file mode 100644 index 53a43d9f6..000000000 Binary files a/src/main/resources/skillicon/Fishing_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Herbalism.png b/src/main/resources/skillicon/Herbalism.png deleted file mode 100644 index 713b4d279..000000000 Binary files a/src/main/resources/skillicon/Herbalism.png and /dev/null differ diff --git a/src/main/resources/skillicon/Herbalism_r.png b/src/main/resources/skillicon/Herbalism_r.png deleted file mode 100644 index d230eede3..000000000 Binary files a/src/main/resources/skillicon/Herbalism_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Icon.png b/src/main/resources/skillicon/Icon.png deleted file mode 100644 index 396839aa2..000000000 Binary files a/src/main/resources/skillicon/Icon.png and /dev/null differ diff --git a/src/main/resources/skillicon/Icon_old.png b/src/main/resources/skillicon/Icon_old.png deleted file mode 100644 index 8cc3e62a7..000000000 Binary files a/src/main/resources/skillicon/Icon_old.png and /dev/null differ diff --git a/src/main/resources/skillicon/Icon_r.png b/src/main/resources/skillicon/Icon_r.png deleted file mode 100644 index f5e847dd3..000000000 Binary files a/src/main/resources/skillicon/Icon_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Mining.png b/src/main/resources/skillicon/Mining.png deleted file mode 100644 index 21e9ca827..000000000 Binary files a/src/main/resources/skillicon/Mining.png and /dev/null differ diff --git a/src/main/resources/skillicon/Mining_r.png b/src/main/resources/skillicon/Mining_r.png deleted file mode 100644 index d24771d05..000000000 Binary files a/src/main/resources/skillicon/Mining_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Repair.png b/src/main/resources/skillicon/Repair.png deleted file mode 100644 index 129762e76..000000000 Binary files a/src/main/resources/skillicon/Repair.png and /dev/null differ diff --git a/src/main/resources/skillicon/Repair_r.png b/src/main/resources/skillicon/Repair_r.png deleted file mode 100644 index 208e3b543..000000000 Binary files a/src/main/resources/skillicon/Repair_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Swords.png b/src/main/resources/skillicon/Swords.png deleted file mode 100644 index e174c0b52..000000000 Binary files a/src/main/resources/skillicon/Swords.png and /dev/null differ diff --git a/src/main/resources/skillicon/Swords_r.png b/src/main/resources/skillicon/Swords_r.png deleted file mode 100644 index 77939ced2..000000000 Binary files a/src/main/resources/skillicon/Swords_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Taming.png b/src/main/resources/skillicon/Taming.png deleted file mode 100644 index 60fcb37c1..000000000 Binary files a/src/main/resources/skillicon/Taming.png and /dev/null differ diff --git a/src/main/resources/skillicon/Taming_r.png b/src/main/resources/skillicon/Taming_r.png deleted file mode 100644 index aac88be83..000000000 Binary files a/src/main/resources/skillicon/Taming_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Unarmed.png b/src/main/resources/skillicon/Unarmed.png deleted file mode 100644 index f84c8fe86..000000000 Binary files a/src/main/resources/skillicon/Unarmed.png and /dev/null differ diff --git a/src/main/resources/skillicon/Unarmed_r.png b/src/main/resources/skillicon/Unarmed_r.png deleted file mode 100644 index fd5c99f8a..000000000 Binary files a/src/main/resources/skillicon/Unarmed_r.png and /dev/null differ diff --git a/src/main/resources/skillicon/Woodcutting.png b/src/main/resources/skillicon/Woodcutting.png deleted file mode 100644 index f0276e184..000000000 Binary files a/src/main/resources/skillicon/Woodcutting.png and /dev/null differ diff --git a/src/main/resources/skillicon/Woodcutting_r.png b/src/main/resources/skillicon/Woodcutting_r.png deleted file mode 100644 index af8f84241..000000000 Binary files a/src/main/resources/skillicon/Woodcutting_r.png and /dev/null differ diff --git a/src/main/resources/sound/level.wav b/src/main/resources/sound/level.wav deleted file mode 100644 index b54951f9e..000000000 Binary files a/src/main/resources/sound/level.wav and /dev/null differ diff --git a/src/main/resources/spout.yml b/src/main/resources/spout.yml deleted file mode 100644 index d445a308a..000000000 --- a/src/main/resources/spout.yml +++ /dev/null @@ -1,77 +0,0 @@ -Menu: - Key: KEY_M -XP: - Bar: - Enabled: true - X_POS: 95 - Y_POS: 6 - Icon: - Enabled: true - X_POS: 78 - Y_POS: 2 -HUD: - Show_Power_Level: true - Default: STANDARD - Retro: - Colors: - Swords: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Taming: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Acrobatics: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Border: - BLUE: 0.0 - GREEN: 0.0 - RED: 0.0 - Background: - BLUE: 0.75 - GREEN: 0.75 - RED: 0.75 - Woodcutting: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Archery: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Axes: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Repair: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Fishing: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Excavation: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Herbalism: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Unarmed: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 - Mining: - BLUE: 0.75 - GREEN: 0.3 - RED: 0.3 -Notifications: - Tier1: 200 - Tier2: 400 - Tier3: 600 - Tier4: 800 \ No newline at end of file diff --git a/src/main/resources/xpbar/xpbar_inc000.png b/src/main/resources/xpbar/xpbar_inc000.png deleted file mode 100644 index d15d73c1a..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc000.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc001.png b/src/main/resources/xpbar/xpbar_inc001.png deleted file mode 100644 index cae4a5773..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc001.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc002.png b/src/main/resources/xpbar/xpbar_inc002.png deleted file mode 100644 index 8979efddb..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc002.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc003.png b/src/main/resources/xpbar/xpbar_inc003.png deleted file mode 100644 index 012d8a939..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc003.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc004.png b/src/main/resources/xpbar/xpbar_inc004.png deleted file mode 100644 index e7c67d344..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc004.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc005.png b/src/main/resources/xpbar/xpbar_inc005.png deleted file mode 100644 index ff6236c65..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc005.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc006.png b/src/main/resources/xpbar/xpbar_inc006.png deleted file mode 100644 index 091881639..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc006.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc007.png b/src/main/resources/xpbar/xpbar_inc007.png deleted file mode 100644 index 80a1fe278..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc007.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc008.png b/src/main/resources/xpbar/xpbar_inc008.png deleted file mode 100644 index 06f1c091d..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc008.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc009.png b/src/main/resources/xpbar/xpbar_inc009.png deleted file mode 100644 index a6f422be4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc009.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc010.png b/src/main/resources/xpbar/xpbar_inc010.png deleted file mode 100644 index 4e993be07..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc010.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc011.png b/src/main/resources/xpbar/xpbar_inc011.png deleted file mode 100644 index 6cb5a7a9f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc011.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc012.png b/src/main/resources/xpbar/xpbar_inc012.png deleted file mode 100644 index cf65d13e4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc012.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc013.png b/src/main/resources/xpbar/xpbar_inc013.png deleted file mode 100644 index 16c16618e..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc013.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc014.png b/src/main/resources/xpbar/xpbar_inc014.png deleted file mode 100644 index f1ca460d2..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc014.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc015.png b/src/main/resources/xpbar/xpbar_inc015.png deleted file mode 100644 index c018e061f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc015.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc016.png b/src/main/resources/xpbar/xpbar_inc016.png deleted file mode 100644 index e1fbe6106..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc016.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc017.png b/src/main/resources/xpbar/xpbar_inc017.png deleted file mode 100644 index 40afb4b57..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc017.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc018.png b/src/main/resources/xpbar/xpbar_inc018.png deleted file mode 100644 index 18f571141..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc018.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc019.png b/src/main/resources/xpbar/xpbar_inc019.png deleted file mode 100644 index 8d7842274..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc019.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc020.png b/src/main/resources/xpbar/xpbar_inc020.png deleted file mode 100644 index 825b4efd0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc020.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc021.png b/src/main/resources/xpbar/xpbar_inc021.png deleted file mode 100644 index f796912a6..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc021.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc022.png b/src/main/resources/xpbar/xpbar_inc022.png deleted file mode 100644 index 4384a066b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc022.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc023.png b/src/main/resources/xpbar/xpbar_inc023.png deleted file mode 100644 index 8775cc50b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc023.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc024.png b/src/main/resources/xpbar/xpbar_inc024.png deleted file mode 100644 index 69f549873..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc024.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc025.png b/src/main/resources/xpbar/xpbar_inc025.png deleted file mode 100644 index 1d2c5b4fe..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc025.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc026.png b/src/main/resources/xpbar/xpbar_inc026.png deleted file mode 100644 index 8b88e028c..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc026.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc027.png b/src/main/resources/xpbar/xpbar_inc027.png deleted file mode 100644 index 2667d9cb8..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc027.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc028.png b/src/main/resources/xpbar/xpbar_inc028.png deleted file mode 100644 index e4987db6f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc028.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc029.png b/src/main/resources/xpbar/xpbar_inc029.png deleted file mode 100644 index edcd03b18..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc029.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc030.png b/src/main/resources/xpbar/xpbar_inc030.png deleted file mode 100644 index 3c2979e2b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc030.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc031.png b/src/main/resources/xpbar/xpbar_inc031.png deleted file mode 100644 index ff3a8769e..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc031.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc032.png b/src/main/resources/xpbar/xpbar_inc032.png deleted file mode 100644 index 54d629d62..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc032.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc033.png b/src/main/resources/xpbar/xpbar_inc033.png deleted file mode 100644 index e704d64aa..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc033.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc034.png b/src/main/resources/xpbar/xpbar_inc034.png deleted file mode 100644 index 94878bab9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc034.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc035.png b/src/main/resources/xpbar/xpbar_inc035.png deleted file mode 100644 index b536915e0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc035.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc036.png b/src/main/resources/xpbar/xpbar_inc036.png deleted file mode 100644 index 0d51fc181..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc036.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc037.png b/src/main/resources/xpbar/xpbar_inc037.png deleted file mode 100644 index c91424123..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc037.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc038.png b/src/main/resources/xpbar/xpbar_inc038.png deleted file mode 100644 index 53647d0c3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc038.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc039.png b/src/main/resources/xpbar/xpbar_inc039.png deleted file mode 100644 index d16ffa8f7..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc039.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc040.png b/src/main/resources/xpbar/xpbar_inc040.png deleted file mode 100644 index 4bf09c782..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc040.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc041.png b/src/main/resources/xpbar/xpbar_inc041.png deleted file mode 100644 index 32edf751f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc041.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc042.png b/src/main/resources/xpbar/xpbar_inc042.png deleted file mode 100644 index 77c5a1a3e..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc042.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc043.png b/src/main/resources/xpbar/xpbar_inc043.png deleted file mode 100644 index 8edb3110c..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc043.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc044.png b/src/main/resources/xpbar/xpbar_inc044.png deleted file mode 100644 index 30e6b9d34..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc044.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc045.png b/src/main/resources/xpbar/xpbar_inc045.png deleted file mode 100644 index 0db111ad4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc045.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc046.png b/src/main/resources/xpbar/xpbar_inc046.png deleted file mode 100644 index ba7215480..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc046.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc047.png b/src/main/resources/xpbar/xpbar_inc047.png deleted file mode 100644 index 5d9f334c7..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc047.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc048.png b/src/main/resources/xpbar/xpbar_inc048.png deleted file mode 100644 index 52c40af82..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc048.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc049.png b/src/main/resources/xpbar/xpbar_inc049.png deleted file mode 100644 index 54eb37df4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc049.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc050.png b/src/main/resources/xpbar/xpbar_inc050.png deleted file mode 100644 index 89cb9c81e..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc050.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc051.png b/src/main/resources/xpbar/xpbar_inc051.png deleted file mode 100644 index 03121403d..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc051.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc052.png b/src/main/resources/xpbar/xpbar_inc052.png deleted file mode 100644 index a18fe4340..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc052.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc053.png b/src/main/resources/xpbar/xpbar_inc053.png deleted file mode 100644 index 17b01fab0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc053.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc054.png b/src/main/resources/xpbar/xpbar_inc054.png deleted file mode 100644 index 21130d8f1..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc054.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc055.png b/src/main/resources/xpbar/xpbar_inc055.png deleted file mode 100644 index 4b898e72a..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc055.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc056.png b/src/main/resources/xpbar/xpbar_inc056.png deleted file mode 100644 index 344d60950..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc056.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc057.png b/src/main/resources/xpbar/xpbar_inc057.png deleted file mode 100644 index 4f99af40c..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc057.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc058.png b/src/main/resources/xpbar/xpbar_inc058.png deleted file mode 100644 index 9030430a5..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc058.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc059.png b/src/main/resources/xpbar/xpbar_inc059.png deleted file mode 100644 index 5d82e0f9b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc059.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc060.png b/src/main/resources/xpbar/xpbar_inc060.png deleted file mode 100644 index 9fa631aed..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc060.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc061.png b/src/main/resources/xpbar/xpbar_inc061.png deleted file mode 100644 index 3a6761c0c..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc061.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc062.png b/src/main/resources/xpbar/xpbar_inc062.png deleted file mode 100644 index b8a3b9117..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc062.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc063.png b/src/main/resources/xpbar/xpbar_inc063.png deleted file mode 100644 index 7331f8320..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc063.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc064.png b/src/main/resources/xpbar/xpbar_inc064.png deleted file mode 100644 index 704e10fd8..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc064.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc065.png b/src/main/resources/xpbar/xpbar_inc065.png deleted file mode 100644 index 6b0e9291b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc065.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc066.png b/src/main/resources/xpbar/xpbar_inc066.png deleted file mode 100644 index 65c7afd5f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc066.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc067.png b/src/main/resources/xpbar/xpbar_inc067.png deleted file mode 100644 index 4b37fc259..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc067.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc068.png b/src/main/resources/xpbar/xpbar_inc068.png deleted file mode 100644 index fea2ae413..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc068.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc069.png b/src/main/resources/xpbar/xpbar_inc069.png deleted file mode 100644 index d929e9339..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc069.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc070.png b/src/main/resources/xpbar/xpbar_inc070.png deleted file mode 100644 index 491b833ab..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc070.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc071.png b/src/main/resources/xpbar/xpbar_inc071.png deleted file mode 100644 index 993dbaf05..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc071.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc072.png b/src/main/resources/xpbar/xpbar_inc072.png deleted file mode 100644 index 6f2f456c5..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc072.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc073.png b/src/main/resources/xpbar/xpbar_inc073.png deleted file mode 100644 index 417e02ac3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc073.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc074.png b/src/main/resources/xpbar/xpbar_inc074.png deleted file mode 100644 index 68c5f1dfe..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc074.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc075.png b/src/main/resources/xpbar/xpbar_inc075.png deleted file mode 100644 index b0325f28c..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc075.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc076.png b/src/main/resources/xpbar/xpbar_inc076.png deleted file mode 100644 index 9d50e3f7f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc076.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc077.png b/src/main/resources/xpbar/xpbar_inc077.png deleted file mode 100644 index fc4d4b2ae..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc077.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc078.png b/src/main/resources/xpbar/xpbar_inc078.png deleted file mode 100644 index bdf646230..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc078.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc079.png b/src/main/resources/xpbar/xpbar_inc079.png deleted file mode 100644 index 433443d26..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc079.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc080.png b/src/main/resources/xpbar/xpbar_inc080.png deleted file mode 100644 index 884fe20be..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc080.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc081.png b/src/main/resources/xpbar/xpbar_inc081.png deleted file mode 100644 index de3813464..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc081.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc082.png b/src/main/resources/xpbar/xpbar_inc082.png deleted file mode 100644 index de7309042..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc082.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc083.png b/src/main/resources/xpbar/xpbar_inc083.png deleted file mode 100644 index 64a831205..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc083.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc084.png b/src/main/resources/xpbar/xpbar_inc084.png deleted file mode 100644 index 28242647c..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc084.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc085.png b/src/main/resources/xpbar/xpbar_inc085.png deleted file mode 100644 index 9713377e6..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc085.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc086.png b/src/main/resources/xpbar/xpbar_inc086.png deleted file mode 100644 index 9f8f68ce4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc086.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc087.png b/src/main/resources/xpbar/xpbar_inc087.png deleted file mode 100644 index 563c9f436..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc087.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc088.png b/src/main/resources/xpbar/xpbar_inc088.png deleted file mode 100644 index 4885cb3ce..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc088.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc089.png b/src/main/resources/xpbar/xpbar_inc089.png deleted file mode 100644 index 7375669c7..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc089.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc090.png b/src/main/resources/xpbar/xpbar_inc090.png deleted file mode 100644 index 8e8d57a7a..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc090.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc091.png b/src/main/resources/xpbar/xpbar_inc091.png deleted file mode 100644 index 939ae9c73..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc091.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc092.png b/src/main/resources/xpbar/xpbar_inc092.png deleted file mode 100644 index 9d7e1cf69..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc092.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc093.png b/src/main/resources/xpbar/xpbar_inc093.png deleted file mode 100644 index 941df5a20..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc093.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc094.png b/src/main/resources/xpbar/xpbar_inc094.png deleted file mode 100644 index c338f5123..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc094.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc095.png b/src/main/resources/xpbar/xpbar_inc095.png deleted file mode 100644 index 799a357b8..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc095.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc096.png b/src/main/resources/xpbar/xpbar_inc096.png deleted file mode 100644 index 59bf2a9cb..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc096.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc097.png b/src/main/resources/xpbar/xpbar_inc097.png deleted file mode 100644 index cd0e5e100..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc097.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc098.png b/src/main/resources/xpbar/xpbar_inc098.png deleted file mode 100644 index ab93b2dc0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc098.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc099.png b/src/main/resources/xpbar/xpbar_inc099.png deleted file mode 100644 index 55a00931f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc099.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc100.png b/src/main/resources/xpbar/xpbar_inc100.png deleted file mode 100644 index 1a44b4340..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc100.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc101.png b/src/main/resources/xpbar/xpbar_inc101.png deleted file mode 100644 index 1b4f083a3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc101.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc102.png b/src/main/resources/xpbar/xpbar_inc102.png deleted file mode 100644 index d387a668a..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc102.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc103.png b/src/main/resources/xpbar/xpbar_inc103.png deleted file mode 100644 index ce80fa693..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc103.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc104.png b/src/main/resources/xpbar/xpbar_inc104.png deleted file mode 100644 index 49210d0eb..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc104.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc105.png b/src/main/resources/xpbar/xpbar_inc105.png deleted file mode 100644 index 687f25de8..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc105.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc106.png b/src/main/resources/xpbar/xpbar_inc106.png deleted file mode 100644 index 6fd617df9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc106.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc107.png b/src/main/resources/xpbar/xpbar_inc107.png deleted file mode 100644 index 91124fa49..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc107.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc108.png b/src/main/resources/xpbar/xpbar_inc108.png deleted file mode 100644 index a915dc293..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc108.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc109.png b/src/main/resources/xpbar/xpbar_inc109.png deleted file mode 100644 index 368cafe08..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc109.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc110.png b/src/main/resources/xpbar/xpbar_inc110.png deleted file mode 100644 index ad6beb554..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc110.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc111.png b/src/main/resources/xpbar/xpbar_inc111.png deleted file mode 100644 index 6f32c8707..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc111.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc112.png b/src/main/resources/xpbar/xpbar_inc112.png deleted file mode 100644 index 838562ad7..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc112.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc113.png b/src/main/resources/xpbar/xpbar_inc113.png deleted file mode 100644 index e1a7b8430..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc113.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc114.png b/src/main/resources/xpbar/xpbar_inc114.png deleted file mode 100644 index 82fa227e3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc114.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc115.png b/src/main/resources/xpbar/xpbar_inc115.png deleted file mode 100644 index 7620754aa..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc115.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc116.png b/src/main/resources/xpbar/xpbar_inc116.png deleted file mode 100644 index 722d5d0ba..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc116.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc117.png b/src/main/resources/xpbar/xpbar_inc117.png deleted file mode 100644 index 18078a444..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc117.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc118.png b/src/main/resources/xpbar/xpbar_inc118.png deleted file mode 100644 index 0c3352cf0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc118.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc119.png b/src/main/resources/xpbar/xpbar_inc119.png deleted file mode 100644 index 6961d3c61..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc119.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc120.png b/src/main/resources/xpbar/xpbar_inc120.png deleted file mode 100644 index f09c43f75..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc120.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc121.png b/src/main/resources/xpbar/xpbar_inc121.png deleted file mode 100644 index e5a41b24d..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc121.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc122.png b/src/main/resources/xpbar/xpbar_inc122.png deleted file mode 100644 index 5b0b4d513..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc122.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc123.png b/src/main/resources/xpbar/xpbar_inc123.png deleted file mode 100644 index f25942cd2..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc123.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc124.png b/src/main/resources/xpbar/xpbar_inc124.png deleted file mode 100644 index 359edabd0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc124.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc125.png b/src/main/resources/xpbar/xpbar_inc125.png deleted file mode 100644 index a44148bd2..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc125.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc126.png b/src/main/resources/xpbar/xpbar_inc126.png deleted file mode 100644 index 54b4ac627..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc126.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc127.png b/src/main/resources/xpbar/xpbar_inc127.png deleted file mode 100644 index 70ada6fd6..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc127.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc128.png b/src/main/resources/xpbar/xpbar_inc128.png deleted file mode 100644 index b85eec658..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc128.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc129.png b/src/main/resources/xpbar/xpbar_inc129.png deleted file mode 100644 index 808390a67..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc129.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc130.png b/src/main/resources/xpbar/xpbar_inc130.png deleted file mode 100644 index 59e3b18b3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc130.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc131.png b/src/main/resources/xpbar/xpbar_inc131.png deleted file mode 100644 index 838ed14ba..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc131.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc132.png b/src/main/resources/xpbar/xpbar_inc132.png deleted file mode 100644 index c8f8086e3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc132.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc133.png b/src/main/resources/xpbar/xpbar_inc133.png deleted file mode 100644 index 1c2b9309d..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc133.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc134.png b/src/main/resources/xpbar/xpbar_inc134.png deleted file mode 100644 index cbd5c3341..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc134.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc135.png b/src/main/resources/xpbar/xpbar_inc135.png deleted file mode 100644 index ff3a1e7fb..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc135.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc136.png b/src/main/resources/xpbar/xpbar_inc136.png deleted file mode 100644 index cc12525a3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc136.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc137.png b/src/main/resources/xpbar/xpbar_inc137.png deleted file mode 100644 index afa209e2d..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc137.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc138.png b/src/main/resources/xpbar/xpbar_inc138.png deleted file mode 100644 index af5cf692e..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc138.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc139.png b/src/main/resources/xpbar/xpbar_inc139.png deleted file mode 100644 index d24fd561f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc139.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc140.png b/src/main/resources/xpbar/xpbar_inc140.png deleted file mode 100644 index a609052f9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc140.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc141.png b/src/main/resources/xpbar/xpbar_inc141.png deleted file mode 100644 index 65376f12f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc141.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc142.png b/src/main/resources/xpbar/xpbar_inc142.png deleted file mode 100644 index 5501fb4e4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc142.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc143.png b/src/main/resources/xpbar/xpbar_inc143.png deleted file mode 100644 index d46c53b39..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc143.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc144.png b/src/main/resources/xpbar/xpbar_inc144.png deleted file mode 100644 index cfa6ce208..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc144.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc145.png b/src/main/resources/xpbar/xpbar_inc145.png deleted file mode 100644 index c24e57095..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc145.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc146.png b/src/main/resources/xpbar/xpbar_inc146.png deleted file mode 100644 index f180b4bb8..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc146.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc147.png b/src/main/resources/xpbar/xpbar_inc147.png deleted file mode 100644 index 4fed434a1..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc147.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc148.png b/src/main/resources/xpbar/xpbar_inc148.png deleted file mode 100644 index 792372162..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc148.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc149.png b/src/main/resources/xpbar/xpbar_inc149.png deleted file mode 100644 index 02e29e51a..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc149.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc150.png b/src/main/resources/xpbar/xpbar_inc150.png deleted file mode 100644 index 6c41c6b15..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc150.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc151.png b/src/main/resources/xpbar/xpbar_inc151.png deleted file mode 100644 index ad533b146..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc151.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc152.png b/src/main/resources/xpbar/xpbar_inc152.png deleted file mode 100644 index f56019467..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc152.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc153.png b/src/main/resources/xpbar/xpbar_inc153.png deleted file mode 100644 index bef5df408..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc153.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc154.png b/src/main/resources/xpbar/xpbar_inc154.png deleted file mode 100644 index 39babf7d9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc154.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc155.png b/src/main/resources/xpbar/xpbar_inc155.png deleted file mode 100644 index aed3daac3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc155.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc156.png b/src/main/resources/xpbar/xpbar_inc156.png deleted file mode 100644 index 293e563d7..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc156.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc157.png b/src/main/resources/xpbar/xpbar_inc157.png deleted file mode 100644 index 84831f79e..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc157.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc158.png b/src/main/resources/xpbar/xpbar_inc158.png deleted file mode 100644 index 69cd97ca9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc158.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc159.png b/src/main/resources/xpbar/xpbar_inc159.png deleted file mode 100644 index cdc92bea9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc159.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc160.png b/src/main/resources/xpbar/xpbar_inc160.png deleted file mode 100644 index 401176cde..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc160.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc161.png b/src/main/resources/xpbar/xpbar_inc161.png deleted file mode 100644 index d77e67026..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc161.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc162.png b/src/main/resources/xpbar/xpbar_inc162.png deleted file mode 100644 index dfd19d459..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc162.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc163.png b/src/main/resources/xpbar/xpbar_inc163.png deleted file mode 100644 index 64db26de9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc163.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc164.png b/src/main/resources/xpbar/xpbar_inc164.png deleted file mode 100644 index 66ab4cccc..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc164.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc165.png b/src/main/resources/xpbar/xpbar_inc165.png deleted file mode 100644 index 73d5fe529..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc165.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc166.png b/src/main/resources/xpbar/xpbar_inc166.png deleted file mode 100644 index 1602ee1ca..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc166.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc167.png b/src/main/resources/xpbar/xpbar_inc167.png deleted file mode 100644 index c48aae936..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc167.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc168.png b/src/main/resources/xpbar/xpbar_inc168.png deleted file mode 100644 index 5eef10c6e..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc168.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc169.png b/src/main/resources/xpbar/xpbar_inc169.png deleted file mode 100644 index c2d1363d3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc169.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc170.png b/src/main/resources/xpbar/xpbar_inc170.png deleted file mode 100644 index e116ae7d0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc170.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc171.png b/src/main/resources/xpbar/xpbar_inc171.png deleted file mode 100644 index d267a7493..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc171.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc172.png b/src/main/resources/xpbar/xpbar_inc172.png deleted file mode 100644 index e94de8cf8..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc172.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc173.png b/src/main/resources/xpbar/xpbar_inc173.png deleted file mode 100644 index 6b15b3713..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc173.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc174.png b/src/main/resources/xpbar/xpbar_inc174.png deleted file mode 100644 index d6537f8f4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc174.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc175.png b/src/main/resources/xpbar/xpbar_inc175.png deleted file mode 100644 index d96af3fa9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc175.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc176.png b/src/main/resources/xpbar/xpbar_inc176.png deleted file mode 100644 index 8f977c4bc..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc176.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc177.png b/src/main/resources/xpbar/xpbar_inc177.png deleted file mode 100644 index b893155bb..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc177.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc178.png b/src/main/resources/xpbar/xpbar_inc178.png deleted file mode 100644 index 5b412f8cb..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc178.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc179.png b/src/main/resources/xpbar/xpbar_inc179.png deleted file mode 100644 index 22a866de9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc179.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc180.png b/src/main/resources/xpbar/xpbar_inc180.png deleted file mode 100644 index ec76c0c44..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc180.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc181.png b/src/main/resources/xpbar/xpbar_inc181.png deleted file mode 100644 index b85ac151d..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc181.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc182.png b/src/main/resources/xpbar/xpbar_inc182.png deleted file mode 100644 index 26f77178f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc182.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc183.png b/src/main/resources/xpbar/xpbar_inc183.png deleted file mode 100644 index 5dd1ed0be..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc183.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc184.png b/src/main/resources/xpbar/xpbar_inc184.png deleted file mode 100644 index 3350c1caa..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc184.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc185.png b/src/main/resources/xpbar/xpbar_inc185.png deleted file mode 100644 index 3c54e7662..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc185.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc186.png b/src/main/resources/xpbar/xpbar_inc186.png deleted file mode 100644 index 3ecd585d9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc186.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc187.png b/src/main/resources/xpbar/xpbar_inc187.png deleted file mode 100644 index 3d4a5ade4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc187.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc188.png b/src/main/resources/xpbar/xpbar_inc188.png deleted file mode 100644 index 5238e8f87..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc188.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc189.png b/src/main/resources/xpbar/xpbar_inc189.png deleted file mode 100644 index 15e18f8b4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc189.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc190.png b/src/main/resources/xpbar/xpbar_inc190.png deleted file mode 100644 index e6b3f2469..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc190.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc191.png b/src/main/resources/xpbar/xpbar_inc191.png deleted file mode 100644 index 0fc1ee072..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc191.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc192.png b/src/main/resources/xpbar/xpbar_inc192.png deleted file mode 100644 index 4199cdca8..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc192.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc193.png b/src/main/resources/xpbar/xpbar_inc193.png deleted file mode 100644 index e217f9220..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc193.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc194.png b/src/main/resources/xpbar/xpbar_inc194.png deleted file mode 100644 index 545c53da7..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc194.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc195.png b/src/main/resources/xpbar/xpbar_inc195.png deleted file mode 100644 index 2d870bbe7..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc195.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc196.png b/src/main/resources/xpbar/xpbar_inc196.png deleted file mode 100644 index c1641144c..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc196.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc197.png b/src/main/resources/xpbar/xpbar_inc197.png deleted file mode 100644 index 7c60ee3e9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc197.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc198.png b/src/main/resources/xpbar/xpbar_inc198.png deleted file mode 100644 index 5686b1827..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc198.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc199.png b/src/main/resources/xpbar/xpbar_inc199.png deleted file mode 100644 index 1df6ec591..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc199.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc200.png b/src/main/resources/xpbar/xpbar_inc200.png deleted file mode 100644 index 947baef50..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc200.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc201.png b/src/main/resources/xpbar/xpbar_inc201.png deleted file mode 100644 index 39648ef14..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc201.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc202.png b/src/main/resources/xpbar/xpbar_inc202.png deleted file mode 100644 index 7b1160ccd..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc202.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc203.png b/src/main/resources/xpbar/xpbar_inc203.png deleted file mode 100644 index 4d741afc5..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc203.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc204.png b/src/main/resources/xpbar/xpbar_inc204.png deleted file mode 100644 index 9e435277b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc204.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc205.png b/src/main/resources/xpbar/xpbar_inc205.png deleted file mode 100644 index daf861298..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc205.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc206.png b/src/main/resources/xpbar/xpbar_inc206.png deleted file mode 100644 index b892e3f2b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc206.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc207.png b/src/main/resources/xpbar/xpbar_inc207.png deleted file mode 100644 index df1a32f6f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc207.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc208.png b/src/main/resources/xpbar/xpbar_inc208.png deleted file mode 100644 index e073409e3..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc208.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc209.png b/src/main/resources/xpbar/xpbar_inc209.png deleted file mode 100644 index 672a29aeb..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc209.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc210.png b/src/main/resources/xpbar/xpbar_inc210.png deleted file mode 100644 index acd2dcfe8..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc210.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc211.png b/src/main/resources/xpbar/xpbar_inc211.png deleted file mode 100644 index 4d1a76bb8..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc211.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc212.png b/src/main/resources/xpbar/xpbar_inc212.png deleted file mode 100644 index df4bb0fa7..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc212.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc213.png b/src/main/resources/xpbar/xpbar_inc213.png deleted file mode 100644 index e8b93f0c4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc213.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc214.png b/src/main/resources/xpbar/xpbar_inc214.png deleted file mode 100644 index c79e908c4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc214.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc215.png b/src/main/resources/xpbar/xpbar_inc215.png deleted file mode 100644 index 9d2a374f1..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc215.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc216.png b/src/main/resources/xpbar/xpbar_inc216.png deleted file mode 100644 index f74d1c59b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc216.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc217.png b/src/main/resources/xpbar/xpbar_inc217.png deleted file mode 100644 index 1d44500b0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc217.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc218.png b/src/main/resources/xpbar/xpbar_inc218.png deleted file mode 100644 index 8f6ad5452..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc218.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc219.png b/src/main/resources/xpbar/xpbar_inc219.png deleted file mode 100644 index 60fca4869..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc219.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc220.png b/src/main/resources/xpbar/xpbar_inc220.png deleted file mode 100644 index 8c506620f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc220.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc221.png b/src/main/resources/xpbar/xpbar_inc221.png deleted file mode 100644 index ed91ae79b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc221.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc222.png b/src/main/resources/xpbar/xpbar_inc222.png deleted file mode 100644 index 936887d72..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc222.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc223.png b/src/main/resources/xpbar/xpbar_inc223.png deleted file mode 100644 index 3f4d526ba..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc223.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc224.png b/src/main/resources/xpbar/xpbar_inc224.png deleted file mode 100644 index 0102c06f0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc224.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc225.png b/src/main/resources/xpbar/xpbar_inc225.png deleted file mode 100644 index 82396db90..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc225.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc226.png b/src/main/resources/xpbar/xpbar_inc226.png deleted file mode 100644 index 31f89bc58..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc226.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc227.png b/src/main/resources/xpbar/xpbar_inc227.png deleted file mode 100644 index 05e8161ab..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc227.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc228.png b/src/main/resources/xpbar/xpbar_inc228.png deleted file mode 100644 index 196d4534d..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc228.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc229.png b/src/main/resources/xpbar/xpbar_inc229.png deleted file mode 100644 index 7b35443ab..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc229.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc230.png b/src/main/resources/xpbar/xpbar_inc230.png deleted file mode 100644 index 79087987b..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc230.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc231.png b/src/main/resources/xpbar/xpbar_inc231.png deleted file mode 100644 index 601c282da..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc231.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc232.png b/src/main/resources/xpbar/xpbar_inc232.png deleted file mode 100644 index a40208dc4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc232.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc233.png b/src/main/resources/xpbar/xpbar_inc233.png deleted file mode 100644 index a3f1da981..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc233.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc234.png b/src/main/resources/xpbar/xpbar_inc234.png deleted file mode 100644 index fa545842a..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc234.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc235.png b/src/main/resources/xpbar/xpbar_inc235.png deleted file mode 100644 index 4d5892f0a..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc235.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc236.png b/src/main/resources/xpbar/xpbar_inc236.png deleted file mode 100644 index 1e4176223..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc236.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc237.png b/src/main/resources/xpbar/xpbar_inc237.png deleted file mode 100644 index ae310f00d..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc237.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc238.png b/src/main/resources/xpbar/xpbar_inc238.png deleted file mode 100644 index a0a9c03eb..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc238.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc239.png b/src/main/resources/xpbar/xpbar_inc239.png deleted file mode 100644 index 1a33d560a..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc239.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc240.png b/src/main/resources/xpbar/xpbar_inc240.png deleted file mode 100644 index 417f43db0..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc240.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc241.png b/src/main/resources/xpbar/xpbar_inc241.png deleted file mode 100644 index 26bc81258..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc241.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc242.png b/src/main/resources/xpbar/xpbar_inc242.png deleted file mode 100644 index b1efefaab..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc242.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc243.png b/src/main/resources/xpbar/xpbar_inc243.png deleted file mode 100644 index 42f8b9dc9..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc243.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc244.png b/src/main/resources/xpbar/xpbar_inc244.png deleted file mode 100644 index d6941d28f..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc244.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc245.png b/src/main/resources/xpbar/xpbar_inc245.png deleted file mode 100644 index 3b780728d..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc245.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc246.png b/src/main/resources/xpbar/xpbar_inc246.png deleted file mode 100644 index 0933c65b5..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc246.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc247.png b/src/main/resources/xpbar/xpbar_inc247.png deleted file mode 100644 index c9016709e..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc247.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc248.png b/src/main/resources/xpbar/xpbar_inc248.png deleted file mode 100644 index 71825bab4..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc248.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc249.png b/src/main/resources/xpbar/xpbar_inc249.png deleted file mode 100644 index 7b4398903..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc249.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc250.png b/src/main/resources/xpbar/xpbar_inc250.png deleted file mode 100644 index 775f931bc..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc250.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc251.png b/src/main/resources/xpbar/xpbar_inc251.png deleted file mode 100644 index 55c160795..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc251.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc252.png b/src/main/resources/xpbar/xpbar_inc252.png deleted file mode 100644 index 031f6d27c..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc252.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc253.png b/src/main/resources/xpbar/xpbar_inc253.png deleted file mode 100644 index e35d30e52..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc253.png and /dev/null differ diff --git a/src/main/resources/xpbar/xpbar_inc254.png b/src/main/resources/xpbar/xpbar_inc254.png deleted file mode 100644 index eab8c9143..000000000 Binary files a/src/main/resources/xpbar/xpbar_inc254.png and /dev/null differ