diff --git a/pom.xml b/pom.xml index 37a6682..4460825 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.fanta.challenges Challenges - 1.18.1-DEV + 1.18.2 UTF-8 UTF-8 @@ -31,12 +31,16 @@ eldonexus https://eldonexus.de/repository/maven-releases/ + + codemc-repo + https://repo.codemc.org/repository/maven-public/ + io.papermc.paper paper-api - 1.18.1-R0.1-SNAPSHOT + 1.18.2-R0.1-SNAPSHOT provided @@ -64,26 +68,28 @@ provided - com.github.yannicklamprecht.worldborderapi - api - 1.170.0 + com.github.yannicklamprecht + worldborderapi + 1.182.0 provided org.jetbrains annotations - RELEASE + 23.0.0 compile de.tr7zw item-nbt-api - 2.9.0-SNAPSHOT + 2.9.2 + provided commons-io commons-io 2.11.0 + provided @@ -120,15 +126,7 @@ maven-compiler-plugin 3.8.1 - 16 - - - - org.apache.maven.plugins - maven-compiler-plugin - - 16 - 16 + 17 diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index 6521ca8..6f97c54 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -16,7 +16,6 @@ import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.VanishUtils; import de.fanta.challenges.utils.guiutils.GUIUtils; -import net.md_5.bungee.api.ChatColor; import org.apache.commons.io.FileUtils; import org.bukkit.BanList; import org.bukkit.Bukkit; @@ -45,53 +44,38 @@ public class Challenges extends JavaPlugin { public static Logger LOGGER; - private static Challenges plugin; - - private File backpackConfigFile; - - private FileConfiguration BackpackConfig; - public File RndDropsConfigFile; - - private File AllItemsConfigFile; - public FileConfiguration RndDropsConfig; - public FileConfiguration AllItemsConfig; - + public FileConfiguration ServerConfig; + public RandomDropsChallenge rndDrops; + public NMSUtils nmsUtils; + public String texturepacklink = null; + public int resetTaskId = -1; + private String PREFIX; + private String GUIPREFIX; + private File backpackConfigFile; + private FileConfiguration BackpackConfig; + private File AllItemsConfigFile; + private File ServerConfigFile; private Timer timer; - private VanishUtils vanish; - private BackpackGui backpack; - private ScoreBoardManager sbManager; private ScoreManager scoreManager; - - public RandomDropsChallenge rndDrops; - - public NMSUtils nmsUtils; - private UUID texturepackid = null; - - public String texturepacklink = null; - - public static Challenges getPlugin() { - return plugin; - } - - private static final String prefix = Bukkit.getMotd(); - public static final String PREFIX = ChatUtil.BLUE + "[" + ChatUtil.GREEN + prefix + ChatUtil.BLUE + "]"; - public static final String GUIPREFIX = ChatColor.of("#2d8745") + prefix; - private Player currentEditor; private OfflinePlayer firstEditor; private boolean waitingForShutdown; - public int resetTaskId = -1; + private ServerType serverType; + + public static Challenges getPlugin() { + return plugin; + } @Override public void onEnable() { @@ -112,22 +96,30 @@ saveDefaultConfig(); reloadConfig(); + createServerConfig(); createRndDropsConfig(); createAllItemsConfig(); createBackpackConfig(); + + serverType = ServerType.valueOf(getServerConfig().getString("servertype")); + + String prefix = serverType.getPrefix(); + PREFIX = ChatUtil.BLUE + "[" + ChatUtil.GREEN + prefix + ChatUtil.BLUE + "]"; + GUIPREFIX = ChatUtil.GREEN + prefix; + this.backpack.loadInventoryFromConfig(); getLogger().info("Plugin loaded!"); this.sbManager = new ScoreBoardManager(this); Bukkit.getScheduler().scheduleSyncDelayedTask(this, () -> { World world = Bukkit.getWorld("world"); - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false); } MLGChallenge.checkMLGWorld(); setPvP(getConfig().getBoolean("pvp")); - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { plugin.getSBManager().initScoreboard(); } }, 1L); @@ -154,7 +146,7 @@ } - if (Bukkit.getMotd().equalsIgnoreCase("Adventure")) { //TODO Challenges Load Server + if (plugin.getServerType() == ServerType.ADVENTURE) { startResetTask(); File texturepack = new File("world/resources.zip"); @@ -164,7 +156,7 @@ File temp = new File(texturepackid.toString()); try { FileUtils.forceMkdir(temp); - FileUtils.moveFileToDirectory(texturepack, temp, false); + FileUtils.copyFileToDirectory(texturepack, temp, false); File renameTP = new File(texturepackid.toString() + "/" + "resources.zip"); File renamedTP = new File(texturepackid.toString() + "/" + texturepackid + ".zip"); renameTP.renameTo(renamedTP); @@ -257,10 +249,6 @@ return this.RndDropsConfig; } - public FileConfiguration getAllItemsConfig() { - return this.AllItemsConfig; - } - private void createRndDropsConfig() { this.RndDropsConfigFile = new File(getDataFolder(), "rnddrops.yml"); if (!this.RndDropsConfigFile.exists()) { @@ -275,6 +263,10 @@ } } + public FileConfiguration getAllItemsConfig() { + return this.AllItemsConfig; + } + private void createAllItemsConfig() { this.AllItemsConfigFile = new File(getDataFolder(), "allitems.yml"); if (!this.getAllItemsConfigFile().exists()) { @@ -289,6 +281,24 @@ } } + public FileConfiguration getServerConfig() { + return ServerConfig; + } + + 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 | org.bukkit.configuration.InvalidConfigurationException e) { + e.printStackTrace(); + } + } + public ScoreBoardManager getSBManager() { return this.sbManager; } @@ -426,4 +436,16 @@ public File getAllItemsConfigFile() { return AllItemsConfigFile; } + + public ServerType getServerType() { + return serverType; + } + + public String getPREFIX() { + return PREFIX; + } + + public String getGUIPREFIX() { + return GUIPREFIX; + } } diff --git a/src/main/java/de/fanta/challenges/ServerType.java b/src/main/java/de/fanta/challenges/ServerType.java new file mode 100644 index 0000000..ee32386 --- /dev/null +++ b/src/main/java/de/fanta/challenges/ServerType.java @@ -0,0 +1,20 @@ +package de.fanta.challenges; + +public enum ServerType { + + ADVENTURE("Adventure"), + CHALLENGE("Challenge"), + CHALLENGE_LOAD("Challenge"), + CHALLENGE_EVENT("Challenge Event"); + + private final String prefix; + + ServerType(String prefix) { + this.prefix = prefix; + } + + public String getPrefix() { + return prefix; + } + +} diff --git a/src/main/java/de/fanta/challenges/commands/BackpackCommand.java b/src/main/java/de/fanta/challenges/commands/BackpackCommand.java index f780264..837203c 100644 --- a/src/main/java/de/fanta/challenges/commands/BackpackCommand.java +++ b/src/main/java/de/fanta/challenges/commands/BackpackCommand.java @@ -22,10 +22,10 @@ ChatUtil.sendErrorMessage(sender, "You are not a Player :>"); return true; } - if (!BingoChallengeEvent.isRunning()) { + if (!plugin.getConfig().getBoolean("event.enabled")) { plugin.getBackpack().open(p); } else { - ChatUtil.sendWarningMessage(p, "Bei einem Bingo Event kannst du den Backpack nicht Nutzen!"); + ChatUtil.sendWarningMessage(p, "Backpack darf während einem Event nicht genutzt werde!"); } return true; } diff --git a/src/main/java/de/fanta/challenges/commands/CommandRegistration.java b/src/main/java/de/fanta/challenges/commands/CommandRegistration.java index 905c049..2a7531d 100644 --- a/src/main/java/de/fanta/challenges/commands/CommandRegistration.java +++ b/src/main/java/de/fanta/challenges/commands/CommandRegistration.java @@ -88,7 +88,7 @@ editorRouter.addCommandMapping(new EditorSetCommand(plugin), "set"); CommandRouter leaveRouter = new CommandRouter(plugin.getCommand("leave")); - leaveRouter.addCommandMapping(new LeaveCommand()); + leaveRouter.addCommandMapping(new LeaveCommand(plugin)); CommandRouter eventRouter = new CommandRouter(plugin.getCommand("event")); eventRouter.addCommandMapping(new EventCommand(plugin)); diff --git a/src/main/java/de/fanta/challenges/commands/LeaveCommand.java b/src/main/java/de/fanta/challenges/commands/LeaveCommand.java index ba4f078..6780fdb 100644 --- a/src/main/java/de/fanta/challenges/commands/LeaveCommand.java +++ b/src/main/java/de/fanta/challenges/commands/LeaveCommand.java @@ -1,5 +1,7 @@ package de.fanta.challenges.commands; +import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -12,7 +14,10 @@ public class LeaveCommand extends SubCommand { - public LeaveCommand() { + private final Challenges plugin; + + public LeaveCommand(Challenges plugin) { + this.plugin = plugin; } @Override @@ -21,9 +26,9 @@ ChatUtil.sendErrorMessage(sender, "You are not a Player :>"); return true; } else { - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() == ServerType.CHALLENGE || plugin.getServerType() == ServerType.CHALLENGE_EVENT) { GlobalApi.portOnlinePlayerToLocation(p.getName(), "challenge"); - } else if (Bukkit.getMotd().equalsIgnoreCase("Adventure")) { + } else if (plugin.getServerType() == ServerType.ADVENTURE) { GlobalApi.portOnlinePlayerToLocation(p.getName(), "adventure"); } } diff --git a/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java b/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java index 74c8ead..b458166 100644 --- a/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java +++ b/src/main/java/de/fanta/challenges/commands/editor/EditorSetCommand.java @@ -44,7 +44,7 @@ } return true; } else if (plugin.getCurrentEditor() != null) { - ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! Nur " + ChatUtil.BLUE + plugin.getCurrentEditor().getName() + ChatUtil.GREEN + " kann einen neuen Editor bestimmen!"); + ChatUtil.sendErrorMessage(sender, "Du bist kein Editor! Nur " + ChatUtil.BLUE + plugin.getCurrentEditor().getName() + ChatUtil.RED + " kann einen neuen Editor bestimmen!"); return true; } else { ChatUtil.sendErrorMessage(sender, "Aktuell gibt es keinen Editor!"); diff --git a/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java index 68cb201..ac61b8c 100644 --- a/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java +++ b/src/main/java/de/fanta/challenges/commands/event/EventStartCommand.java @@ -1,6 +1,7 @@ package de.fanta.challenges.commands.event; import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.guiutils.GUIUtils; import de.iani.cubesideutils.bukkit.commands.SubCommand; @@ -42,7 +43,7 @@ if(j <= 0){ bukkitTask.cancel(); World world = Bukkit.getWorld("world"); - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, true); } plugin.getTimer().startTimer(); diff --git a/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java b/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java index 4102584..5bde390 100644 --- a/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java +++ b/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java @@ -1,6 +1,7 @@ package de.fanta.challenges.commands.reset; import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import de.fanta.challenges.events.EventStatusChangedEvent; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.SaveWorldUtils; @@ -12,7 +13,6 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.event.block.BlockBreakEvent; import java.io.BufferedReader; import java.io.FileOutputStream; @@ -53,10 +53,10 @@ plugin.getTimer().setTime(0); Bukkit.getPluginManager().callEvent(new EventStatusChangedEvent(false)); for (Player p : Bukkit.getOnlinePlayers()) { - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() == ServerType.CHALLENGE || plugin.getServerType() == ServerType.CHALLENGE_EVENT) { p.sendTitle(ChatColor.of("#0ddead") + "Server wird zurückgesetzt!", ChatUtil.RED + "Bitte warte einen Moment" + ChatColor.of("#0ddead") + "." + ChatColor.AQUA + "." + ChatColor.YELLOW + ".", 10, 220, 10); GlobalApi.portOnlinePlayerToLocation(p.getName(), "challenge"); - } else if (Bukkit.getMotd().equalsIgnoreCase("Adventure")) { + } else if (plugin.getServerType() == ServerType.ADVENTURE) { p.sendTitle(ChatColor.of("#0ddead") + "Server wird gestoppt!", ChatUtil.RED + "Bitte warte einen Moment" + ChatColor.of("#0ddead") + "." + ChatColor.AQUA + "." + ChatColor.YELLOW + ".", 10, 220, 10); GlobalApi.portOnlinePlayerToLocation(p.getName(), "adventure"); } diff --git a/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.java b/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.java index 19ef7bc..ef2b82f 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerPauseCommand.java @@ -1,6 +1,7 @@ package de.fanta.challenges.commands.timer; import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -28,7 +29,7 @@ if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { if (plugin.getTimer().isRunning()) { World world = Bukkit.getWorld("world"); - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false); } plugin.getTimer().stopTimer(); diff --git a/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.java b/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.java index b862381..c3ba373 100644 --- a/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.java +++ b/src/main/java/de/fanta/challenges/commands/timer/TimerStartCommand.java @@ -1,6 +1,7 @@ package de.fanta.challenges.commands.timer; import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.bukkit.commands.SubCommand; import de.iani.cubesideutils.commands.ArgsParser; @@ -29,7 +30,7 @@ if (plugin.isEditor((Player) sender) || sender.hasPermission("Challenges.editor.override")) { if (!plugin.getTimer().isRunning()) { World world = Bukkit.getWorld("world"); - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, true); } plugin.getTimer().startTimer(); diff --git a/src/main/java/de/fanta/challenges/guis/BackpackGui.java b/src/main/java/de/fanta/challenges/guis/BackpackGui.java index 02b6084..f63c190 100644 --- a/src/main/java/de/fanta/challenges/guis/BackpackGui.java +++ b/src/main/java/de/fanta/challenges/guis/BackpackGui.java @@ -17,7 +17,7 @@ public class BackpackGui { - public static final String TITLE = Challenges.GUIPREFIX + " >> Backpack"; + public static final String TITLE = Challenges.getPlugin().getGUIPREFIX() + " >> Backpack"; private Inventory backpack; public BackpackGui(int size) { diff --git a/src/main/java/de/fanta/challenges/guis/ResetGui.java b/src/main/java/de/fanta/challenges/guis/ResetGui.java index 4eb6789..f68da50 100644 --- a/src/main/java/de/fanta/challenges/guis/ResetGui.java +++ b/src/main/java/de/fanta/challenges/guis/ResetGui.java @@ -23,7 +23,7 @@ public static final int INVENTORY_SIZE = 5; - public static final Inventory RESET_GUI = Bukkit.createInventory(null, InventoryType.HOPPER, Challenges.GUIPREFIX + " >> Reset"); + public static final Inventory RESET_GUI = Bukkit.createInventory(null, InventoryType.HOPPER, plugin.getGUIPREFIX() + " >> Reset"); public static String seed = ""; diff --git a/src/main/java/de/fanta/challenges/guis/TimerGui.java b/src/main/java/de/fanta/challenges/guis/TimerGui.java index 6675ab8..780dfca 100644 --- a/src/main/java/de/fanta/challenges/guis/TimerGui.java +++ b/src/main/java/de/fanta/challenges/guis/TimerGui.java @@ -1,6 +1,7 @@ package de.fanta.challenges.guis; import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import de.fanta.challenges.utils.ChatUtil; import de.fanta.challenges.utils.guiutils.GUIUtils; import net.md_5.bungee.api.ChatColor; @@ -20,7 +21,7 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 27; - public static final Inventory TIMER_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Timer"); + public static final Inventory TIMER_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Timer"); private static final int SHOWTIMER_INDEX = 13; @@ -60,7 +61,7 @@ plugin.getTimer().stopTimer(); for (Player pp : Bukkit.getOnlinePlayers()) { pp.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1.0F, 2.0F); - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false); } pp.sendTitle(ChatColor.of("#0ddead") + "Timer", ChatUtil.RED + "Der Timer wurde pausiert.", 10, 40, 10); @@ -69,7 +70,7 @@ plugin.getTimer().startTimer(); for (Player pp : Bukkit.getOnlinePlayers()) { pp.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1.0F, 2.0F); - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { world.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, true); } pp.sendTitle(ChatColor.of("#0ddead") + "Timer", ChatUtil.GREEN + "Der Timer wurde gestartet.", 10, 60, 10); diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java index 4342c90..d96304c 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/EventGui.java @@ -19,9 +19,10 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 27; - public static final Inventory EVENT_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Event Settings"); + public static final Inventory EVENT_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Event Settings"); private static final int NULL_EVENT_INDEX = 0; + private static final int TEAM_INDEX = 8; private static final int BINGO_EVENT_INDEX = 10; private static final int XP_EVENT_INDEX = 11; private static final int BUILD_EVENT_INDEX = 12; @@ -45,6 +46,11 @@ } else { EVENT_GUI.setItem(NULL_EVENT_INDEX, GUIUtils.EMPTY_ICON); } + if (!plugin.getConfig().getBoolean("event.teams")) { + EVENT_GUI.setItem(TEAM_INDEX, GUIUtils.createGuiItem(Material.RED_BED, "Teams deaktiviert")); + } else { + EVENT_GUI.setItem(TEAM_INDEX, GUIUtils.createGuiItem(Material.LIME_BED, "Teams aktiviert", true)); + } if (Objects.equals(plugin.getConfig().getString("event.type"), "build")) { EVENT_GUI.setItem(BUILD_EVENT_INDEX, GUIUtils.createGuiItem(Material.DIAMOND_PICKAXE, ChatUtil.GREEN + "Build Event", true, ChatUtil.GREEN + "Baue so viele Blöcke wie möglich ab", ChatUtil.RED + "Einen Block setzen gibt einen Minus Punkt")); } else { @@ -89,10 +95,21 @@ if (plugin.getConfig().getBoolean("event.enabled")) { switch (slot) { case NULL_EVENT_INDEX -> { - plugin.getScoreManager().saveScores(p); - plugin.getScoreManager().resetScores(); - GUIUtils.setConfig("event.type", "nix"); - GUIUtils.sendTitleToAll("Event", "Event beendet", ChatUtil.RED); + if (!Objects.equals(plugin.getConfig().getString("event.type"), "nix")) { + plugin.getScoreManager().saveScores(p); + plugin.getScoreManager().resetScores(); + GUIUtils.setConfig("event.type", "nix"); + GUIUtils.sendTitleToAll("Event", "Event beendet", ChatUtil.RED); + } + } + case TEAM_INDEX -> { + if (!plugin.getConfig().getBoolean("event.teams")) { + GUIUtils.setConfig("event.teams", true); + GUIUtils.sendTitleToAll("Event", "Teams aktiviert", ChatUtil.GREEN); + } else { + GUIUtils.setConfig("event.teams", false); + GUIUtils.sendTitleToAll("Event", "Teams deaktiviert", ChatUtil.RED); + } } case BUILD_EVENT_INDEX -> { GUIUtils.setConfig("event.type", "build"); diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java index 683f2cc..a810563 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/EventItemsGui.java @@ -27,7 +27,7 @@ private static final Challenges plugin = Challenges.getPlugin(); - public static final String TITLE = Challenges.GUIPREFIX + " >> Event Items"; + public static final String TITLE = plugin.getGUIPREFIX() + " >> Event Items"; private static final Inventory event_items = Bukkit.createInventory(null, InventoryType.DISPENSER, TITLE); private static final Map playerInvs = new HashMap<>(); @@ -45,7 +45,7 @@ } public static void openPlayerInv(Player player, Player sender) { - Inventory inventory = Bukkit.createInventory(player, InventoryType.DISPENSER, Challenges.GUIPREFIX + " >> Bingo"); + Inventory inventory = Bukkit.createInventory(player, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> Bingo"); List playerMaterials = BingoChallengeEvent.getPlayerMaterials().getOrDefault(player.getUniqueId(), new ArrayList<>()); BingoChallengeEvent.getMaterials().forEach(material -> { ItemStack itemStack = new ItemStack(material); diff --git a/src/main/java/de/fanta/challenges/guis/eventgui/SammelFieberSettingsGui.java b/src/main/java/de/fanta/challenges/guis/eventgui/SammelFieberSettingsGui.java index 05994c2..90a6633 100644 --- a/src/main/java/de/fanta/challenges/guis/eventgui/SammelFieberSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/eventgui/SammelFieberSettingsGui.java @@ -14,16 +14,18 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; import java.util.Objects; public class SammelFieberSettingsGui implements Listener { public static final int INVENTORY_SIZE = 9; - public static final Inventory SAMMEL_FIEBER_SETTINGS_GUI = Bukkit.createInventory(null, InventoryType.DISPENSER, Challenges.GUIPREFIX + " >> Sammel Fieber Settings"); private static final Challenges plugin = Challenges.getPlugin(); + public static final Inventory SAMMEL_FIEBER_SETTINGS_GUI = Bukkit.createInventory(null, InventoryType.DISPENSER, plugin.getGUIPREFIX() + " >> Sammel Fieber Settings"); private static final int MONEY_INDEX = 5; private static final int ADD_MONEY_INDEX = 2; private static final int REMOVE_MONEY_INDEX = 8; @@ -49,7 +51,12 @@ } public static Material getEventItem() { - return Objects.requireNonNull(SAMMEL_FIEBER_SETTINGS_GUI.getItem(ITEM_INDEX)).getType(); + ItemStack stack = SAMMEL_FIEBER_SETTINGS_GUI.getItem(ITEM_INDEX); + if (stack != null) { + return stack.getType(); + } else { + return Material.AIR; + } } @EventHandler @@ -59,10 +66,21 @@ if (SAMMEL_FIEBER_SETTINGS_GUI.equals(e.getClickedInventory()) && slot != ITEM_INDEX) { if (plugin.getConfig().getBoolean("event.enabled")) { switch (slot) { - case ADD_MONEY_INDEX -> MONEY = MONEY + 10; + case ADD_MONEY_INDEX -> { + if (!e.isShiftClick()) { + MONEY = MONEY + 10; + } else { + MONEY = MONEY + 1; + } + + } case REMOVE_MONEY_INDEX -> { if (MONEY > 10) { - MONEY = MONEY - 10; + if (!e.isShiftClick()) { + MONEY = MONEY - 10; + } else { + MONEY = MONEY - 1; + } } } case SET_HOPPER_INDEX -> { @@ -84,6 +102,18 @@ e.setCancelled(true); } } + + @EventHandler + public void onInventoryClose(InventoryCloseEvent e) { + Inventory inventory = e.getInventory(); + if (inventory.equals(SAMMEL_FIEBER_SETTINGS_GUI)) { + if (getEventItem() != Material.AIR) { + plugin.getConfig().set("event.sammelfieber.item", getEventItem().name()); + plugin.getConfig().set("event.sammelfieber.money", SammelFieberSettingsGui.MONEY); + plugin.saveConfig(); + } + } + } } diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java index 5194b27..ae08be4 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/MainGui.java @@ -17,7 +17,7 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 27; - public static final Inventory MAIN_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Settings"); + public static final Inventory MAIN_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Settings"); private static final int CHALLENGES_INDEX = 10; private static final int OTHER_SETTINGS_INDEX = 13; diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java index f74c903..52a2829 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java @@ -28,7 +28,7 @@ private static final int BACKPACK_ADD_INDEX = 1; private static final int BACKPACK_REMOVE_INDEX = 19; - public static final Inventory OTHER_SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Other Settings"); + public static final Inventory OTHER_SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Other Settings"); private static final int CLOSE_IDEX = 26; diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java index 13fd5b2..ed1c2e4 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java @@ -19,7 +19,7 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 27; - public static final Inventory SERVER_SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Server Settings"); + public static final Inventory SERVER_SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Server Settings"); private static final int DIFFICULTY_INDEX = 10; private static final int KEEP_INVENTORY_INDEX = 11; diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java index 495192b..fc3f64b 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/SettingsGui.java @@ -20,7 +20,7 @@ private static final Challenges plugin = Challenges.getPlugin(); public static final int INVENTORY_SIZE = 54; - public static final Inventory SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, Challenges.GUIPREFIX + " >> Challenges"); + public static final Inventory SETTINGS_GUI = Bukkit.createInventory(null, INVENTORY_SIZE, plugin.getGUIPREFIX() + " >> Challenges"); private static final int CRAFTING_TABLE_INDEX = 0; private static final int TRADING_INDEX = 9; diff --git a/src/main/java/de/fanta/challenges/listeners/DeathListener.java b/src/main/java/de/fanta/challenges/listeners/DeathListener.java index 91a13a6..ec38ba1 100644 --- a/src/main/java/de/fanta/challenges/listeners/DeathListener.java +++ b/src/main/java/de/fanta/challenges/listeners/DeathListener.java @@ -26,15 +26,15 @@ for (Player p : Bukkit.getOnlinePlayers()) { p.setGameMode(GameMode.SPECTATOR); } - e.setDeathMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + e.getEntity().getName() + ChatUtil.GREEN + " ist gestorben!"); + e.setDeathMessage(plugin.getPREFIX() + " " + ChatUtil.BLUE + e.getEntity().getName() + ChatUtil.GREEN + " ist gestorben!"); ChatUtil.sendBrodcastMessage("Verschwendete Zeit " + plugin.getTimer().formatTime(ChatColor.GOLD)); ChatUtil.sendBrodcastMessage("Welt Seed: " + Bukkit.getWorlds().get(0).getSeed()); ChatUtil.sendBrodcastMessage("Um alle wiederzubeleben benutze §c/revive ALL"); } else { if (plugin.getConfig().getBoolean("event.enabled")) { - e.setDeathMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + e.getDeathMessage()); + e.setDeathMessage(plugin.getPREFIX() + " " + ChatUtil.BLUE + e.getDeathMessage()); } else { - e.setDeathMessage(Challenges.PREFIX + " " + ChatUtil.BLUE + e.getDeathMessage() + ChatUtil.ORANGE + " (" + e.getEntity().getLocation().getBlockX() + "/" + e.getEntity().getLocation().getBlockY() + "/" + e.getEntity().getLocation().getBlockZ() + ")"); + e.setDeathMessage(plugin.getPREFIX() + " " + ChatUtil.BLUE + e.getDeathMessage() + ChatUtil.ORANGE + " (" + e.getEntity().getLocation().getBlockX() + "/" + e.getEntity().getLocation().getBlockY() + "/" + e.getEntity().getLocation().getBlockZ() + ")"); } if (!plugin.getConfig().getBoolean("respawn")) { Player editor = plugin.getCurrentEditor(); diff --git a/src/main/java/de/fanta/challenges/listeners/PlayerListener.java b/src/main/java/de/fanta/challenges/listeners/PlayerListener.java index 0e4022a..1ee0cef 100644 --- a/src/main/java/de/fanta/challenges/listeners/PlayerListener.java +++ b/src/main/java/de/fanta/challenges/listeners/PlayerListener.java @@ -1,6 +1,7 @@ package de.fanta.challenges.listeners; import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import de.fanta.challenges.events.PlayerCountChangedEvent; import de.fanta.challenges.utils.ChatUtil; import de.iani.cubesideutils.commands.ArgsParser; @@ -40,6 +41,55 @@ private final Challenges plugin = Challenges.getPlugin(); + public static int romanToDecimal(String romanNumber) { + int decimal = 0; + int lastNumber = 0; + String romanNumeral = romanNumber.toUpperCase(); + for (int x = romanNumeral.length() - 1; x >= 0; x--) { + char convertToDecimal = romanNumeral.charAt(x); + + switch (convertToDecimal) { + case 'M' -> { + decimal = processDecimal(1000, lastNumber, decimal); + lastNumber = 1000; + } + case 'D' -> { + decimal = processDecimal(500, lastNumber, decimal); + lastNumber = 500; + } + case 'C' -> { + decimal = processDecimal(100, lastNumber, decimal); + lastNumber = 100; + } + case 'L' -> { + decimal = processDecimal(50, lastNumber, decimal); + lastNumber = 50; + } + case 'X' -> { + decimal = processDecimal(10, lastNumber, decimal); + lastNumber = 10; + } + case 'V' -> { + decimal = processDecimal(5, lastNumber, decimal); + lastNumber = 5; + } + case 'I' -> { + decimal = processDecimal(1, lastNumber, decimal); + lastNumber = 1; + } + } + } + return decimal; + } + + public static int processDecimal(int decimal, int lastNumber, int lastDecimal) { + if (lastNumber > decimal) { + return lastDecimal - decimal; + } else { + return lastDecimal + decimal; + } + } + @EventHandler public void onEntityTarget(EntityTargetLivingEntityEvent e) { if (!plugin.getTimer().isRunning()) { @@ -87,7 +137,7 @@ public void onPayerMove(PlayerMoveEvent e) { Player player = e.getPlayer(); Location playerloc = player.getLocation(); - if (!plugin.getConfig().getBoolean("firsttimerstart") && (Bukkit.getMotd().equalsIgnoreCase("Challenge"))) { + if (!plugin.getConfig().getBoolean("firsttimerstart") && plugin.getServerType() != ServerType.ADVENTURE) { if (!plugin.getTimer().isRunning() && player.getGameMode() == GameMode.SURVIVAL) { Location spawn = e.getPlayer().getWorld().getSpawnLocation(); if (playerloc.distance(spawn) > 20) { @@ -148,10 +198,12 @@ if (e.isVanishing()) { plugin.getSBManager().removeScoreboard(p); if (plugin.getCurrentEditor() == p) { - plugin.updateEditor(); + if (plugin.getServerType() != ServerType.CHALLENGE_EVENT) { + plugin.updateEditor(); + } } } else { - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { plugin.getSBManager().setScoreboard(p); } if (plugin.getCurrentEditor() == null) { @@ -221,55 +273,6 @@ } } - public static int romanToDecimal(String romanNumber) { - int decimal = 0; - int lastNumber = 0; - String romanNumeral = romanNumber.toUpperCase(); - for (int x = romanNumeral.length() - 1; x >= 0; x--) { - char convertToDecimal = romanNumeral.charAt(x); - - switch (convertToDecimal) { - case 'M' -> { - decimal = processDecimal(1000, lastNumber, decimal); - lastNumber = 1000; - } - case 'D' -> { - decimal = processDecimal(500, lastNumber, decimal); - lastNumber = 500; - } - case 'C' -> { - decimal = processDecimal(100, lastNumber, decimal); - lastNumber = 100; - } - case 'L' -> { - decimal = processDecimal(50, lastNumber, decimal); - lastNumber = 50; - } - case 'X' -> { - decimal = processDecimal(10, lastNumber, decimal); - lastNumber = 10; - } - case 'V' -> { - decimal = processDecimal(5, lastNumber, decimal); - lastNumber = 5; - } - case 'I' -> { - decimal = processDecimal(1, lastNumber, decimal); - lastNumber = 1; - } - } - } - return decimal; - } - - public static int processDecimal(int decimal, int lastNumber, int lastDecimal) { - if (lastNumber > decimal) { - return lastDecimal - decimal; - } else { - return lastDecimal + decimal; - } - } - /*@EventHandler public void move(PlayerMoveEvent e) { Player p = e.getPlayer(); diff --git a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java index c93d449..a4f5b68 100644 --- a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java +++ b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java @@ -1,7 +1,7 @@ package de.fanta.challenges.listeners; import de.fanta.challenges.Challenges; -import de.fanta.challenges.Timer; +import de.fanta.challenges.ServerType; import de.fanta.challenges.events.PlayerCountChangedEvent; import de.fanta.challenges.events.ServerStatusChangedEvent; import de.fanta.challenges.utils.ChatUtil; @@ -41,7 +41,7 @@ if (!plugin.getVanish().isVanish(p)) { ChatUtil.sendBrodcastMessage(ChatUtil.BLUE + p.getName() + ChatUtil.GREEN + " hat die Lobby betreten! " + ChatColor.of("#E4E737") + "[" + (Bukkit.getServer().getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers()) + "/" + Bukkit.getServer().getMaxPlayers() + "]"); e.setJoinMessage(null); - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { plugin.getSBManager().setScoreboard(p); } if (plugin.getCurrentEditor() == null) { @@ -69,6 +69,23 @@ @EventHandler public void onPlayerLogin(PlayerLoginEvent e) { + if (plugin.getServerType() == ServerType.CHALLENGE_EVENT) { + if (!plugin.getConfig().getBoolean("firsttimerstart") && Bukkit.getOnlinePlayers().size() == 0) { + if (!e.getPlayer().hasPermission("challenges.event")) { + e.setResult(PlayerLoginEvent.Result.KICK_OTHER); + e.setKickMessage("Aktuell läuft kein Event."); + } + } else { + if (!plugin.getTimer().isRunning() && plugin.getConfig().getBoolean("firsttimerstart")) { + if (!e.getPlayer().hasPermission("challenges.event")) { + e.setResult(PlayerLoginEvent.Result.KICK_OTHER); + e.setKickMessage("Das Event wurde pausiert."); + } + } + } + + } + if (plugin.isWaitingForShutdown()) { e.setResult(PlayerLoginEvent.Result.KICK_OTHER); e.setKickMessage("Der Server wird gerade neu gestartet."); @@ -79,23 +96,25 @@ public void onPlayerQuit(PlayerQuitEvent e) { Player player = e.getPlayer(); - if (Bukkit.getOnlinePlayers().size() - 1 == 0) { - plugin.getTimer().stopTimer(); - Challenges.LOGGER.info("Stop Timer " + (Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers())); - } - - if (Bukkit.getServer().getOnlinePlayers().size() - 1 == 0) { - if (plugin.getConfig().getBoolean("firsttimerstart")) { - SaveWorldUtils.saveWorld(plugin.getFirstEditor().getUniqueId().toString(), true); - plugin.startResetTask(); - Challenges.LOGGER.info("Player Reset Task " + (Bukkit.getServer().getOnlinePlayers().size())); - } else { - Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "reset confirm"); + 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())); } - } - if (player == plugin.getCurrentEditor()) { - plugin.updateEditor(); + if (Bukkit.getServer().getOnlinePlayers().size() - 1 == 0) { + if (plugin.getConfig().getBoolean("firsttimerstart")) { + SaveWorldUtils.saveWorld(plugin.getFirstEditor().getUniqueId().toString(), true); + plugin.startResetTask(); + Challenges.LOGGER.info("Player Reset Task " + (Bukkit.getServer().getOnlinePlayers().size())); + } else { + Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "reset confirm"); + } + } + + if (player == plugin.getCurrentEditor()) { + plugin.updateEditor(); + } } if (!plugin.getVanish().isVanish(player)) { diff --git a/src/main/java/de/fanta/challenges/scoreboard/ScoreBoardManager.java b/src/main/java/de/fanta/challenges/scoreboard/ScoreBoardManager.java index 7c226ca..e7f88a3 100644 --- a/src/main/java/de/fanta/challenges/scoreboard/ScoreBoardManager.java +++ b/src/main/java/de/fanta/challenges/scoreboard/ScoreBoardManager.java @@ -1,6 +1,7 @@ package de.fanta.challenges.scoreboard; import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -35,7 +36,7 @@ public void setScoreboard(Player p) { if (this.scoreboard == null) { - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { initScoreboard(); } } @@ -47,7 +48,7 @@ public void removeScoreboard(Player p) { if (team != null) { - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { team.removeEntry(p.getName()); p.setScoreboard(scoreboard); } @@ -55,7 +56,7 @@ } public void addScoreboard(Player p) { - if (Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() != ServerType.ADVENTURE) { team.addEntry(p.getName()); p.setScoreboard(scoreboard); } @@ -66,7 +67,7 @@ } public void updateTabHP() { - if (!Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() == ServerType.ADVENTURE) { return; } if (plugin.getConfig().getBoolean("tabhp")) { @@ -93,7 +94,7 @@ } public void updateEventScoreboard() { - if (!Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() == ServerType.ADVENTURE) { return; } if (plugin.getConfig().getBoolean("event.enabled")) { @@ -122,7 +123,7 @@ } void updateEventScore(Player player, int difference) { - if (!Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() == ServerType.ADVENTURE) { return; } if (this.event != null) { @@ -132,7 +133,7 @@ } void setEventScore(Player player, int newScore) { - if (!Bukkit.getMotd().equalsIgnoreCase("Challenge")) { + if (plugin.getServerType() == ServerType.ADVENTURE) { return; } if (this.event != null) { diff --git a/src/main/java/de/fanta/challenges/utils/ChatUtil.java b/src/main/java/de/fanta/challenges/utils/ChatUtil.java index f4aa554..747b376 100644 --- a/src/main/java/de/fanta/challenges/utils/ChatUtil.java +++ b/src/main/java/de/fanta/challenges/utils/ChatUtil.java @@ -20,7 +20,7 @@ } public static void sendMessage(CommandSender sender, String colors, Object... messageParts) { - ChatUtilBukkit.sendMessage(sender, Challenges.PREFIX, colors, messageParts); + ChatUtilBukkit.sendMessage(sender, Challenges.getPlugin().getPREFIX(), colors, messageParts); } public static void sendNormalMessage(CommandSender sender, Object... messageParts) { diff --git a/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java b/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java index d99b8e7..639e9a7 100644 --- a/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java +++ b/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java @@ -2,6 +2,7 @@ import de.cubeside.nmsutils.NMSUtils; import de.fanta.challenges.Challenges; +import de.fanta.challenges.ServerType; import de.fanta.challenges.challenges.AllItemsChallenge; import org.apache.commons.io.FileUtils; import org.bukkit.Bukkit; @@ -47,7 +48,7 @@ File savenether = new File(uuid + "/world_nether"); File saveworld = new File(uuid + "/world"); File saveconfigs = new File(uuid + "/Challenges"); - if (Bukkit.getMotd().equals("Challenge")) { + if (plugin.getServerType() == ServerType.CHALLENGE || plugin.getServerType() == ServerType.CHALLENGE_EVENT) { File loaddir; if (autosafe) { loaddir = new File("/home/minecraft/saves/" + uuid + "/autosave/"); @@ -70,7 +71,7 @@ } catch (IOException ex) { Bukkit.getLogger().log(Level.SEVERE, "Could not save world ", ex); } - } else if (Bukkit.getMotd().equals("Adventure")) { + } else if (plugin.getServerType() == ServerType.ADVENTURE) { File loaddir; if (autosafe) { loaddir = new File("/home/minecraft/Adventure-saves/" + uuid + "/autosave/"); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 3508310..a06d06e 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -45,6 +45,10 @@ event: enabled: false type: nix + teams: false + sammelfieber: + item: AIR + money: 100 nether: enabled: false void: diff --git a/src/main/resources/serverconfig.yml b/src/main/resources/serverconfig.yml new file mode 100644 index 0000000..9bf7a84 --- /dev/null +++ b/src/main/resources/serverconfig.yml @@ -0,0 +1,2 @@ +# ServerTyes: ADVENTURE, CHALLENGE, CHALLENGE_EVENT +servertype: CHALLENGE \ No newline at end of file