Merge pull request #478 from KingGamerXd/master

Maploop · web-flow · commit cf3f7a3592d6 · 2025-04-19T21:48:10.000+03:30
Fixed: Player inventory is no longer incorrectly treated as an opened inventory.
Re-implemented: Cross-version support
Tested on: 1.8.9, 1.17.1, 1.20.4, 1.21.4
Changed: Renamed is_craftable to default_craftable in the minions registry.
Added: /serverstatus command to check server status.
Fixed: Error when opening collections that include a minion display.
diff --git a/configuration/items/minions.yml b/configuration/items/minions.yml
diff --git a/configuration/resources.json b/configuration/resources.json
@@ -6,8 +6,9 @@
   "pterodactyl-mode": false,
   "spark": false,
   "require-authentication": false,
+  "cross-version-support": true,
   "host-name": "0.0.0.0",
   "transfer-timeout": "800",
   "sandbox-mode": true,
   "anticheat": true
-}
+}
diff --git a/type.generic/src/main/java/net/swofty/types/generic/collection/CollectionCategory.java b/type.generic/src/main/java/net/swofty/types/generic/collection/CollectionCategory.java
@@ -11,6 +11,7 @@
 import net.swofty.types.generic.item.components.MinionComponent;
 import net.swofty.types.generic.item.crafting.SkyBlockRecipe;
 import net.swofty.types.generic.item.updater.NonPlayerItemUpdater;
+import net.swofty.types.generic.minion.MinionRegistry;
 import net.swofty.types.generic.user.SkyBlockPlayer;
 
 import java.util.ArrayList;
