feature(detection): Add possibility to track flying machines (#179)

Author: TheMeinerLP

SERVICE_ARCHITECTURE.md

@@ -117,7 +117,7 @@ The plugin automatically selects the appropriate implementation:
 ```java
 // In AntiRedstoneClockRemastered.java
 private void enableRedstoneClockService() {
-    this.redstoneClockService = RedstoneClockServiceFactory.createService(this);
+    this.decisionService = RedstoneClockServiceFactory.createService(this);
 }
 ```
 

build.gradle.kts

@@ -67,6 +67,7 @@ dependencies {
     implementation(libs.adventure.text.feature.pagination)
     implementation(libs.adventure.text.discord)
     implementation(libs.jda.webhook)
+    implementation(libs.customblockdata)
     implementation(libs.guice)
     implementation(libs.jakarta.inject)
     annotationProcessor(libs.cloud.command.annotations)
@@ -132,6 +133,7 @@ tasks {
     shadowJar {
         archiveClassifier.set("")
         relocate("org.bstats", "net.onelitefeather.antiredstoneclockremastered.org.bstats")
+        relocate("com.jeff_media.customblockdata", "net.onelitefeather.antiredstoneclockremastered.com.jeff_media.customblockdata")
         dependsOn(jar)
     }
     this.modrinth {

settings.gradle.kts

@@ -25,6 +25,7 @@ dependencyResolutionManagement {
 
             version("paper", "1.21.8-R0.1-SNAPSHOT")
             version("bstats", "3.1.0")
+            version("customblockdata", "2.2.4")
 
             version("cloudcommand", "2.0.0")
             version("cloudcommandPaper", "2.0.0-SNAPSHOT")
@@ -72,6 +73,7 @@ dependencyResolutionManagement {
             library("adventure.text.discord", "dev.vankka", "mcdiscordreserializer").versionRef("adventure-text-discord-serializer")
             library("jda-webhook", "club.minnced", "discord-webhooks").versionRef("jda-webhook")
             library("bstats", "org.bstats", "bstats-bukkit").versionRef("bstats")
+            library("customblockdata", "com.jeff-media", "custom-block-data").versionRef("customblockdata")
 
             library("cloud.command.paper", "org.incendo", "cloud-paper").versionRef("cloudcommandPaper")
             library("cloud.command.annotations", "org.incendo", "cloud-annotations").versionRef("cloudcommandAnnotations")

src/main/java/net/onelitefeather/antiredstoneclockremastered/AntiRedstoneClockRemastered.java

@@ -3,6 +3,7 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
+import com.jeff_media.customblockdata.CustomBlockData;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.onelitefeather.antiredstoneclockremastered.api.PlotsquaredSupport;
@@ -15,7 +16,9 @@
 import net.onelitefeather.antiredstoneclockremastered.injection.ServiceModule;
 import net.onelitefeather.antiredstoneclockremastered.injection.TranslationModule;
 import net.onelitefeather.antiredstoneclockremastered.service.UpdateService;
+import net.onelitefeather.antiredstoneclockremastered.service.tracking.ConfigMode;
 import net.onelitefeather.antiredstoneclockremastered.utils.CheckTPS;
+import org.bukkit.configuration.serialization.ConfigurationSerialization;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.Arrays;
@@ -46,7 +49,10 @@ public void onLoad() {
 
     @Override
     public void onEnable() {
+        CustomBlockData.registerListener(this);
         injector.getInstance(TranslationModule.class);
+        var mode = ConfigMode.getEnum(getConfig(), "check.mode", ConfigMode.STATIC);
+        getComponentLogger().info(mode.getEnableMessage());
         injector.getInstance(CheckTPS.class).startCheck();
         Optional.ofNullable(injector.getInstance(PlotsquaredSupport.class)).ifPresent(PlotsquaredSupport::init);
         donationInformation();

src/main/java/net/onelitefeather/antiredstoneclockremastered/commands/DisplayActiveClocksCommand.java

@@ -1,15 +1,13 @@
 package net.onelitefeather.antiredstoneclockremastered.commands;
 
 import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TranslationArgument;
-import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.feature.pagination.Pagination;
 import net.onelitefeather.antiredstoneclockremastered.AntiRedstoneClockRemastered;
 import net.onelitefeather.antiredstoneclockremastered.model.RedstoneClock;
-import net.onelitefeather.antiredstoneclockremastered.service.api.RedstoneClockService;
+import net.onelitefeather.antiredstoneclockremastered.service.api.RedstoneTrackingService;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.incendo.cloud.annotation.specifier.Greedy;
 import org.incendo.cloud.annotations.Argument;
 import org.incendo.cloud.annotations.Command;
@@ -30,13 +28,13 @@
  */
 public final class DisplayActiveClocksCommand implements Pagination.Renderer.RowRenderer<RedstoneClock> {
 
-    private final RedstoneClockService redstoneClockService;
+    private final RedstoneTrackingService trackingService;
 
     private final Pagination.Builder pagination = Pagination.builder().resultsPerPage(4);
 
     @Inject
-    public DisplayActiveClocksCommand(RedstoneClockService redstoneClockService) {
-        this.redstoneClockService = redstoneClockService;
+    public DisplayActiveClocksCommand(RedstoneTrackingService trackingService) {
+        this.trackingService = trackingService;
     }
 
     @Command("arcm display [page]")
@@ -50,7 +48,7 @@ public void displayClocks(CommandSender commandSender, @Greedy @Argument("page")
         if (page == null) {
             page = 0;
         }
-        build.render(this.redstoneClockService.getRedstoneClocks(), Math.max(1, page))
+        build.render(this.trackingService.getRedstoneClocks(), Math.max(1, page))
                 .forEach(commandSender::sendMessage);
 
     }
@@ -59,25 +57,9 @@ private String mapToCommand(int i) {
         return "/arcm display " + i;
     }
 
-    private Component mapClockToMessage(RedstoneClock redstoneClock) {
-        var location = redstoneClock.getLocation();
-        return Component.empty().hoverEvent(Component.translatable("antiredstoneclockremastered.command.display.clock.hover").asHoverEvent())
-                .append(Component.translatable("antiredstoneclockremastered.command.display.clock.text").arguments(
-                                TranslationArgument.numeric(redstoneClock.getTriggerCount()),
-                                TranslationArgument.numeric(location.getBlockX()),
-                                TranslationArgument.numeric(location.getBlockY()),
-                                TranslationArgument.numeric(location.getBlockZ()),
-                                Component.empty() // TODO: Temporary fix for display issue
-                        ).clickEvent(ClickEvent.callback(audience -> {
-                            if (audience instanceof final Player executor) {
-                                executor.teleport(location);
-                            }
-                        }))
-                );
-    }
-
     @Override
     public @NotNull Collection<Component> renderRow(@Nullable RedstoneClock redstoneClock, int index) {
-        return List.of(mapClockToMessage(redstoneClock));
+        if (redstoneClock == null) return List.of();
+        return List.of(redstoneClock.render());
     }
 }

src/main/java/net/onelitefeather/antiredstoneclockremastered/commands/FeatureCommand.java

@@ -4,7 +4,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TranslationArgument;
 import net.onelitefeather.antiredstoneclockremastered.AntiRedstoneClockRemastered;
-import net.onelitefeather.antiredstoneclockremastered.service.api.RedstoneClockService;
+import net.onelitefeather.antiredstoneclockremastered.service.api.DecisionService;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.incendo.cloud.annotations.Argument;
@@ -25,12 +25,12 @@
 public final class FeatureCommand {
 
     private final AntiRedstoneClockRemastered plugin;
-    private final RedstoneClockService redstoneClockService;
+    private final DecisionService decisionService;
 
     @Inject
-    public FeatureCommand(AntiRedstoneClockRemastered plugin, RedstoneClockService redstoneClockService) {
+    public FeatureCommand(AntiRedstoneClockRemastered plugin, DecisionService decisionService) {
         this.plugin = plugin;
-        this.redstoneClockService = redstoneClockService;
+        this.decisionService = decisionService;
     }
 
     @Command("check observer")
@@ -39,7 +39,7 @@ public FeatureCommand(AntiRedstoneClockRemastered plugin, RedstoneClockService r
     public void toggleObserver(CommandSender sender) {
         plugin.getConfig().set("check.observer", !plugin.getConfig().getBoolean("check.observer"));
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageToggleMessage(sender, plugin.getConfig().getBoolean("check.observer"));
     }
 
@@ -49,7 +49,7 @@ public void toggleObserver(CommandSender sender) {
     public void togglePiston(CommandSender sender) {
         plugin.getConfig().set("check.piston", !plugin.getConfig().getBoolean("check.piston"));
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageToggleMessage(sender, plugin.getConfig().getBoolean("check.piston"));
     }
 
@@ -59,7 +59,7 @@ public void togglePiston(CommandSender sender) {
     public void toggleComparator(CommandSender sender) {
         plugin.getConfig().set("check.comparator", !plugin.getConfig().getBoolean("check.comparator"));
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageToggleMessage(sender, plugin.getConfig().getBoolean("check.comparator"));
     }
 
@@ -69,7 +69,7 @@ public void toggleComparator(CommandSender sender) {
     public void toggleSculk(CommandSender sender) {
         plugin.getConfig().set("check.sculk", !plugin.getConfig().getBoolean("check.sculk"));
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageToggleMessage(sender, plugin.getConfig().getBoolean("check.sculk"));
     }
 
@@ -79,7 +79,7 @@ public void toggleSculk(CommandSender sender) {
     public void toggleRedstoneAndRepeater(CommandSender sender) {
         plugin.getConfig().set("check.redstoneAndRepeater", !plugin.getConfig().getBoolean("check.redstoneAndRepeater"));
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageToggleMessage(sender, plugin.getConfig().getBoolean("check.redstoneAndRepeater"));
     }
 
@@ -99,7 +99,7 @@ public void addIgnoredWorld(CommandSender sender, @Argument("world") World world
         worlds.add(world.getName());
         plugin.getConfig().set("check.ignoredWorlds", worlds);
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sender.sendMessage(Component.translatable("antiredstoneclockremastered.command.feature.check.world.add").arguments(AntiRedstoneClockRemastered.PREFIX, Component.text(world.getName())));
     }
 
@@ -111,7 +111,7 @@ public void removeIgnoredWorld(CommandSender sender, @Argument("world") World wo
         worlds.remove(world.getName());
         plugin.getConfig().set("check.ignoredWorlds", worlds);
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sender.sendMessage(Component.translatable("antiredstoneclockremastered.command.feature.check.world.remove").arguments(AntiRedstoneClockRemastered.PREFIX, Component.text(world.getName())));
     }
 
@@ -123,7 +123,7 @@ public void addIgnoredRegion(CommandSender sender, @Argument("region") String re
         regions.add(region);
         plugin.getConfig().set("check.ignoredRegions", regions);
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sender.sendMessage(Component.translatable("antiredstoneclockremastered.command.feature.check.region.add").arguments(AntiRedstoneClockRemastered.PREFIX, Component.text(region)));
     }
 
@@ -135,7 +135,7 @@ public void removeIgnoredRegion(CommandSender sender, @Argument("region") String
         regions.remove(region);
         plugin.getConfig().set("check.ignoredRegions", regions);
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sender.sendMessage(Component.translatable("antiredstoneclockremastered.command.feature.check.region.remove").arguments(AntiRedstoneClockRemastered.PREFIX, Component.text(region)));
     }
 
@@ -145,7 +145,7 @@ public void removeIgnoredRegion(CommandSender sender, @Argument("region") String
     public void toggleAutoBreak(CommandSender sender) {
         plugin.getConfig().set("clock.autoBreak", !plugin.getConfig().getBoolean("clock.autoBreak"));
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageToggleMessage(sender, plugin.getConfig().getBoolean("clock.autoBreak"));
     }
 
@@ -155,7 +155,7 @@ public void toggleAutoBreak(CommandSender sender) {
     public void toggleNotifyAdmins(CommandSender sender) {
         plugin.getConfig().set("clock.notifyAdmins", !plugin.getConfig().getBoolean("clock.notifyAdmins"));
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageToggleMessage(sender, plugin.getConfig().getBoolean("clock.notifyAdmins"));
     }
 
@@ -165,7 +165,7 @@ public void toggleNotifyAdmins(CommandSender sender) {
     public void toggleNotifyConsole(CommandSender sender) {
         plugin.getConfig().set("clock.notifyConsole", !plugin.getConfig().getBoolean("clock.notifyConsole"));
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageToggleMessage(sender, plugin.getConfig().getBoolean("clock.notifyConsole"));
     }
 
@@ -175,7 +175,7 @@ public void toggleNotifyConsole(CommandSender sender) {
     public void toggleDrop(CommandSender sender) {
         plugin.getConfig().set("clock.drop", !plugin.getConfig().getBoolean("clock.drop"));
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageToggleMessage(sender, plugin.getConfig().getBoolean("clock.drop"));
     }
 
@@ -185,7 +185,7 @@ public void toggleDrop(CommandSender sender) {
     public void setEndDelay(CommandSender sender,@Argument("delay") Integer endDeplay) {
         plugin.getConfig().set("clock.endDelay", endDeplay);
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageSetMessage(sender, plugin.getConfig().getInt("clock.endDelay"));
     }
 
@@ -195,7 +195,7 @@ public void setEndDelay(CommandSender sender,@Argument("delay") Integer endDepla
     public void setMaxCount(CommandSender sender,@Argument("count") Integer count) {
         plugin.getConfig().set("clock.maxCount", count);
         plugin.saveConfig();
-        redstoneClockService.reload();
+        decisionService.reload();
         sendMessageSetMessage(sender, plugin.getConfig().getInt("clock.maxCount"));
     }
 

src/main/java/net/onelitefeather/antiredstoneclockremastered/commands/ReloadCommand.java

@@ -3,7 +3,7 @@
 import jakarta.inject.Inject;
 import net.kyori.adventure.text.Component;
 import net.onelitefeather.antiredstoneclockremastered.AntiRedstoneClockRemastered;
-import net.onelitefeather.antiredstoneclockremastered.service.api.RedstoneClockService;
+import net.onelitefeather.antiredstoneclockremastered.service.api.DecisionService;
 import org.bukkit.command.CommandSender;
 import org.incendo.cloud.annotations.Command;
 import org.incendo.cloud.annotations.CommandDescription;
@@ -18,18 +18,18 @@
  */
 public final class ReloadCommand {
 
-    private final RedstoneClockService redstoneClockService;
+    private final DecisionService decisionService;
 
     @Inject
-    public ReloadCommand(RedstoneClockService redstoneClockService) {
-        this.redstoneClockService = redstoneClockService;
+    public ReloadCommand(DecisionService decisionService) {
+        this.decisionService = decisionService;
     }
 
     @Command("arcm reload")
     @CommandDescription("antiredstoneclockremastered.command.reload.description")
     @Permission("antiredstoneclockremastered.command.reload")
     public void reloadConfig(CommandSender commandSender) {
-        this.redstoneClockService.reload();
+        this.decisionService.reload();
         commandSender.sendMessage(Component.translatable("antiredstoneclockremastered.command.reload.success").arguments(AntiRedstoneClockRemastered.PREFIX));
     }
 }