Revert most signs

APDevTeam · Sep 1, 2024 · 61198ab · 61198ab
1 parent 19eedfa
commit 61198ab
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 178 deletions.
diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java b/Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java
@@ -108,22 +108,21 @@ public void onEnable() {
         injector.register(PlayerListener.class);
         injector.register(ChunkManager.class);
 
-        // Signs
-        injector.register(AscendSign.class);
-        injector.register(CraftSign.class);
-        injector.register(CruiseSign.class);
-        injector.register(DescendSign.class);
-        injector.register(HelmSign.class);
-        injector.register(MoveSign.class);
-        injector.register(NameSign.class);
-        injector.register(PilotSign.class);
-        injector.register(RelativeMoveSign.class);
-        injector.register(ReleaseSign.class);
-        injector.register(RemoteSign.class);
-        injector.register(SpeedSign.class);
-        injector.register(SubcraftRotateSign.class);
-        injector.register(TeleportSign.class);
-        injector.register(ScuttleSign.class);
+        getServer().getPluginManager().registerEvents(new AscendSign(), this);
+        getServer().getPluginManager().registerEvents(new CraftSign(), this);
+        getServer().getPluginManager().registerEvents(new CruiseSign(), this);
+        getServer().getPluginManager().registerEvents(new DescendSign(), this);
+        getServer().getPluginManager().registerEvents(new HelmSign(), this);
+        getServer().getPluginManager().registerEvents(new MoveSign(), this);
+        getServer().getPluginManager().registerEvents(new NameSign(), this);
+        getServer().getPluginManager().registerEvents(new PilotSign(), this);
+        getServer().getPluginManager().registerEvents(new RelativeMoveSign(), this);
+        getServer().getPluginManager().registerEvents(new ReleaseSign(), this);
+        getServer().getPluginManager().registerEvents(new RemoteSign(), this);
+        getServer().getPluginManager().registerEvents(new SpeedSign(), this);
+        getServer().getPluginManager().registerEvents(new SubcraftRotateSign(), this);
+        getServer().getPluginManager().registerEvents(new TeleportSign(), this);
+        getServer().getPluginManager().registerEvents(new ScuttleSign(), this);
 
         injector.register(CraftPilotListener.class);
         injector.register(CraftReleaseListener.class);

diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/sign/AscendSign.java b/Movecraft/src/main/java/net/countercraft/movecraft/sign/AscendSign.java
@@ -1,6 +1,5 @@
 package net.countercraft.movecraft.sign;
 
-import jakarta.inject.Inject;
 import net.countercraft.movecraft.CruiseDirection;
 import net.countercraft.movecraft.MovecraftLocation;
 import net.countercraft.movecraft.craft.Craft;
@@ -21,12 +20,6 @@
 import org.jetbrains.annotations.NotNull;
 
 public class AscendSign implements Listener {
-    private final @NotNull CraftManager craftManager;
-
-    @Inject
-    public AscendSign(@NotNull CraftManager craftManager){
-        this.craftManager = craftManager;
-    }
 
     @EventHandler
     public void onCraftDetect(CraftDetectEvent event){
@@ -61,10 +54,10 @@ public void onSignClickEvent(@NotNull PlayerInteractEvent event){
         Sign sign = (Sign) block.getState();
         if (ChatColor.stripColor(sign.getLine(0)).equalsIgnoreCase("Ascend: OFF")) {
             event.setCancelled(true);
-            if (craftManager.getCraftByPlayer(event.getPlayer()) == null) {
+            if (CraftManager.getInstance().getCraftByPlayer(event.getPlayer()) == null) {
                 return;
             }
-            Craft c = craftManager.getCraftByPlayer(event.getPlayer());
+            Craft c = CraftManager.getInstance().getCraftByPlayer(event.getPlayer());
             if (!c.getType().getBoolProperty(CraftType.CAN_CRUISE)) {
                 return;
             }
@@ -78,15 +71,15 @@ public void onSignClickEvent(@NotNull PlayerInteractEvent event){
             c.resetSigns(sign);
 
             if (!c.getType().getBoolProperty(CraftType.MOVE_ENTITIES)) {
-                craftManager.addReleaseTask(c);
+                CraftManager.getInstance().addReleaseTask(c);
             }
             return;
         }
         if (!ChatColor.stripColor(sign.getLine(0)).equalsIgnoreCase("Ascend: ON")) {
             return;
         }
         event.setCancelled(true);
-        Craft c = craftManager.getCraftByPlayer(event.getPlayer());
+        Craft c = CraftManager.getInstance().getCraftByPlayer(event.getPlayer());
         if (c == null || !c.getType().getBoolProperty(CraftType.CAN_CRUISE)) {
             return;
         }

diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/sign/CraftSign.java b/Movecraft/src/main/java/net/countercraft/movecraft/sign/CraftSign.java
@@ -1,6 +1,5 @@
 package net.countercraft.movecraft.sign;
 
-import jakarta.inject.Inject;
 import net.countercraft.movecraft.CruiseDirection;
 import net.countercraft.movecraft.Movecraft;
 import net.countercraft.movecraft.MovecraftLocation;
@@ -38,18 +37,11 @@
 import java.util.Set;
 
 public final class CraftSign implements Listener {
-    private final Set<MovecraftLocation> piloting;
-    private final @NotNull CraftManager craftManager;
-
-    @Inject
-    public CraftSign(@NotNull CraftManager craftManager) {
-        this.craftManager = craftManager;
-        piloting = new HashSet<>();
-    }
+    private final Set<MovecraftLocation> piloting = new HashSet<>();
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onSignChange(@NotNull SignChangeEvent event) {
-        if (craftManager.getCraftTypeFromString(event.getLine(0)) == null)
+        if (CraftManager.getInstance().getCraftTypeFromString(event.getLine(0)) == null)
             return;
 
         if (!Settings.RequireCreatePerm)
@@ -71,7 +63,7 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
             return;
 
         Sign sign = (Sign) state;
-        CraftType craftType = craftManager.getCraftTypeFromString(ChatColor.stripColor(sign.getLine(0)));
+        CraftType craftType = CraftManager.getInstance().getCraftTypeFromString(ChatColor.stripColor(sign.getLine(0)));
         if (craftType == null)
             return;
 
@@ -92,7 +84,7 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
         // Attempt to run detection
         World world = event.getClickedBlock().getWorld();
 
-        craftManager.detect(
+        CraftManager.getInstance().detect(
                 startPoint,
                 craftType, (type, w, p, parents) -> {
                     assert p != null; // Note: This only passes in a non-null player.
@@ -144,15 +136,15 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
                             @Override
                             public void run() {
                                 craft.setCruising(false);
-                                craftManager.sink(craft);
+                                CraftManager.getInstance().sink(craft);
                             }
                         }.runTaskLater(Movecraft.getInstance(), (craftType.getIntProperty(CraftType.CRUISE_ON_PILOT_LIFETIME)));
                     }
                     else {
                         // Release old craft if it exists
-                        Craft oldCraft = craftManager.getCraftByPlayer(player);
+                        Craft oldCraft = CraftManager.getInstance().getCraftByPlayer(player);
                         if (oldCraft != null)
-                            craftManager.release(oldCraft, CraftReleaseEvent.Reason.PLAYER, false);
+                            CraftManager.getInstance().release(oldCraft, CraftReleaseEvent.Reason.PLAYER, false);
                     }
                 }
         );

diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/sign/CruiseSign.java b/Movecraft/src/main/java/net/countercraft/movecraft/sign/CruiseSign.java
@@ -1,6 +1,5 @@
 package net.countercraft.movecraft.sign;
 
-import jakarta.inject.Inject;
 import net.countercraft.movecraft.CruiseDirection;
 import net.countercraft.movecraft.MovecraftLocation;
 import net.countercraft.movecraft.config.Settings;
@@ -25,12 +24,6 @@
 import org.jetbrains.annotations.NotNull;
 
 public final class CruiseSign implements Listener {
-    private final @NotNull CraftManager craftManager;
-
-    @Inject
-    public CruiseSign(@NotNull CraftManager craftManager){
-        this.craftManager = craftManager;
-    }
 
     @EventHandler
     public void onCraftDetect(@NotNull CraftDetectEvent event) {
@@ -64,7 +57,7 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
         String line = ChatColor.stripColor(sign.getLine(0));
         if (line.equalsIgnoreCase("Cruise: OFF")) {
             event.setCancelled(true);
-            Craft c = craftManager.getCraftByPlayer(event.getPlayer());
+            Craft c = CraftManager.getInstance().getCraftByPlayer(event.getPlayer());
             if (c == null || !c.getType().getBoolProperty(CraftType.CAN_CRUISE))
                 return;
             if (!(sign.getBlockData() instanceof Directional))
@@ -78,12 +71,12 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
             c.setCruising(true);
             c.resetSigns(sign);
             if (!c.getType().getBoolProperty(CraftType.MOVE_ENTITIES)) {
-                craftManager.addReleaseTask(c);
+                CraftManager.getInstance().addReleaseTask(c);
             }
         }
         else if (line.equalsIgnoreCase("Cruise: ON")) {
             event.setCancelled(true);
-            Craft c = craftManager.getCraftByPlayer(event.getPlayer());
+            Craft c = CraftManager.getInstance().getCraftByPlayer(event.getPlayer());
             if (c == null || !c.getType().getBoolProperty(CraftType.CAN_CRUISE))
                 return;
 

diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/sign/DescendSign.java b/Movecraft/src/main/java/net/countercraft/movecraft/sign/DescendSign.java
@@ -1,6 +1,5 @@
 package net.countercraft.movecraft.sign;
 
-import jakarta.inject.Inject;
 import net.countercraft.movecraft.CruiseDirection;
 import net.countercraft.movecraft.MovecraftLocation;
 import net.countercraft.movecraft.craft.Craft;
@@ -19,13 +18,7 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.jetbrains.annotations.NotNull;
 
-public final class DescendSign implements Listener {
-    private final @NotNull CraftManager craftManager;
-
-    @Inject
-    public DescendSign(@NotNull CraftManager craftManager){
-        this.craftManager = craftManager;
-    }
+public final class DescendSign implements Listener{
 
     @EventHandler
     public void onCraftDetect(CraftDetectEvent event){
@@ -58,10 +51,10 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
         Sign sign = (Sign) state;
         if (ChatColor.stripColor(sign.getLine(0)).equalsIgnoreCase("Descend: OFF")) {
             event.setCancelled(true);
-            if (craftManager.getCraftByPlayer(event.getPlayer()) == null) {
+            if (CraftManager.getInstance().getCraftByPlayer(event.getPlayer()) == null) {
                 return;
             }
-            Craft c = craftManager.getCraftByPlayer(event.getPlayer());
+            Craft c = CraftManager.getInstance().getCraftByPlayer(event.getPlayer());
             if (!c.getType().getBoolProperty(CraftType.CAN_CRUISE)) {
                 return;
             }
@@ -75,13 +68,13 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
             c.resetSigns(sign);
 
             if (!c.getType().getBoolProperty(CraftType.MOVE_ENTITIES)) {
-                craftManager.addReleaseTask(c);
+                CraftManager.getInstance().addReleaseTask(c);
             }
             return;
         }
         if (ChatColor.stripColor(sign.getLine(0)).equalsIgnoreCase("Descend: ON")) {
             event.setCancelled(true);
-            Craft c = craftManager.getCraftByPlayer(event.getPlayer());
+            Craft c = CraftManager.getInstance().getCraftByPlayer(event.getPlayer());
             if (c != null && c.getType().getBoolProperty(CraftType.CAN_CRUISE)) {
                 sign.setLine(0, "Descend: OFF");
                 sign.update(true);

diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/sign/HelmSign.java b/Movecraft/src/main/java/net/countercraft/movecraft/sign/HelmSign.java
@@ -1,6 +1,5 @@
 package net.countercraft.movecraft.sign;
 
-import jakarta.inject.Inject;
 import net.countercraft.movecraft.MovecraftRotation;
 import net.countercraft.movecraft.craft.Craft;
 import net.countercraft.movecraft.craft.CraftManager;
@@ -19,12 +18,6 @@
 import org.jetbrains.annotations.NotNull;
 
 public final class HelmSign implements Listener {
-    private final @NotNull CraftManager craftManager;
-
-    @Inject
-    public HelmSign(@NotNull CraftManager craftManager){
-        this.craftManager = craftManager;
-    }
 
     @EventHandler
     public void onSignChange(SignChangeEvent event){
@@ -57,7 +50,7 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
             return;
         }
         event.setCancelled(true);
-        Craft craft = craftManager.getCraftByPlayer(event.getPlayer());
+        Craft craft = CraftManager.getInstance().getCraftByPlayer(event.getPlayer());
         if (craft == null) {
             return;
         }
@@ -85,20 +78,20 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
             return;
 
         if (craft.getType().getBoolProperty(CraftType.ROTATE_AT_MIDPOINT)) {
-            craftManager.getCraftByPlayer(event.getPlayer()).rotate(rotation, craft.getHitBox().getMidPoint());
+            CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).rotate(rotation, craft.getHitBox().getMidPoint());
         } else {
-            craftManager.getCraftByPlayer(event.getPlayer()).rotate(rotation, MathUtils.bukkit2MovecraftLoc(sign.getLocation()));
+            CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).rotate(rotation, MathUtils.bukkit2MovecraftLoc(sign.getLocation()));
         }
 
         //timeMap.put(event.getPlayer(), System.currentTimeMillis());
         //TODO: Lower speed while turning
-            /*int curTickCooldown = craftManager.getCraftByPlayer(event.getPlayer()).getCurTickCooldown();
-            int baseTickCooldown = craftManager.getCraftByPlayer(event.getPlayer()).getType().getCruiseTickCooldown();
+            /*int curTickCooldown = CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).getCurTickCooldown();
+            int baseTickCooldown = CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).getType().getCruiseTickCooldown();
             if (curTickCooldown * 2 > baseTickCooldown)
                 curTickCooldown = baseTickCooldown;
             else
                 curTickCooldown = curTickCooldown * 2;*/
-        //craftManager.getCraftByPlayer(event.getPlayer()).setCurTickCooldown(curTickCooldown); // lose half your speed when turning
+        //CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).setCurTickCooldown(curTickCooldown); // lose half your speed when turning
 
     }
 }
diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/sign/MoveSign.java b/Movecraft/src/main/java/net/countercraft/movecraft/sign/MoveSign.java
@@ -1,6 +1,5 @@
 package net.countercraft.movecraft.sign;
 
-import jakarta.inject.Inject;
 import net.countercraft.movecraft.craft.CraftManager;
 import net.countercraft.movecraft.craft.type.CraftType;
 import net.countercraft.movecraft.localisation.I18nSupport;
@@ -16,12 +15,6 @@
 
 public final class MoveSign implements Listener{
     private static final String HEADER = "Move:";
-    private final @NotNull CraftManager craftManager;
-
-    @Inject
-    public MoveSign(@NotNull CraftManager craftManager){
-        this.craftManager = craftManager;
-    }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onSignClick(@NotNull PlayerInteractEvent event) {
@@ -37,19 +30,19 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
             return;
         }
         event.setCancelled(true);
-        if (craftManager.getCraftByPlayer(event.getPlayer()) == null) {
+        if (CraftManager.getInstance().getCraftByPlayer(event.getPlayer()) == null) {
             return;
         }
         /*Long time = timeMap.get(event.getPlayer());
         if (time != null) {
             long ticksElapsed = (System.currentTimeMillis() - time) / 50;
-            Craft craft = craftManager.getCraftByPlayer(event.getPlayer());
+            Craft craft = CraftManager.getInstance().getCraftByPlayer(event.getPlayer());
             // if the craft should go slower underwater, make time pass
             // more slowly there
             if (craft.getType().getHalfSpeedUnderwater() && craft.getMinY() < craft.getW().getSeaLevel()) {
                 ticksElapsed = ticksElapsed >> 1;
             }
-            if (Math.abs(ticksElapsed) < craftManager.getCraftByPlayer(event.getPlayer()).getType().getTickCooldown()) {
+            if (Math.abs(ticksElapsed) < CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).getType().getTickCooldown()) {
                 event.setCancelled(true);
                 return;
             }
@@ -58,7 +51,7 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
         int dx = Integer.parseInt(numbers[0]);
         int dy = Integer.parseInt(numbers[1]);
         int dz = Integer.parseInt(numbers[2]);
-        int maxMove = craftManager.getCraftByPlayer(event.getPlayer()).getType().getIntProperty(CraftType.MAX_STATIC_MOVE);
+        int maxMove = CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).getType().getIntProperty(CraftType.MAX_STATIC_MOVE);
 
         if (dx > maxMove)
             dx = maxMove;
@@ -73,15 +66,15 @@ public void onSignClick(@NotNull PlayerInteractEvent event) {
         if (dz < 0 - maxMove)
             dz = 0 - maxMove;
 
-        if (!event.getPlayer().hasPermission("movecraft." + craftManager.getCraftByPlayer(event.getPlayer()).getType().getStringProperty(CraftType.NAME) + ".move")) {
+        if (!event.getPlayer().hasPermission("movecraft." + CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).getType().getStringProperty(CraftType.NAME) + ".move")) {
             event.getPlayer().sendMessage(
                     I18nSupport.getInternationalisedString("Insufficient Permissions"));
             return;
         }
-        if (craftManager.getCraftByPlayer(event.getPlayer()).getType().getBoolProperty(CraftType.CAN_STATIC_MOVE)) {
-            craftManager.getCraftByPlayer(event.getPlayer()).translate(dx, dy, dz);
+        if (CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).getType().getBoolProperty(CraftType.CAN_STATIC_MOVE)) {
+            CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).translate(dx, dy, dz);
             //timeMap.put(event.getPlayer(), System.currentTimeMillis());
-            craftManager.getCraftByPlayer(event.getPlayer()).setLastCruiseUpdate(System.currentTimeMillis());
+            CraftManager.getInstance().getCraftByPlayer(event.getPlayer()).setLastCruiseUpdate(System.currentTimeMillis());
         }
     }
 }
diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/sign/NameSign.java b/Movecraft/src/main/java/net/countercraft/movecraft/sign/NameSign.java
@@ -1,6 +1,5 @@
 package net.countercraft.movecraft.sign;
 
-import jakarta.inject.Inject;
 import net.countercraft.movecraft.MovecraftLocation;
 import net.countercraft.movecraft.config.Settings;
 import net.countercraft.movecraft.craft.Craft;
@@ -26,10 +25,6 @@
 
 public final class NameSign implements Listener {
     private static final String HEADER = "Name:";
-
-    @Inject
-    public NameSign(){}
-
     @EventHandler
     public void onCraftDetect(@NotNull CraftDetectEvent event) {
         Craft c = event.getCraft();