@@ -54,7 +55,7 @@ public List<String> getDisplay(List<String> lore, String itemDisplay) {
                     case RECIPE -> {
                         ((UnlockRecipe) unlock).getRecipes().forEach(recipe -> {
                             if (recipe.getResult().getDisplayName().contains("Minion") && !Arrays.toString(lore.toArray()).contains("Minion §7Recipes")) {
-                                lore.add("§9  " + StringUtility.toNormalCase(recipe.getResult().getAttributeHandler().getMinionType().toString()) + " Minion §7Recipes");
+                                lore.add("§9  " + StringUtility.toNormalCase(MinionRegistry.fromItemType(recipe.getResult().getAttributeHandler().getPotentialType()).name()) + " Minion §7Recipes");
                             } else if (!recipe.getResult().getDisplayName().contains("Minion")) {
                                 lore.add("§7  §e" + recipe.getResult().getDisplayName() + " §7Recipe");
                             }
diff --git a/type.generic/src/main/java/net/swofty/types/generic/event/actions/player/gui/ActionPlayerInventoryClick.java b/type.generic/src/main/java/net/swofty/types/generic/event/actions/player/gui/ActionPlayerInventoryClick.java
@@ -3,6 +3,7 @@
 import net.kyori.adventure.text.Component;
 import net.minestom.server.event.inventory.InventoryCloseEvent;
 import net.minestom.server.event.inventory.InventoryPreClickEvent;
+import net.minestom.server.inventory.PlayerInventory;
 import net.minestom.server.inventory.click.ClickType;
 import net.minestom.server.item.ItemComponent;
 import net.swofty.commons.StringUtility;
@@ -66,9 +67,11 @@ public void run(InventoryPreClickEvent event) {
             if (event.getInventory() == null) {
                 if (!gui.allowHotkeying() && isHotKey(event)) {
                     event.setCancelled(true);
-                    return;
                 }
-                gui.onBottomClick(event);
+                return;
+            }
+            if (event.getInventory() instanceof PlayerInventory){
+              gui.onBottomClick(event);
             } else {
                 int slot = event.getSlot();
                 GUIItem item = gui.get(slot);
@@ -94,7 +97,7 @@ public void run(InventoryPreClickEvent event) {
                     gui.onClose(new InventoryCloseEvent(
                             player.getOpenInventory(),
                             player,
-                            true
+                            false
                     ), SkyBlockInventoryGUI.CloseReason.SIGN_OPENED);
 
                     new SkyBlockSignGUI(player).open(query.lines()).thenAccept(string -> {
diff --git a/type.generic/src/main/java/net/swofty/types/generic/item/ItemConfigParser.java b/type.generic/src/main/java/net/swofty/types/generic/item/ItemConfigParser.java
@@ -181,7 +181,7 @@ yield new EnchantableComponent(
             case "MINION" -> {
                 String minionType = (String) config.get("minion_type");
                 String baseItem = (String) config.get("base_item");
-                boolean isByDefaultCraftable = (boolean) config.get("is_craftable");
+                boolean isByDefaultCraftable = (boolean) config.get("default_craftable");
 
                 List<String> ingredients = (List<String>) config.get("ingredients");
                 List<MinionIngredient> ingredientsMap = new ArrayList<>();
diff --git a/type.generic/src/main/java/net/swofty/types/generic/minion/MinionRegistry.java b/type.generic/src/main/java/net/swofty/types/generic/minion/MinionRegistry.java
@@ -10,6 +10,8 @@
 import net.swofty.types.generic.minion.minions.foraging.*;
 import net.swofty.types.generic.minion.minions.mining.*;
 
+import java.util.Arrays;
+
 public enum MinionRegistry {
     COBBLESTONE(MinionCobblestone.class, ItemType.COBBLESTONE_MINION),
     COAL(MinionCoal.class, ItemType.COAL_MINION),
@@ -77,6 +79,9 @@ public enum MinionRegistry {
         this.minionClass = minionClass;
         this.itemType = ItemType;
     }
+    public static MinionRegistry fromItemType(ItemType itemType){
+        return Arrays.stream(values()).filter(minionType -> minionType.itemType == itemType).findFirst().orElse(null);
+    }
 
     public SkyBlockMinion asSkyBlockMinion() {
         try {
diff --git a/velocity.extension/build.gradle.kts b/velocity.extension/build.gradle.kts
@@ -32,6 +32,11 @@ dependencies {
     // implementation("net.swofty:AtlasRedisAPI:1.1.4")
     implementation(project(":commons"))
 
+    implementation("com.viaversion:vialoader:4.0.2")
+    implementation("com.viaversion:viabackwards-common:5.3.2")
+    implementation("com.viaversion:viarewind-common:4.0.7")
+    implementation("com.viaversion:viaversion:5.3.2")
+
     implementation("io.netty:netty-all:4.1.110.Final")
 
     implementation("net.bytebuddy:byte-buddy:1.14.16")
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java b/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java
@@ -1,6 +1,8 @@
 package net.swofty.velocity;
 
 import com.google.inject.Inject;
+import com.velocitypowered.api.command.CommandManager;
+import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.AwaitingEventExecutor;
 import com.velocitypowered.api.event.EventTask;
 import com.velocitypowered.api.event.PostOrder;
@@ -22,6 +24,10 @@
 import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
 import com.velocitypowered.proxy.network.Connections;
+import com.viaversion.vialoader.ViaLoader;
+import com.viaversion.vialoader.impl.platform.ViaBackwardsPlatformImpl;
+import com.viaversion.vialoader.impl.platform.ViaRewindPlatformImpl;
+import com.viaversion.vialoader.impl.platform.ViaVersionPlatformImpl;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPipeline;
 import lombok.Getter;
@@ -30,6 +36,7 @@
 import net.swofty.commons.ServerType;
 import net.swofty.commons.proxy.FromProxyChannels;
 import net.swofty.redisapi.api.RedisAPI;
+import net.swofty.velocity.command.ServerStatusCommand;
 import net.swofty.velocity.data.CoopDatabase;
 import net.swofty.velocity.data.ProfilesDatabase;
 import net.swofty.velocity.data.UserDatabase;
@@ -41,9 +48,12 @@
 import net.swofty.velocity.redis.ChannelListener;
 import net.swofty.velocity.redis.RedisListener;
 import net.swofty.velocity.redis.RedisMessage;
+import net.swofty.velocity.viaversion.injector.SkyBlockViaInjector;
+import net.swofty.velocity.viaversion.loader.SkyBlockVLLoader;
 import org.json.JSONObject;
 import org.reflections.Reflections;
 
+import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.net.InetSocketAddress;
 import java.nio.file.Path;
@@ -68,6 +78,8 @@ public class SkyBlockVelocity {
     private static RegisteredServer limboServer;
     @Getter
     private static boolean shouldAuthenticate = false;
+    @Getter
+    private static boolean supportCrossVersion = false;
     @Inject
     private ProxyServer proxy;
 
@@ -84,6 +96,14 @@ public SkyBlockVelocity(ProxyServer tempServer, Logger tempLogger, @DataDirector
     public void onProxyInitialization(ProxyInitializeEvent event) {
         server = proxy;
         shouldAuthenticate = Configuration.getOrDefault("require-authentication", false);
+        supportCrossVersion = Configuration.getOrDefault("cross-version-support" , false);
+
+        /**
+         * initialize cross version support
+         */
+        if (supportCrossVersion) {
+            ViaLoader.init(null, new SkyBlockVLLoader(), new SkyBlockViaInjector(), null, ViaBackwardsPlatformImpl::new, ViaRewindPlatformImpl::new);
+        }
         /**
          * Register packets
          */
@@ -104,6 +124,19 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
                                 : EventTask.async(() -> removePlayer(disconnectEvent.getPlayer()))
         );
 
+        /**
+         * Register commands
+         */
+
+        CommandManager commandManager = proxy.getCommandManager();
+        CommandMeta statusCommandMeta = commandManager.metaBuilder("serverstatus")
+                .aliases("status")
+                .plugin(this)
+                .build();
+
+        commandManager.register(statusCommandMeta , new ServerStatusCommand());
+
+
         /**
          * Handle database
          */
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/command/ServerStatusCommand.java b/velocity.extension/src/main/java/net/swofty/velocity/command/ServerStatusCommand.java
@@ -0,0 +1,46 @@
+package net.swofty.velocity.command;
+
+import com.velocitypowered.api.command.SimpleCommand;
+import net.swofty.velocity.gamemanager.GameManager;
+import net.swofty.velocity.gamemanager.GameManager.GameServer;
+import net.swofty.commons.ServerType;
+import net.kyori.adventure.text.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ServerStatusCommand implements SimpleCommand {
+    @Override
+    public void execute(Invocation invocation) {
+        invocation.source().sendMessage(Component.text("***** Server Status *****"));
+
+        Map<ServerType, ArrayList<GameServer>> serverMap = GameManager.getServers();
+        if (serverMap.isEmpty()) {
+            invocation.source().sendMessage(Component.text("No servers are currently registered."));
+            return;
+        }
+
+        for (Map.Entry<ServerType, ArrayList<GameServer>> entry : serverMap.entrySet()) {
+            ServerType type = entry.getKey();
+            List<GameServer> gameServers = entry.getValue();
+
+            invocation.source().sendMessage(Component.text(type.name() + ":"));
+
+            if (gameServers.isEmpty()) {
+                invocation.source().sendMessage(Component.text(" - No servers of this type are currently online."));
+                continue;
+            }
+
+            for (GameServer server : gameServers) {
+                String msg = String.format(" - %s (ID: %s, Port: %d, PlayerCount: %d)",
+                        server.displayName(),
+                        server.internalID(),
+                        server.registeredServer().getServerInfo().getAddress().getPort(),
+                        server.registeredServer().getPlayersConnected().size()
+                );
+                invocation.source().sendMessage(Component.text(msg));
+            }
+        }
+    }
+}
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/gamemanager/GameManager.java b/velocity.extension/src/main/java/net/swofty/velocity/gamemanager/GameManager.java
@@ -106,8 +106,6 @@ FromProxyChannels.PING_SERVER, new JSONObject()
                         }
                     }).delay(Duration.ofMillis(SLEEP_TIME - 100)).schedule();
                 });
-
-                System.out.println(serverType.name() + ": " + registeredServers.stream().map(gameServer -> "mini" + gameServer.displayName() + " (" + gameServer.internalID() + ")").toList());
             });
         }).repeat(Duration.ofMillis(SLEEP_TIME)).schedule();
     }
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/packet/PlayerChannelInitializer.java b/velocity.extension/src/main/java/net/swofty/velocity/packet/PlayerChannelInitializer.java
@@ -0,0 +1,51 @@
+package net.swofty.velocity.packet;
+
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.connection.UserConnectionImpl;
+import com.viaversion.viaversion.protocol.ProtocolPipelineImpl;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import net.swofty.velocity.viaversion.handler.PacketDecodeHandler;
+import net.swofty.velocity.viaversion.handler.PacketEncodeHandler;
+
+import java.lang.reflect.Method;
+
+public class PlayerChannelInitializer extends ChannelInitializer<Channel> {
+    public static final String MINECRAFT_ENCODER = "minecraft-encoder";
+    public static final String MINECRAFT_DECODER = "minecraft-decoder";
+    public static final String VIA_ENCODER = "via-encoder";
+    public static final String VIA_DECODER = "via-decoder";
+    public static final Object COMPRESSION_ENABLED_EVENT;
+    private static final Method INIT_CHANNEL;
+
+    private final ChannelInitializer<?> original;
+    private final boolean clientSide;
+
+    static {
+        try {
+            INIT_CHANNEL = ChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
+            INIT_CHANNEL.setAccessible(true);
+
+            Class<?> eventClass = Class.forName("com.velocitypowered.proxy.protocol.VelocityConnectionEvent");
+            COMPRESSION_ENABLED_EVENT = eventClass.getDeclaredField("COMPRESSION_ENABLED").get(null);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public PlayerChannelInitializer(ChannelInitializer<?> original, boolean clientSide) {
+        this.original = original;
+        this.clientSide = clientSide;
+    }
+
+    @Override
+    protected void initChannel(Channel channel) throws Exception {
+        INIT_CHANNEL.invoke(original, channel);
+
+        UserConnection user = new UserConnectionImpl(channel, clientSide);
+        new ProtocolPipelineImpl(user);
+
+        channel.pipeline().addBefore(MINECRAFT_ENCODER, VIA_ENCODER, new PacketEncodeHandler(user));
+        channel.pipeline().addBefore(MINECRAFT_DECODER, VIA_DECODER, new PacketDecodeHandler(user));
+    }
+}
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/viaversion/handler/PacketDecodeHandler.java b/velocity.extension/src/main/java/net/swofty/velocity/viaversion/handler/PacketDecodeHandler.java
@@ -0,0 +1,67 @@
+package net.swofty.velocity.viaversion.handler;
+
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.exception.CancelCodecException;
+import com.viaversion.viaversion.exception.CancelDecoderException;
+import com.viaversion.viaversion.util.ByteBufUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import net.swofty.velocity.packet.PlayerChannelInitializer;
+
+import java.util.List;
+
+@ChannelHandler.Sharable
+public class PacketDecodeHandler extends MessageToMessageDecoder<ByteBuf> {
+    private final UserConnection info;
+
+    public PacketDecodeHandler(UserConnection info) {
+        this.info = info;
+    }
+
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) throws Exception {
+        if (!info.checkIncomingPacket()) throw CancelDecoderException.generate(null);
+        if (!info.shouldTransformPacket()) {
+            out.add(bytebuf.retain());
+            return;
+        }
+
+        ByteBuf transformedBuf = ByteBufUtil.copy(ctx.alloc(), bytebuf);
+        try {
+            info.transformIncoming(transformedBuf, CancelDecoderException::generate);
+            out.add(transformedBuf.retain());
+        } finally {
+            transformedBuf.release();
+        }
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        if (cause instanceof CancelCodecException) return;
+        super.exceptionCaught(ctx, cause);
+    }
+
+    // Abuse decoder handler to catch events
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object event) throws Exception {
+        if (event != PlayerChannelInitializer.COMPRESSION_ENABLED_EVENT) {
+            super.userEventTriggered(ctx, event);
+            return;
+        }
+
+        // When Velocity adds the compression handlers, the order becomes Minecraft Encoder -> Compressor -> Via Encoder
+        // Move Via codec handlers back to right position
+        ChannelPipeline pipeline = ctx.pipeline();
+
+        ChannelHandler encoder = pipeline.remove(PlayerChannelInitializer.VIA_ENCODER);
+        pipeline.addBefore(PlayerChannelInitializer.MINECRAFT_ENCODER, PlayerChannelInitializer.VIA_ENCODER, encoder);
+
+        ChannelHandler decoder = pipeline.remove(PlayerChannelInitializer.VIA_DECODER);
+        pipeline.addBefore(PlayerChannelInitializer.MINECRAFT_DECODER, PlayerChannelInitializer.VIA_DECODER, decoder);
+
+        super.userEventTriggered(ctx, event);
+    }
+}
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/viaversion/handler/PacketEncodeHandler.java b/velocity.extension/src/main/java/net/swofty/velocity/viaversion/handler/PacketEncodeHandler.java
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/viaversion/injector/SkyBlockViaInjector.java b/velocity.extension/src/main/java/net/swofty/velocity/viaversion/injector/SkyBlockViaInjector.java
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/viaversion/loader/SkyBlockVLLoader.java b/velocity.extension/src/main/java/net/swofty/velocity/viaversion/loader/SkyBlockVLLoader.java
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/viaversion/provider/SkyBlockVersionProvider.java b/velocity.extension/src/main/java/net/swofty/velocity/viaversion/provider/SkyBlockVersionProvider.java

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,6 @@ FromProxyChannels.PING_SERVER, new JSONObject()`
`106`	`106`	`}`
`107`	`107`	`}).delay(Duration.ofMillis(SLEEP_TIME - 100)).schedule();`
`108`	`108`	`});`
`109`		`-`
`110`		`- System.out.println(serverType.name() + ": " + registeredServers.stream().map(gameServer -> "mini" + gameServer.displayName() + " (" + gameServer.internalID() + ")").toList());`
`111`	`109`	`});`
`112`	`110`	`}).repeat(Duration.ofMillis(SLEEP_TIME)).schedule();`
`113`	`111`	`}`