(func) command to change guidance preference

Author: Lori3f6

pom.xml

@@ -70,6 +70,10 @@
             <id>enginehub-maven</id>
             <url>https://maven.enginehub.org/repo/</url>
         </repository>
+        <repository>
+            <id>codemc</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -96,6 +100,12 @@
             <version>7.2.12-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>dev.jorel</groupId>
+            <artifactId>commandapi-bukkit-core</artifactId>
+            <version>9.5.2</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>

src/main/java/cat/nyaa/nfs/GuidanceLevel.java

@@ -0,0 +1,5 @@
+package cat.nyaa.nfs;
+
+public enum GuidanceLevel {
+    ON, PARTIAL, OFF
+}

src/main/java/cat/nyaa/nfs/GuidanceService.java

@@ -1,24 +1,25 @@
 package cat.nyaa.nfs;
 
 import cat.nyaa.nfs.dataclasses.Point;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Particle;
-import org.bukkit.Vibration;
+import org.bukkit.*;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Marker;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.persistence.PersistentDataType;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 
 import static java.lang.Math.min;
 
 public class GuidanceService implements Listener {
     private final Map<UUID, Marker> guidanceMap = new HashMap<>();
+    public static final NamespacedKey guidancePreferenceKey = new NamespacedKey(NeedForSpeed.instance, "guidance");
 
     public void updateGuidance(UUID playerUniqueID, Point location, String world) {
         removeGuidance(playerUniqueID);
@@ -36,24 +37,39 @@ public void removeGuidance(UUID playerUniqueID) {
         }
     }
 
+    public void updatePlayerPreference(Player player, GuidanceLevel guidanceLevel) {
+        player.getPersistentDataContainer().set(guidancePreferenceKey, PersistentDataType.INTEGER, guidanceLevel.ordinal());
+    }
+
+    public GuidanceLevel getGuidanceLevel(Player player) {
+        if (!player.getPersistentDataContainer().has(guidancePreferenceKey))
+            return GuidanceLevel.ON;
+        var ordinal = player.getPersistentDataContainer().get(guidancePreferenceKey, PersistentDataType.INTEGER);
+        return GuidanceLevel.values()[Objects.requireNonNullElseGet(ordinal, GuidanceLevel.ON::ordinal)];
+
+    }
+
     @EventHandler
     public void onPlayerMove(PlayerMoveEvent event) {
+        var guidanceLevel = getGuidanceLevel(event.getPlayer());
+        if (guidanceLevel == GuidanceLevel.OFF) return;
         var player = event.getPlayer();
         if (!guidanceMap.containsKey(player.getUniqueId())) return;
         var guidanceMarker = guidanceMap.get(event.getPlayer().getUniqueId());
 
         player.spawnParticle(Particle.HAPPY_VILLAGER, guidanceMarker.getLocation(), 10);
 
         if (!player.isGliding()) return;
+        if (guidanceLevel != GuidanceLevel.ON) return;
         var playerLocation = player.getLocation();
         var playerSpeed = player.getVelocity().length();
         var playerDistance = playerLocation.distance(guidanceMarker.getLocation());
 
-        if (playerSpeed > 0.15 && playerDistance > 5) {
-            var locInFront = playerLocation.clone().add(playerLocation.getDirection().multiply(5));
+        if (playerSpeed > 0.15 && playerDistance > 8) {
+            var locInFront = playerLocation.clone().add(playerLocation.getDirection().multiply(8));
             var vibrationSpeed = min(playerDistance / playerSpeed / 1.5, playerDistance / 2);
             var data = new Vibration(locInFront, new Vibration.Destination.BlockDestination(guidanceMarker.getLocation().getBlock()), (int) (vibrationSpeed));
-            player.spawnParticle(Particle.VIBRATION, locInFront, 1, data);
+            player.spawnParticle(Particle.VIBRATION, locInFront, 3, data);
         }
     }
 

src/main/java/cat/nyaa/nfs/Language.java

@@ -40,4 +40,8 @@ public class Language {
     public Text nameUsed = Text.of("&7name &c{name}&7 is used, please change another one.");
     public Text failedToLoadPersonalBestOn = Text.of("&cFailed to load personal best on {objective}&c, new record notification disabled");
     public Text failedToLogRecord = Text.of("&6Failed to log record, but you can still make a screenshot!");
+    public Text guidanceEnabled = Text.of("&8Flying guidance level changed to: {level}");
+    public Text on = Text.of("ON");
+    public Text off = Text.of("OFF");
+    public Text partial = Text.of("PARTIAL ON");
 }

src/main/java/cat/nyaa/nfs/NeedForSpeed.java

@@ -2,8 +2,14 @@
 
 import cat.nyaa.nfs.command.NFSCommand;
 import cat.nyaa.nfs.save.Recorder;
+import dev.jorel.commandapi.CommandAPI;
+import dev.jorel.commandapi.CommandAPICommand;
+import dev.jorel.commandapi.arguments.ArgumentSuggestions;
+import dev.jorel.commandapi.arguments.StringArgument;
 import land.melon.lab.simplelanguageloader.SimpleLanguageLoader;
+import land.melon.lab.simplelanguageloader.utils.Pair;
 import org.bukkit.event.HandlerList;
+import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
@@ -41,10 +47,8 @@ public void onEnable() {
     }
 
     private void reload() throws IOException, SQLException {
-
         onDisable();
 
-
         var languageFile = new File(dataFolder, "language.json");
         language = simpleLanguageLoader.loadOrInitialize(languageFile, Language.class, Language::new);
 
@@ -57,6 +61,7 @@ private void reload() throws IOException, SQLException {
         getServer().getPluginManager().registerEvents(guidanceService, this);
 
         getCommand("nfs").setExecutor(new NFSCommand(this));
+        registerCommands();
     }
 
     public Recorder getRecorder() {
@@ -75,6 +80,37 @@ public void onDisable() {
             throw new RuntimeException(e);
         }
         if (timerListenersManager != null) timerListenersManager.shutdown();
+        unregisterCommands();
         HandlerList.unregisterAll(this);
     }
+
+    private void registerCommands() {
+        new CommandAPICommand("guidance").withArguments(new StringArgument("status").replaceSuggestions(ArgumentSuggestions.strings("on", "partial", "off"))).executesPlayer((player, args) -> {
+            var arg = (String) args.get("status");
+            if (arg == null) return;
+            var pdc = player.getPersistentDataContainer();
+            GuidanceLevel guidanceLevel;
+            String statusText;
+            switch (arg) {
+                case "partial" -> {
+                    guidanceLevel = GuidanceLevel.PARTIAL;
+                    statusText = language.partial.produce();
+                }
+                case "off" -> {
+                    guidanceLevel = GuidanceLevel.OFF;
+                    statusText = language.off.produce();
+                }
+                default -> {
+                    guidanceLevel = GuidanceLevel.ON;
+                    statusText = language.on.produce();
+                }
+            }
+            player.sendMessage(language.guidanceEnabled.produce(Pair.of("level", statusText)));
+            pdc.set(GuidanceService.guidancePreferenceKey, PersistentDataType.INTEGER, guidanceLevel.ordinal());
+        }).register(this);
+    }
+
+    private void unregisterCommands() {
+        CommandAPI.unregister("guidance");
+    }
 }

src/main/java/cat/nyaa/nfs/TimerListenerInstance.java

@@ -166,22 +166,26 @@ private boolean isBestPlay(Player player, long timeUsedInMilliseconds) {
 
     private void pushRecordAsync(PlayerRecord record) {
         NeedForSpeed.instance.getServer().getScheduler().runTaskAsynchronously(NeedForSpeed.instance, () -> {
-            try {
-                recorder.record(record);
-            } catch (SQLException e) {
-                NeedForSpeed.instance.getLogger().severe("Failed to log record");
-                NeedForSpeed.instance.getLogger().severe(record.toString());
-                throw new RuntimeException(e);
-            }
+            pushRecordSync(record);
         });
     }
 
+    private void pushRecordSync(PlayerRecord record) {
+        try {
+            recorder.record(record);
+        } catch (SQLException e) {
+            NeedForSpeed.instance.getLogger().severe("Failed to log record");
+            NeedForSpeed.instance.getLogger().severe(record.toString());
+            throw new RuntimeException(e);
+        }
+    }
+
     public void shutdown() {
         HandlerList.unregisterAll(this);
         Bukkit.getServer().getOnlinePlayers().forEach(player -> {
             if (isPlayingThisObjective(player)) {
                 var record = recordThenReset(player, RecordBy.SERVER_SHUTDOWN);
-                pushRecordAsync(record);
+                pushRecordSync(record);
             }
         });
     }

src/main/resources/plugin.yml

@@ -5,6 +5,7 @@ api-version: 1.18
 authors: [ langua ]
 depend:
   - WorldEdit
+  - CommandAPI
 libraries:
   - org.xerial:sqlite-jdbc:3.46.1.0
 commands: