diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderCommands.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderCommands.java index d457bbb..e44bb25 100644 --- a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderCommands.java +++ b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderCommands.java @@ -4,9 +4,6 @@ import com.mojang.brigadier.arguments.BoolArgumentType; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import net.kyrptonaught.serverutils.customMapLoader.voting.HostOptions; -import net.kyrptonaught.serverutils.customMapLoader.voting.Votebook; -import net.kyrptonaught.serverutils.customMapLoader.voting.Voter; import net.minecraft.command.argument.CommandFunctionArgumentType; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.command.argument.IdentifierArgumentType; @@ -28,7 +25,7 @@ public static void registerCommands(CommandDispatcher dispa .then(CommandManager.literal("openBook") .executes(context -> { Votebook.generateBookLibrary(CustomMapLoaderMod.BATTLE_MAPS.values().stream().toList()); - Votebook.openPage(context.getSource().getPlayer(), "title"); + Votebook.openbook(context.getSource().getPlayer(), "title"); return 1; })) .then(CommandManager.literal("giveBook") @@ -38,19 +35,20 @@ public static void registerCommands(CommandDispatcher dispa return 1; })) .then(CommandManager.literal("showBookPage") - .then(CommandManager.argument("page", StringArgumentType.string()) + .then(CommandManager.argument("page", StringArgumentType.greedyString()) .executes(context -> { String page = StringArgumentType.getString(context, "page"); - Votebook.openPage(context.getSource().getPlayer(), page); + Votebook.openbook(context.getSource().getPlayer(), page); return 1; }) .then(CommandManager.literal("after") .fork(dispatcher.getRoot(), (context -> { - context.getChild().getCommand().run(context.getChild()); + context.getChild().getCommand().run(context); + Votebook.generateBookLibrary(CustomMapLoaderMod.BATTLE_MAPS.values().stream().toList()); String page = StringArgumentType.getString(context, "page"); - Votebook.openPage(context.getSource().getPlayer(), page); + Votebook.openbook(context.getSource().getPlayer(), page); return List.of(); }))))) @@ -60,7 +58,7 @@ public static void registerCommands(CommandDispatcher dispa ServerPlayerEntity player = context.getSource().getPlayer(); Identifier map = IdentifierArgumentType.getIdentifier(context, "map"); - Voter.voteFor(context.getSource().getServer(), player, map); + Voter.voteFor(context.getSource().getServer(), player, map, CustomMapLoaderMod.BATTLE_MAPS.get(map).getNameText()); return 1; }))) .then(CommandManager.literal("removeVote") @@ -108,19 +106,6 @@ public static void registerCommands(CommandDispatcher dispa return 1; }))))); } - - cmd.then(CommandManager.literal("hostOptions") - .then(CommandManager.literal("enableMap") - .then(CommandManager.argument("mapID", IdentifierArgumentType.identifier()) - .then(CommandManager.argument("enabled", BoolArgumentType.bool()) - .executes(context -> { - Identifier id = IdentifierArgumentType.getIdentifier(context, "mapID"); - boolean enabled = BoolArgumentType.getBool(context, "enabled"); - - HostOptions.enableDisableMap(context.getSource().getServer(), id, enabled); - return 1; - }))))); - cmd.then(CommandManager.literal("unload") .then(CommandManager.argument("dimID", IdentifierArgumentType.identifier()) .then(CommandManager.argument("callbackFunction", CommandFunctionArgumentType.commandFunction()) diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java index ff4ed74..c7414ff 100644 --- a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java +++ b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java @@ -7,7 +7,6 @@ import net.kyrptonaught.serverutils.chestTracker.ChestTrackerMod; import net.kyrptonaught.serverutils.customMapLoader.addons.BattleMapAddon; import net.kyrptonaught.serverutils.customMapLoader.addons.LobbyAddon; -import net.kyrptonaught.serverutils.customMapLoader.voting.HostOptions; import net.kyrptonaught.serverutils.customWorldBorder.CustomWorldBorderMod; import net.kyrptonaught.serverutils.dimensionLoader.CustomDimHolder; import net.kyrptonaught.serverutils.dimensionLoader.DimensionLoaderMod; diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/HostOptions.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/HostOptions.java new file mode 100644 index 0000000..d514c3e --- /dev/null +++ b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/HostOptions.java @@ -0,0 +1,5 @@ +package net.kyrptonaught.serverutils.customMapLoader; + +public class HostOptions { + public static MapSize selectedMapSize = MapSize.AUTO; +} diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/Votebook.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/Votebook.java similarity index 65% rename from src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/Votebook.java rename to src/main/java/net/kyrptonaught/serverutils/customMapLoader/Votebook.java index 1cc53ea..283ee20 100644 --- a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/Votebook.java +++ b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/Votebook.java @@ -1,10 +1,8 @@ -package net.kyrptonaught.serverutils.customMapLoader.voting; +package net.kyrptonaught.serverutils.customMapLoader; -import net.kyrptonaught.serverutils.customMapLoader.CustomMapLoaderMod; -import net.kyrptonaught.serverutils.customMapLoader.MapSize; +import eu.pb4.sgui.api.elements.BookElementBuilder; +import eu.pb4.sgui.api.gui.BookGui; import net.kyrptonaught.serverutils.customMapLoader.addons.BattleMapAddon; -import net.kyrptonaught.serverutils.customMapLoader.voting.pages.BookPage; -import net.kyrptonaught.serverutils.customMapLoader.voting.pages.DynamicBookPage; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.*; import net.minecraft.util.Formatting; @@ -16,12 +14,18 @@ public class Votebook { - public static HashMap bookLibrary = new HashMap<>(); + public static HashMap bookLibrary = new HashMap<>(); public static void generateBookLibrary(List addons) { bookLibrary.clear(); + bookLibrary.put("404", createBasicBook().addPage( + Text.literal("404"), + Text.literal("Page not found"), + Text.empty(), + backButton("title") + )); - bookLibrary.put("title", createBasicPage().addPage( + bookLibrary.put("title", createBasicBook().addPage( Text.literal("Legacy Edition Battle").formatted(Formatting.BLUE), Text.translatable("lem.mapdecider.menu.header").formatted(Formatting.DARK_AQUA), Text.translatable("lem.mapdecider.menu.credit", withLink(Text.literal("DBTDerpbox & Kyrptonaught").styled(style -> style.withColor(0x99C1F1).withUnderline(true)), "https://www.legacyminigames.net/credits")).styled(style -> style.withColor(0x62A0EA)), @@ -32,7 +36,7 @@ public static void generateBookLibrary(List addons) { withOpenCmd(bracketTrans("lem.mapdecider.menu.hosts"), "hostConfig") )); - bookLibrary.put("mapVoting", createBasicPage().addPage( + bookLibrary.put("mapVoting", createBasicBook().addPage( dashTrans("lem.mapdecider.menu.mapvoting"), Text.empty(), withOpenCmd(bracketTrans("lem.mapdecider.menu.basegame"), "baseMaps"), @@ -43,59 +47,42 @@ public static void generateBookLibrary(List addons) { backButton("title") )); - bookLibrary.put("hostConfig", createBasicPage().addPage( + bookLibrary.put("hostConfig", createBasicBook().addPage( dashTrans("lem.mapdecider.menu.hosts"), Text.empty(), withCmd(bracketTrans("lem.mapdecider.menu.gameoptions"), "/trigger lem.gamecfg"), withCmd(bracketTrans("lem.mapdecider.menu.transferhost"), "/trigger lem.gamecfg set 103"), - withOpenCmd(bracketTrans("lem.mapdecider.menu.mapsettings"), "host_map_settings"), + withOpenCmd(bracketLit("Map Settings"), "host_map_settings"), Text.empty(), backButton("title") )); - bookLibrary.put("host_map_settings", createDynamicPage().setRunner(Votebook::generateHostSettings)); - bookLibrary.put("host_map_enable_disable", createDynamicPage().setRunner(Votebook::generateMapEnableDisable)); - + generateHostSettings(); generateMapPacks(false, addons.stream().filter(config -> !config.isBaseAddon).toList()); generateMapPacks(true, addons.stream().filter(config -> config.isBaseAddon).toList()); generateMapPages(addons); } - private static BookPage createBasicPage() { - return new BookPage("Voting Book", "LEM"); + private static BookElementBuilder createBasicBook() { + return new BookElementBuilder() + .setTitle("Voting Book") + .setAuthor("LEM"); } - private static DynamicBookPage createDynamicPage() { - return new DynamicBookPage("Voting Book", "LEM"); - } - - public static void openPage(ServerPlayerEntity player, String page) { - BookPage book = bookLibrary.get(page); - - if (book == null) book = createBasicPage().addPage( - Text.translatable("lem.mapdecider.menu.missing"), - Text.literal(page), - Text.empty(), - backButton("title") - ); + public static void openbook(ServerPlayerEntity player, String book) { + BookElementBuilder bookElement = bookLibrary.get(book); - if (book instanceof DynamicBookPage dynamic) - dynamic.update(CustomMapLoaderMod.BATTLE_MAPS.values().stream().toList()); + if (bookElement == null) bookElement = bookLibrary.get("404"); - book.build(player).open(); + new BookGui(player, bookElement).open(); } - public static void giveBook(ServerPlayerEntity player, String page) { - BookPage book = bookLibrary.get(page); + public static void giveBook(ServerPlayerEntity player, String book) { + BookElementBuilder bookElement = bookLibrary.get(book); - if (book == null) book = createBasicPage().addPage( - Text.translatable("lem.mapdecider.menu.missing"), - Text.literal(page), - Text.empty(), - backButton("title") - ); + if (bookElement == null) bookElement = bookLibrary.get("404"); - player.giveItemStack(book.build(player).getBook()); + player.giveItemStack(new BookGui(player, bookElement).getBook()); } public static void generateMapPacks(boolean isBase, List addons) { @@ -118,7 +105,7 @@ public static void generateMapPacks(boolean isBase, List addons) for (String pack : packs.keySet()) { if (pack.equals("base_base")) continue; - BookPage builder = createBasicPage(); + BookElementBuilder builder = createBasicBook(); List packAddons = packs.get(pack); List> packPages = generateMapPackPages(packAddons, true); @@ -162,7 +149,7 @@ public static void generateMapPacks(boolean isBase, List addons) packsText.add(Text.empty()); packsText.add(backButton("mapVoting")); - bookLibrary.put(isBase ? "baseMaps" : "customMaps", createBasicPage().addPage(packsText.toArray(Text[]::new))); + bookLibrary.put(isBase ? "baseMaps" : "customMaps", createBasicBook().addPage(packsText.toArray(Text[]::new))); } public static List> generateMapPackPages(List packMods, boolean includeHeader) { @@ -181,7 +168,18 @@ public static List> generateMapPackPages(List packMod for (; lastUsed < packMods.size() && lastUsed - (pages.size() * maxPerPage) < maxPerPage; lastUsed++) { BattleMapAddon config = packMods.get(lastUsed); - pageText.add(withHover(withOpenCmd(bracket(trimName(config.getNameText(), 20)), "map_" + config.addon_id), generateMapTooltip(config))); + Text availableSizes = Text.literal("Available sizes: ") + .append(Text.translatable(config.hasSize(MapSize.SMALL) ? "lem.battle.menu.host.config.maps.option.small" : "")) + .append(Text.translatable(config.hasSize(MapSize.LARGE) ? "lem.battle.menu.host.config.maps.option.large" : "")) + .append(Text.translatable(config.hasSize(MapSize.LARGE_PLUS) ? "lem.battle.menu.host.config.maps.option.largeplus" : "")) + .append(Text.translatable(config.hasSize(MapSize.REMASTERED) ? "lem.battle.menu.host.config.maps.option.remastered" : "")); + + Text tooltip = config.getNameText().append("\n") + .append(Text.translatable("mco.template.select.narrate.authors", config.authors)).append("\n") + .append(Text.translatable("mco.version", config.version)).append("\n") + .append("Resource Pack: " + config.resource_pack).append("\n") + .append(availableSizes); + pageText.add(withHover(withOpenCmd(bracket(trimName(config.getNameText(), 20)), "map_" + config.addon_id), tooltip)); } pages.add(pageText); } @@ -193,83 +191,49 @@ public static void generateMapPages(List lemmods) { for (BattleMapAddon config : lemmods) { List mapText = new ArrayList<>(); - mapText.add(withHover(config.getNameText().formatted(Formatting.BLUE), generateMapTooltip(config))); + Text availableSizes = Text.literal("Available sizes: ") + .append(Text.translatable(config.hasSize(MapSize.SMALL) ? "lem.battle.menu.host.config.maps.option.small" : "")) + .append(Text.translatable(config.hasSize(MapSize.LARGE) ? "lem.battle.menu.host.config.maps.option.large" : "")) + .append(Text.translatable(config.hasSize(MapSize.LARGE_PLUS) ? "lem.battle.menu.host.config.maps.option.largeplus" : "")) + .append(Text.translatable(config.hasSize(MapSize.REMASTERED) ? "lem.battle.menu.host.config.maps.option.remastered" : "")); + + Text tooltip = config.getNameText().append("\n") + .append(Text.translatable("mco.template.select.narrate.authors", config.authors)).append("\n") + .append(Text.translatable("mco.version", config.version)).append("\n") + .append("Resource Pack: " + config.resource_pack).append("\n") + .append(availableSizes); + + mapText.add(withHover(config.getNameText().formatted(Formatting.BLUE), tooltip)); mapText.add(config.getDescriptionText().formatted(Formatting.DARK_AQUA)); mapText.add(Text.empty()); mapText.add(voteButton(config.addon_id).append(" ").append(backButton("mapPack_" + config.addon_pack))); - bookLibrary.put("map_" + config.addon_id, createBasicPage().addPage(mapText.toArray(Text[]::new))); + bookLibrary.put("map_" + config.addon_id, createBasicBook().addPage(mapText.toArray(Text[]::new))); } } - public static Text generateMapTooltip(BattleMapAddon config) { - MutableText availableTypes = Text.empty(); - if (config.hasSize(MapSize.SMALL)) - availableTypes.append(Text.translatable("lem.battle.menu.host.config.maps.option.small")).append(", "); - if (config.hasSize(MapSize.LARGE)) - availableTypes.append(Text.translatable("lem.battle.menu.host.config.maps.option.large")).append(", "); - if (config.hasSize(MapSize.LARGE_PLUS)) - availableTypes.append(Text.translatable("lem.battle.menu.host.config.maps.option.largeplus")).append(", "); - if (config.hasSize(MapSize.REMASTERED)) - availableTypes.append(Text.translatable("lem.battle.menu.host.config.maps.option.remastered")).append(", "); - availableTypes.getSiblings().remove(availableTypes.getSiblings().size() - 1); - - return config.getNameText().append("\n") - .append(Text.translatable("mco.template.select.narrate.authors", config.authors)).append("\n") - .append(Text.translatable("mco.version", config.version)).append("\n") - .append(Text.translatable("lem.mapdecider.menu.voting.pack", Text.translatable("lem.resource." + config.resource_pack + ".name"))).append("\n") - .append(Text.translatable("lem.mapdecider.menu.voting.typelist", availableTypes)); - } + public static void generateHostSettings() { + Text tooltip = Text.literal("Choose between Small and Large maps or let the system decide automatically.").append("\n\n") + .append("Large+ maps are like Large maps but come with an extra helping of chests!").append("\n\n") + .append("Note: Playing on a Small or Large map with more than 8 players will automatically disable the Central Spawn option!"); - public static void generateHostSettings(List packMods, DynamicBookPage dynamicBookPage) { MapSize selected = HostOptions.selectedMapSize; - dynamicBookPage.addPage( - dashTrans("lem.mapdecider.menu.mapsettings"), + bookLibrary.put("host_map_settings", createBasicBook().addPage( + dashLit("Map Settings"), Text.empty(), - withOpenCmd(withHover(bracketTrans("lem.menu.host.config.maps.enabled.header"), Text.translatable("lem.menu.host.config.maps.enabled.tooltip")), "host_map_enable_disable"), + withOpenCmd(bracketTrans("lem.menu.host.config.maps.enabled.header"), "host_map_enabled"), Text.empty(), - withHover(coloredTrans("lem.battle.menu.host.config.maps.option.selectedsize", Formatting.GOLD), Text.translatable("lem.battle.menu.host.config.maps.option.selectedsize.tooltip")), + withHover(colored("Selected Map Size:", Formatting.GOLD), tooltip), withOpenAfterCmd(colored(bracketTrans("lem.battle.menu.host.config.maps.option.auto"), selected == MapSize.AUTO ? Formatting.GREEN : Formatting.BLUE), "host_map_settings", "custommaploader hostOptions mapSize set Auto"), withOpenAfterCmd(colored(bracketTrans("lem.battle.menu.host.config.maps.option.small"), selected == MapSize.SMALL ? Formatting.GREEN : Formatting.BLUE), "host_map_settings", "custommaploader hostOptions mapSize set Small"), withOpenAfterCmd(colored(bracketTrans("lem.battle.menu.host.config.maps.option.large"), selected == MapSize.LARGE ? Formatting.GREEN : Formatting.BLUE), "host_map_settings", "custommaploader hostOptions mapSize set Large"), withOpenAfterCmd(colored(bracketTrans("lem.battle.menu.host.config.maps.option.largeplus"), selected == MapSize.LARGE_PLUS ? Formatting.GREEN : Formatting.BLUE), "host_map_settings", "custommaploader hostOptions mapSize set Large+"), withOpenAfterCmd(colored(bracketTrans("lem.battle.menu.host.config.maps.option.remastered"), selected == MapSize.REMASTERED ? Formatting.GREEN : Formatting.BLUE), "host_map_settings", "custommaploader hostOptions mapSize set Remastered"), Text.empty(), - backButton("hostConfig")); - } - - public static void generateMapEnableDisable(List packMods, DynamicBookPage dynamicBookPage) { - int maxPerPage = 10; - int lastUsed = 0; - int pages = 0; - - while (lastUsed < packMods.size()) { - List pageText = new ArrayList<>(); - - pageText.add(dashTrans("lem.menu.host.config.maps.enabled.header")); - pageText.add(Text.empty()); - - for (; lastUsed < packMods.size() && lastUsed - (pages * maxPerPage) < maxPerPage; lastUsed++) { - - BattleMapAddon config = packMods.get(lastUsed); - boolean enabled = config.isAddonEnabled; - - String cmd = "custommaploader hostOptions enableMap " + config.addon_id + " " + (!enabled); - pageText.add(withHover(withOpenAfterCmd(colored(bracket(trimName(config.getNameText(), 20)), enabled ? Formatting.GREEN : Formatting.RED), "host_map_enable_disable", cmd), Text.translatable("lem.menu.host.config.maps.enabled.toggle"))); - } - - pageText.add(Text.empty()); - if (pages == 0) pageText.add(backButton("host_map_settings")); - else pageText.add(nextButton("gui.back", pages)); - - if (lastUsed < packMods.size()) - ((MutableText) pageText.get(pageText.size() - 1)).append(" ").append(nextButton("createWorld.customize.custom.next", pages + 2)); - - dynamicBookPage.addPage(pageText.toArray(Text[]::new)); - pages++; - } + backButton("hostConfig") + )); } public static MutableText trimName(MutableText text, int maxLength) { @@ -294,10 +258,6 @@ public static MutableText colored(String text, Formatting... formatting) { return colored(Text.literal(text), formatting); } - public static MutableText coloredTrans(String transKey, Formatting... formatting) { - return colored(Text.translatable(transKey), formatting); - } - public static MutableText bracketTrans(String transKey) { return bracket(Text.translatable(transKey)); } @@ -339,7 +299,7 @@ public static MutableText withHover(MutableText text, Text hover) { } public static MutableText withOpenCmd(MutableText text, String page) { - return withCmd(text, "/custommaploader voting showBookPage \"" + page + "\""); + return withCmd(text, "/custommaploader voting showBookPage " + page); } public static MutableText withOpenCmd(MutableText text, String page, Text hover) { @@ -347,7 +307,7 @@ public static MutableText withOpenCmd(MutableText text, String page, Text hover) } public static MutableText withOpenAfterCmd(MutableText text, String page, String afterCmd) { - return withCmd(text, "/custommaploader voting showBookPage \"" + page + "\" after " + afterCmd); + return withCmd(text, "/custommaploader voting showBookPage " + page + " after " + afterCmd); } public static MutableText withCmd(MutableText text, String cmd) { diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/Voter.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/Voter.java similarity index 83% rename from src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/Voter.java rename to src/main/java/net/kyrptonaught/serverutils/customMapLoader/Voter.java index 839bdf7..0f04d5c 100644 --- a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/Voter.java +++ b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/Voter.java @@ -1,6 +1,5 @@ -package net.kyrptonaught.serverutils.customMapLoader.voting; +package net.kyrptonaught.serverutils.customMapLoader; -import net.kyrptonaught.serverutils.customMapLoader.CustomMapLoaderMod; import net.kyrptonaught.serverutils.customMapLoader.addons.BattleMapAddon; import net.minecraft.scoreboard.*; import net.minecraft.server.MinecraftServer; @@ -60,23 +59,25 @@ private static Identifier calculateWinner() { return winningMaps.get(random.nextInt(winningMaps.size())); } - public static void voteFor(MinecraftServer server, ServerPlayerEntity player, Identifier map) { + + public static void voteFor(MinecraftServer server, ServerPlayerEntity player, Identifier map, Text mapName) { if (!mapVotes.containsKey(map)) mapVotes.put(map, new HashSet<>()); removeVote(server, player); mapVotes.get(map).add(player.getUuid()); - updateScore(server, map); + updateScore(server, map, mapName); } public static void removeVote(MinecraftServer server, ServerPlayerEntity player) { for (Identifier id : mapVotes.keySet()) { if (mapVotes.get(id).remove(player.getUuid())) { - updateScore(server, id); + updateScore(server, id, CustomMapLoaderMod.BATTLE_MAPS.get(id).getNameText()); } } } - public static void updateScore(MinecraftServer server, Identifier map) { + + private static void updateScore(MinecraftServer server, Identifier map, Text mapName) { ScoreHolder holder = new ScoreHolder() { @Override public String getNameForScoreboard() { @@ -86,19 +87,16 @@ public String getNameForScoreboard() { @Nullable @Override public Text getDisplayName() { - return CustomMapLoaderMod.BATTLE_MAPS.get(map).getNameText(); + return mapName; } }; - if (!CustomMapLoaderMod.BATTLE_MAPS.get(map).isAddonEnabled) - mapVotes.remove(map); - ServerScoreboard scoreboard = server.getScoreboard(); ScoreboardObjective objective = scoreboard.getNullableObjective(objName); - Set votes = mapVotes.get(map); - if (votes != null && !votes.isEmpty()) { - scoreboard.getOrCreateScore(holder, objective).setScore(votes.size()); + int votes = mapVotes.get(map).size(); + if (votes > 0) { + scoreboard.getOrCreateScore(holder, objective).setScore(votes); } else { scoreboard.removeScore(holder, objective); } diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/HostOptions.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/HostOptions.java deleted file mode 100644 index e9d58c7..0000000 --- a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/HostOptions.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.kyrptonaught.serverutils.customMapLoader.voting; - -import net.kyrptonaught.serverutils.customMapLoader.CustomMapLoaderMod; -import net.kyrptonaught.serverutils.customMapLoader.MapSize; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.Identifier; - -public class HostOptions { - public static MapSize selectedMapSize = MapSize.AUTO; - - public static void enableDisableMap(MinecraftServer server, Identifier map, boolean enabled) { - CustomMapLoaderMod.BATTLE_MAPS.get(map).isAddonEnabled = enabled; - Voter.updateScore(server, map); - } -} diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/pages/BookPage.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/pages/BookPage.java deleted file mode 100644 index 50b6e11..0000000 --- a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/pages/BookPage.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.kyrptonaught.serverutils.customMapLoader.voting.pages; - -import eu.pb4.sgui.api.elements.BookElementBuilder; -import eu.pb4.sgui.api.gui.BookGui; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.Text; - -public class BookPage { - protected final BookElementBuilder builder; - - public BookPage(String title, String author) { - builder = new BookElementBuilder() - .setTitle(title) - .setAuthor(author); - } - - public BookGui build(ServerPlayerEntity player) { - return new BookGui(player, builder); - } - - public BookPage addPage(Text... lines) { - builder.addPage(lines); - return this; - } -} diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/pages/DynamicBookPage.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/pages/DynamicBookPage.java deleted file mode 100644 index f3428b0..0000000 --- a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/voting/pages/DynamicBookPage.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.kyrptonaught.serverutils.customMapLoader.voting.pages; - -import net.kyrptonaught.serverutils.customMapLoader.addons.BattleMapAddon; - -import java.util.List; -import java.util.function.BiConsumer; - -public class DynamicBookPage extends BookPage { - - private BiConsumer, DynamicBookPage> runnable; - - public DynamicBookPage(String title, String author) { - super(title, author); - } - - public DynamicBookPage setRunner(BiConsumer, DynamicBookPage> consumer) { - this.runnable = consumer; - return this; - } - - public void update(List addonList) { - builder.getOrCreateNbt().remove("pages"); - runnable.accept(addonList, this); - } -}