Merge pull request #23 from IllgiLP/fix-fawe-upload-on-connect

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 apply(plugin = "com.github.johnrengelman.shadow")
 
 group = "me.illgilp"
-version = "3.0.0-beta"
+version = "3.0.1-beta"
 
 applyCommonRepositories()
 

docs/Commands & Permissions.md

@@ -10,7 +10,7 @@ Commands
 --------
 
 | Command                                                                          | Description                                          | Permissions                                      |
-|----------------------------------------------------------------------------------|------------------------------------------------------|--------------------------------------------------|
+| -------------------------------------------------------------------------------- | ---------------------------------------------------- | ------------------------------------------------ |
 | [`/weg clipboard`](#weg-clipboard)                                               | commands regarding clipboards                        |                                                  |
 | [`/weg clipboard clear [player name]`](#weg-clipboard-clear-player-name)         | clears your/someone else's clipboard                 | `worldeditglobalizer.command.clipboard.clear`    |
 | [`/weg clipboard download`](#weg-clipboard-download)                             | download your clipboard                              | `worldeditglobalizer.command.clipboard.download` |
@@ -212,7 +212,7 @@ Permissions
 -----------
 
 | Permission                                          | Description                                     | Commands                                                                         |
-|-----------------------------------------------------|-------------------------------------------------|----------------------------------------------------------------------------------|
+| --------------------------------------------------- | ----------------------------------------------- | -------------------------------------------------------------------------------- |
 | `worldeditglobalizer.admin.notify.update`           | allowing to receive update notifications        |                                                                                  |
 | `worldeditglobalizer.clipboard.auto.download`       | enable clipboard auto-download                  |                                                                                  |
 | `worldeditglobalizer.clipboard.auto.upload`         | enable clipboard auto-upload                    |                                                                                  |

weg-common/src/main/java/me/illgilp/worldeditglobalizer/common/network/AbstractPacketHandler.java

@@ -1,7 +1,6 @@
 package me.illgilp.worldeditglobalizer.common.network;
 
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.ActionBarPacket;
-import me.illgilp.worldeditglobalizer.common.network.protocol.packet.AutoUploadReadyPacket;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.ClipboardDataPacket;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.ClipboardRequestPacket;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.KeepAlivePacket;
@@ -48,8 +47,4 @@ public void handle(MessagePacket packet) {
     public void handle(ActionBarPacket packet) {
         throw new UnsupportedOperationException("Method not implemented");
     }
-
-    public void handle(AutoUploadReadyPacket packet) {
-        throw new UnsupportedOperationException("Method not implemented");
-    }
 }

weg-common/src/main/java/me/illgilp/worldeditglobalizer/common/network/protocol/Protocol.java

@@ -5,7 +5,6 @@
 import java.util.function.Supplier;
 import lombok.Getter;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.ActionBarPacket;
-import me.illgilp.worldeditglobalizer.common.network.protocol.packet.AutoUploadReadyPacket;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.ClipboardDataPacket;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.ClipboardRequestPacket;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.KeepAlivePacket;
@@ -36,7 +35,6 @@ public enum Protocol {
             registerPacket(0x2, ProxyConfigResponsePacket.class, ProxyConfigResponsePacket::new);
             registerPacket(0x3, ClipboardDataPacket.class, ClipboardDataPacket::new);
             registerPacket(0x4, ClipboardRequestPacket.class, ClipboardRequestPacket::new);
-            registerPacket(0x5, AutoUploadReadyPacket.class, AutoUploadReadyPacket::new);
         }
     };
 

weg-proxy/core/src/main/java/me/illgilp/worldeditglobalizer/proxy/core/server/connection/ServerConnectionListener.java

@@ -2,7 +2,6 @@
 
 import java.util.concurrent.TimeUnit;
 import lombok.RequiredArgsConstructor;
-import me.illgilp.worldeditglobalizer.common.network.protocol.packet.AutoUploadReadyPacket;
 import me.illgilp.worldeditglobalizer.common.permission.Permission;
 import me.illgilp.worldeditglobalizer.common.scheduler.WegScheduler;
 import me.illgilp.worldeditglobalizer.proxy.core.api.WegProxy;
@@ -25,15 +24,8 @@ public void handleStateChange(WegServer.State from, WegServer.State to) {
                         } catch (ServerNotUsableException ignored) {
                         }
                     }
-                    sendAutoUploadReady();
                 }, 2500, TimeUnit.MILLISECONDS);
-            } else {
-                sendAutoUploadReady();
             }
         }
     }
-
-    private void sendAutoUploadReady() {
-        player.getServerConnection().sendPacket(new AutoUploadReadyPacket(true));
-    }
 }

weg-server/bukkit/adapter_1_13_fawe_2_5_1/src/main/java/me/illgilp/worldeditglobalizer/server/bukkit/worldedit/adapter/v1_13_fawe_2_5_1/WorldEditAdapterImpl.java

@@ -125,4 +125,10 @@ public boolean readAndSetClipboard(WegPlayer player, byte[] data, int hashCode)
     }
 
 
+    @Override
+    public void clearClipboard(WegPlayer player) {
+        Optional.ofNullable(Bukkit.getPlayer(player.getUniqueId()))
+            .map(worldEditPlugin::getSession)
+            .ifPresent(localSession -> localSession.setClipboard(null));
+    }
 }

weg-server/bukkit/adapter_1_13_worldedit_7_2_12/src/main/java/me/illgilp/worldeditglobalizer/server/bukkit/worldedit/adapter/v1_13_worldedit_7_2_12/WorldEditAdapterImpl.java

@@ -125,5 +125,11 @@ public boolean readAndSetClipboard(WegPlayer player, byte[] data, int hashCode)
         return true;
     }
 
