diff --git a/api/build.gradle.kts b/api/build.gradle.kts index c4d2c28..af6b2d8 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -7,7 +7,9 @@ dependencies { } tasks { - + jar { + enabled = true + } } publishing { diff --git a/build.gradle.kts b/build.gradle.kts index ee9fc71..f34b224 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { allprojects { group = "com.alttd.datalock" - version = "1.0.0-SNAPSHOT" + version = "1.1.0-SNAPSHOT" description = "Altitude DataLock Library." } @@ -23,7 +23,7 @@ subprojects { tasks { jar { - enabled = false + enabled = true } } diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index d7dfd2b..2d9b821 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { tasks { jar { - enabled = false + enabled = true } shadowJar { diff --git a/plugin/src/main/java/com/alttd/datalock/DataLock.java b/plugin/src/main/java/com/alttd/datalock/DataLock.java index 87c3fd1..8cb38cd 100644 --- a/plugin/src/main/java/com/alttd/datalock/DataLock.java +++ b/plugin/src/main/java/com/alttd/datalock/DataLock.java @@ -5,8 +5,8 @@ import com.google.common.io.ByteStreams; import org.bukkit.scheduler.BukkitRunnable; import java.util.HashSet; -import java.util.Objects; import java.util.UUID; +import java.util.logging.Level; public class DataLock implements DataLockAPI { @@ -35,7 +35,9 @@ public class DataLock implements DataLockAPI { ByteArrayDataOutput out = ByteStreams.newDataOutput(); out.writeUTF(requestType.subChannel); out.writeUTF(idempotencyData.data()); + out.writeUTF(idempotencyData.idempotencyToken().toString()); plugin.getServer().sendPluginMessage(plugin, idempotencyData.channel(), out.toByteArray()); + DataLockLib.getInstance().getLogger().log(Level.INFO, "Send plugin message on [" + requestType.subChannel + "] about data: [" + idempotencyData.data() + "]"); } private final HashSet activeChannels = new HashSet<>(); @@ -74,8 +76,8 @@ public class DataLock implements DataLockAPI { @Override public void run() { for (RequestType requestType : RequestType.values()) { - for (IdempotencyData next : activeRequests.getIdempotencyData(requestType)) { - sendPluginMessage(requestType, next); + for (IdempotencyData idempotencyData : activeRequests.getIdempotencyData(requestType)) { + sendPluginMessage(requestType, idempotencyData); } } } diff --git a/plugin/src/main/java/com/alttd/datalock/PluginMessageListener.java b/plugin/src/main/java/com/alttd/datalock/PluginMessageListener.java index ae639ae..8ab9fe3 100644 --- a/plugin/src/main/java/com/alttd/datalock/PluginMessageListener.java +++ b/plugin/src/main/java/com/alttd/datalock/PluginMessageListener.java @@ -7,6 +7,7 @@ import org.bukkit.scheduler.BukkitRunnable; import org.jetbrains.annotations.NotNull; import java.util.UUID; +import java.util.logging.Level; class PluginMessageListener implements org.bukkit.plugin.messaging.PluginMessageListener { @@ -23,14 +24,16 @@ class PluginMessageListener implements org.bukkit.plugin.messaging.PluginMessage return; } ByteArrayDataInput in = ByteStreams.newDataInput(bytes); - String data = in.readUTF(); + String subChannel = in.readUTF(); boolean result = in.readBoolean(); + String data = in.readUTF(); UUID idempotency = UUID.fromString(in.readUTF()); IdempotencyData idempotencyData = new IdempotencyData(channel, data, idempotency); + DataLockLib.getInstance().getLogger().log(Level.INFO, "Received plugin message on [" + subChannel + "] about data: [" + data + "]"); new BukkitRunnable() { @Override public void run() { - switch (in.readUTF()) { + switch (subChannel) { case "try-lock-result" -> { if (!alreadyReceived.putIdempotencyData(RequestType.TRY_LOCK, idempotencyData)) return;