Revert "Add host enable/disabling of maps to voting book"

This reverts commit 8f56535.
Legacy-Edition-Minigames · Apr 11, 2024 · 88fff7a · 88fff7a
1 parent e397229
commit 88fff7a
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 208 deletions.
diff --git 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<ServerCommandSource> 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<ServerCommandSource> 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<ServerCommandSource> 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<ServerCommandSource> 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
@@ -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
@@ -0,0 +1,5 @@
+package net.kyrptonaught.serverutils.customMapLoader;
+
+public class HostOptions {
+    public static MapSize selectedMapSize = MapSize.AUTO;
+}