+    @Override
+    public void clearClipboard(WegPlayer player) {
+        Optional.ofNullable(Bukkit.getPlayer(player.getUniqueId()))
+            .map(worldEditPlugin::getSession)
+            .ifPresent(localSession -> localSession.setClipboard(null));
+    }
 
 }

weg-server/bukkit/adapter_1_8_fawe_22_3_9/src/main/java/me/illgilp/worldeditglobalizer/server/bukkit/worldedit/adapter/v1_8_fawe_22_3_9/WorldEditAdapterImpl.java

@@ -128,6 +128,13 @@ public boolean readAndSetClipboard(WegPlayer player, byte[] data, int hashCode)
         return true;
     }
 
+    @Override
+    public void clearClipboard(WegPlayer player) {
+        Optional.ofNullable(Bukkit.getPlayer(player.getUniqueId()))
+            .map(worldEditPlugin::getSession)
+            .ifPresent(localSession -> localSession.setClipboard(null));
+    }
+
     private boolean isNewFormat(InputStream inputStream) {
         try (NBTInputStream str = new NBTInputStream(inputStream)) {
             NamedTag rootTag = str.readNamedTag();

weg-server/bukkit/adapter_1_8_worldedit_6_1_5/src/main/java/me/illgilp/worldeditglobalizer/server/bukkit/worldedit/adapter/v1_8_worldedit_6_1_5/WorldEditAdapterImpl.java

@@ -128,6 +128,13 @@ public boolean readAndSetClipboard(WegPlayer player, byte[] data, int hashCode)
         return true;
     }
 
+    @Override
+    public void clearClipboard(WegPlayer player) {
+        Optional.ofNullable(Bukkit.getPlayer(player.getUniqueId()))
+            .map(worldEditPlugin::getSession)
+            .ifPresent(localSession -> localSession.setClipboard(null));
+    }
+
     private boolean isNewFormat(InputStream inputStream) {
         try (NBTInputStream str = new NBTInputStream(inputStream)) {
             NamedTag rootTag = str.readNamedTag();

weg-server/bukkit/impl/src/main/java/me/illgilp/worldeditglobalizer/server/bukkit/WegServerCoreImpl.java

@@ -92,6 +92,8 @@ protected Optional<WegCorePlayer> fetchPlayer(String name) {
 
     @Override
     protected void onPlayerConnected(WegPlayer player) {
+        Optional.ofNullable(WorldEditAdapterFilter.getWorldEditAdapter())
+            .ifPresent(worldEditAdapter -> worldEditAdapter.clearClipboard(player));
         super.onPlayerConnected(player);
     }
 

weg-server/bukkit/impl/src/main/java/me/illgilp/worldeditglobalizer/server/bukkit/api/worldedit/adapter/WorldEditAdapter.java

@@ -17,4 +17,6 @@ public WorldEditAdapterFilter getFilter() {
     public abstract Optional<WegClipboard> getClipboardOfPlayer(WegPlayer player);
 
     public abstract boolean readAndSetClipboard(WegPlayer player, byte[] data, int hashCode);
+
+    public abstract void clearClipboard(WegPlayer player);
 }

weg-server/core/src/main/java/me/illgilp/worldeditglobalizer/server/core/api/player/WegPlayer.java

@@ -31,6 +31,4 @@ public interface WegPlayer extends Audience, Identified, PermissionSubject {
 
     CommonProxyConfig getProxyConfig();
 
-    boolean isAutoUploadReady();
-
 }

weg-server/core/src/main/java/me/illgilp/worldeditglobalizer/server/core/player/WegCorePlayer.java

@@ -173,9 +173,4 @@ private class IdentityImpl implements Identity {
             return WegCorePlayer.this.getUniqueId();
         }
     }
-
-    @Override
-    public boolean isAutoUploadReady() {
-        return autoUploadReady;
-    }
 }

weg-server/core/src/main/java/me/illgilp/worldeditglobalizer/server/core/runnable/ClipboardAutoUploadRunnable.java

@@ -21,9 +21,7 @@ public ClipboardAutoUploadRunnable(WegServer wegServer) {
     @Override
     public void run() {
         for (WegPlayer wegPlayer : new ArrayList<>(wegServer.getPlayers())) {
-            if (wegPlayer.getConnection().getState() != WegServerConnection.State.USABLE
-                || !wegPlayer.isAutoUploadReady()
-            ) {
+            if (wegPlayer.getConnection().getState() != WegServerConnection.State.USABLE) {
                 continue;
             }
             if (wegPlayer.getProxyConfig().isClipboardAutoUploadEnabled()) {

weg-server/core/src/main/java/me/illgilp/worldeditglobalizer/server/core/server/connection/ServerConnectionPacketHandler.java

@@ -9,7 +9,6 @@
 import me.illgilp.worldeditglobalizer.common.messages.MessageHelper;
 import me.illgilp.worldeditglobalizer.common.messages.translation.TranslationKey;
 import me.illgilp.worldeditglobalizer.common.network.AbstractPacketHandler;
-import me.illgilp.worldeditglobalizer.common.network.protocol.packet.AutoUploadReadyPacket;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.ClipboardDataPacket;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.ClipboardRequestPacket;
 import me.illgilp.worldeditglobalizer.common.network.protocol.packet.KeepAlivePacket;
@@ -67,9 +66,4 @@ public void handle(PermissionCheckRequestPacket packet) {
     public void handle(ClipboardRequestPacket packet) {
         WegScheduler.getInstance().getSyncExecutor().execute(player::uploadClipboard);
     }
-
-    @Override
-    public void handle(AutoUploadReadyPacket packet) {
-        player.setAutoUploadReady(packet.isReady());
-    }
 }