From d32edaefc9db06fbda4cbb5302958139eb7c5b27 Mon Sep 17 00:00:00 2001 From: tunikakeks Date: Sat, 27 Dec 2025 22:40:55 +0100 Subject: [PATCH 1/4] pnx repo & small update --- pom.xml | 16 ++-- .../components/BridgeServer.java | 4 +- .../bridge/platform/allay/AllayExecutor.java | 73 ------------------- .../bridge/platform/allay/AllayListener.java | 23 ------ .../bridge/platform/allay/AllayPlugin.java | 25 ------- 5 files changed, 13 insertions(+), 128 deletions(-) delete mode 100644 src/main/java/de/redstonecloud/bridge/platform/allay/AllayExecutor.java delete mode 100644 src/main/java/de/redstonecloud/bridge/platform/allay/AllayListener.java delete mode 100644 src/main/java/de/redstonecloud/bridge/platform/allay/AllayPlugin.java diff --git a/pom.xml b/pom.xml index dd3802d..cd5104e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,13 +9,13 @@ 1.0-SNAPSHOT - 22 - 22 + 21 + 21 UTF-8 master-SNAPSHOT 2.0.3-SNAPSHOT - master-SNAPSHOT + 2.0.0-SNAPSHOT 1.0-SNAPSHOT @@ -48,6 +48,10 @@ lpmc-redstonecloud https://repo.lostplacemc.eu/redstonecloud + + pnx-releases + https://repo.powernukkitx.org/releases + @@ -66,8 +70,8 @@ - com.github.PowerNukkitX - PowerNukkitX + org.powernukkitx + server ${version.powernukkitx} provided @@ -106,7 +110,7 @@ de.redstonecloud api - 0.1-beta + 1.0.0-SNAPSHOT compile diff --git a/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java b/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java index 15e649e..d7b3b2b 100644 --- a/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java +++ b/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java @@ -33,6 +33,7 @@ public static BridgeServer readFromCache(String serverName) { .type(data.serverType()) .isProxy(data.proxy()) .extraData(data.extraData()) + .address(data.address()) .build(); return server; @@ -47,6 +48,7 @@ public static BridgeServer readFromCache(String serverName) { protected boolean isProxy; protected UUID uuid; protected JsonObject extraData; + protected String address; @Override public long getCreatedAt() { @@ -55,7 +57,7 @@ public long getCreatedAt() { @Override public HostAndPort getAddress() { - return HostAndPort.fromParts("0.0.0.0", port); + return HostAndPort.fromParts(address, port); } @Override diff --git a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayExecutor.java b/src/main/java/de/redstonecloud/bridge/platform/allay/AllayExecutor.java deleted file mode 100644 index 4779585..0000000 --- a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayExecutor.java +++ /dev/null @@ -1,73 +0,0 @@ -package de.redstonecloud.bridge.platform.allay; - -import com.google.common.net.HostAndPort; -import de.redstonecloud.api.components.ICloudPlayer; -import de.redstonecloud.bridge.cloudinterface.components.BridgeExecutor; -import de.redstonecloud.bridge.cloudinterface.components.BridgeServer; -import org.allaymc.api.entity.interfaces.EntityPlayer; -import org.allaymc.api.scheduler.Task; -import org.allaymc.api.scheduler.TaskCreator; -import org.allaymc.api.server.Server; - -import java.util.Objects; -import java.util.UUID; - -public class AllayExecutor implements BridgeExecutor { - private static Server server = Server.getInstance(); - - public EntityPlayer getPlayerByCloudPlayer(ICloudPlayer player) { - return server.getPlayerManager().getPlayers().get(player.getUUID()); - } - - public void sendMessage(ICloudPlayer cloudPlayer, String message) { - Objects.requireNonNull(getPlayerByCloudPlayer(cloudPlayer)).sendMessage(message); - } - - @Override - public void sendTitle(ICloudPlayer cloudPlayer, String title) { - Objects.requireNonNull(getPlayerByCloudPlayer(cloudPlayer)).sendTitle(title); - } - - @Override - public void kick(ICloudPlayer player) { - Objects.requireNonNull(getPlayerByCloudPlayer(player)).disconnect(); - } - - @Override - public void kick(ICloudPlayer player, String reason) { - Objects.requireNonNull(getPlayerByCloudPlayer(player)).disconnect(reason); - } - - @Override - public void sendActionbar(ICloudPlayer player, String message) { - Objects.requireNonNull(getPlayerByCloudPlayer(player)).sendActionBar(message); - } - - @Override - public void sendToast(ICloudPlayer player, String title, String message) { - Objects.requireNonNull(getPlayerByCloudPlayer(player)).sendToast(title, message); - } - - @Override - public void runDelayed(Runnable code, int tickDelay) { - server.getScheduler().scheduleDelayed(Server.getInstance(), () -> { - code.run(); - return true; - }, tickDelay); - } - - - public void addServer(String name, HostAndPort address) {} - - public void removeServer(String name) {} - - public boolean hasServer(String name) { - return false; - } - - public BridgeServer determineServer(String serverName) { - return null; - } - - public void connect(ICloudPlayer player, String name) {} -} diff --git a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayListener.java b/src/main/java/de/redstonecloud/bridge/platform/allay/AllayListener.java deleted file mode 100644 index 7d7f09b..0000000 --- a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayListener.java +++ /dev/null @@ -1,23 +0,0 @@ -package de.redstonecloud.bridge.platform.allay; - -import de.redstonecloud.bridge.cloudinterface.CloudInterface; -import org.allaymc.api.entity.interfaces.EntityPlayer; -import org.allaymc.api.eventbus.EventHandler; -import org.allaymc.api.eventbus.event.player.PlayerLoginEvent; -import org.allaymc.api.eventbus.event.player.PlayerQuitEvent; - -public class AllayListener { - @EventHandler - public void onLogin(PlayerLoginEvent ev) { - EntityPlayer player = ev.getPlayer(); - - CloudInterface.getInstance().playerLogin(player.getOriginName(), player.getLoginData().getUuid().toString(), player.getSocketAddress().toString()); - } - - @EventHandler - public void onDisconnect(PlayerQuitEvent ev) { - EntityPlayer player = ev.getPlayer(); - - CloudInterface.getInstance().playerDisconnect(player.getLoginData().getUuid().toString()); - } -} diff --git a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayPlugin.java b/src/main/java/de/redstonecloud/bridge/platform/allay/AllayPlugin.java deleted file mode 100644 index 20632a1..0000000 --- a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayPlugin.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.redstonecloud.bridge.platform.allay; - -import de.redstonecloud.bridge.cloudinterface.CloudInterface; -import org.allaymc.api.plugin.Plugin; -import org.allaymc.api.server.Server; - -public class AllayPlugin extends Plugin { - public CloudInterface cloudInterface; - - @Override - public void onLoad() { - cloudInterface = CloudInterface.getInstance(); - } - - @Override - public void onEnable() { - cloudInterface.start(new AllayExecutor()); - Server.getInstance().getEventBus().registerListener(new AllayListener()); - } - - @Override - public void onDisable() { - cloudInterface.shutdown(); - } -} \ No newline at end of file From 3a2cd6f2caa4c2ba103a5a38553aedf7ebe87eff Mon Sep 17 00:00:00 2001 From: tunikakeks Date: Sat, 27 Dec 2025 22:50:58 +0100 Subject: [PATCH 2/4] fix pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd5104e..784ef3e 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ de.redstonecloud api - 1.0.0-SNAPSHOT + 0.1-beta compile From edaec3757b27ba5437aa6fc123aa72bff38814a6 Mon Sep 17 00:00:00 2001 From: tunikakeks Date: Sat, 27 Dec 2025 22:58:18 +0100 Subject: [PATCH 3/4] fix --- .../bridge/cloudinterface/components/BridgeServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java b/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java index d7b3b2b..7f1b26f 100644 --- a/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java +++ b/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java @@ -33,7 +33,8 @@ public static BridgeServer readFromCache(String serverName) { .type(data.serverType()) .isProxy(data.proxy()) .extraData(data.extraData()) - .address(data.address()) + //TODO: Re-add once fully implemented + //.address(data.address()) .build(); return server; From 129857bcbf17822615365b9e82216daab299ac80 Mon Sep 17 00:00:00 2001 From: tunikakeks Date: Thu, 8 Jan 2026 09:56:26 +0100 Subject: [PATCH 4/4] update to latest RC --- pom.xml | 10 +--------- .../bridge/cloudinterface/components/BridgeServer.java | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 784ef3e..b6e88f2 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,6 @@ 21 UTF-8 - master-SNAPSHOT 2.0.3-SNAPSHOT 2.0.0-SNAPSHOT 1.0-SNAPSHOT @@ -93,13 +92,6 @@ provided - - org.allaymc.allay - api - ${version.allay} - provided - - cn.nukkit nukkit @@ -110,7 +102,7 @@ de.redstonecloud api - 0.1-beta + 1.0.0-SNAPSHOT compile diff --git a/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java b/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java index 7f1b26f..d7b3b2b 100644 --- a/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java +++ b/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java @@ -33,8 +33,7 @@ public static BridgeServer readFromCache(String serverName) { .type(data.serverType()) .isProxy(data.proxy()) .extraData(data.extraData()) - //TODO: Re-add once fully implemented - //.address(data.address()) + .address(data.address()) .build(); return server;