Remove block highlights and protocollib (#533)

APDevTeam · Jul 30, 2022 · 0cf847b · 0cf847b
1 parent 379925a
commit 0cf847b
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 1,040 deletions.
diff --git a/modules/Movecraft/pom.xml b/modules/Movecraft/pom.xml
@@ -96,13 +96,6 @@
             <version>8.5.8</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.comphenix.protocol</groupId>
-            <artifactId>ProtocolLib</artifactId>
-            <version>4.7.0</version>
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

diff --git a/modules/Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java b/modules/Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java
@@ -55,7 +55,6 @@
 import net.countercraft.movecraft.sign.StatusSign;
 import net.countercraft.movecraft.sign.SubcraftRotateSign;
 import net.countercraft.movecraft.sign.TeleportSign;
-import net.countercraft.movecraft.util.BlockHighlight;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -215,7 +214,6 @@ public void onEnable() {
 
 
         getServer().getPluginManager().registerEvents(new InteractListener(), this);
-        getServer().getPluginManager().registerEvents(new BlockHighlight(), this);
 
         getCommand("movecraft").setExecutor(new MovecraftCommand());
         getCommand("release").setExecutor(new ReleaseCommand());

diff --git a/modules/Movecraft/src/main/java/net/countercraft/movecraft/listener/PlayerListener.java b/modules/Movecraft/src/main/java/net/countercraft/movecraft/listener/PlayerListener.java
@@ -25,7 +25,6 @@
 import net.countercraft.movecraft.craft.type.CraftType;
 import net.countercraft.movecraft.events.CraftReleaseEvent;
 import net.countercraft.movecraft.localisation.I18nSupport;
-import net.countercraft.movecraft.util.BlockHighlight;
 import net.countercraft.movecraft.util.MathUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -47,7 +46,6 @@
 
 public class PlayerListener implements Listener {
     private final Map<Craft, Long> timeToReleaseAfter = new WeakHashMap<>();
-    private final Map<Craft, Queue<Integer>> highlights = new WeakHashMap<>();
 
     private Set<Location> checkCraftBorders(Craft craft) {
         Set<Location> mergePoints = new HashSet<>();
@@ -126,18 +124,14 @@ public void onPlayerMove(PlayerMoveEvent event) {
             return;
         }
 
-        highlights.computeIfAbsent(c, (craft) -> new LinkedList<>());
-
         if(MathUtils.locationNearHitBox(c.getHitBox(), p.getLocation(), 2)){
             timeToReleaseAfter.remove(c);
-            clearHighlights(c, p);
             return;
         }
 
         if(timeToReleaseAfter.containsKey(c) && timeToReleaseAfter.get(c) < System.currentTimeMillis()){
             CraftManager.getInstance().release(c, CraftReleaseEvent.Reason.PLAYER, false);
             timeToReleaseAfter.remove(c);
-            clearHighlights(c, p);
             return;
         }
 
@@ -153,23 +147,7 @@ public void onPlayerMove(PlayerMoveEvent event) {
             var mergePoints = checkCraftBorders(c);
             if (!mergePoints.isEmpty())
                 p.sendMessage(I18nSupport.getInternationalisedString("Manoverboard - Craft May Merge"));
-            for (var location : mergePoints){
-                highlights.get(c).add(BlockHighlight.highlightBlockAt(location, p));
-            }
             timeToReleaseAfter.put(c, System.currentTimeMillis() + c.getType().getIntProperty(CraftType.RELEASE_TIMEOUT) * 1000L);
         }
     }
-
-    @EventHandler
-    public void onCraftRelease(CraftReleaseEvent event) {
-        if(event.getCraft() instanceof PlayerCraft)
-            clearHighlights(event.getCraft(), ((PlayerCraft) event.getCraft()).getPilot());
-    }
-
-    private void clearHighlights(Craft craft, Player player) {
-        highlights.computeIfAbsent(craft, (c) -> new LinkedList<>());
-        var queue = highlights.get(craft);
-        BlockHighlight.removeHighlights(queue, player);
-        queue.clear();
-    }
 }
diff --git a/modules/Movecraft/src/main/java/net/countercraft/movecraft/util/BlockHighlight.java b/modules/Movecraft/src/main/java/net/countercraft/movecraft/util/BlockHighlight.java
diff --git a/modules/Movecraft/src/main/resources/plugin.yml b/modules/Movecraft/src/main/resources/plugin.yml
@@ -1,7 +1,6 @@
 name: Movecraft
 version: ${project.version}
 api-version: 1.14
-depend: [ProtocolLib]
 description: The original flight and movement plugin for minecraft.
 authors: [cccm5, BaccaYarro, TylerS1066, eirik1996, drfiveminusmint, HumorousFool]
 website: https://github.com/APDevTeam/Movecraft

diff --git a/modules/api/pom.xml b/modules/api/pom.xml
@@ -99,12 +99,6 @@
             <artifactId>adventure-platform-bukkit</artifactId>
             <version>4.1.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.comphenix.protocol</groupId>
-            <artifactId>ProtocolLib</artifactId>
-            <version>4.8.0</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/modules/api/src/main/java/net/countercraft/movecraft/util/packets/AbstractPacket.java b/modules/api/src/main/java/net/countercraft/movecraft/util/packets/AbstractPacket.java