From 9ac3c391d8032917ce7bcf074ceb901ad8835830 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sun, 17 Dec 2023 19:48:49 +0800 Subject: [PATCH] Update to 1.20.4 --- Waterfall | 2 +- .../0001-Change-brand-to-lightfall.patch | 95 ++++++++++--------- .../0002-Modern-forge-support.patch | 58 +++++------ .../0003-Queue-packets-during-handshake.patch | 14 +-- .../0004-Wrap-modded-command-arguments.patch | 26 ++--- .../0005-Accept-all-suggestion-types.patch | 6 +- ...06-Implement-ModernFMLHandshakeEvent.patch | 6 +- .../0007-Add-GetPlayerServer-channel.patch | 51 ---------- 8 files changed, 99 insertions(+), 159 deletions(-) delete mode 100644 Waterfall-Proxy-Patches/0007-Add-GetPlayerServer-channel.patch diff --git a/Waterfall b/Waterfall index 3102433..25ecd40 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 3102433f31c1bec78fbc74a7bd2b8424e6e78af8 +Subproject commit 25ecd402f3c7e210cc375b9a9abab9c7e6044329 diff --git a/Waterfall-Proxy-Patches/0001-Change-brand-to-lightfall.patch b/Waterfall-Proxy-Patches/0001-Change-brand-to-lightfall.patch index 992b5e1..3fb7fcc 100644 --- a/Waterfall-Proxy-Patches/0001-Change-brand-to-lightfall.patch +++ b/Waterfall-Proxy-Patches/0001-Change-brand-to-lightfall.patch @@ -1,11 +1,11 @@ -From c5d11f76fafcadf38c140ed814a693b466c8581b Mon Sep 17 00:00:00 2001 +From 5d1486c80db1766e58a17d439d462f22f6e5d21a Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sun, 7 Mar 2021 19:26:00 +0800 Subject: [PATCH] Change brand to lightfall diff --git a/api/pom.xml b/api/pom.xml -index 01b8f888..4260e2b5 100644 +index 3cd57d98..23d08d27 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,42 +4,47 @@ @@ -14,15 +14,16 @@ index 01b8f888..4260e2b5 100644 - io.github.waterfallmc - waterfall-parent +- 1.20-R0.2-SNAPSHOT + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT ++ 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc waterfall-api - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-API @@ -68,9 +69,9 @@ index 01b8f888..4260e2b5 100644 ${project.version} compile -@@ -81,5 +86,11 @@ - slf4j-api - 1.7.36 +@@ -75,5 +80,11 @@ + 2.2 + compile + + @@ -81,7 +82,7 @@ index 01b8f888..4260e2b5 100644 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index 8328e576..2a1ee7de 100644 +index 7fbac761..5ecb4452 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -4,19 +4,18 @@ @@ -92,14 +93,14 @@ index 8328e576..2a1ee7de 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-bootstrap + lightfall-bootstrap - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Bootstrap @@ -142,7 +143,7 @@ index a4516ed9..1bb5dbce 100644 return; } diff --git a/chat/pom.xml b/chat/pom.xml -index 040aa0f7..424259c9 100644 +index 2aa2ad55..2ac8e2a6 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -4,18 +4,17 @@ @@ -153,14 +154,14 @@ index 040aa0f7..424259c9 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-chat + lightfall-chat - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Chat @@ -169,7 +170,7 @@ index 040aa0f7..424259c9 100644 diff --git a/config/pom.xml b/config/pom.xml -index 7e2d07a7..616f9bca 100644 +index 058e6fa8..7865bcf5 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -4,18 +4,17 @@ @@ -180,14 +181,14 @@ index 7e2d07a7..616f9bca 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-config + lightfall-config - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Config @@ -196,7 +197,7 @@ index 7e2d07a7..616f9bca 100644 diff --git a/event/pom.xml b/event/pom.xml -index b2541c62..bb7a8689 100644 +index 316f1e35..a38b6d54 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -4,17 +4,16 @@ @@ -207,14 +208,14 @@ index b2541c62..bb7a8689 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-event + lightfall-event - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Event @@ -223,7 +224,7 @@ index b2541c62..bb7a8689 100644 + Generic java event dispatching API intended for use with lightfall. diff --git a/log/pom.xml b/log/pom.xml -index 8368f7b3..153780a0 100644 +index 9ee30d66..d2da305a 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -4,18 +4,17 @@ @@ -234,14 +235,14 @@ index 8368f7b3..153780a0 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-log + lightfall-log - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Log @@ -261,7 +262,7 @@ index 8368f7b3..153780a0 100644 compile diff --git a/log4j/pom.xml b/log4j/pom.xml -index e83b2f21..20a7eccd 100644 +index 6d20191e..f75e7bf9 100644 --- a/log4j/pom.xml +++ b/log4j/pom.xml @@ -3,18 +3,17 @@ @@ -272,14 +273,14 @@ index e83b2f21..20a7eccd 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-log4j + lightfall-log4j - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Log4J @@ -288,7 +289,7 @@ index e83b2f21..20a7eccd 100644 diff --git a/module/pom.xml b/module/pom.xml -index 89c34e80..58b3e668 100644 +index d78c9a25..0917140d 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -4,8 +4,8 @@ @@ -299,11 +300,11 @@ index 89c34e80..58b3e668 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT pom - Waterfall Modules @@ -321,7 +322,7 @@ index 89c34e80..58b3e668 100644 ${project.version} compile diff --git a/native/pom.xml b/native/pom.xml -index 2412768b..db027938 100644 +index 5e9d29d7..d81d9cfa 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -4,18 +4,17 @@ @@ -332,14 +333,14 @@ index 2412768b..db027938 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-native + lightfall-native - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Native @@ -348,7 +349,7 @@ index 2412768b..db027938 100644 diff --git a/pom.xml b/pom.xml -index d333a528..13fc68be 100644 +index 0c04b87a..2117d732 100644 --- a/pom.xml +++ b/pom.xml @@ -4,24 +4,23 @@ @@ -366,7 +367,7 @@ index d333a528..13fc68be 100644 - io.github.waterfallmc - waterfall-parent + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT pom - Waterfall-Parent @@ -414,7 +415,7 @@ index d333a528..13fc68be 100644 diff --git a/protocol/pom.xml b/protocol/pom.xml -index c6105b87..bdfc14f5 100644 +index 76a3510d..549cbf87 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -4,18 +4,17 @@ @@ -425,22 +426,22 @@ index c6105b87..bdfc14f5 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-protocol + lightfall-protocol - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Protocol + lightfall-Protocol Minimal implementation of the Minecraft protocol for use in Waterfall - -@@ -41,8 +40,8 @@ + +@@ -35,8 +34,8 @@ compile @@ -452,7 +453,7 @@ index c6105b87..bdfc14f5 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index 83d8719b..e08289d2 100644 +index 9be9aa22..897a8ed9 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -4,18 +4,17 @@ @@ -463,14 +464,14 @@ index 83d8719b..e08289d2 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-proxy + lightfall-proxy - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Proxy @@ -521,7 +522,7 @@ index 83d8719b..e08289d2 100644 compile diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -index a7091ab6..1fa98f14 100644 +index 01c8a172..f508961e 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -545,7 +545,7 @@ public class BungeeCord extends ProxyServer @@ -559,7 +560,7 @@ index b26035cf..d7d0ed58 100644 } } diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java -index 0dd69778..2c3381f7 100644 +index f6b5e8b8..98a175e6 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java @@ -227,7 +227,7 @@ public class YamlConfig implements ConfigurationAdapter @@ -598,7 +599,7 @@ index d3abee44..f7aaf001 100644 System.out.println( "Attempting to update plugin from " + moduleVersion + " to " + bungeeVersion ); module.getProvider().retrieve( module, bungeeVersion ); diff --git a/query/pom.xml b/query/pom.xml -index fc864f83..4d96b6b3 100644 +index 4e9bd6cc..fb9dc20f 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -4,18 +4,17 @@ @@ -609,14 +610,14 @@ index fc864f83..4d96b6b3 100644 - waterfall-parent + io.izzel.lightfall + lightfall-parent - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT ../pom.xml - io.github.waterfallmc - waterfall-query + lightfall-query - 1.20-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT jar - Waterfall-Query @@ -634,5 +635,5 @@ index fc864f83..4d96b6b3 100644 ${project.version} compile -- -2.40.1 +2.36.1.windows.1 diff --git a/Waterfall-Proxy-Patches/0002-Modern-forge-support.patch b/Waterfall-Proxy-Patches/0002-Modern-forge-support.patch index e111cd6..032c1e2 100644 --- a/Waterfall-Proxy-Patches/0002-Modern-forge-support.patch +++ b/Waterfall-Proxy-Patches/0002-Modern-forge-support.patch @@ -1,11 +1,11 @@ -From 9dca8d55c6430e482da8b1610f6b4672856a5ede Mon Sep 17 00:00:00 2001 +From 1719ed1ffccc9ae562d360f90a56f9cf6097b7fd Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sun, 7 Mar 2021 22:24:56 +0800 Subject: [PATCH] Modern forge support diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java -index fc92a7b5..8ec48eeb 100644 +index 29cd91dd..d8242958 100644 --- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java +++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java @@ -3,6 +3,8 @@ package net.md_5.bungee.api; @@ -25,25 +25,6 @@ index fc92a7b5..8ec48eeb 100644 @Deprecated public ServerPing(Protocol version, Players players, String description, String favicon) -diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java -index d4b03843..5d0ca482 100644 ---- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java -+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java -@@ -4,12 +4,14 @@ import io.netty.buffer.ByteBuf; - import io.netty.channel.ChannelHandlerContext; - import io.netty.handler.codec.MessageToByteEncoder; - import lombok.AllArgsConstructor; -+import lombok.Getter; - import lombok.Setter; - - @AllArgsConstructor - public class MinecraftEncoder extends MessageToByteEncoder - { - -+ @Getter - @Setter - private Protocol protocol; - private boolean server; diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java index 91f71c09..be62a708 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java @@ -283,10 +264,10 @@ index 00000000..5e5432ec + } +} diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index 8181d76b..664788ef 100644 +index 9a22a1f7..fbfcd57e 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -64,10 +64,10 @@ import net.md_5.bungee.util.QuietException; +@@ -66,10 +66,10 @@ import net.md_5.bungee.util.QuietException; public class ServerConnector extends PacketHandler { @@ -302,10 +283,10 @@ index 8181d76b..664788ef 100644 @Getter private ForgeServerHandler handshakeHandler; diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -index cf82c182..4dc91186 100644 +index 2f996a69..49a2d7bd 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -46,6 +46,8 @@ import net.md_5.bungee.entitymap.EntityMap; +@@ -47,6 +47,8 @@ import net.md_5.bungee.entitymap.EntityMap; import net.md_5.bungee.forge.ForgeClientHandler; import net.md_5.bungee.forge.ForgeConstants; import net.md_5.bungee.forge.ForgeServerHandler; @@ -314,12 +295,20 @@ index cf82c182..4dc91186 100644 import net.md_5.bungee.netty.ChannelWrapper; import net.md_5.bungee.netty.HandlerBoss; import net.md_5.bungee.netty.PipelineUtils; -@@ -169,6 +171,16 @@ public final class UserConnection implements ProxiedPlayer +@@ -174,6 +176,24 @@ public final class UserConnection implements ProxiedPlayer addGroups( s ); } + // lightfall start -+ if (this.getPendingConnection().getExtraDataInHandshake().contains( ForgeConstants.MODERN_FML_HANDSHAKE_TOKEN ) ++ // Forge 1.20.2+ ++ if ( ForgeConstants.FORGE_1_20_4_TOKEN.matcher(this.getPendingConnection().getExtraDataInHandshake()).find() ) ++ { ++ // This version of Forge uses configuration phase for registry sync, so we do not report it as modern forge but only forward tokens ++ forgeClientHandler = new ModernForgeClientHandler(this); ++ forgeClientHandler.setFmlTokenInHandshake( true ); ++ } ++ // Forge 1.13 - 1.20.1 ++ else if (this.getPendingConnection().getExtraDataInHandshake().contains( ForgeConstants.MODERN_FML_HANDSHAKE_TOKEN ) + || this.getPendingConnection().getExtraDataInHandshake().contains( ForgeConstants.MODERN_FML_NET_3 )) + { + forgeClientHandler = new ModernForgeClientHandler(this); @@ -331,15 +320,15 @@ index cf82c182..4dc91186 100644 forgeClientHandler = new ForgeClientHandler( this ); // No-config FML handshake marker. -@@ -177,6 +189,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -182,6 +202,7 @@ public final class UserConnection implements ProxiedPlayer { forgeClientHandler.setFmlTokenInHandshake( true ); } + } // lightfall + return BungeeCord.getInstance().addConnection( this ); } - public void sendPacket(PacketWrapper packet) -@@ -349,7 +362,13 @@ public final class UserConnection implements ProxiedPlayer +@@ -376,7 +397,13 @@ public final class UserConnection implements ProxiedPlayer PipelineUtils.BASE_SERVERSIDE.initChannel( ch ); ch.pipeline().addAfter( PipelineUtils.FRAME_DECODER, PipelineUtils.PACKET_DECODER, new MinecraftDecoder( Protocol.HANDSHAKE, false, getPendingConnection().getVersion() ) ); ch.pipeline().addAfter( PipelineUtils.FRAME_PREPENDER, PipelineUtils.PACKET_ENCODER, new MinecraftEncoder( Protocol.HANDSHAKE, false, getPendingConnection().getVersion() ) ); @@ -354,7 +343,7 @@ index cf82c182..4dc91186 100644 } }; ChannelFutureListener listener = new ChannelFutureListener() -@@ -373,7 +392,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -400,7 +427,7 @@ public final class UserConnection implements ProxiedPlayer { if (request.isSendFeedback()) sendMessage( bungee.getTranslation( "fallback_lobby" ) ); // Waterfall connect( def, null, true, ServerConnectEvent.Reason.LOBBY_FALLBACK, request.getConnectTimeout(), request.isSendFeedback() ); // Waterfall @@ -363,7 +352,7 @@ index cf82c182..4dc91186 100644 { disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) ); } else -@@ -786,4 +805,13 @@ public final class UserConnection implements ProxiedPlayer +@@ -802,4 +829,13 @@ public final class UserConnection implements ProxiedPlayer return entityRewrite == net.md_5.bungee.entitymap.EntityMap_Dummy.INSTANCE; } // Waterfall end @@ -391,15 +380,16 @@ index bea2bbff..6fca66a8 100644 /** * The users' mod list. diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java -index f5253b89..8161c06b 100644 +index f5253b89..37789125 100644 --- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java +++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java -@@ -22,6 +22,8 @@ public class ForgeConstants +@@ -22,6 +22,9 @@ public class ForgeConstants * The FML 1.8 handshake token. */ public static final String FML_HANDSHAKE_TOKEN = "\0FML\0"; + public static final String MODERN_FML_HANDSHAKE_TOKEN = "\0FML2\0", MODERN_FML_NET_3 = "\0FML3\0"; // lightfall + public static final PluginMessage MODERN_FML_RESET = new PluginMessage("lightfall:reset", new byte[]{0,0}, true); ++ public static final java.util.regex.Pattern FORGE_1_20_4_TOKEN = java.util.regex.Pattern.compile("\\x00FORGE\\d*(\\x00|$)"); public static final PluginMessage FML_RESET_HANDSHAKE = new PluginMessage( FML_HANDSHAKE_TAG, new byte[] { diff --git a/Waterfall-Proxy-Patches/0003-Queue-packets-during-handshake.patch b/Waterfall-Proxy-Patches/0003-Queue-packets-during-handshake.patch index 99822b8..53df023 100644 --- a/Waterfall-Proxy-Patches/0003-Queue-packets-during-handshake.patch +++ b/Waterfall-Proxy-Patches/0003-Queue-packets-during-handshake.patch @@ -1,4 +1,4 @@ -From 1ed65897d4cb2efe2332e0b22223665cd4fafe88 Mon Sep 17 00:00:00 2001 +From 95adbd39ea62388a8e168dcadb05a25f02c48be2 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sun, 14 Mar 2021 20:04:23 +0800 Subject: [PATCH] Queue packets during handshake @@ -25,7 +25,7 @@ index 1713e7d5..0f5c1fa6 100644 if (user.getServer() != null) { user.getServer().setObsolete(true); diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java -index 6dc5633f..e9f03515 100644 +index 00e03bae..894cbdbd 100644 --- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java @@ -6,6 +6,9 @@ import io.netty.channel.ChannelFutureListener; @@ -38,7 +38,7 @@ index 6dc5633f..e9f03515 100644 import java.util.concurrent.TimeUnit; import lombok.Getter; import lombok.Setter; -@@ -16,6 +19,8 @@ import net.md_5.bungee.protocol.MinecraftEncoder; +@@ -17,6 +20,8 @@ import net.md_5.bungee.protocol.MinecraftEncoder; import net.md_5.bungee.protocol.PacketWrapper; import net.md_5.bungee.protocol.Protocol; import net.md_5.bungee.protocol.packet.Kick; @@ -47,7 +47,7 @@ index 6dc5633f..e9f03515 100644 public class ChannelWrapper { -@@ -51,6 +56,17 @@ public class ChannelWrapper +@@ -78,6 +83,17 @@ public class ChannelWrapper { if ( !closed ) { @@ -62,10 +62,10 @@ index 6dc5633f..e9f03515 100644 + return; + } + // lightfall end + DefinedPacket defined = null; if ( packet instanceof PacketWrapper ) { - ( (PacketWrapper) packet ).setReleased( true ); -@@ -145,4 +161,19 @@ public class ChannelWrapper +@@ -188,4 +204,19 @@ public class ChannelWrapper ch.pipeline().remove( "decompress" ); } } @@ -86,5 +86,5 @@ index 6dc5633f..e9f03515 100644 + // lightfall end } -- -2.17.1 +2.36.1.windows.1 diff --git a/Waterfall-Proxy-Patches/0004-Wrap-modded-command-arguments.patch b/Waterfall-Proxy-Patches/0004-Wrap-modded-command-arguments.patch index 7dbd5f4..85bde58 100644 --- a/Waterfall-Proxy-Patches/0004-Wrap-modded-command-arguments.patch +++ b/Waterfall-Proxy-Patches/0004-Wrap-modded-command-arguments.patch @@ -1,4 +1,4 @@ -From dc01198449836cb50ffb65bc627eba836d9fb8da Mon Sep 17 00:00:00 2001 +From 1bf437aba8c0d7118a9ee42dad0c1bc5f5ca774b Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Wed, 5 May 2021 23:50:01 +0800 Subject: [PATCH] Wrap modded command arguments @@ -32,7 +32,7 @@ index 00000000..73d491fa + } +} diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java -index 05761bf5..9f6918fb 100644 +index 069bb52b..64cc579b 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java @@ -21,6 +21,7 @@ import com.mojang.brigadier.tree.ArgumentCommandNode; @@ -43,7 +43,7 @@ index 05761bf5..9f6918fb 100644 import io.netty.buffer.ByteBuf; import java.util.ArrayDeque; import java.util.Collection; -@@ -534,6 +535,64 @@ public class Commands extends DefinedPacket +@@ -535,6 +536,64 @@ public class Commands extends DefinedPacket DefinedPacket.writeString( t, buf ); } }; @@ -108,7 +108,7 @@ index 05761bf5..9f6918fb 100644 static { -@@ -744,6 +803,13 @@ public class Commands extends DefinedPacket +@@ -799,6 +858,13 @@ public class Commands extends DefinedPacket get( "minecraft:uuid", VOID ), get( "minecraft:heightmap", VOID ) }; @@ -122,7 +122,7 @@ index 05761bf5..9f6918fb 100644 } private static void register(String name, ArgumentSerializer serializer) -@@ -764,7 +830,11 @@ public class Commands extends DefinedPacket +@@ -819,7 +885,11 @@ public class Commands extends DefinedPacket if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 ) { key = readVarInt( buf ); @@ -132,10 +132,10 @@ index 05761bf5..9f6918fb 100644 + reader = ARCLIGHT_WRAP; + } else + // lightfall - end - if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19_4 ) + if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_20_3 ) { - reader = IDS_1_19_4[(Integer) key]; -@@ -783,7 +853,7 @@ public class Commands extends DefinedPacket + reader = IDS_1_20_3[(Integer) key]; +@@ -841,7 +911,7 @@ public class Commands extends DefinedPacket Preconditions.checkArgument( reader != null, "No provider for argument " + key ); @@ -144,7 +144,7 @@ index 05761bf5..9f6918fb 100644 return val != null && PROPER_PROVIDERS.containsKey( val.getClass() ) ? (ArgumentType) val : new DummyType( key, reader, val ); } -@@ -794,10 +864,10 @@ public class Commands extends DefinedPacket +@@ -852,10 +922,10 @@ public class Commands extends DefinedPacket { if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_19 ) { @@ -157,7 +157,7 @@ index 05761bf5..9f6918fb 100644 } proper.write( buf, arg ); } else -@@ -836,6 +906,12 @@ public class Commands extends DefinedPacket +@@ -894,6 +964,12 @@ public class Commands extends DefinedPacket protected abstract T read(ByteBuf buf); @@ -170,7 +170,7 @@ index 05761bf5..9f6918fb 100644 protected abstract void write(ByteBuf buf, T t); } -@@ -845,6 +921,16 @@ public class Commands extends DefinedPacket +@@ -903,6 +979,16 @@ public class Commands extends DefinedPacket protected abstract int getIntKey(); protected abstract String getKey(); @@ -188,10 +188,10 @@ index 05761bf5..9f6918fb 100644 } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java -index e01f65ac..11639f9c 100644 +index d0496ab4..c73e85a4 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java -@@ -93,6 +93,7 @@ public class DownstreamBridge extends PacketHandler +@@ -97,6 +97,7 @@ public class DownstreamBridge extends PacketHandler // do not perform any actions if the user has already moved return; } diff --git a/Waterfall-Proxy-Patches/0005-Accept-all-suggestion-types.patch b/Waterfall-Proxy-Patches/0005-Accept-all-suggestion-types.patch index af5e004..2fac11d 100644 --- a/Waterfall-Proxy-Patches/0005-Accept-all-suggestion-types.patch +++ b/Waterfall-Proxy-Patches/0005-Accept-all-suggestion-types.patch @@ -1,14 +1,14 @@ -From fa0ecc31dbcfa1dfcd40ae25c3708c70c47da901 Mon Sep 17 00:00:00 2001 +From 53b7bbe1f81c217ae17a4257e5303c184e8879db Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Thu, 6 May 2021 21:04:52 +0800 Subject: [PATCH] Accept all suggestion types diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java -index 9f6918fb..956f42fe 100644 +index 64cc579b..afa2676e 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java -@@ -957,7 +957,7 @@ public class Commands extends DefinedPacket +@@ -1015,7 +1015,7 @@ public class Commands extends DefinedPacket private static SuggestionProvider getProvider(String key) { diff --git a/Waterfall-Proxy-Patches/0006-Implement-ModernFMLHandshakeEvent.patch b/Waterfall-Proxy-Patches/0006-Implement-ModernFMLHandshakeEvent.patch index 412d139..e67f5a3 100644 --- a/Waterfall-Proxy-Patches/0006-Implement-ModernFMLHandshakeEvent.patch +++ b/Waterfall-Proxy-Patches/0006-Implement-ModernFMLHandshakeEvent.patch @@ -1,14 +1,14 @@ -From bb523d029de3e151fbd5293569b0325143c396b1 Mon Sep 17 00:00:00 2001 +From 1b21148f2b1e7006b2c1885e2955fd5e643d6191 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Fri, 9 Jul 2021 15:58:58 +0800 Subject: [PATCH] Implement ModernFMLHandshakeEvent diff --git a/api/pom.xml b/api/pom.xml -index 1d248bc7..e9ef74f9 100644 +index 23d08d27..a7fe5292 100644 --- a/api/pom.xml +++ b/api/pom.xml -@@ -90,7 +90,7 @@ +@@ -84,7 +84,7 @@ io.izzel.lightfall lightfall-api diff --git a/Waterfall-Proxy-Patches/0007-Add-GetPlayerServer-channel.patch b/Waterfall-Proxy-Patches/0007-Add-GetPlayerServer-channel.patch deleted file mode 100644 index 759b0c4..0000000 --- a/Waterfall-Proxy-Patches/0007-Add-GetPlayerServer-channel.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4d0854a5934456d57dc56fbed887e6e6b6866dd2 Mon Sep 17 00:00:00 2001 -From: IzzelAliz -Date: Sat, 19 Aug 2023 20:15:53 +0800 -Subject: [PATCH] Add GetPlayerServer channel - - -diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java -index 11639f9c..a68c1538 100644 ---- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java -+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java -@@ -33,6 +33,7 @@ import net.md_5.bungee.api.chat.BaseComponent; - import net.md_5.bungee.api.chat.TextComponent; - import net.md_5.bungee.api.config.ServerInfo; - import net.md_5.bungee.api.connection.ProxiedPlayer; -+import net.md_5.bungee.api.connection.Server; - import net.md_5.bungee.api.event.PluginMessageEvent; - import net.md_5.bungee.api.event.ServerConnectEvent; - import net.md_5.bungee.api.event.ServerDisconnectEvent; -@@ -427,6 +428,29 @@ public class DownstreamBridge extends PacketHandler - } - break; - } -+ // lightfall start -+ case "GetPlayerServer": -+ { -+ String name = in.readUTF(); -+ ProxiedPlayer player = bungee.getPlayer( name ); -+ out.writeUTF( "GetPlayerServer" ); -+ out.writeUTF( name ); -+ if ( player == null ) -+ { -+ out.writeUTF( "" ); -+ break; -+ } -+ Server srv = player.getServer(); -+ if ( srv == null ) -+ { -+ out.writeUTF( "" ); -+ } else -+ { -+ out.writeUTF( srv.getInfo().getName() ); -+ } -+ break; -+ } -+ // lightfall end - case "IP": - out.writeUTF( "IP" ); - if ( con.getSocketAddress() instanceof InetSocketAddress ) --- -2.36.1.windows.1 -