diff --git a/Adventure/src/main/java/de/fanta/adventure/Adventure.java b/Adventure/src/main/java/de/fanta/adventure/Adventure.java index 6693f57..ed452a0 100644 --- a/Adventure/src/main/java/de/fanta/adventure/Adventure.java +++ b/Adventure/src/main/java/de/fanta/adventure/Adventure.java @@ -2,8 +2,27 @@ import org.bukkit.plugin.java.JavaPlugin; +import java.io.File; +import java.util.logging.Logger; + public final class Adventure extends JavaPlugin { + private Adventure plugin; + private Logger LOGGER; + + @Override + public void onLoad() { + plugin = this; + LOGGER = getLogger(); + File oldPluginFolder = new File("plugins/Challenges"); + if (oldPluginFolder.isDirectory()) { + if (!oldPluginFolder.renameTo(new File("plugins/Adventure"))) { + LOGGER.severe("Challenges Ordner konnte nicht in Adventure umgenannt werden!"); + plugin.getServer().shutdown(); + } + } + } + @Override public void onEnable() { // Plugin startup logic diff --git a/Challenge/src/main/java/de/fanta/challenge/Challenge.java b/Challenge/src/main/java/de/fanta/challenge/Challenge.java new file mode 100644 index 0000000..88a6214 --- /dev/null +++ b/Challenge/src/main/java/de/fanta/challenge/Challenge.java @@ -0,0 +1,699 @@ +package de.fanta.challenge; + +import com.destroystokyo.paper.profile.PlayerProfile; +import de.cubeside.nmsutils.NMSUtils; +import de.fanta.challenge.challenges.AllItemsChallenge; +import de.fanta.challenge.challenges.MLGChallenge; +import de.fanta.challenge.challenges.RandomDropsChallenge; +import de.fanta.challenge.commands.CommandRegistration; +import de.fanta.challenge.events.ChallengeEventStatusChangedEvent; +import de.fanta.challenge.events.EventStatusChangedEvent; +import de.fanta.challenge.events.PlayerCountChangedEvent; +import de.fanta.challenge.events.ServerStatusChangedEvent; +import de.fanta.challenge.events.TimerChangedEvent; +import de.fanta.challenge.guis.BackpackGui; +import de.fanta.challenge.listeners.EventRegistration; +import de.fanta.challenge.schedular.BukkitScheduler; +import de.fanta.challenge.schedular.CancellableTask; +import de.fanta.challenge.schedular.Scheduler; +import de.fanta.challenge.scoreboard.BukkitScoreBoardManager; +import de.fanta.challenge.scoreboard.ScoreBoardMananger; +import de.fanta.challenge.scoreboard.ScoreManager; +import de.fanta.challenge.utils.ChatUtil; +import de.fanta.challenge.utils.ColorUtils; +import de.fanta.challenge.utils.Config; +import de.fanta.challenge.utils.Statistics; +import de.fanta.challenge.utils.VanishUtils; +import de.fanta.challenge.waypoints.WaypointManager; +import de.iani.cubesidestats.api.CubesideStatisticsAPI; +import de.iani.playerUUIDCache.PlayerUUIDCache; +import de.speedy64.globalport.GlobalApi; +import io.papermc.paper.ban.BanListType; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import org.apache.commons.io.FileUtils; +import org.bukkit.BanList; +import org.bukkit.Bukkit; +import org.bukkit.Difficulty; +import org.bukkit.GameRule; +import org.bukkit.Material; +import org.bukkit.OfflinePlayer; +import org.bukkit.World; +import org.bukkit.advancement.Advancement; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +public class Challenge extends JavaPlugin { + + public static Logger LOGGER; + private static Challenge plugin; + public File RndDropsConfigFile; + public FileConfiguration RndDropsConfig; + public FileConfiguration AllItemsConfig; + public FileConfiguration ServerConfig; + public File serverConfigFile; + public RandomDropsChallenge rndDrops; + public NMSUtils nmsUtils; + public PlayerUUIDCache playerUUIDCache; + public String texturepacklink = null; + public CancellableTask resetTask; + public boolean reset = false; + private TextComponent prefixComponent; + private TextComponent guiPrefix; + private File backpackConfigFile; + private FileConfiguration BackpackConfig; + private File AllItemsConfigFile; + private Timer timer; + private VanishUtils vanish; + private BackpackGui backpack; + private ScoreBoardMananger sbManager; + private ScoreManager scoreManager; + private Player currentEditor; + + private OfflinePlayer firstEditor; + + private boolean waitingForShutdown; + + private ServerType serverType; + + public FileConfiguration ItemConfig; + public File ItemConfigFile; + + private static final ArrayList not_available_materials = new ArrayList<>(); + private static final ArrayList materials = new ArrayList<>(); + private static final ArrayList advancements = new ArrayList<>(); + + private CubesideStatisticsAPI cubesideStatistics; + + private Statistics statistics; + + private static final ArrayList statisticPlayers = new ArrayList<>(); + + private static final ArrayList bannedPlayers = new ArrayList<>(); + + public boolean resetwithseed; + + private static final String CubesideMod_ModChannel = "cubesidemod:data"; + private Scheduler scheduler; + private ColorUtils colorUtils; + private final Path challengeSavePath = new File("/home/storagebox/Challenge-saves").toPath(); + private final Path adventureSavePath = new File("/home/storagebox/Adventure-saves/").toPath(); + + private WaypointManager waypointMananger; + + public static Challenge getPlugin() { + return plugin; + } + + @Override + public void onLoad() { + plugin = this; + LOGGER = getLogger(); + File oldPluginFolder = new File("plugins/Challenges"); + if (oldPluginFolder.isDirectory()) { + if (!oldPluginFolder.renameTo(new File("plugins/Challenge"))) { + LOGGER.severe("Challenges Ordner konnte nicht in Challenge umgenannt werden!"); + plugin.getServer().shutdown(); + } + } + } + + @Override + public void onEnable() { + nmsUtils = getServer().getServicesManager().load(NMSUtils.class); + playerUUIDCache = (PlayerUUIDCache) Bukkit.getPluginManager().getPlugin("PlayerUUIDCache"); + try { + cubesideStatistics = getServer().getServicesManager().load(CubesideStatisticsAPI.class); + } catch (NoClassDefFoundError ex) { + cubesideStatistics = null; + } + + if (isCubesideStatisticsInstalled()) { + statistics = new Statistics(this); + } + + getLogger().log(Level.INFO, "Bukkit found. Use Bukkit Scheduler"); + scheduler = new BukkitScheduler(this); + + colorUtils = new ColorUtils(this); + this.timer = new Timer(this); + this.rndDrops = new RandomDropsChallenge(); + + this.scoreManager = new ScoreManager(this); + this.vanish = new VanishUtils(this); + + saveDefaultConfig(); + reloadConfig(); + createServerConfig(); + createItemConfig(); + + serverType = ServerType.valueOf(getServerConfig().getString("servertype")); + + String prefix = serverType.getPrefix(); + prefixComponent = Component.text("[").color(ChatUtil.BLUE).append(Component.text(prefix).color(ChatUtil.GREEN)).append(Component.text("] ").color(ChatUtil.BLUE)); + guiPrefix = Component.text(prefix).color(ChatUtil.GREEN); + + createRndDropsConfig(); + createAllItemsConfig(); + createBackpackConfig(); + + this.backpack = new BackpackGui(Config.getInt("backpack_size") * 9); + + new CommandRegistration(this).registerCommands(); + new EventRegistration(this).registerEvents(); + + this.backpack.loadInventoryFromConfig(); + this.sbManager = new BukkitScoreBoardManager(this); + + getScheduler().runGlobalDelayed(() -> { + plugin.setDayLightCircle(false); + MLGChallenge.checkMLGWorld(); + setPvP(Config.getBoolean("pvp")); + if (plugin.getServerType() != ServerType.ADVENTURE) { + plugin.getSBManager().initScoreboard(); + } + }, 1L); + + resetwithseed = Config.getBoolean("resetwithseed"); + + if (Config.getBoolean("World_Reset") && (serverType == ServerType.CHALLENGE || serverType == ServerType.CHALLENGE_EVENT)) { + if (!Config.getBoolean("firsttimerstart")) { + timer.setTime(0); + } + File config = new File(plugin.getDataFolder(), "config.yml"); + config.delete(); + reloadConfig(); + saveConfig(); + this.backpack.clearConfig(); + this.rndDrops.shuffleItems(); + this.rndDrops.saveItems(); + this.rndDrops.loadItems(); + } else { + this.getBackpack().resize(Config.getInt("backpack_size") * 9); + this.rndDrops.loadItems(); + this.backpack.loadInventoryFromConfig(); + timer.setTime(getConfig().getInt("timertime")); + } + + waypointMananger = new WaypointManager(this); + + if (plugin.getServerType() == ServerType.ADVENTURE) { + File texturepack = new File("world/resources.zip"); + if (texturepack.exists()) { + File mapConfigFile = new File("plugins/Challenge/serverconfig.yml"); + YamlConfiguration mapConfig = YamlConfiguration.loadConfiguration(mapConfigFile); + String texturepackname = mapConfig.getString("displayItem.name"); + String textureID = texturepackname != null ? texturepackname.replace("§", "").replace(" ", "_") : UUID.randomUUID().toString(); + + File texturepackdownload = new File("/home/web/fanta/AdventureMap-TexturePacks/" + textureID + "/"); + File temp = new File(textureID); + + try { + if (!texturepackdownload.isDirectory()) { + FileUtils.forceMkdir(temp); + FileUtils.copyFileToDirectory(texturepack, temp, false); + File renameTP = new File(textureID + "/" + "resources.zip"); + File renamedTP = new File(textureID + "/" + textureID + ".zip"); + renameTP.renameTo(renamedTP); + if (temp.isDirectory()) { + FileUtils.moveDirectory(temp, texturepackdownload); + } else { + Challenge.getPlugin().getLogger().info("Ordner nicht da!"); + } + } + texturepacklink = "https://fantacs.de/AdventureMap-TexturePacks/" + textureID + "/" + textureID + ".zip"; + } catch (IOException e) { + plugin.getLogger().log(Level.SEVERE, "Error while move directory", e); + } + } + getConfig().set("showtimer", false); + } else { + getConfig().set("showtimer", true); + } + + for (String string : getItemConfig().getStringList("items")) { + try { + Material material = Material.valueOf(string); + not_available_materials.add(material); + } catch (IllegalArgumentException ex) { + Challenge.getPlugin().getLogger().log(Level.INFO, "Some items could not be loaded into the ItemGroup"); + } + + } + + for (Material material : Material.values()) { + if (material.isItem() && !material.isAir()) { + materials.add(material); + } + } + + if (getConfig().getBoolean("allitems")) { + AllItemsChallenge.start(); + } + + if (serverType != ServerType.ADVENTURE) { + for (@NotNull Iterator it = Bukkit.advancementIterator(); it.hasNext(); ) { + Advancement advancement = it.next(); + if (advancement.getDisplay() != null) { + advancements.add(advancement); + } + } + } + + if (getServerType() == ServerType.CHALLENGE) { + if (resetwithseed) { + Config.setValue("editsettings", true); + } + } else { + Config.setValue("editsettings", true); + } + + for (String UUIDString : Config.getStringList("bannedPlayers")) { + addBannedPlayer(UUID.fromString(UUIDString), false); + } + + if (plugin.getServerType() == ServerType.ADVENTURE || plugin.getServerType() == ServerType.CHALLENGE_LOAD) { + startResetTask(); + } + + getServer().getMessenger().registerOutgoingPluginChannel(this, CubesideMod_ModChannel); + + plugin.getScheduler().runGlobalDelayed(() -> { + EventRegistration.pM.callEvent(new ServerStatusChangedEvent(true)); + EventRegistration.pM.callEvent(new TimerChangedEvent(timer.isRunning())); + EventRegistration.pM.callEvent(new PlayerCountChangedEvent(Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers())); + }, 200L); + getLogger().info("Plugin loaded!"); + } + + @Override + public void onDisable() { + BanList banList = Bukkit.getBanList(BanListType.PROFILE); + banList.getEntries().forEach(banEntry -> banList.pardon((PlayerProfile) banEntry)); + if (!getConfig().getBoolean("World_Reset")) { + this.backpack.saveInventoryToConfig(); + Config.setValue("backpack_size", backpack.getSize() / 9); + } else if (serverType == ServerType.CHALLENGE || serverType == ServerType.CHALLENGE_EVENT) { + this.backpack.clearConfig(); + } + try { + this.RndDropsConfig.save(this.RndDropsConfigFile); + this.AllItemsConfig.save(this.getAllItemsConfigFile()); + } catch (IOException e) { + plugin.getLogger().log(Level.SEVERE, "Error while saving configs", e); + } + Config.setValue("timertime", timer.getTime()); + if (getConfig().getBoolean("event.enabled")) { + Config.setValue("event.enabled", false); + Bukkit.getPluginManager().callEvent(new EventStatusChangedEvent(false)); + Bukkit.getPluginManager().callEvent(new ChallengeEventStatusChangedEvent(false)); + getScoreManager().saveScores(null); + } + + saveConfig(); + getLogger().info("Plugin unloaded"); + } + + public RandomDropsChallenge getRandomDropsManager() { + return this.rndDrops; + } + + public FileConfiguration getBackpackConfig() { + return this.BackpackConfig; + } + + private void createBackpackConfig() { + this.backpackConfigFile = new File(getDataFolder(), "backpack.yml"); + if (!this.backpackConfigFile.exists()) { + this.backpackConfigFile.getParentFile().mkdirs(); + saveResource("backpack.yml", false); + } + this.BackpackConfig = new YamlConfiguration(); + try { + this.BackpackConfig.load(this.backpackConfigFile); + } catch (InvalidConfigurationException | IOException e) { + plugin.getLogger().log(Level.SEVERE, "Error while loading Backpack", e); + } + } + + public FileConfiguration getRndDropsConfig() { + return this.RndDropsConfig; + } + + private void createRndDropsConfig() { + this.RndDropsConfigFile = new File(getDataFolder(), "rnddrops.yml"); + if (!this.RndDropsConfigFile.exists()) { + this.RndDropsConfigFile.getParentFile().mkdirs(); + saveResource("rnddrops.yml", false); + } + this.RndDropsConfig = new YamlConfiguration(); + try { + this.RndDropsConfig.load(this.RndDropsConfigFile); + } catch (IOException | org.bukkit.configuration.InvalidConfigurationException e) { + plugin.getLogger().log(Level.SEVERE, "Error while load RandomDrops Config", e); + } + } + + public FileConfiguration getAllItemsConfig() { + return this.AllItemsConfig; + } + + private void createAllItemsConfig() { + this.AllItemsConfigFile = new File(getDataFolder(), "allitems.yml"); + if (!AllItemsConfigFile.exists() || ((serverType == ServerType.CHALLENGE || serverType == ServerType.CHALLENGE_EVENT) && Config.getBoolean("World_Reset"))) { + this.getAllItemsConfigFile().getParentFile().mkdirs(); + saveResource("allitems.yml", true); + } + this.AllItemsConfig = new YamlConfiguration(); + try { + this.AllItemsConfig.load(this.AllItemsConfigFile); + } catch (IOException | org.bukkit.configuration.InvalidConfigurationException e) { + plugin.getLogger().log(Level.SEVERE, "Error while loading AllItems Config", e); + } + } + + public FileConfiguration getServerConfig() { + return ServerConfig; + } + + public void saveServerConfig() { + try { + ServerConfig.save(serverConfigFile); + } catch (IOException e) { + getLogger().log(Level.SEVERE, "Error while saving Server Config", e); + } + } + + private void createServerConfig() { + serverConfigFile = new File(getDataFolder(), "serverconfig.yml"); + if (!serverConfigFile.exists()) { + serverConfigFile.getParentFile().mkdirs(); + saveResource("serverconfig.yml", false); + } + this.ServerConfig = new YamlConfiguration(); + try { + ServerConfig.load(serverConfigFile); + } catch (IOException | InvalidConfigurationException e) { + plugin.getLogger().log(Level.SEVERE, "Error while loading Server Config", e); + } + } + + public FileConfiguration getItemConfig() { + return ItemConfig; + } + + private void createItemConfig() { + ItemConfigFile = new File(getDataFolder(), "items.yml"); + ItemConfigFile.getParentFile().mkdirs(); + saveResource("items.yml", true); + this.ItemConfig = new YamlConfiguration(); + try { + ItemConfig.load(ItemConfigFile); + } catch (IOException | InvalidConfigurationException e) { + plugin.getLogger().log(Level.SEVERE, "Error while loading Item Config", e); + } + } + + public ScoreBoardMananger getSBManager() { + return this.sbManager; + } + + public Player getCurrentEditor() { + return currentEditor; + } + + public void setCurrentEditor(Player currentEditor) { + this.currentEditor = currentEditor; + plugin.setFirstEditor(currentEditor); + if (currentEditor != null) { + ChatUtil.sendNormalMessage(currentEditor, "Du bist nun der Editor dieser Lobby!"); + ChatUtil.sendNormalMessage(currentEditor, "Alle Befehle und Funktionen vom Challenge Plugin findest du in unserem Wiki."); + ChatUtil.sendNormalMessage(currentEditor, "Hier Klicken --> https://wiki.cubeside.de/Challenge"); + ChatUtil.sendBrodCastMessage(Component.text(currentEditor.getName(), ChatUtil.BLUE).append(Component.text(" ist nun der Editor dieser Lobby!", ChatUtil.GREEN))); + } + } + + public OfflinePlayer getFirstEditor() { + return firstEditor; + } + + public void setFirstEditor(Player firstEditor) { + if (this.firstEditor == null) { + this.firstEditor = firstEditor; + } + } + + public void updateEditor() { + Random random = new Random(); + Player randomPlayer = null; + Player oldEditor = plugin.getCurrentEditor(); + + List onlinePlayersWithPermission = Bukkit.getOnlinePlayers().stream().filter(p -> p.hasPermission("Challenges.editor")).distinct().collect(Collectors.toList()); + onlinePlayersWithPermission.remove(oldEditor); + if (!onlinePlayersWithPermission.isEmpty()) { + int rnd = random.nextInt(onlinePlayersWithPermission.size()); + randomPlayer = onlinePlayersWithPermission.get(rnd); + } else { + ArrayList onlinePlayers = Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toCollection(ArrayList::new)); + List vanishPlayers = plugin.getVanish().getVanishPlayerList(); + onlinePlayers.removeAll(vanishPlayers); + onlinePlayers.remove(oldEditor.getName()); + + if (!onlinePlayers.isEmpty()) { + int rnd = random.nextInt(onlinePlayers.size()); + randomPlayer = Bukkit.getPlayer(onlinePlayers.get(rnd)); + } + } + plugin.setCurrentEditor(randomPlayer); + } + + public boolean hasEditor() { + return currentEditor != null; + } + + public boolean isEditor(Player player) { + return hasEditor() && currentEditor.getUniqueId().equals(player.getUniqueId()); + } + + public void startResetTask() { + getLogger().info("Start Reset Task"); + resetTask = plugin.getScheduler().runGlobalDelayed(() -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "reset confirm"), 3 * 60 * 20); + reset = true; + } + + public void stopResetTask() { + getLogger().info("Stop Reset Task"); + resetTask.cancel(); + resetTask = null; + reset = false; + } + + public void setPvP(Boolean value) { + for (World w : plugin.getServer().getWorlds()) { + if (w != null) { + w.setPVP(value); + } + + } + } + + public boolean getPvP() { + return Bukkit.getWorld("world").getPVP(); + } + + public void setDifficulty(Difficulty difficulty) { + for (World w : plugin.getServer().getWorlds()) { + if (w != null) { + w.setDifficulty(difficulty); + } + } + } + + public Difficulty getDifficulty() { + return Bukkit.getWorld("world").getDifficulty(); + } + + public void setKeepInventory(Boolean value) { + for (World w : plugin.getServer().getWorlds()) { + if (w != null) { + getScheduler().run(() -> w.setGameRule(GameRule.KEEP_INVENTORY, value)); + } + } + } + + public boolean getKeepInventory() { + return Bukkit.getWorld("world").getGameRuleValue(GameRule.KEEP_INVENTORY); + } + + public void setNaturalRegeneration(Boolean value) { + for (World w : plugin.getServer().getWorlds()) { + if (w != null) { + getScheduler().run(() -> w.setGameRule(GameRule.NATURAL_REGENERATION, value)); + } + } + } + + public boolean getNaturalRegeneration() { + return Bukkit.getWorld("world").getGameRuleValue(GameRule.NATURAL_REGENERATION); + } + + public void setDayLightCircle(boolean value) { + for (World world : Bukkit.getWorlds()) { + if (world.getEnvironment() == World.Environment.NORMAL && plugin.getServerType() != ServerType.ADVENTURE) { + getScheduler().run(() -> world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, value)); + } + } + } + + public void portPlayerToLobby(Player player) { + if (plugin.getServerType() == ServerType.CHALLENGE || plugin.getServerType() == ServerType.CHALLENGE_LOAD) { + GlobalApi.portOnlinePlayerToLocation(player.getName(), "challenge"); + } else if (plugin.getServerType() == ServerType.ADVENTURE) { + GlobalApi.portOnlinePlayerToLocation(player.getName(), "adventure"); + } else if (plugin.getServerType() == ServerType.CHALLENGE_EVENT) { + GlobalApi.portOnlinePlayerToLocation(player.getName(), "challenge_event"); + } + } + + public Timer getTimer() { + return timer; + } + + public VanishUtils getVanish() { + return vanish; + } + + public boolean isWaitingForShutdown() { + return waitingForShutdown; + } + + public void setWaitingForShutdown(boolean waitingForShutdown) { + this.waitingForShutdown = waitingForShutdown; + } + + public BackpackGui getBackpack() { + return backpack; + } + + public File getBackpackConfigFile() { + return backpackConfigFile; + } + + public ScoreManager getScoreManager() { + return scoreManager; + } + + public NMSUtils getNMSUtils() { + return nmsUtils; + } + + public File getAllItemsConfigFile() { + return AllItemsConfigFile; + } + + public ServerType getServerType() { + return serverType; + } + + public TextComponent getPrefixComponent() { + return prefixComponent; + } + + public TextComponent getGuiPrefix() { + return guiPrefix; + } + + public ArrayList getNotAvailableMaterials() { + return not_available_materials; + } + + public ArrayList getMaterials() { + return materials; + } + + public ArrayList getAdvancements() { + return advancements; + } + + public CubesideStatisticsAPI getCubesideStatistics() { + return cubesideStatistics; + } + + public boolean isCubesideStatisticsInstalled() { + return cubesideStatistics != null; + } + + public Statistics getStatistics() { + return statistics; + } + + public PlayerUUIDCache getPlayerUUIDCache() { + return playerUUIDCache; + } + + public void addstatisticPlayers(UUID uuid) { + statisticPlayers.add(uuid); + } + + public ArrayList getstatisticPlayers() { + return statisticPlayers; + } + + public void addBannedPlayer(UUID uuid, boolean isPermaBan) { + bannedPlayers.add(uuid); + if (isPermaBan) { + List bannedPlayer = Config.getStringList("bannedPlayers"); + bannedPlayer.add(uuid.toString()); + Config.setValue("bannedPlayers", bannedPlayer, false); + } + } + + public void removeBannedPlayer(UUID uuid, Boolean removeConfig) { + bannedPlayers.remove(uuid); + if (removeConfig) { + List bannedPlayer = Config.getStringList("bannedPlayers"); + bannedPlayer.remove(uuid.toString()); + Config.setValue("bannedPlayers", bannedPlayer, false); + } + } + + public boolean isPlayerBanned(UUID uuid) { + return bannedPlayers.contains(uuid); + } + + public String getCubesideMod_ModChannel() { + return CubesideMod_ModChannel; + } + + public Scheduler getScheduler() { + return scheduler; + } + + public ColorUtils getColorUtils() { + return colorUtils; + } + + public Path getAdventureSavePath() { + return adventureSavePath; + } + + public Path getChallengeSavePath() { + return challengeSavePath; + } +} diff --git a/Challenge/src/main/java/de/fanta/challenge/Challenges.java b/Challenge/src/main/java/de/fanta/challenge/Challenges.java deleted file mode 100644 index e5e698b..0000000 --- a/Challenge/src/main/java/de/fanta/challenge/Challenges.java +++ /dev/null @@ -1,688 +0,0 @@ -package de.fanta.challenge; - -import com.destroystokyo.paper.profile.PlayerProfile; -import de.cubeside.nmsutils.NMSUtils; -import de.fanta.challenge.challenges.AllItemsChallenge; -import de.fanta.challenge.challenges.MLGChallenge; -import de.fanta.challenge.challenges.RandomDropsChallenge; -import de.fanta.challenge.commands.CommandRegistration; -import de.fanta.challenge.events.ChallengeEventStatusChangedEvent; -import de.fanta.challenge.events.EventStatusChangedEvent; -import de.fanta.challenge.events.PlayerCountChangedEvent; -import de.fanta.challenge.events.ServerStatusChangedEvent; -import de.fanta.challenge.events.TimerChangedEvent; -import de.fanta.challenge.guis.BackpackGui; -import de.fanta.challenge.listeners.EventRegistration; -import de.fanta.challenge.schedular.BukkitScheduler; -import de.fanta.challenge.schedular.CancellableTask; -import de.fanta.challenge.schedular.Scheduler; -import de.fanta.challenge.scoreboard.BukkitScoreBoardManager; -import de.fanta.challenge.scoreboard.ScoreBoardMananger; -import de.fanta.challenge.scoreboard.ScoreManager; -import de.fanta.challenge.utils.ChatUtil; -import de.fanta.challenge.utils.ColorUtils; -import de.fanta.challenge.utils.Config; -import de.fanta.challenge.utils.Statistics; -import de.fanta.challenge.utils.VanishUtils; -import de.fanta.challenge.waypoints.WaypointManager; -import de.iani.cubesidestats.api.CubesideStatisticsAPI; -import de.iani.playerUUIDCache.PlayerUUIDCache; -import de.speedy64.globalport.GlobalApi; -import io.papermc.paper.ban.BanListType; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TextComponent; -import org.apache.commons.io.FileUtils; -import org.bukkit.BanList; -import org.bukkit.Bukkit; -import org.bukkit.Difficulty; -import org.bukkit.GameRule; -import org.bukkit.Material; -import org.bukkit.OfflinePlayer; -import org.bukkit.World; -import org.bukkit.advancement.Advancement; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -public class Challenges extends JavaPlugin { - - public static Logger LOGGER; - private static Challenges plugin; - public File RndDropsConfigFile; - public FileConfiguration RndDropsConfig; - public FileConfiguration AllItemsConfig; - public FileConfiguration ServerConfig; - public File serverConfigFile; - public RandomDropsChallenge rndDrops; - public NMSUtils nmsUtils; - public PlayerUUIDCache playerUUIDCache; - public String texturepacklink = null; - public CancellableTask resetTask; - public boolean reset = false; - private TextComponent prefixComponent; - private TextComponent guiPrefix; - private File backpackConfigFile; - private FileConfiguration BackpackConfig; - private File AllItemsConfigFile; - private Timer timer; - private VanishUtils vanish; - private BackpackGui backpack; - private ScoreBoardMananger sbManager; - private ScoreManager scoreManager; - private Player currentEditor; - - private OfflinePlayer firstEditor; - - private boolean waitingForShutdown; - - private ServerType serverType; - - public FileConfiguration ItemConfig; - public File ItemConfigFile; - - private static final ArrayList not_available_materials = new ArrayList<>(); - private static final ArrayList materials = new ArrayList<>(); - private static final ArrayList advancements = new ArrayList<>(); - - private CubesideStatisticsAPI cubesideStatistics; - - private Statistics statistics; - - private static final ArrayList statisticPlayers = new ArrayList<>(); - - private static final ArrayList bannedPlayers = new ArrayList<>(); - - public boolean resetwithseed; - - private static final String CubesideMod_ModChannel = "cubesidemod:data"; - private Scheduler scheduler; - private ColorUtils colorUtils; - private final Path challengeSavePath = new File("/home/storagebox/Challenge-saves").toPath(); - private final Path adventureSavePath = new File("/home/storagebox/Adventure-saves/").toPath(); - - private WaypointManager waypointMananger; - - public static Challenges getPlugin() { - return plugin; - } - - @Override - public void onEnable() { - LOGGER = getLogger(); - plugin = this; - nmsUtils = getServer().getServicesManager().load(NMSUtils.class); - playerUUIDCache = (PlayerUUIDCache) Bukkit.getPluginManager().getPlugin("PlayerUUIDCache"); - try { - cubesideStatistics = getServer().getServicesManager().load(CubesideStatisticsAPI.class); - } catch (NoClassDefFoundError ex) { - cubesideStatistics = null; - } - - if (isCubesideStatisticsInstalled()) { - statistics = new Statistics(this); - } - - getLogger().log(Level.INFO, "Bukkit found. Use Bukkit Scheduler"); - scheduler = new BukkitScheduler(this); - - colorUtils = new ColorUtils(this); - this.timer = new Timer(this); - this.rndDrops = new RandomDropsChallenge(); - - this.scoreManager = new ScoreManager(this); - this.vanish = new VanishUtils(this); - - saveDefaultConfig(); - reloadConfig(); - createServerConfig(); - createItemConfig(); - - serverType = ServerType.valueOf(getServerConfig().getString("servertype")); - - String prefix = serverType.getPrefix(); - prefixComponent = Component.text("[").color(ChatUtil.BLUE).append(Component.text(prefix).color(ChatUtil.GREEN)).append(Component.text("] ").color(ChatUtil.BLUE)); - guiPrefix = Component.text(prefix).color(ChatUtil.GREEN); - - createRndDropsConfig(); - createAllItemsConfig(); - createBackpackConfig(); - - this.backpack = new BackpackGui(Config.getInt("backpack_size") * 9); - - new CommandRegistration(this).registerCommands(); - new EventRegistration(this).registerEvents(); - - this.backpack.loadInventoryFromConfig(); - this.sbManager = new BukkitScoreBoardManager(this); - - getScheduler().runGlobalDelayed(() -> { - plugin.setDayLightCircle(false); - MLGChallenge.checkMLGWorld(); - setPvP(Config.getBoolean("pvp")); - if (plugin.getServerType() != ServerType.ADVENTURE) { - plugin.getSBManager().initScoreboard(); - } - }, 1L); - - resetwithseed = Config.getBoolean("resetwithseed"); - - if (Config.getBoolean("World_Reset") && (serverType == ServerType.CHALLENGE || serverType == ServerType.CHALLENGE_EVENT)) { - if (!Config.getBoolean("firsttimerstart")) { - timer.setTime(0); - } - File config = new File(plugin.getDataFolder(), "config.yml"); - config.delete(); - reloadConfig(); - saveConfig(); - this.backpack.clearConfig(); - this.rndDrops.shuffleItems(); - this.rndDrops.saveItems(); - this.rndDrops.loadItems(); - } else { - this.getBackpack().resize(Config.getInt("backpack_size") * 9); - this.rndDrops.loadItems(); - this.backpack.loadInventoryFromConfig(); - timer.setTime(getConfig().getInt("timertime")); - } - - waypointMananger = new WaypointManager(this); - - if (plugin.getServerType() == ServerType.ADVENTURE) { - File texturepack = new File("world/resources.zip"); - if (texturepack.exists()) { - File mapConfigFile = new File("plugins/Challenges/serverconfig.yml"); - YamlConfiguration mapConfig = YamlConfiguration.loadConfiguration(mapConfigFile); - String texturepackname = mapConfig.getString("displayItem.name"); - String textureID = texturepackname != null ? texturepackname.replace("§", "").replace(" ", "_") : UUID.randomUUID().toString(); - - File texturepackdownload = new File("/home/web/fanta/AdventureMap-TexturePacks/" + textureID + "/"); - File temp = new File(textureID); - - try { - if (!texturepackdownload.isDirectory()) { - FileUtils.forceMkdir(temp); - FileUtils.copyFileToDirectory(texturepack, temp, false); - File renameTP = new File(textureID + "/" + "resources.zip"); - File renamedTP = new File(textureID + "/" + textureID + ".zip"); - renameTP.renameTo(renamedTP); - if (temp.isDirectory()) { - FileUtils.moveDirectory(temp, texturepackdownload); - } else { - Challenges.getPlugin().getLogger().info("Ordner nicht da!"); - } - } - texturepacklink = "https://fantacs.de/AdventureMap-TexturePacks/" + textureID + "/" + textureID + ".zip"; - } catch (IOException e) { - plugin.getLogger().log(Level.SEVERE, "Error while move directory", e); - } - } - getConfig().set("showtimer", false); - } else { - getConfig().set("showtimer", true); - } - - for (String string : getItemConfig().getStringList("items")) { - try { - Material material = Material.valueOf(string); - not_available_materials.add(material); - } catch (IllegalArgumentException ex) { - Challenges.getPlugin().getLogger().log(Level.INFO, "Some items could not be loaded into the ItemGroup"); - } - - } - - for (Material material : Material.values()) { - if (material.isItem() && !material.isAir()) { - materials.add(material); - } - } - - if (getConfig().getBoolean("allitems")) { - AllItemsChallenge.start(); - } - - if (serverType != ServerType.ADVENTURE) { - for (@NotNull Iterator it = Bukkit.advancementIterator(); it.hasNext(); ) { - Advancement advancement = it.next(); - if (advancement.getDisplay() != null) { - advancements.add(advancement); - } - } - } - - if (getServerType() == ServerType.CHALLENGE) { - if (resetwithseed) { - Config.setValue("editsettings", true); - } - } else { - Config.setValue("editsettings", true); - } - - for (String UUIDString : Config.getStringList("bannedPlayers")) { - addBannedPlayer(UUID.fromString(UUIDString), false); - } - - if (plugin.getServerType() == ServerType.ADVENTURE || plugin.getServerType() == ServerType.CHALLENGE_LOAD) { - startResetTask(); - } - - getServer().getMessenger().registerOutgoingPluginChannel(this, CubesideMod_ModChannel); - - plugin.getScheduler().runGlobalDelayed(() -> { - EventRegistration.pM.callEvent(new ServerStatusChangedEvent(true)); - EventRegistration.pM.callEvent(new TimerChangedEvent(timer.isRunning())); - EventRegistration.pM.callEvent(new PlayerCountChangedEvent(Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers())); - }, 200L); - getLogger().info("Plugin loaded!"); - } - - @Override - public void onDisable() { - BanList banList = Bukkit.getBanList(BanListType.PROFILE); - banList.getEntries().forEach(banEntry -> banList.pardon((PlayerProfile) banEntry)); - if (!getConfig().getBoolean("World_Reset")) { - this.backpack.saveInventoryToConfig(); - Config.setValue("backpack_size", backpack.getSize() / 9); - } else if (serverType == ServerType.CHALLENGE || serverType == ServerType.CHALLENGE_EVENT) { - this.backpack.clearConfig(); - } - try { - this.RndDropsConfig.save(this.RndDropsConfigFile); - this.AllItemsConfig.save(this.getAllItemsConfigFile()); - } catch (IOException e) { - plugin.getLogger().log(Level.SEVERE, "Error while saving configs", e); - } - Config.setValue("timertime", timer.getTime()); - if (getConfig().getBoolean("event.enabled")) { - Config.setValue("event.enabled", false); - Bukkit.getPluginManager().callEvent(new EventStatusChangedEvent(false)); - Bukkit.getPluginManager().callEvent(new ChallengeEventStatusChangedEvent(false)); - getScoreManager().saveScores(null); - } - - saveConfig(); - getLogger().info("Plugin unloaded"); - } - - public RandomDropsChallenge getRandomDropsManager() { - return this.rndDrops; - } - - public FileConfiguration getBackpackConfig() { - return this.BackpackConfig; - } - - private void createBackpackConfig() { - this.backpackConfigFile = new File(getDataFolder(), "backpack.yml"); - if (!this.backpackConfigFile.exists()) { - this.backpackConfigFile.getParentFile().mkdirs(); - saveResource("backpack.yml", false); - } - this.BackpackConfig = new YamlConfiguration(); - try { - this.BackpackConfig.load(this.backpackConfigFile); - } catch (InvalidConfigurationException | IOException e) { - plugin.getLogger().log(Level.SEVERE, "Error while loading Backpack", e); - } - } - - public FileConfiguration getRndDropsConfig() { - return this.RndDropsConfig; - } - - private void createRndDropsConfig() { - this.RndDropsConfigFile = new File(getDataFolder(), "rnddrops.yml"); - if (!this.RndDropsConfigFile.exists()) { - this.RndDropsConfigFile.getParentFile().mkdirs(); - saveResource("rnddrops.yml", false); - } - this.RndDropsConfig = new YamlConfiguration(); - try { - this.RndDropsConfig.load(this.RndDropsConfigFile); - } catch (IOException | org.bukkit.configuration.InvalidConfigurationException e) { - plugin.getLogger().log(Level.SEVERE, "Error while load RandomDrops Config", e); - } - } - - public FileConfiguration getAllItemsConfig() { - return this.AllItemsConfig; - } - - private void createAllItemsConfig() { - this.AllItemsConfigFile = new File(getDataFolder(), "allitems.yml"); - if (!AllItemsConfigFile.exists() || ((serverType == ServerType.CHALLENGE || serverType == ServerType.CHALLENGE_EVENT) && Config.getBoolean("World_Reset"))) { - this.getAllItemsConfigFile().getParentFile().mkdirs(); - saveResource("allitems.yml", true); - } - this.AllItemsConfig = new YamlConfiguration(); - try { - this.AllItemsConfig.load(this.AllItemsConfigFile); - } catch (IOException | org.bukkit.configuration.InvalidConfigurationException e) { - plugin.getLogger().log(Level.SEVERE, "Error while loading AllItems Config", e); - } - } - - public FileConfiguration getServerConfig() { - return ServerConfig; - } - - public void saveServerConfig() { - try { - ServerConfig.save(serverConfigFile); - } catch (IOException e) { - getLogger().log(Level.SEVERE, "Error while saving Server Config", e); - } - } - - private void createServerConfig() { - serverConfigFile = new File(getDataFolder(), "serverconfig.yml"); - if (!serverConfigFile.exists()) { - serverConfigFile.getParentFile().mkdirs(); - saveResource("serverconfig.yml", false); - } - this.ServerConfig = new YamlConfiguration(); - try { - ServerConfig.load(serverConfigFile); - } catch (IOException | InvalidConfigurationException e) { - plugin.getLogger().log(Level.SEVERE, "Error while loading Server Config", e); - } - } - - public FileConfiguration getItemConfig() { - return ItemConfig; - } - - private void createItemConfig() { - ItemConfigFile = new File(getDataFolder(), "items.yml"); - ItemConfigFile.getParentFile().mkdirs(); - saveResource("items.yml", true); - this.ItemConfig = new YamlConfiguration(); - try { - ItemConfig.load(ItemConfigFile); - } catch (IOException | InvalidConfigurationException e) { - plugin.getLogger().log(Level.SEVERE, "Error while loading Item Config", e); - } - } - - public ScoreBoardMananger getSBManager() { - return this.sbManager; - } - - public Player getCurrentEditor() { - return currentEditor; - } - - public void setCurrentEditor(Player currentEditor) { - this.currentEditor = currentEditor; - plugin.setFirstEditor(currentEditor); - if (currentEditor != null) { - ChatUtil.sendNormalMessage(currentEditor, "Du bist nun der Editor dieser Lobby!"); - ChatUtil.sendNormalMessage(currentEditor, "Alle Befehle und Funktionen vom Challenge Plugin findest du in unserem Wiki."); - ChatUtil.sendNormalMessage(currentEditor, "Hier Klicken --> https://wiki.cubeside.de/Challenge"); - ChatUtil.sendBrodCastMessage(Component.text(currentEditor.getName(), ChatUtil.BLUE).append(Component.text(" ist nun der Editor dieser Lobby!", ChatUtil.GREEN))); - } - } - - public OfflinePlayer getFirstEditor() { - return firstEditor; - } - - public void setFirstEditor(Player firstEditor) { - if (this.firstEditor == null) { - this.firstEditor = firstEditor; - } - } - - public void updateEditor() { - Random random = new Random(); - Player randomPlayer = null; - Player oldEditor = plugin.getCurrentEditor(); - - List onlinePlayersWithPermission = Bukkit.getOnlinePlayers().stream().filter(p -> p.hasPermission("Challenges.editor")).distinct().collect(Collectors.toList()); - onlinePlayersWithPermission.remove(oldEditor); - if (!onlinePlayersWithPermission.isEmpty()) { - int rnd = random.nextInt(onlinePlayersWithPermission.size()); - randomPlayer = onlinePlayersWithPermission.get(rnd); - } else { - ArrayList onlinePlayers = Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toCollection(ArrayList::new)); - List vanishPlayers = plugin.getVanish().getVanishPlayerList(); - onlinePlayers.removeAll(vanishPlayers); - onlinePlayers.remove(oldEditor.getName()); - - if (!onlinePlayers.isEmpty()) { - int rnd = random.nextInt(onlinePlayers.size()); - randomPlayer = Bukkit.getPlayer(onlinePlayers.get(rnd)); - } - } - plugin.setCurrentEditor(randomPlayer); - } - - public boolean hasEditor() { - return currentEditor != null; - } - - public boolean isEditor(Player player) { - return hasEditor() && currentEditor.getUniqueId().equals(player.getUniqueId()); - } - - public void startResetTask() { - getLogger().info("Start Reset Task"); - resetTask = plugin.getScheduler().runGlobalDelayed(() -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "reset confirm"), 3 * 60 * 20); - reset = true; - } - - public void stopResetTask() { - getLogger().info("Stop Reset Task"); - resetTask.cancel(); - resetTask = null; - reset = false; - } - - public void setPvP(Boolean value) { - for (World w : plugin.getServer().getWorlds()) { - if (w != null) { - w.setPVP(value); - } - - } - } - - public boolean getPvP() { - return Bukkit.getWorld("world").getPVP(); - } - - public void setDifficulty(Difficulty difficulty) { - for (World w : plugin.getServer().getWorlds()) { - if (w != null) { - w.setDifficulty(difficulty); - } - } - } - - public Difficulty getDifficulty() { - return Bukkit.getWorld("world").getDifficulty(); - } - - public void setKeepInventory(Boolean value) { - for (World w : plugin.getServer().getWorlds()) { - if (w != null) { - getScheduler().run(() -> w.setGameRule(GameRule.KEEP_INVENTORY, value)); - } - } - } - - public boolean getKeepInventory() { - return Bukkit.getWorld("world").getGameRuleValue(GameRule.KEEP_INVENTORY); - } - - public void setNaturalRegeneration(Boolean value) { - for (World w : plugin.getServer().getWorlds()) { - if (w != null) { - getScheduler().run(() -> w.setGameRule(GameRule.NATURAL_REGENERATION, value)); - } - } - } - - public boolean getNaturalRegeneration() { - return Bukkit.getWorld("world").getGameRuleValue(GameRule.NATURAL_REGENERATION); - } - - public void setDayLightCircle(boolean value) { - for (World world : Bukkit.getWorlds()) { - if (world.getEnvironment() == World.Environment.NORMAL && plugin.getServerType() != ServerType.ADVENTURE) { - getScheduler().run(() -> world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, value)); - } - } - } - - public void portPlayerToLobby(Player player) { - if (plugin.getServerType() == ServerType.CHALLENGE || plugin.getServerType() == ServerType.CHALLENGE_LOAD) { - GlobalApi.portOnlinePlayerToLocation(player.getName(), "challenge"); - } else if (plugin.getServerType() == ServerType.ADVENTURE) { - GlobalApi.portOnlinePlayerToLocation(player.getName(), "adventure"); - } else if (plugin.getServerType() == ServerType.CHALLENGE_EVENT) { - GlobalApi.portOnlinePlayerToLocation(player.getName(), "challenge_event"); - } - } - - public Timer getTimer() { - return timer; - } - - public VanishUtils getVanish() { - return vanish; - } - - public boolean isWaitingForShutdown() { - return waitingForShutdown; - } - - public void setWaitingForShutdown(boolean waitingForShutdown) { - this.waitingForShutdown = waitingForShutdown; - } - - public BackpackGui getBackpack() { - return backpack; - } - - public File getBackpackConfigFile() { - return backpackConfigFile; - } - - public ScoreManager getScoreManager() { - return scoreManager; - } - - public NMSUtils getNMSUtils() { - return nmsUtils; - } - - public File getAllItemsConfigFile() { - return AllItemsConfigFile; - } - - public ServerType getServerType() { - return serverType; - } - - public TextComponent getPrefixComponent() { - return prefixComponent; - } - - public TextComponent getGuiPrefix() { - return guiPrefix; - } - - public ArrayList getNotAvailableMaterials() { - return not_available_materials; - } - - public ArrayList getMaterials() { - return materials; - } - - public ArrayList getAdvancements() { - return advancements; - } - - public CubesideStatisticsAPI getCubesideStatistics() { - return cubesideStatistics; - } - - public boolean isCubesideStatisticsInstalled() { - return cubesideStatistics != null; - } - - public Statistics getStatistics() { - return statistics; - } - - public PlayerUUIDCache getPlayerUUIDCache() { - return playerUUIDCache; - } - - public void addstatisticPlayers(UUID uuid) { - statisticPlayers.add(uuid); - } - - public ArrayList getstatisticPlayers() { - return statisticPlayers; - } - - public void addBannedPlayer(UUID uuid, boolean isPermaBan) { - bannedPlayers.add(uuid); - if (isPermaBan) { - List bannedPlayer = Config.getStringList("bannedPlayers"); - bannedPlayer.add(uuid.toString()); - Config.setValue("bannedPlayers", bannedPlayer, false); - } - } - - public void removeBannedPlayer(UUID uuid, Boolean removeConfig) { - bannedPlayers.remove(uuid); - if (removeConfig) { - List bannedPlayer = Config.getStringList("bannedPlayers"); - bannedPlayer.remove(uuid.toString()); - Config.setValue("bannedPlayers", bannedPlayer, false); - } - } - - public boolean isPlayerBanned(UUID uuid) { - return bannedPlayers.contains(uuid); - } - - public String getCubesideMod_ModChannel() { - return CubesideMod_ModChannel; - } - - public Scheduler getScheduler() { - return scheduler; - } - - public ColorUtils getColorUtils() { - return colorUtils; - } - - public Path getAdventureSavePath() { - return adventureSavePath; - } - - public Path getChallengeSavePath() { - return challengeSavePath; - } -} diff --git a/Challenge/src/main/java/de/fanta/challenge/Timer.java b/Challenge/src/main/java/de/fanta/challenge/Timer.java index 46904d6..6f0414a 100644 --- a/Challenge/src/main/java/de/fanta/challenge/Timer.java +++ b/Challenge/src/main/java/de/fanta/challenge/Timer.java @@ -22,7 +22,7 @@ public class Timer { - private final Challenges plugin; + private final Challenge plugin; private CancellableTask actionBarTaskId; private CancellableTask idleActionBarTaskId; private long time; // milliseconds @@ -32,7 +32,7 @@ private static final int[] baseColorsTimer = new int[]{0xFF6668, 0xFFB566, 0xFFED66, 0x66FF75, 0x66B8FF, 0xE666FF}; private static final int[] baseColorsReserveTimer = new int[]{0x7FD4E0, 0x947DFF, 0xFF88F1, 0xFF7D7D}; - public Timer(Challenges plugin) { + public Timer(Challenge plugin) { this.plugin = plugin; this.mode = TimerMode.UP; diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/AllAdvancementsChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/AllAdvancementsChallenge.java index e41c2eb..7680380 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/AllAdvancementsChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/AllAdvancementsChallenge.java @@ -1,7 +1,7 @@ package de.fanta.challenge.challenges; import com.destroystokyo.paper.event.player.PlayerAdvancementCriterionGrantEvent; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -29,7 +29,7 @@ public static BossBar bossBar; private static boolean running; - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onActivation(TimerChangedEvent event) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/AllItemsChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/AllItemsChallenge.java index e7616d0..d21f878 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/AllItemsChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/AllItemsChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.schedular.CancellableTask; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -29,7 +29,7 @@ public static final List foundItems = new ArrayList<>(); public static final List itemsToSearch = new ArrayList<>(); - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static int itemcount = 0; @@ -70,7 +70,7 @@ public static void update() { ItemScheduler = plugin.getScheduler().runGlobalAtFixedRate(() -> { - if (Config.getBoolean("allitems") && Challenges.getPlugin().getTimer().isRunning()) { + if (Config.getBoolean("allitems") && Challenge.getPlugin().getTimer().isRunning()) { if (!itemsToSearch.isEmpty()) { for (Player pp : Bukkit.getOnlinePlayers()) { bossBar.addViewer(pp); @@ -85,7 +85,7 @@ } else { bossBar.name(Component.text("Alle Items gesammelt!", ChatUtil.GREEN)); ChatUtil.sendBrodCastMessage(Component.text("Alle Items gesammelt!", ChatUtil.GREEN)); - Challenges.getPlugin().getTimer().stopTimer(); + Challenge.getPlugin().getTimer().stopTimer(); for (Player pl : Bukkit.getOnlinePlayers()) { pl.playSound(pl.getLocation(), Sound.UI_TOAST_CHALLENGE_COMPLETE, 0.2f, 1); } @@ -120,19 +120,19 @@ } private static void saveItems() { - FileConfiguration config = Challenges.getPlugin().getAllItemsConfig(); + FileConfiguration config = Challenge.getPlugin().getAllItemsConfig(); ArrayList itemStings = new ArrayList<>(); foundItems.forEach(material -> itemStings.add(material.name())); config.set("items", itemStings); try { - Challenges.getPlugin().AllItemsConfig.save(Challenges.getPlugin().getAllItemsConfigFile()); + Challenge.getPlugin().AllItemsConfig.save(Challenge.getPlugin().getAllItemsConfigFile()); } catch (IOException e) { plugin.getLogger().log(Level.SEVERE, "Error while saving Items", e); } } private static void loadItems() { - FileConfiguration config = Challenges.getPlugin().getAllItemsConfig(); + FileConfiguration config = Challenge.getPlugin().getAllItemsConfig(); if (config.isList("items")) { config.getStringList("items").forEach(itemSting -> foundItems.add(Material.valueOf(itemSting))); } diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/BedrockWallChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/BedrockWallChallenge.java index 738625a..528a996 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/BedrockWallChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/BedrockWallChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.Location; import org.bukkit.Material; @@ -13,7 +13,7 @@ public class BedrockWallChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onMove(PlayerMoveEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/BingoChallengeEvent.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/BingoChallengeEvent.java index 9b53176..e47df23 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/BingoChallengeEvent.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/BingoChallengeEvent.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges.ChallengeEvents; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.guis.eventgui.BingoItemsGui; import de.fanta.challenge.scoreboard.ChallengePlayer; @@ -50,7 +50,7 @@ private static List materials = new ArrayList<>(); private static final BossBar bossBar = BossBar.bossBar(Component.text("Nutze ", ChatUtil.GREEN).append(Component.text("/bingo", ChatUtil.BLUE).append(Component.text(" um die Items zu sehen", ChatUtil.GREEN))), 1.0f, BossBar.Color.GREEN, BossBar.Overlay.PROGRESS); - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); public static List getMaterials() { return materials; diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/BridgeRaceChallengeEvent.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/BridgeRaceChallengeEvent.java index 4ae5273..56914a5 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/BridgeRaceChallengeEvent.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/BridgeRaceChallengeEvent.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges.ChallengeEvents; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.schedular.CancellableTask; import de.fanta.challenge.scoreboard.ChallengePlayer; @@ -47,7 +47,7 @@ public class BridgeRaceChallengeEvent implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static boolean running; private static final HashMap playerSpawnLocations = new HashMap<>(); private static final Map bossBarMap = new HashMap<>(); diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DeathrunChallengeEvent.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DeathrunChallengeEvent.java index 71bee57..eff3436 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DeathrunChallengeEvent.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DeathrunChallengeEvent.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges.ChallengeEvents; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.schedular.CancellableTask; import de.fanta.challenge.scoreboard.ChallengePlayer; @@ -52,7 +52,7 @@ public class DeathrunChallengeEvent implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final List deadPlayer = new ArrayList<>(); private final Map bossBarMap = new HashMap<>(); @@ -63,7 +63,7 @@ private CancellableTask task; - private static final NamespacedKey UUIDKey = new NamespacedKey(Challenges.getPlugin(), "uuid_deathrun"); + private static final NamespacedKey UUIDKey = new NamespacedKey(Challenge.getPlugin(), "uuid_deathrun"); private final Random random = new Random(); private static World world; diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DifferentItemsChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DifferentItemsChallenge.java index 72e096f..0b83fb5 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DifferentItemsChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DifferentItemsChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges.ChallengeEvents; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.ChallengeEventStatusChangedEvent; import de.fanta.challenge.guis.eventgui.BingoItemsGui; import de.fanta.challenge.scoreboard.ChallengePlayer; @@ -36,7 +36,7 @@ public class DifferentItemsChallenge implements Listener { private static boolean running; - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private final HashMap> playerMaterials = new HashMap<>(); private static final Map bossBarMap = new HashMap<>(); diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/OreBattleChallengeEvent.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/OreBattleChallengeEvent.java index f7c2336..ce68bca 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/OreBattleChallengeEvent.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/OreBattleChallengeEvent.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges.ChallengeEvents; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.scoreboard.ChallengePlayer; import de.fanta.challenge.scoreboard.Scorable; @@ -26,7 +26,7 @@ public class OreBattleChallengeEvent implements Listener { private static final HashMap blocklist = new HashMap<>(); private static boolean running; - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); public static boolean isRunning() { return running; diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/SammelFieberChallengeEvent.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/SammelFieberChallengeEvent.java index 3bfb04c..daf9d39 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/SammelFieberChallengeEvent.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/SammelFieberChallengeEvent.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges.ChallengeEvents; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.guis.eventgui.SammelFieberSettingsGui; import de.fanta.challenge.scoreboard.ChallengePlayer; @@ -49,7 +49,7 @@ private static Material material; private static boolean running; private static int count; - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); public static Location getHopperLocation() { return hopperloc; diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/TimeChallengeEvent.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/TimeChallengeEvent.java index 95672d8..82d9b7f 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/TimeChallengeEvent.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/TimeChallengeEvent.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges.ChallengeEvents; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.schedular.CancellableTask; import de.fanta.challenge.utils.Config; @@ -18,7 +18,7 @@ public class TimeChallengeEvent implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); private static final HashMap playerPlayTimes = new HashMap<>(); private static final HashMap playerStartTimes = new HashMap<>(); private CancellableTask updateTimesTask; diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java index dda6fa9..666a5d0 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/forcequest/ForceQuestChallengeEvent.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges.ChallengeEvents.forcequest; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.schedular.CancellableTask; import de.fanta.challenge.scoreboard.ChallengePlayer; @@ -84,7 +84,7 @@ import java.util.UUID; public class ForceQuestChallengeEvent implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final Random random = new Random(); private static boolean running; diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeGoals.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeGoals.java index 66debf0..d3fa506 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeGoals.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeGoals.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -19,7 +19,7 @@ public class ChallengeGoals implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void GoalDeath(EntityDeathEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ClearInventoryByDamageChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ClearInventoryByDamageChallenge.java index 3a54b19..c210018 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ClearInventoryByDamageChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ClearInventoryByDamageChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.fanta.challenge.utils.CubesideModUtils; @@ -14,7 +14,7 @@ public class ClearInventoryByDamageChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onDamageclear(EntityDamageEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/CraftingTableChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/CraftingTableChallenge.java index 284e4d5..07c592f 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/CraftingTableChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/CraftingTableChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.Material; import org.bukkit.event.EventHandler; @@ -10,7 +10,7 @@ public class CraftingTableChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onInteractWorlkbench(PlayerInteractEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/FloorIsLavaChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/FloorIsLavaChallenge.java index 7708d85..b2c096e 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/FloorIsLavaChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/FloorIsLavaChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.GameMode; import org.bukkit.Location; @@ -14,7 +14,7 @@ import java.util.ArrayList; public class FloorIsLavaChallenge implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static final ArrayList LAVA_BLOCKS = new ArrayList<>(); @EventHandler diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/IceRunnerChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/IceRunnerChallenge.java index def36b4..9c7959c 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/IceRunnerChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/IceRunnerChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.Location; import org.bukkit.Material; @@ -15,7 +15,7 @@ public class IceRunnerChallenge implements Listener { - public final Challenges plugin = Challenges.getPlugin(); + public final Challenge plugin = Challenge.getPlugin(); private final HashMap iceRunnerEnable = new HashMap<>(); diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/MLGChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/MLGChallenge.java index 7e50439..d834a11 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/MLGChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/MLGChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.gravestones.GravestoneUtils; import de.fanta.challenge.schedular.CancellableTask; @@ -34,7 +34,7 @@ public class MLGChallenge implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final Random random = new Random(); private static boolean MLGinProgress; diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ManHunt.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ManHunt.java index bbcf50e..2bbfca6 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ManHunt.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ManHunt.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.schedular.CancellableTask; import de.fanta.challenge.utils.ChatUtil; @@ -35,7 +35,7 @@ import java.util.HashMap; public class ManHunt implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private CancellableTask task; private final HashMap locationList = new HashMap<>(); private static final NamespacedKey hunterItemKey = new NamespacedKey(plugin, "HunterItem"); diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/MobRemoveWorldChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/MobRemoveWorldChallenge.java index 9add796..a6ebcd8 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/MobRemoveWorldChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/MobRemoveWorldChallenge.java @@ -1,7 +1,7 @@ package de.fanta.challenge.challenges; import com.destroystokyo.paper.event.entity.EntityAddToWorldEvent; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.utils.Config; import io.papermc.paper.event.entity.EntityMoveEvent; @@ -19,7 +19,7 @@ public class MobRemoveWorldChallenge implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final ArrayList dragonList = new ArrayList<>(); diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/NoFallDamageChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/NoFallDamageChallenge.java index ec70516..e2270b5 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/NoFallDamageChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/NoFallDamageChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -9,7 +9,7 @@ public class NoFallDamageChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onDamage(EntityDamageEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/NoJumpChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/NoJumpChallenge.java index 8830438..09381aa 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/NoJumpChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/NoJumpChallenge.java @@ -1,7 +1,7 @@ package de.fanta.challenge.challenges; import com.destroystokyo.paper.event.player.PlayerJumpEvent; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.GameMode; import org.bukkit.entity.Player; @@ -10,7 +10,7 @@ public class NoJumpChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onPlayerJump(PlayerJumpEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/NoSneakChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/NoSneakChallenge.java index 228836c..ae8d5bc 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/NoSneakChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/NoSneakChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.GameMode; import org.bukkit.entity.Player; @@ -10,7 +10,7 @@ public class NoSneakChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onPlayerSneak(PlayerToggleSneakEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/NoSprintChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/NoSprintChallenge.java index 6d0a0d7..e829dc1 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/NoSprintChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/NoSprintChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.GameMode; import org.bukkit.entity.Player; @@ -10,7 +10,7 @@ public class NoSprintChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onPlayerSprint(PlayerToggleSprintEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/NoTradingChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/NoTradingChallenge.java index 6bcb6ea..9b20ac2 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/NoTradingChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/NoTradingChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; @@ -9,7 +9,7 @@ public class NoTradingChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onEntityClick(PlayerInteractEntityEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/RandomDropsChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/RandomDropsChallenge.java index a71b485..94f6b25 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/RandomDropsChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/RandomDropsChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import io.papermc.paper.event.block.BlockBreakBlockEvent; import org.bukkit.Material; @@ -29,7 +29,7 @@ private final HashMap drops = new HashMap<>(); - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); public RandomDropsChallenge() { this.BLOCKS = (ArrayList) Arrays.stream(Material.values()).filter(mat -> (mat.isBlock() && mat != Material.AIR && mat != Material.CAVE_AIR && mat != Material.VOID_AIR)).collect(Collectors.toList()); @@ -90,10 +90,10 @@ } public void saveItems() { - FileConfiguration config = Challenges.getPlugin().getRndDropsConfig(); + FileConfiguration config = Challenge.getPlugin().getRndDropsConfig(); config.set("drops", this.drops.entrySet().stream().map(entry -> entry.getKey() + ":" + entry.getValue()).collect(Collectors.toList())); try { - Challenges.getPlugin().RndDropsConfig.save(Challenges.getPlugin().RndDropsConfigFile); + Challenge.getPlugin().RndDropsConfig.save(Challenge.getPlugin().RndDropsConfigFile); } catch (IOException e) { plugin.getLogger().log(Level.SEVERE, "Error while saving randomDrop Config", e); } @@ -101,7 +101,7 @@ public void loadItems() { this.drops.clear(); - FileConfiguration config = Challenges.getPlugin().getRndDropsConfig(); + FileConfiguration config = Challenge.getPlugin().getRndDropsConfig(); if (config.isList("drops")) { config.getStringList("drops").forEach(str -> { String[] materialSplitted = str.split(":"); diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/RandomEffectChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/RandomEffectChallenge.java index f065948..e4a450a 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/RandomEffectChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/RandomEffectChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.Registry; import org.bukkit.entity.Player; @@ -16,7 +16,7 @@ public class RandomEffectChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); private final Random random = new Random(); private final HashMap chunkPotionEffectMap = new HashMap<>(); diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/RandomMobChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/RandomMobChallenge.java index f436cec..57fae7f 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/RandomMobChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/RandomMobChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.Location; import org.bukkit.World; @@ -19,7 +19,7 @@ public class RandomMobChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onEntityDeath(EntityDeathEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ShareDamageChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ShareDamageChallenge.java index 8feb0c7..7c5d215 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ShareDamageChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ShareDamageChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -12,7 +12,7 @@ public class ShareDamageChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onDamage(EntityDamageEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/TiedTogetherChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/TiedTogetherChallenge.java index f57c52a..b1b36f4 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/TiedTogetherChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/TiedTogetherChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -12,7 +12,7 @@ public class TiedTogetherChallenge implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onMove(PlayerMoveEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/WorldBorderLevelChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/WorldBorderLevelChallenge.java index ec72e63..b683f4b 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/WorldBorderLevelChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/WorldBorderLevelChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.fanta.challenge.utils.CubesideModUtils; @@ -29,7 +29,7 @@ public class WorldBorderLevelChallenge implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static WorldBorder worldBorder; private static WorldBorder netherBorder; diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/XPChallenge.java b/Challenge/src/main/java/de/fanta/challenge/challenges/XPChallenge.java index f62fde6..24cb078 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/XPChallenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/XPChallenge.java @@ -1,6 +1,6 @@ package de.fanta.challenge.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import net.kyori.adventure.text.Component; @@ -12,7 +12,7 @@ public class XPChallenge implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onPlayerGetXP(PlayerExpChangeEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/BackpackCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/BackpackCommand.java index 24baf5f..3d652b9 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/BackpackCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/BackpackCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.teams.ChallengeTeam; import de.fanta.challenge.teams.TeamUtils; import de.fanta.challenge.utils.ChatUtil; @@ -12,9 +12,9 @@ import org.bukkit.entity.Player; public class BackpackCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public BackpackCommand(Challenges plugin) { + public BackpackCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/BingoCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/BingoCommand.java index 03479c4..d213dd6 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/BingoCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/BingoCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.eventgui.BingoItemsGui; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -14,9 +14,9 @@ import java.util.Objects; public class BingoCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public BingoCommand(Challenges plugin) { + public BingoCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/CommandRegistration.java b/Challenge/src/main/java/de/fanta/challenge/commands/CommandRegistration.java index c31a64f..a3c7b39 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/CommandRegistration.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/CommandRegistration.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.commands.challenges.ChallengeMaxPlayersCommand; import de.fanta.challenge.commands.challenges.ChallengesBanCommand; import de.fanta.challenge.commands.challenges.ChallengesCommand; @@ -49,11 +49,11 @@ import de.iani.cubesideutils.bukkit.MinecraftVersion; import de.iani.cubesideutils.bukkit.commands.CommandRouter; -public record CommandRegistration(Challenges plugin) { +public record CommandRegistration(Challenge plugin) { public void registerCommands() { - CommandRouter challengesRouter = new CommandRouter(plugin.getCommand("challenges")); + CommandRouter challengesRouter = new CommandRouter(plugin.getCommand("challenge")); challengesRouter.addPluginCommand(plugin.getCommand("adventure")); challengesRouter.addCommandMapping(new ChallengesCommand(plugin)); challengesRouter.addCommandMapping(new ChallengesHelpCommand(plugin), "help"); diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/ForceMLGCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/ForceMLGCommand.java index ab958b1..cbf3760 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/ForceMLGCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/ForceMLGCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.MLGChallenge; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -11,9 +11,9 @@ public class ForceMLGCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ForceMLGCommand(Challenges plugin) { + public ForceMLGCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/LeaveCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/LeaveCommand.java index 811f94c..b2fde59 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/LeaveCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/LeaveCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -10,9 +10,9 @@ public class LeaveCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public LeaveCommand(Challenges plugin) { + public LeaveCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/NetherToggleCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/NetherToggleCommand.java index d2d1d84..5cfc065 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/NetherToggleCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/NetherToggleCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -16,10 +16,10 @@ public class NetherToggleCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; private final boolean enable; - public NetherToggleCommand(Challenges plugin, boolean enable) { + public NetherToggleCommand(Challenge plugin, boolean enable) { this.plugin = plugin; this.enable = enable; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/ReviveCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/ReviveCommand.java index 4bf80d7..f3edbb0 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/ReviveCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/ReviveCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.MLGChallenge; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -16,9 +16,9 @@ public class ReviveCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ReviveCommand(Challenges plugin) { + public ReviveCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/SkipItemCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/SkipItemCommand.java index 490b98d..0b30f4a 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/SkipItemCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/SkipItemCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.AllItemsChallenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -12,9 +12,9 @@ public class SkipItemCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public SkipItemCommand(Challenges plugin) { + public SkipItemCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/VillageCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/VillageCommand.java index e0950c0..8e671b7 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/VillageCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/VillageCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -22,9 +22,9 @@ public class VillageCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public VillageCommand(Challenges plugin) { + public VillageCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengeMaxPlayersCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengeMaxPlayersCommand.java index 9febde6..9154272 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengeMaxPlayersCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengeMaxPlayersCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.PlayerCountChangedEvent; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -24,7 +24,7 @@ try { int playeCount = Integer.parseInt(args.getNext()); Bukkit.getServer().setMaxPlayers(playeCount); - Bukkit.getPluginManager().callEvent(new PlayerCountChangedEvent(Challenges.getPlugin().getVanish().getPlayerListWithoutVanishPlayers().size())); + Bukkit.getPluginManager().callEvent(new PlayerCountChangedEvent(Challenge.getPlugin().getVanish().getPlayerListWithoutVanishPlayers().size())); ChatUtil.sendMessage(player, Component.text("Du hast die maximale Spieleranzahl vom server auf ", ChatUtil.GREEN).append(Component.text(playeCount, ChatUtil.BLUE).append(Component.text(" gesetzt!", ChatUtil.GREEN)))); } catch (NumberFormatException ex) { ChatUtil.sendErrorMessage(player, "Du musst eine Zahl angeben!"); diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesBanCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesBanCommand.java index 4cae631..4832a8a 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesBanCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesBanCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -11,9 +11,9 @@ import org.bukkit.entity.Player; public class ChallengesBanCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ChallengesBanCommand(Challenges plugin) { + public ChallengesBanCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesCommand.java index d120c02..d244a22 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -9,16 +9,16 @@ public class ChallengesCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ChallengesCommand(Challenges plugin) { + public ChallengesCommand(Challenge plugin) { this.plugin = plugin; } @Override public boolean onCommand(CommandSender sender, Command command, String alias, String commandString, ArgsParser args) { - ChatUtil.sendNormalMessage(sender, "Challenges v" + plugin.getPluginMeta().getVersion() + " by " + (plugin.getPluginMeta().getAuthors() + "").replace("[", "").replace("]", "")); - ChatUtil.sendNormalMessage(sender, "Nutze /challenges help für Hilfe"); + ChatUtil.sendNormalMessage(sender, "Challenge v" + plugin.getPluginMeta().getVersion() + " by " + (plugin.getPluginMeta().getAuthors() + "").replace("[", "").replace("]", "")); + ChatUtil.sendNormalMessage(sender, "Nutze /challenge help für Hilfe"); return true; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesEnderSeeCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesEnderSeeCommand.java index 82a666f..f533f87 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesEnderSeeCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesEnderSeeCommand.java @@ -32,7 +32,7 @@ player.openInventory(enderSeePlayer.getEnderChest()); } else { - ChatUtil.sendErrorMessage(player, "/challenges endersee "); + ChatUtil.sendErrorMessage(player, "/challenge endersee "); return true; } return true; diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesHelpCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesHelpCommand.java index b0f4392..f32ac77 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesHelpCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesHelpCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -11,9 +11,9 @@ public class ChallengesHelpCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ChallengesHelpCommand(Challenges plugin) { + public ChallengesHelpCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesInvSeeCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesInvSeeCommand.java index b44cc38..aa875b8 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesInvSeeCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesInvSeeCommand.java @@ -32,7 +32,7 @@ player.openInventory(invseePlayer.getInventory()); } else { - ChatUtil.sendWarningMessage(player, "/challenges invsee "); + ChatUtil.sendWarningMessage(player, "/challenge invsee "); return true; } return true; diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesKickCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesKickCommand.java index 5a203c0..eb24a7c 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesKickCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesKickCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -11,9 +11,9 @@ import org.bukkit.entity.Player; public class ChallengesKickCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ChallengesKickCommand(Challenges plugin) { + public ChallengesKickCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesSaveCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesSaveCommand.java index 5ddd5ed..ac6f1b7 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesSaveCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesSaveCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.savegui.ChallengeSaveGui; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -13,9 +13,9 @@ public class ChallengesSaveCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ChallengesSaveCommand(Challenges plugin) { + public ChallengesSaveCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesUnBanCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesUnBanCommand.java index 86450e5..ae8a9bc 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesUnBanCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/ChallengesUnBanCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -18,9 +18,9 @@ import java.util.UUID; public class ChallengesUnBanCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ChallengesUnBanCommand(Challenges plugin) { + public ChallengesUnBanCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/CheckItemsCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/CheckItemsCommand.java index d2feb02..0971d48 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/challenges/CheckItemsCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/challenges/CheckItemsCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.challenges; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.CheckItemsGUI; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -19,10 +19,10 @@ public class CheckItemsCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; private boolean reset = false; - public CheckItemsCommand(Challenges plugin) { + public CheckItemsCommand(Challenge plugin) { this.plugin = plugin; } @@ -33,10 +33,10 @@ } if (!args.hasNext()) { if (!reset) { - FileConfiguration config = Challenges.getPlugin().getItemConfig(); + FileConfiguration config = Challenge.getPlugin().getItemConfig(); config.set("items", null); try { - Challenges.getPlugin().ItemConfig.save(Challenges.getPlugin().ItemConfigFile); + Challenge.getPlugin().ItemConfig.save(Challenge.getPlugin().ItemConfigFile); } catch (IOException e) { plugin.getLogger().log(Level.SEVERE, "Error while saving item Config", e); } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/coords/CoordsSaveCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/coords/CoordsSaveCommand.java index 62910e5..6e68d4b 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/coords/CoordsSaveCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/coords/CoordsSaveCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.coords; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -12,9 +12,9 @@ public class CoordsSaveCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public CoordsSaveCommand(Challenges plugin) { + public CoordsSaveCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/coords/CoordsTargetCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/coords/CoordsTargetCommand.java index 3f63e71..9348483 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/coords/CoordsTargetCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/coords/CoordsTargetCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.coords; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.CoordsTargeter; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -17,9 +17,9 @@ public class CoordsTargetCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public CoordsTargetCommand(Challenges plugin) { + public CoordsTargetCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/editor/EditorCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/editor/EditorCommand.java index a0cfdf1..6414150 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/editor/EditorCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/editor/EditorCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.editor; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatSkullAPI.ChatSkull; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -12,9 +12,9 @@ public class EditorCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public EditorCommand(Challenges plugin) { + public EditorCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/editor/EditorSetCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/editor/EditorSetCommand.java index 6667231..045315d 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/editor/EditorSetCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/editor/EditorSetCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.editor; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -12,9 +12,9 @@ public class EditorSetCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public EditorSetCommand(Challenges plugin) { + public EditorSetCommand(Challenge plugin) { this.plugin = plugin; } @@ -35,7 +35,7 @@ } else if (!plugin.isEditor(player)) { plugin.setCurrentEditor(player); ChatUtil.sendBrodCastMessage(player.name().color(ChatUtil.BLUE).append(Component.text(" wurde von ", ChatUtil.GREEN).append(sender.name().color(ChatUtil.BLUE).append(Component.text(" zum Editor ernannt", ChatUtil.GREEN))))); - ChatUtil.sendNormalMessage(player, "Du bist jetzt Editor und kannst diese Lobby bearbeiten. (/challenges)"); + ChatUtil.sendNormalMessage(player, "Du bist jetzt Editor und kannst diese Lobby bearbeiten. (/challenge)"); return true; } else { ChatUtil.sendWarningMessage(sender, "Du bist bereits Editor!"); diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/event/EventGetScoreCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/event/EventGetScoreCommand.java index 298abf1..48081dc 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/event/EventGetScoreCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/event/EventGetScoreCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.event; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.scoreboard.ChallengePlayer; import de.fanta.challenge.scoreboard.Scorable; import de.fanta.challenge.utils.ChatUtil; @@ -12,9 +12,9 @@ import org.bukkit.entity.Player; public class EventGetScoreCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public EventGetScoreCommand(Challenges plugin) { + public EventGetScoreCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/event/EventSaveScoresCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/event/EventSaveScoresCommand.java index 8fe3030..647a3b1 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/event/EventSaveScoresCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/event/EventSaveScoresCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.event; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.scoreboard.Scorable; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -17,9 +17,9 @@ public class EventSaveScoresCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public EventSaveScoresCommand(Challenges plugin) { + public EventSaveScoresCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/event/EventStartCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/event/EventStartCommand.java index f1433ff..e617efe 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/event/EventStartCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/event/EventStartCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.event; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.ChallengeEventStatusChangedEvent; import de.fanta.challenge.scoreboard.ChallengePlayer; import de.fanta.challenge.teams.ChallengeTeam; @@ -19,9 +19,9 @@ import java.util.concurrent.atomic.AtomicInteger; public class EventStartCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public EventStartCommand(Challenges plugin) { + public EventStartCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/event/EventToggleCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/event/EventToggleCommand.java index ce1da22..7feb814 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/event/EventToggleCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/event/EventToggleCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.event; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.ChallengeEventStatusChangedEvent; import de.fanta.challenge.events.EventStatusChangedEvent; import de.fanta.challenge.utils.ChatUtil; @@ -15,10 +15,10 @@ public class EventToggleCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; private final boolean enable; - public EventToggleCommand(Challenges plugin, boolean enable) { + public EventToggleCommand(Challenge plugin, boolean enable) { this.plugin = plugin; this.enable = enable; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPAddCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPAddCommand.java index 74fe4ab..33f7e8f 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPAddCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPAddCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.hp; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -13,9 +13,9 @@ public class HPAddCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public HPAddCommand(Challenges plugin) { + public HPAddCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPGetCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPGetCommand.java index 8570727..b93320f 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPGetCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPGetCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.hp; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -11,9 +11,9 @@ public class HPGetCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public HPGetCommand(Challenges plugin) { + public HPGetCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPMaxCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPMaxCommand.java index 57d4c1e..5806dc6 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPMaxCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPMaxCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.hp; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -13,9 +13,9 @@ public class HPMaxCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public HPMaxCommand(Challenges plugin) { + public HPMaxCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPRemoveCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPRemoveCommand.java index 6f0804c..922e5d5 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPRemoveCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPRemoveCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.hp; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -13,9 +13,9 @@ public class HPRemoveCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public HPRemoveCommand(Challenges plugin) { + public HPRemoveCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPSetCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPSetCommand.java index 893796b..e8676b6 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPSetCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPSetCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.hp; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -13,9 +13,9 @@ public class HPSetCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public HPSetCommand(Challenges plugin) { + public HPSetCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/reset/ResetCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/reset/ResetCommand.java index a095b23..a414b7a 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/reset/ResetCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/reset/ResetCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.reset; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.ResetGui; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -11,9 +11,9 @@ public class ResetCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ResetCommand(Challenges plugin) { + public ResetCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/reset/ResetConfirmCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/reset/ResetConfirmCommand.java index 24806da..944b6c9 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/reset/ResetConfirmCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/reset/ResetConfirmCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.reset; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.SaveWorldUtils; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -11,9 +11,9 @@ public class ResetConfirmCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public ResetConfirmCommand(Challenges plugin) { + public ResetConfirmCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/settings/SettingsCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/settings/SettingsCommand.java index 192f40e..bfe517f 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/settings/SettingsCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/settings/SettingsCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.settings; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.settingsgui.MainGui; import de.fanta.challenge.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -11,9 +11,9 @@ public class SettingsCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public SettingsCommand(Challenges plugin) { + public SettingsCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerCommand.java index 6bf5811..978b4ad 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.timer; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.guis.TimerGui; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -11,9 +11,9 @@ public class TimerCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public TimerCommand(Challenges plugin) { + public TimerCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerGetCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerGetCommand.java index 03649c1..fec983a 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerGetCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerGetCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.timer; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -11,9 +11,9 @@ public class TimerGetCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public TimerGetCommand(Challenges plugin) { + public TimerGetCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerPauseCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerPauseCommand.java index 578060d..3e1cf53 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerPauseCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerPauseCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.timer; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -13,9 +13,9 @@ public class TimerPauseCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public TimerPauseCommand(Challenges plugin) { + public TimerPauseCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerResetCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerResetCommand.java index 8539649..54168bb 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerResetCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerResetCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.timer; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -13,9 +13,9 @@ public class TimerResetCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public TimerResetCommand(Challenges plugin) { + public TimerResetCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerReverseCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerReverseCommand.java index 65850d4..aace1a9 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerReverseCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerReverseCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.timer; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -13,9 +13,9 @@ public class TimerReverseCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public TimerReverseCommand(Challenges plugin) { + public TimerReverseCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerSetCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerSetCommand.java index 8b49a56..e6e2bf4 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerSetCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerSetCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.timer; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -13,9 +13,9 @@ public class TimerSetCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public TimerSetCommand(Challenges plugin) { + public TimerSetCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerStartCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerStartCommand.java index 289f6de..0943569 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerStartCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/timer/TimerStartCommand.java @@ -1,6 +1,6 @@ package de.fanta.challenge.commands.timer; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -12,9 +12,9 @@ public class TimerStartCommand extends SubCommand { - private final Challenges plugin; + private final Challenge plugin; - public TimerStartCommand(Challenges plugin) { + public TimerStartCommand(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/gravestones/GravestoneListener.java b/Challenge/src/main/java/de/fanta/challenge/gravestones/GravestoneListener.java index 7704a3a..fa6f4cf 100644 --- a/Challenge/src/main/java/de/fanta/challenge/gravestones/GravestoneListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/gravestones/GravestoneListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.gravestones; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import org.bukkit.GameRule; @@ -28,7 +28,7 @@ public class GravestoneListener implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onDeath(PlayerDeathEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/gravestones/GravestoneUtils.java b/Challenge/src/main/java/de/fanta/challenge/gravestones/GravestoneUtils.java index 1e499d1..fd1e70e 100644 --- a/Challenge/src/main/java/de/fanta/challenge/gravestones/GravestoneUtils.java +++ b/Challenge/src/main/java/de/fanta/challenge/gravestones/GravestoneUtils.java @@ -1,6 +1,6 @@ package de.fanta.challenge.gravestones; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.ItemStackUtil; import de.iani.cubesideutils.bukkit.items.ItemGroups; @@ -35,9 +35,9 @@ import java.util.zip.InflaterInputStream; public class GravestoneUtils { - private static final NamespacedKey UUIDKey = new NamespacedKey(Challenges.getPlugin(), "uuid_gravestone"); - private static final NamespacedKey inventoryKey = new NamespacedKey(Challenges.getPlugin(), "inventory_gravestone"); - private static final NamespacedKey inventoryBase64Key = new NamespacedKey(Challenges.getPlugin(), "inventory_base64_gravestone"); + private static final NamespacedKey UUIDKey = new NamespacedKey(Challenge.getPlugin(), "uuid_gravestone"); + private static final NamespacedKey inventoryKey = new NamespacedKey(Challenge.getPlugin(), "inventory_gravestone"); + private static final NamespacedKey inventoryBase64Key = new NamespacedKey(Challenge.getPlugin(), "inventory_base64_gravestone"); public static byte[] compressString(String s) { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -108,7 +108,7 @@ } } } catch (InvalidConfigurationException ex) { - Challenges.getPlugin().getLogger().log(Level.SEVERE, "Error while loading yaml Config", ex); + Challenge.getPlugin().getLogger().log(Level.SEVERE, "Error while loading yaml Config", ex); } return inventory; } diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/BackpackGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/BackpackGui.java index f381ffe..0dacbee 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/BackpackGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/BackpackGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; @@ -17,7 +17,7 @@ public class BackpackGui { - public static final Component TITLE = Challenges.getPlugin().getGuiPrefix().append(Component.text(" >> Backpack")); + public static final Component TITLE = Challenge.getPlugin().getGuiPrefix().append(Component.text(" >> Backpack")); private Inventory backpack; public BackpackGui(int size) { @@ -68,14 +68,14 @@ } public void clearConfig() { - for (String section : Challenges.getPlugin().getBackpackConfig().getKeys(false)) { + for (String section : Challenge.getPlugin().getBackpackConfig().getKeys(false)) { if (section != null) { - Challenges.getPlugin().getBackpackConfig().set(section, null); + Challenge.getPlugin().getBackpackConfig().set(section, null); } try { - Challenges.getPlugin().getBackpackConfig().save(Challenges.getPlugin().getBackpackConfigFile()); + Challenge.getPlugin().getBackpackConfig().save(Challenge.getPlugin().getBackpackConfigFile()); } catch (IOException e) { - Challenges.getPlugin().getLogger().log(Level.SEVERE, "Could not save backpack config", e); + Challenge.getPlugin().getLogger().log(Level.SEVERE, "Could not save backpack config", e); } } } @@ -85,27 +85,27 @@ for (int slot = 0; slot < backpack.getSize(); slot++) { ItemStack stack = backpack.getItem(slot); if (stack != null && stack.getType() != Material.AIR) { - Challenges.getPlugin().getBackpackConfig().set(String.valueOf(slot), stack.serialize()); + Challenge.getPlugin().getBackpackConfig().set(String.valueOf(slot), stack.serialize()); } } try { - Challenges.getPlugin().getBackpackConfig().save(Challenges.getPlugin().getBackpackConfigFile()); + Challenge.getPlugin().getBackpackConfig().save(Challenge.getPlugin().getBackpackConfigFile()); } catch (IOException e) { - Challenges.getPlugin().getLogger().log(Level.SEVERE, "Could not save backpack config", e); + Challenge.getPlugin().getLogger().log(Level.SEVERE, "Could not save backpack config", e); } } public void loadInventoryFromConfig() { - for (Map.Entry stringObjectEntry : Challenges.getPlugin().getBackpackConfig().getValues(false).entrySet()) { + for (Map.Entry stringObjectEntry : Challenge.getPlugin().getBackpackConfig().getValues(false).entrySet()) { int slot; try { slot = Integer.parseInt(stringObjectEntry.getKey()); } catch (NumberFormatException e) { - Challenges.getPlugin().getLogger().log(Level.SEVERE, "Fehler! Slot: " + stringObjectEntry.getKey(), e); + Challenge.getPlugin().getLogger().log(Level.SEVERE, "Fehler! Slot: " + stringObjectEntry.getKey(), e); continue; } if (slot >= backpack.getSize()) { - Challenges.getPlugin().getLogger().log(Level.SEVERE, "Slot " + slot + " befindet sich außerhalb des Inventars!"); + Challenge.getPlugin().getLogger().log(Level.SEVERE, "Slot " + slot + " befindet sich außerhalb des Inventars!"); continue; } MemorySection memorySection = (MemorySection) stringObjectEntry.getValue(); diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/CheckItemsGUI.java b/Challenge/src/main/java/de/fanta/challenge/guis/CheckItemsGUI.java index d474e1b..4e6aae0 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/CheckItemsGUI.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/CheckItemsGUI.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; @@ -19,7 +19,7 @@ import java.util.logging.Level; public class CheckItemsGUI extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int JA_INDEX = 0; private static final int ITEM_INDEX = 2; @@ -85,12 +85,12 @@ } public static void addItem(Material material) { - FileConfiguration config = Challenges.getPlugin().getItemConfig(); + FileConfiguration config = Challenge.getPlugin().getItemConfig(); List list = config.getStringList("items"); list.add(material.name()); config.set("items", list); try { - Challenges.getPlugin().ItemConfig.save(Challenges.getPlugin().ItemConfigFile); + Challenge.getPlugin().ItemConfig.save(Challenge.getPlugin().ItemConfigFile); } catch (IOException e) { plugin.getLogger().log(Level.SEVERE, "Error while saving item Config", e); } diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/ResetGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/ResetGui.java index 25ec250..3163e79 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/ResetGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/ResetGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -16,7 +16,7 @@ public class ResetGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int RESET_INDEX = 2; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/TeleportGUI.java b/Challenge/src/main/java/de/fanta/challenge/guis/TeleportGUI.java index 49d10fb..24af038 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/TeleportGUI.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/TeleportGUI.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.ItemUtils; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; @@ -18,7 +18,7 @@ import java.util.Map; public class TeleportGUI extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final Map playerPerSlot = new HashMap<>(); private static final int INVENTORY_SIZE = 9 * (plugin.getVanish().getPlayerListWithoutVanishPlayers().size() / 7 + ((plugin.getVanish().getPlayerListWithoutVanishPlayers().size() % 7 > 0) ? 1 : 0)) + 18; private static final int CLOSE_IDEX = INVENTORY_SIZE - 9; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/TimerGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/TimerGui.java index 68df9e4..cd5af7f 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/TimerGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/TimerGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.Timer; import de.fanta.challenge.utils.ChatUtil; @@ -19,7 +19,7 @@ public class TimerGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static final int INVENTORY_SIZE = 27; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/BackPackSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/BackPackSettingsGui.java index b35ea27..24e4a4e 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/BackPackSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/BackPackSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.challengesettingsguis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.settingsgui.OtherSettingsGui; import de.fanta.challenge.teams.ChallengeTeam; import de.fanta.challenge.teams.TeamUtils; @@ -19,7 +19,7 @@ import org.bukkit.inventory.meta.ItemMeta; public class BackPackSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int ADD_SIZE_INDEX = 2; private static final int SIZE_INDEX = 5; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/BedrockWallSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/BedrockWallSettingsGui.java index 09e3cc5..188b2e7 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/BedrockWallSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/BedrockWallSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.challengesettingsguis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.settingsgui.ChallengesGui; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -17,7 +17,7 @@ import org.bukkit.inventory.meta.ItemMeta; public class BedrockWallSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int ADD_TIME_INDEX = 2; private static final int TIME_INDEX = 5; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/LevelBorderSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/LevelBorderSettingsGui.java index 856b8a0..622eaf5 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/LevelBorderSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/LevelBorderSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.challengesettingsguis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.WorldBorderLevelChallenge; import de.fanta.challenge.guis.settingsgui.ChallengesGui; import de.fanta.challenge.utils.ChatUtil; @@ -18,7 +18,7 @@ import org.bukkit.inventory.meta.ItemMeta; public class LevelBorderSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int ADD_MULTIPLAYER_INDEX = 2; private static final int MULTIPLAYER_INDEX = 5; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/MLGSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/MLGSettingsGui.java index d73404b..bd982d5 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/MLGSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/MLGSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.challengesettingsguis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.settingsgui.ChallengesGui; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -17,7 +17,7 @@ import org.bukkit.inventory.meta.ItemMeta; public class MLGSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int RANDOM_BLOCK_INDEX = 1; private static final int ADD_TIME_INDEX = 2; private static final int TIME_INDEX = 5; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/NoSneakSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/NoSneakSettingsGui.java index 87b4d9f..5b24660 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/NoSneakSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/NoSneakSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.challengesettingsguis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.settingsgui.ChallengesGui; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -18,7 +18,7 @@ import org.bukkit.inventory.meta.ItemMeta; public class NoSneakSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int ADD_DAMAGE_INDEX = 2; private static final int DAMAGE_INDEX = 5; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/TiedTogetherSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/TiedTogetherSettingsGui.java index b14b218..31a6ab2 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/TiedTogetherSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/TiedTogetherSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.challengesettingsguis; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.settingsgui.ChallengesGui; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -17,7 +17,7 @@ import org.bukkit.inventory.meta.ItemMeta; public class TiedTogetherSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int ADD_RANGE_INDEX = 2; private static final int RANGE_INDEX = 5; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/coordsgui/CoordsDeleteGUI.java b/Challenge/src/main/java/de/fanta/challenge/guis/coordsgui/CoordsDeleteGUI.java index 1e61535..3099d2b 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/coordsgui/CoordsDeleteGUI.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/coordsgui/CoordsDeleteGUI.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.coordsgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.fanta.challenge.utils.ItemUtils; @@ -16,7 +16,7 @@ import org.bukkit.inventory.ItemStack; public class CoordsDeleteGUI implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int ACCEPT_INDEX = 0; private static final int DENY_INDEX = 4; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/coordsgui/CoordsGUI.java b/Challenge/src/main/java/de/fanta/challenge/guis/coordsgui/CoordsGUI.java index 8c4ecba..7c3b960 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/coordsgui/CoordsGUI.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/coordsgui/CoordsGUI.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.coordsgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.fanta.challenge.utils.ItemUtils; @@ -22,7 +22,7 @@ import java.util.Set; public class CoordsGUI implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final Map wayPointPerSlot = new HashMap<>(); private static final Map InventoryperPlayer = new HashMap<>(); private static int CLOSE_IDEX = 0; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/BingoItemsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/BingoItemsGui.java index 8d60ea8..9cdd64a 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/BingoItemsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/BingoItemsGui.java @@ -1,7 +1,7 @@ package de.fanta.challenge.guis.eventgui; import de.fanta.challenge.challenges.ChallengeEvents.BingoChallengeEvent; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -26,7 +26,7 @@ public class BingoItemsGui implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static final Component TITLE = plugin.getGuiPrefix().append(Component.text(" >> Event Items")); private static final Inventory event_items = Bukkit.createInventory(null, InventoryType.DISPENSER, TITLE); diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/EventGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/EventGui.java index e0b16a0..62f2357 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/EventGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/EventGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.eventgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.ChallengeEvents.BridgeRaceChallengeEvent; import de.fanta.challenge.challenges.ChallengeEvents.DeathrunChallengeEvent; import de.fanta.challenge.utils.ChatUtil; @@ -18,7 +18,7 @@ import java.util.Objects; public class EventGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static final int INVENTORY_SIZE = 54; private static final int NULL_EVENT_INDEX = 0; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/EventSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/EventSettingsGui.java index 755dd43..c2e4191 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/EventSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/EventSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.eventgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.fanta.challenge.utils.ItemUtils; @@ -13,7 +13,7 @@ import org.bukkit.inventory.ItemStack; public class EventSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static final int INVENTORY_SIZE = 27; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/ForceQuestSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/ForceQuestSettingsGui.java index a6989ec..498e335 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/ForceQuestSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/ForceQuestSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.eventgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.ChallengeEvents.forcequest.ForceQuestChallengeEvent; import de.fanta.challenge.challenges.ChallengeEvents.forcequest.QuestType; import de.fanta.challenge.utils.ChatUtil; @@ -16,7 +16,7 @@ import org.bukkit.inventory.meta.ItemMeta; public class ForceQuestSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int ADD_SKIP_INDEX = 8; private static final int SKIP_COUNT_INDEX = 17; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/SammelFieberSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/SammelFieberSettingsGui.java index 8058c81..3c65e7e 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/SammelFieberSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/SammelFieberSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.eventgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.ChallengeEvents.SammelFieberChallengeEvent; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -25,7 +25,7 @@ public class SammelFieberSettingsGui extends AbstractWindow { public static final int INVENTORY_SIZE = 9; - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int SET_HOPPER_INDEX = 0; private static final int ADD_MONEY_INDEX = 2; private static final int SINGLEPLAYER_INDEX = 3; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/TeamSelectGUI.java b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/TeamSelectGUI.java index 5c61830..83ec47f 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/TeamSelectGUI.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/TeamSelectGUI.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.eventgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.teams.ChallengeTeam; import de.fanta.challenge.teams.TeamUtils; import de.fanta.challenge.utils.ChatUtil; @@ -23,7 +23,7 @@ public class TeamSelectGUI implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final Map teamperSlot = new HashMap<>(); private static final Map slotbyTeam = new HashMap<>(); private static int CLOSE_IDEX; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/TeamSettingsGUI.java b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/TeamSettingsGUI.java index 4493e3c..aa109e2 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/TeamSettingsGUI.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/eventgui/TeamSettingsGUI.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.eventgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.teams.TeamUtils; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -15,7 +15,7 @@ import org.bukkit.inventory.ItemStack; public class TeamSettingsGUI extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int TEAM_INDEX = 0; private static final int TEAM_SELECT_INDEX = 2; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveConfirmGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveConfirmGui.java index 6cd3d0d..4b5afa1 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveConfirmGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveConfirmGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.savegui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.SaveSlot; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.SaveWorldUtils; @@ -18,7 +18,7 @@ import java.util.UUID; public class ChallengeSaveConfirmGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int JA_INDEX = 0; private static final int ITEM_INDEX = 2; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveGui.java index 16a208f..2067be9 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/savegui/ChallengeSaveGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.savegui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.SaveSlot; import de.fanta.challenge.ServerType; import de.fanta.challenge.utils.ChatUtil; @@ -27,7 +27,7 @@ import java.util.logging.Level; public class ChallengeSaveGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final int SAVE_1_INDEX = 1; private static final int SAVE_2_INDEX = 3; private static final int SAVE_3_INDEX = 5; @@ -151,7 +151,7 @@ ItemStack item; if (player.hasPermission(saveSlot.getPermission())) { if (save.isDirectory()) { - File mapConfig = new File(save, "/Challenges/serverconfig.yml"); + File mapConfig = new File(save, "/Challenge/serverconfig.yml"); Material displayItem = null; String displayName = null; YamlConfiguration serverConfig = new YamlConfiguration(); diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/ChallengesGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/ChallengesGui.java index c2e8990..bd70905 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/ChallengesGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/ChallengesGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.settingsgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.AllAdvancementsChallenge; import de.fanta.challenge.challenges.AllItemsChallenge; import de.fanta.challenge.challenges.MLGChallenge; @@ -26,7 +26,7 @@ public class ChallengesGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static final int WINDOW_SIZE = 54; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/MainGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/MainGui.java index d6d4e45..9e863d4 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/MainGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/MainGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.settingsgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.ItemUtils; @@ -15,7 +15,7 @@ public class MainGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static final int WINDOW_SIZE = 27; diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/OtherSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/OtherSettingsGui.java index 32894f0..005a1ce 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/OtherSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/OtherSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.settingsgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.challengesettingsguis.BackPackSettingsGui; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; @@ -17,7 +17,7 @@ public class OtherSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static final int INVENTORY_SIZE = 45; @@ -158,9 +158,9 @@ } case TELEPORT_COMMAND_INDEX -> { if (Config.getBoolean("teleportcommand")) { - item = ItemUtils.createGuiItem(Material.ENDER_PEARL, Component.text("Teleport Command aktiviert", ChatUtil.GREEN), true, Component.text("Deaktiviert den \"/challenges tp\" command", ChatUtil.GREEN)); + item = ItemUtils.createGuiItem(Material.ENDER_PEARL, Component.text("Teleport Command aktiviert", ChatUtil.GREEN), true, Component.text("Deaktiviert den \"/challenge tp\" command", ChatUtil.GREEN)); } else { - item = ItemUtils.createGuiItem(Material.ENDER_PEARL, Component.text("Teleport Command deaktiviert", ChatUtil.RED), Component.text("Aktiviert den \"/challenges tp\" command", ChatUtil.RED)); + item = ItemUtils.createGuiItem(Material.ENDER_PEARL, Component.text("Teleport Command deaktiviert", ChatUtil.RED), Component.text("Aktiviert den \"/challenge tp\" command", ChatUtil.RED)); } } case HP_ON_TAB_INDEX -> { diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/ServerSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/ServerSettingsGui.java index 38a77b3..e11bcd6 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/ServerSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/settingsgui/ServerSettingsGui.java @@ -1,6 +1,6 @@ package de.fanta.challenge.guis.settingsgui; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.fanta.challenge.utils.ItemUtils; @@ -17,7 +17,7 @@ public class ServerSettingsGui extends AbstractWindow { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static final int INVENTORY_SIZE = 36; diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/BlockCreateListener.java b/Challenge/src/main/java/de/fanta/challenge/listeners/BlockCreateListener.java index 5273551..4989286 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/BlockCreateListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/BlockCreateListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import org.bukkit.GameMode; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -9,7 +9,7 @@ public class BlockCreateListener implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onBlockPlace(BlockPlaceEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/BlockDestroyListener.java b/Challenge/src/main/java/de/fanta/challenge/listeners/BlockDestroyListener.java index d01999b..792ce39 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/BlockDestroyListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/BlockDestroyListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.MinecraftVersion; import org.bukkit.GameMode; @@ -14,7 +14,7 @@ public class BlockDestroyListener implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onBlockBreak(BlockBreakEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/ContainerListener.java b/Challenge/src/main/java/de/fanta/challenge/listeners/ContainerListener.java index 663c029..03e3da5 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/ContainerListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/ContainerListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.teams.ChallengeTeam; import de.fanta.challenge.teams.TeamUtils; import de.fanta.challenge.utils.ChatUtil; @@ -26,7 +26,7 @@ private static final String META_PLACED_BY_PLAYER = "PlacedByPlayer"; private static final String META_PLACED_BY_TEAM = "PlacedByTeam"; - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); public static final ArrayList unlockList = new ArrayList<>(); diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/DamageListener.java b/Challenge/src/main/java/de/fanta/challenge/listeners/DamageListener.java index a26bd76..146754e 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/DamageListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/DamageListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.StringUtil; @@ -16,7 +16,7 @@ public class DamageListener implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onDamage(EntityDamageEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/DeathListener.java b/Challenge/src/main/java/de/fanta/challenge/listeners/DeathListener.java index c77376e..e2a47b3 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/DeathListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/DeathListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.ChatUtil; import de.fanta.challenge.utils.Config; import net.kyori.adventure.text.Component; @@ -14,7 +14,7 @@ public class DeathListener implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onPlayerDeath(PlayerDeathEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/EventRegistration.java b/Challenge/src/main/java/de/fanta/challenge/listeners/EventRegistration.java index 8d6f174..c18770d 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/EventRegistration.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/EventRegistration.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.AllAdvancementsChallenge; import de.fanta.challenge.challenges.BedrockWallChallenge; import de.fanta.challenge.challenges.ChallengeEvents.BingoChallengeEvent; @@ -42,7 +42,7 @@ import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; -public record EventRegistration(Challenges plugin) { +public record EventRegistration(Challenge plugin) { public static final PluginManager pM = Bukkit.getPluginManager(); public void registerEvents() { diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/InteractListener.java b/Challenge/src/main/java/de/fanta/challenge/listeners/InteractListener.java index 48e0960..98f2a03 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/InteractListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/InteractListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import org.bukkit.GameMode; import org.bukkit.entity.Villager; @@ -13,7 +13,7 @@ public class InteractListener implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onBlockClick(PlayerInteractEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/MinimapListener.java b/Challenge/src/main/java/de/fanta/challenge/listeners/MinimapListener.java index 78f84e8..f6d4fe6 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/MinimapListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/MinimapListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.utils.Config; import de.iani.cubesideutils.bukkit.events.GetMinimapWorldNameEvent; import org.bukkit.World; @@ -11,7 +11,7 @@ public class MinimapListener implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); @EventHandler public void getMiniMapWorldName(GetMinimapWorldNameEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/PlayerListener.java b/Challenge/src/main/java/de/fanta/challenge/listeners/PlayerListener.java index 0ac9edc..5803b3b 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/PlayerListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/PlayerListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.challenges.ChallengeEvents.BridgeRaceChallengeEvent; import de.fanta.challenge.events.PlayerCountChangedEvent; @@ -34,7 +34,7 @@ public class PlayerListener implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onEntityTarget(EntityTargetLivingEntityEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/listeners/QuitJoinListener.java b/Challenge/src/main/java/de/fanta/challenge/listeners/QuitJoinListener.java index 89de875..48c0ef7 100644 --- a/Challenge/src/main/java/de/fanta/challenge/listeners/QuitJoinListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/listeners/QuitJoinListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.listeners; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.SaveSlot; import de.fanta.challenge.ServerType; import de.fanta.challenge.challenges.ChallengeEvents.DeathrunChallengeEvent; @@ -24,7 +24,7 @@ public class QuitJoinListener implements Listener { - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(PlayerJoinEvent e) { @@ -120,7 +120,7 @@ if (plugin.getServerType() != ServerType.CHALLENGE_EVENT) { if (Bukkit.getOnlinePlayers().size() - 1 == 0) { plugin.getTimer().stopTimer(); - Challenges.LOGGER.info("Stop Timer " + (Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers())); + Challenge.LOGGER.info("Stop Timer " + (Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers())); } if (Bukkit.getServer().getOnlinePlayers().size() - 1 == 0) { diff --git a/Challenge/src/main/java/de/fanta/challenge/schedular/BukkitScheduler.java b/Challenge/src/main/java/de/fanta/challenge/schedular/BukkitScheduler.java index 22b78cf..bf33365 100644 --- a/Challenge/src/main/java/de/fanta/challenge/schedular/BukkitScheduler.java +++ b/Challenge/src/main/java/de/fanta/challenge/schedular/BukkitScheduler.java @@ -1,6 +1,6 @@ package de.fanta.challenge.schedular; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; @@ -10,9 +10,9 @@ public class BukkitScheduler implements Scheduler { - private final Challenges plugin; + private final Challenge plugin; - public BukkitScheduler(Challenges plugin) { + public BukkitScheduler(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/scoreboard/BukkitScoreBoardManager.java b/Challenge/src/main/java/de/fanta/challenge/scoreboard/BukkitScoreBoardManager.java index 001bdcd..79c1252 100644 --- a/Challenge/src/main/java/de/fanta/challenge/scoreboard/BukkitScoreBoardManager.java +++ b/Challenge/src/main/java/de/fanta/challenge/scoreboard/BukkitScoreBoardManager.java @@ -1,6 +1,6 @@ package de.fanta.challenge.scoreboard; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.teams.ChallengeTeam; import de.fanta.challenge.teams.TeamUtils; @@ -19,14 +19,14 @@ public class BukkitScoreBoardManager implements ScoreBoardMananger { - private final Challenges plugin; + private final Challenge plugin; private Scoreboard scoreboard; private Team team; private Objective event; private Objective tabHP; - public BukkitScoreBoardManager(Challenges plugin) { + public BukkitScoreBoardManager(Challenge plugin) { this.plugin = plugin; } diff --git a/Challenge/src/main/java/de/fanta/challenge/scoreboard/ScoreManager.java b/Challenge/src/main/java/de/fanta/challenge/scoreboard/ScoreManager.java index 90ded9d..e88e3cc 100644 --- a/Challenge/src/main/java/de/fanta/challenge/scoreboard/ScoreManager.java +++ b/Challenge/src/main/java/de/fanta/challenge/scoreboard/ScoreManager.java @@ -1,6 +1,6 @@ package de.fanta.challenge.scoreboard; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.challenges.ChallengeEvents.SammelFieberChallengeEvent; import de.fanta.challenge.challenges.ChallengeEvents.TimeChallengeEvent; import de.fanta.challenge.guis.eventgui.SammelFieberSettingsGui; @@ -78,11 +78,11 @@ } } - private final Challenges plugin; + private final Challenge plugin; private final Map scores; private final List positions; - public ScoreManager(Challenges plugin) { + public ScoreManager(Challenge plugin) { this.plugin = plugin; this.scores = new HashMap<>(); this.positions = new ArrayList<>(); diff --git a/Challenge/src/main/java/de/fanta/challenge/teams/ChallengeTeam.java b/Challenge/src/main/java/de/fanta/challenge/teams/ChallengeTeam.java index fa62530..ea0ed11 100644 --- a/Challenge/src/main/java/de/fanta/challenge/teams/ChallengeTeam.java +++ b/Challenge/src/main/java/de/fanta/challenge/teams/ChallengeTeam.java @@ -1,6 +1,6 @@ package de.fanta.challenge.teams; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.BackpackGui; import de.fanta.challenge.scoreboard.Scorable; import de.fanta.challenge.utils.Config; @@ -30,7 +30,7 @@ this.name = name; this.chatColor = chatColor; this.displayItem = displayItem; - this.backpack = new BackpackGui(Config.getInt("backpack_size") * 9, Challenges.getPlugin().getGuiPrefix().append(Component.text(" >> " + name))); + this.backpack = new BackpackGui(Config.getInt("backpack_size") * 9, Challenge.getPlugin().getGuiPrefix().append(Component.text(" >> " + name))); } public String getName() { diff --git a/Challenge/src/main/java/de/fanta/challenge/teams/TeamListener.java b/Challenge/src/main/java/de/fanta/challenge/teams/TeamListener.java index b83e1c8..538b36b 100644 --- a/Challenge/src/main/java/de/fanta/challenge/teams/TeamListener.java +++ b/Challenge/src/main/java/de/fanta/challenge/teams/TeamListener.java @@ -1,6 +1,6 @@ package de.fanta.challenge.teams; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.fanta.challenge.guis.eventgui.TeamSelectGUI; import de.fanta.challenge.utils.ChatUtil; @@ -33,7 +33,7 @@ public class TeamListener implements Listener { private static final HashMap playerTeams = new HashMap<>(); - private final Challenges plugin = Challenges.getPlugin(); + private final Challenge plugin = Challenge.getPlugin(); @EventHandler public void onSwapItem(PlayerSwapHandItemsEvent e) { diff --git a/Challenge/src/main/java/de/fanta/challenge/teams/TeamUtils.java b/Challenge/src/main/java/de/fanta/challenge/teams/TeamUtils.java index 7f3ddb7..dd03bd1 100644 --- a/Challenge/src/main/java/de/fanta/challenge/teams/TeamUtils.java +++ b/Challenge/src/main/java/de/fanta/challenge/teams/TeamUtils.java @@ -1,6 +1,6 @@ package de.fanta.challenge.teams; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.guis.eventgui.TeamSelectGUI; import de.fanta.challenge.utils.ChatUtil; import de.iani.playerUUIDCache.CachedPlayer; @@ -34,7 +34,7 @@ public class TeamUtils { private static final HashMap playerTeams = new HashMap<>(); - private static final NamespacedKey selectKey = new NamespacedKey(Challenges.getPlugin(), "selectitem"); + private static final NamespacedKey selectKey = new NamespacedKey(Challenge.getPlugin(), "selectitem"); private static ChallengeTeam[] teams; private static int teamSize; private static Scoreboard scoreboard; @@ -175,7 +175,7 @@ } Set entries = scoreTeam.getEntries(); entries.forEach(string -> { - CachedPlayer cachedPlayer = Challenges.getPlugin().playerUUIDCache.getPlayer(string); + CachedPlayer cachedPlayer = Challenge.getPlugin().playerUUIDCache.getPlayer(string); players.add(cachedPlayer); }); @@ -183,7 +183,7 @@ } public static void createScoreBoardTeams() { - if (Challenges.getPlugin().getSBManager().getScoreboard() instanceof Scoreboard currentScore) { + if (Challenge.getPlugin().getSBManager().getScoreboard() instanceof Scoreboard currentScore) { scoreboard = currentScore; if (teamscoreboardObjective == null) { teamscoreboardObjective = scoreboard.registerNewObjective("teams", Criteria.DUMMY, Component.text("Event")); @@ -208,7 +208,7 @@ public static void selectTeam(Player player, ChallengeTeam team) { ChallengeTeam oldteam = playerTeams.get(player.getUniqueId()); - if (team != null && !Challenges.getPlugin().getConfig().getBoolean("event.teams")) { + if (team != null && !Challenge.getPlugin().getConfig().getBoolean("event.teams")) { ChatUtil.sendErrorMessage(player, "In dieser Arena können keine Teams gewählt werden!"); return; } @@ -234,12 +234,12 @@ scoreboard.getTeam(team.getName()).addPlayer(player); TeamSelectGUI.updateTeamSelectGui(); - Challenges.getPlugin().getSBManager().setScoreboardtoTeam(team); + Challenge.getPlugin().getSBManager().setScoreboardtoTeam(team); } public static void setAllPlayerWithoutTeamToTeam() { ArrayList playersWithoutTeam = new ArrayList<>(); - for (Player pp : Challenges.getPlugin().getVanish().getPlayerListWithoutVanishPlayers()) { + for (Player pp : Challenge.getPlugin().getVanish().getPlayerListWithoutVanishPlayers()) { if (getPlayerTeam(pp) == null && pp.getGameMode() == GameMode.SURVIVAL) { playersWithoutTeam.add(pp); } diff --git a/Challenge/src/main/java/de/fanta/challenge/utils/ChatSkullAPI/SkullClass.java b/Challenge/src/main/java/de/fanta/challenge/utils/ChatSkullAPI/SkullClass.java index 925701e..a6b5893 100644 --- a/Challenge/src/main/java/de/fanta/challenge/utils/ChatSkullAPI/SkullClass.java +++ b/Challenge/src/main/java/de/fanta/challenge/utils/ChatSkullAPI/SkullClass.java @@ -1,6 +1,6 @@ package de.fanta.challenge.utils.ChatSkullAPI; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -33,7 +33,7 @@ try { imageToSend = ImageIO.read(newURL(name)); } catch (Exception e) { - Challenges.getPlugin().getLogger().log(Level.SEVERE, "Error while load skin", e); + Challenge.getPlugin().getLogger().log(Level.SEVERE, "Error while load skin", e); } new Message(imageToSend, 8, '█').appendText(this.lines).sendToPlayer(player); } diff --git a/Challenge/src/main/java/de/fanta/challenge/utils/ChatUtil.java b/Challenge/src/main/java/de/fanta/challenge/utils/ChatUtil.java index 7822ce7..9688b16 100644 --- a/Challenge/src/main/java/de/fanta/challenge/utils/ChatUtil.java +++ b/Challenge/src/main/java/de/fanta/challenge/utils/ChatUtil.java @@ -1,6 +1,6 @@ package de.fanta.challenge.utils; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.format.TextColor; @@ -27,7 +27,7 @@ } public static void sendMessage(CommandSender sender, Component component) { - Component message = Challenges.getPlugin().getPrefixComponent().append(component); + Component message = Challenge.getPlugin().getPrefixComponent().append(component); sender.sendMessage(message); } diff --git a/Challenge/src/main/java/de/fanta/challenge/utils/ColorUtils.java b/Challenge/src/main/java/de/fanta/challenge/utils/ColorUtils.java index ded87cf..5c18b60 100644 --- a/Challenge/src/main/java/de/fanta/challenge/utils/ColorUtils.java +++ b/Challenge/src/main/java/de/fanta/challenge/utils/ColorUtils.java @@ -1,6 +1,6 @@ package de.fanta.challenge.utils; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.Timer; import de.fanta.challenge.schedular.CancellableTask; import net.kyori.adventure.text.Component; @@ -10,11 +10,11 @@ public class ColorUtils { - private final Challenges plugin; + private final Challenge plugin; private long time; private CancellableTask cancellableTask; - public ColorUtils(Challenges plugin) { + public ColorUtils(Challenge plugin) { this.plugin = plugin; restartTask(1); } diff --git a/Challenge/src/main/java/de/fanta/challenge/utils/Config.java b/Challenge/src/main/java/de/fanta/challenge/utils/Config.java index 288ad5f..c59ef26 100644 --- a/Challenge/src/main/java/de/fanta/challenge/utils/Config.java +++ b/Challenge/src/main/java/de/fanta/challenge/utils/Config.java @@ -1,6 +1,6 @@ package de.fanta.challenge.utils; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import org.bukkit.Location; import org.bukkit.configuration.ConfigurationSection; @@ -10,7 +10,7 @@ public class Config { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static void setValue(String path, Object value) { setValue(path, value, true); @@ -19,7 +19,7 @@ public static void setValue(String path, Object value, boolean edit) { plugin.getConfig().set(path, value); plugin.saveConfig(); - Challenges.getPlugin().getLogger().info("Save Config " + path + ": " + value + " (" + edit + ")"); + Challenge.getPlugin().getLogger().info("Save Config " + path + ": " + value + " (" + edit + ")"); if (edit && plugin.getServerType() == ServerType.CHALLENGE) { if (!getBoolean("editsettings")) { setValue("editsettings", true, false); diff --git a/Challenge/src/main/java/de/fanta/challenge/utils/CoordsTargeter.java b/Challenge/src/main/java/de/fanta/challenge/utils/CoordsTargeter.java index adb0bd6..0d19bd8 100644 --- a/Challenge/src/main/java/de/fanta/challenge/utils/CoordsTargeter.java +++ b/Challenge/src/main/java/de/fanta/challenge/utils/CoordsTargeter.java @@ -1,6 +1,6 @@ package de.fanta.challenge.utils; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.events.TimerChangedEvent; import de.fanta.challenge.schedular.CancellableTask; import org.bukkit.Location; @@ -18,7 +18,7 @@ public class CoordsTargeter implements Listener { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); private static final HashMap locationMap = new HashMap<>(); private static final Collection autoDetectionList = new ArrayList<>(); diff --git a/Challenge/src/main/java/de/fanta/challenge/utils/CubesideModUtils.java b/Challenge/src/main/java/de/fanta/challenge/utils/CubesideModUtils.java index f405cc8..3bc8b2b 100644 --- a/Challenge/src/main/java/de/fanta/challenge/utils/CubesideModUtils.java +++ b/Challenge/src/main/java/de/fanta/challenge/utils/CubesideModUtils.java @@ -1,6 +1,6 @@ package de.fanta.challenge.utils; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.iani.cubesideutils.MinecraftDataOutputStream; import net.kyori.adventure.text.format.TextColor; import org.bukkit.entity.Player; @@ -12,7 +12,7 @@ - public static void sendFlashScreenToCubesideMod(Challenges plugin, Player player, int duration, TextColor color) { + public static void sendFlashScreenToCubesideMod(Challenge plugin, Player player, int duration, TextColor color) { plugin.getScheduler().runDelayedOnEntity(player, () -> { if (player == null) { return; diff --git a/Challenge/src/main/java/de/fanta/challenge/utils/SaveWorldUtils.java b/Challenge/src/main/java/de/fanta/challenge/utils/SaveWorldUtils.java index 61d65c5..caca264 100644 --- a/Challenge/src/main/java/de/fanta/challenge/utils/SaveWorldUtils.java +++ b/Challenge/src/main/java/de/fanta/challenge/utils/SaveWorldUtils.java @@ -1,7 +1,7 @@ package de.fanta.challenge.utils; import de.cubeside.nmsutils.NMSUtils; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.SaveSlot; import de.fanta.challenge.ServerType; import de.fanta.challenge.events.ChallengeEventStatusChangedEvent; @@ -28,7 +28,7 @@ public class SaveWorldUtils { - private static final Challenges plugin = Challenges.getPlugin(); + private static final Challenge plugin = Challenge.getPlugin(); public static boolean isSavingWorld = false; public static boolean isCopyWorld = false; @@ -59,9 +59,9 @@ isSavingWorld = true; plugin.getServerConfig().set("saveTime", System.currentTimeMillis()); plugin.saveServerConfig(); - Config.setValue("timertime", Challenges.getPlugin().getTimer().getTime()); - Config.setValue("backpack_size", Challenges.getPlugin().getBackpack().getSize() / 9); - Challenges.getPlugin().getBackpack().saveInventoryToConfig(); + Config.setValue("timertime", Challenge.getPlugin().getTimer().getTime()); + Config.setValue("backpack_size", Challenge.getPlugin().getBackpack().getSize() / 9); + Challenge.getPlugin().getBackpack().saveInventoryToConfig(); for (Player p : Bukkit.getOnlinePlayers()) { p.saveData(); @@ -80,14 +80,14 @@ private static void copyWorldAsync(Player player, String saveID, SaveSlot saveSlot) { File dir = new File(saveID); - File configs = new File("plugins/Challenges"); + File configs = new File("plugins/Challenge"); File end = new File("world_the_end"); File nether = new File("world_nether"); File world = new File("world"); File saveend = new File(saveID + "/world_the_end"); File savenether = new File(saveID + "/world_nether"); File saveworld = new File(saveID + "/world"); - File saveconfigs = new File(saveID + "/Challenges"); + File saveconfigs = new File(saveID + "/Challenge"); File saveFolder; if (plugin.getServerType() != ServerType.ADVENTURE) { saveFolder = new File(plugin.getChallengeSavePath().toFile(), saveID + "/"); diff --git a/Challenge/src/main/java/de/fanta/challenge/utils/Statistics.java b/Challenge/src/main/java/de/fanta/challenge/utils/Statistics.java index bf4bd97..ae40121 100644 --- a/Challenge/src/main/java/de/fanta/challenge/utils/Statistics.java +++ b/Challenge/src/main/java/de/fanta/challenge/utils/Statistics.java @@ -1,6 +1,6 @@ package de.fanta.challenge.utils; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import de.fanta.challenge.ServerType; import de.iani.cubesidestats.api.CubesideStatisticsAPI; import de.iani.cubesidestats.api.StatisticKey; @@ -8,7 +8,7 @@ import java.util.UUID; public class Statistics { - private final Challenges plugin; + private final Challenge plugin; private final CubesideStatisticsAPI statistics; @@ -26,7 +26,7 @@ private final StatisticKey challengeWeekStats; - public Statistics(Challenges plugin) { + public Statistics(Challenge plugin) { this.plugin = plugin; statistics = plugin.getCubesideStatistics(); diff --git a/Challenge/src/main/java/de/fanta/challenge/utils/VanishUtils.java b/Challenge/src/main/java/de/fanta/challenge/utils/VanishUtils.java index 7e25fb1..f4355e9 100644 --- a/Challenge/src/main/java/de/fanta/challenge/utils/VanishUtils.java +++ b/Challenge/src/main/java/de/fanta/challenge/utils/VanishUtils.java @@ -1,6 +1,6 @@ package de.fanta.challenge.utils; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.kitteh.vanish.VanishPlugin; @@ -12,7 +12,7 @@ private final VanishPlugin vanish; - public VanishUtils(Challenges plugin) { + public VanishUtils(Challenge plugin) { vanish = (VanishPlugin) plugin.getServer().getPluginManager().getPlugin("VanishNoPacket"); } diff --git a/Challenge/src/main/java/de/fanta/challenge/waypoints/WaypointManager.java b/Challenge/src/main/java/de/fanta/challenge/waypoints/WaypointManager.java index b94b154..d6963b0 100644 --- a/Challenge/src/main/java/de/fanta/challenge/waypoints/WaypointManager.java +++ b/Challenge/src/main/java/de/fanta/challenge/waypoints/WaypointManager.java @@ -1,15 +1,15 @@ package de.fanta.challenge.waypoints; -import de.fanta.challenge.Challenges; +import de.fanta.challenge.Challenge; import java.util.HashMap; public class WaypointManager { - private final Challenges plugin; + private final Challenge plugin; private final HashMap waypoints; - public WaypointManager(Challenges plugin) { + public WaypointManager(Challenge plugin) { this.plugin = plugin; this.waypoints = loadWaypoints(); } diff --git a/Challenge/src/main/resources/plugin.yml b/Challenge/src/main/resources/plugin.yml index 3000b4a..dc5a546 100644 --- a/Challenge/src/main/resources/plugin.yml +++ b/Challenge/src/main/resources/plugin.yml @@ -21,10 +21,10 @@ timer: description: Verwalte den Timer usage: Benutze /timer resume/pause/reset/set [Zeit in Sekunden] - challenges: + challenge: description: Main Command - usage: Benutze /Challenges - aliases: [challenge, c] + usage: Benutze /Challenge + aliases: [c] adventure: description: Main Command alias usage: Benutze /adventure