Add method to save rtp buttons in config.

Author: vLuckyyy

build.gradle.kts

@@ -57,7 +57,7 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.19.4")
+        minecraftVersion("1.20.1")
     }
     // run local developement server ^^^
 

run/bukkit.yml

@@ -1,5 +1,5 @@
 settings:
-  allow-end: true
+  allow-end: false
   warn-on-overload: false
   permissions-file: permissions.yml
   update-folder: false

run/server.properties

@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Mon Apr 17 19:00:31 CEST 2023
+#Mon Jul 03 01:47:47 CEST 2023
 enable-jmx-monitoring=false
 level-seed=
 rcon.port=25575

src/main/java/com/eternalcode/randomteleport/RandomTeleport.java

@@ -31,7 +31,7 @@ public void onEnable() {
         ButtonDataConfig buttonDataConfig = configManager.load(new ButtonDataConfig());
 
         TeleportService teleportService = new TeleportService();
-        TeleportButtonService teleportButtonService = new TeleportButtonService();
+        TeleportButtonService teleportButtonService = new TeleportButtonService(buttonDataConfig, configManager);
 
         this.liteCommands = LiteBukkitAdventurePlatformFactory.builder(server, "randomteleport", this.audienceProvider)
                 .argument(Player.class, new BukkitPlayerArgument<>(this.getServer(), "cant find player"))

src/main/java/com/eternalcode/randomteleport/RandomTeleportCommand.java

@@ -1,33 +1,22 @@
 package com.eternalcode.randomteleport;
 
-import com.eternalcode.randomteleport.config.ConfigManager;
-import com.eternalcode.randomteleport.config.impl.ButtonDataConfig;
-import com.eternalcode.randomteleport.shared.Position;
-import com.eternalcode.randomteleport.shared.PositionAdapter;
-import com.eternalcode.randomteleport.teleport.TeleportButtonPlace;
 import com.eternalcode.randomteleport.teleport.TeleportButtonService;
 import com.eternalcode.randomteleport.teleport.TeleportButtonType;
 import com.eternalcode.randomteleport.teleport.TeleportService;
 import dev.rollczi.litecommands.argument.Arg;
 import dev.rollczi.litecommands.command.execute.Execute;
 import dev.rollczi.litecommands.command.route.Route;
-import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
-@Route(name = "randomteleport", aliases = { "rt", "rtp" })
+@Route(name = "randomteleport", aliases = {"rtp"})
 public class RandomTeleportCommand {
 
     private final TeleportService teleportService;
     private final TeleportButtonService teleportButtonService;
 
-    private final ButtonDataConfig buttonDataConfig;
-    private final ConfigManager configManager;
-
-    public RandomTeleportCommand(TeleportService teleportService, TeleportButtonService teleportButtonService, ButtonDataConfig buttonDataConfig, ConfigManager configManager) {
+    public RandomTeleportCommand(TeleportService teleportService, TeleportButtonService teleportButtonService) {
         this.teleportService = teleportService;
         this.teleportButtonService = teleportButtonService;
-        this.buttonDataConfig = buttonDataConfig;
-        this.configManager = configManager;
     }
 
     @Execute
@@ -36,13 +25,8 @@ void randomTeleport(Player player, @Arg int radius) {
     }
 
     @Execute(route = "setbutton")
-    void button(Player player, @Arg String name, @Arg TeleportButtonType type) {
-        Location buttonLocation = this.teleportButtonService.setButtonsAround(player);
-        Position convertButtonLocation = PositionAdapter.convert(buttonLocation);
-
-        TeleportButtonPlace buttonPlace = new TeleportButtonPlace(name, convertButtonLocation, type);
-        this.buttonDataConfig.buttons.put(name, buttonPlace);
-        this.configManager.save(this.buttonDataConfig);
+    void button(Player player, @Arg TeleportButtonType type, @Arg String name) {
+        this.teleportButtonService.createButtonArea(player, name, type);
     }
 }
 

src/main/java/com/eternalcode/randomteleport/config/ConfigManager.java

@@ -1,7 +1,10 @@
 package com.eternalcode.randomteleport.config;
 
+import com.eternalcode.randomteleport.config.composer.PositionComposer;
+import com.eternalcode.randomteleport.shared.Position;
 import net.dzikoysk.cdn.Cdn;
 import net.dzikoysk.cdn.CdnFactory;
+import net.dzikoysk.cdn.reflect.Visibility;
 
 import java.io.File;
 import java.util.HashSet;
@@ -12,6 +15,9 @@ public class ConfigManager {
     private final Cdn cdn = CdnFactory
             .createYamlLike()
             .getSettings()
+            .withMemberResolver(Visibility.PRIVATE)
+            .withMemberResolver(Visibility.PACKAGE_PRIVATE)
+            .withComposer(Position.class, new PositionComposer())
             .build();
 
     private final Set<ReloadableConfig> configs = new HashSet<>();

src/main/java/com/eternalcode/randomteleport/config/composer/PositionComposer.java

@@ -0,0 +1,18 @@
+package com.eternalcode.randomteleport.config.composer;
+
+import com.eternalcode.randomteleport.shared.Position;
+import panda.std.Result;
+
+public class PositionComposer implements SimpleComposer<Position> {
+
+    @Override
+    public Result<Position, Exception> deserialize(String source) {
+        return Result.supplyThrowing(IllegalArgumentException.class, () -> Position.parse(source));
+    }
+
+    @Override
+    public Result<String, Exception> serialize(Position entity) {
+        return Result.ok(entity.toString());
+    }
+
+}

src/main/java/com/eternalcode/randomteleport/config/composer/SimpleComposer.java

@@ -0,0 +1,9 @@
+package com.eternalcode.randomteleport.config.composer;
+
+import net.dzikoysk.cdn.serdes.Composer;
+import net.dzikoysk.cdn.serdes.SimpleDeserializer;
+import net.dzikoysk.cdn.serdes.SimpleSerializer;
+
+public interface SimpleComposer<T> extends Composer<T>, SimpleDeserializer<T>, SimpleSerializer<T> {
+
+}

src/main/java/com/eternalcode/randomteleport/config/impl/ButtonDataConfig.java

@@ -2,19 +2,22 @@
 
 import com.eternalcode.randomteleport.config.ReloadableConfig;
 import com.eternalcode.randomteleport.teleport.TeleportButtonPlace;
+import net.dzikoysk.cdn.entity.Description;
 import net.dzikoysk.cdn.source.Resource;
 import net.dzikoysk.cdn.source.Source;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ButtonDataConfig implements ReloadableConfig {
 
-    public Map<String, TeleportButtonPlace> buttons = new HashMap<>();
+    @Description("# Please don't touch this, this is automatically added by /rtp setbutton command")
+    public List<TeleportButtonPlace> buttons = new ArrayList<>();
 
     @Override
     public Resource resource(File folder) {
         return Source.of(folder, "buttons.yml");
     }
-}
+
+}

src/main/java/com/eternalcode/randomteleport/teleport/TeleportButtonPlace.java

@@ -4,16 +4,30 @@
 import net.dzikoysk.cdn.entity.Contextual;
 
 @Contextual
-public final class TeleportButtonPlace {
+public class TeleportButtonPlace {
 
     public String name;
     public Position position;
-    public TeleportButtonType type;
+    public TeleportButtonType type = TeleportButtonType.SOLO;
 
     public TeleportButtonPlace(String name, Position position, TeleportButtonType type) {
         this.name = name;
         this.position = position;
         this.type = type;
     }
 
+    public TeleportButtonPlace() {}
+
+    public String name() {
+        return this.name;
+    }
+
+    public Position position() {
+        return this.position;
+    }
+
+    public TeleportButtonType type() {
+        return this.type;
+    }
+
 }