Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-30 07:27:28 +02:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

Browse Source
This commit is contained in:
LinsaFTW 2023-03-27 20:33:42 -03:00
parent 8d413a58d6
commit 7f60e3748e
9 changed files with 50 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit cf69c8c94d4a0c6ffaea4aa6d7ad877f7ab7d1a9
Subproject commit 0dc74bb24213c9e08dc78d9f3c53089b3b52118b

8
Waterfall-Proxy-Patches/0003-FlameCord-rebrand.patch
View File

@ -1,14 +1,14 @@
From 014be7c18f3e1b2488497be0fcdf541c1edd3fed Mon Sep 17 00:00:00 2001
From a2b921fb0525f5af3562057eeec84c4b0c46ae37 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Tue, 8 Jun 2021 22:24:27 -0300
Subject: [PATCH] FlameCord rebrand
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index 1b3287e6..e5662111 100644
index da0efa36..966d2442 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -69,7 +69,8 @@ public class WaterfallConfiguration extends Configuration {
@@ -68,7 +68,8 @@ public class WaterfallConfiguration extends Configuration {
YamlConfig config = new YamlConfig(new File("waterfall.yml"));
config.load(false); // Load, but no permissions
logInitialHandlerConnections = config.getBoolean( "log_initial_handler_connections", logInitialHandlerConnections );
@ -19,7 +19,7 @@ index 1b3287e6..e5662111 100644
// Throttling options
tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
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 8617cdc7..1b60f615 100644
index 821904f3..49adbde0 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -551,7 +551,7 @@ public class BungeeCord extends ProxyServer

14
Waterfall-Proxy-Patches/0010-Close-connections-Don-t-flush-if-not-necessary.patch
View File

@ -1,11 +1,11 @@
From 9c6dd2dc6ee18d5429d098b5a5d1963cfd404856 Mon Sep 17 00:00:00 2001
From 3fcd08a5340657c1144a5d9a2c919c2297937589 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:06:17 +0800
Subject: [PATCH] Close connections & Don't flush if not necessary
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index c3543a18..8ed26e5c 100644
index 965a419f..99e2dafa 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -208,6 +208,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -86,7 +86,7 @@ index 6dc5633f..8b0fac0a 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 2a21243b..a95193ba 100644
index af65e192..993b55b0 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -5,6 +5,7 @@ import io.github.waterfallmc.waterfall.event.ConnectionInitEvent;
@ -97,7 +97,7 @@ index 2a21243b..a95193ba 100644
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
@@ -98,6 +99,14 @@ public class PipelineUtils
@@ -101,6 +102,14 @@ public class PipelineUtils
BungeeCord.getInstance().getPluginManager().callEvent(connectionInitEvent);
}
@ -110,9 +110,9 @@ index 2a21243b..a95193ba 100644
+ ctx.close();
+ }
};
public static final Base BASE = new Base();
private static final KickStringWriter legacyKicker = new KickStringWriter();
@@ -192,5 +201,13 @@ public class PipelineUtils
public static final Base BASE = new Base( false );
public static final Base BASE_SERVERSIDE = new Base( true );
@@ -203,5 +212,13 @@ public class PipelineUtils
ch.pipeline().addLast( BOSS_HANDLER, new HandlerBoss() );
}

8
Waterfall-Proxy-Patches/0027-TCP-Fast-Open.patch
View File

@ -1,11 +1,11 @@
From 62bf8051431b5035171c900d729a1c175fcda639 Mon Sep 17 00:00:00 2001
From 7967c49c7a8e56c79de7d520f9ae03f2ed53af1e Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 24 Feb 2022 23:41:57 -0300
Subject: [PATCH] TCP Fast Open
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
index b41ee92cc..14665b1f6 100644
index b41ee92c..14665b1f 100644
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
@@ -15,6 +15,10 @@ import net.md_5.bungee.config.Configuration;
@ -29,10 +29,10 @@ index b41ee92cc..14665b1f6 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index a4c3bd710..ffea15992 100644
index d9e360a1..156ea2aa 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -194,6 +194,8 @@ public class PipelineUtils
@@ -203,6 +203,8 @@ public class PipelineUtils
// IP_TOS is not supported (Windows XP / Windows Server 2003)
}
ch.config().setOption( ChannelOption.TCP_NODELAY, true );

10
Waterfall-Proxy-Patches/0028-Antibot-System.patch
View File

@ -1,4 +1,4 @@
From f3f2e3d8f146ae949b0e803c996520825fe8a8e1 Mon Sep 17 00:00:00 2001
From 87645acfa86b4bd64b98b3a6aef7e9727fb1f24c Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 4 Mar 2022 13:35:53 -0300
Subject: [PATCH] Antibot System
@ -1621,7 +1621,7 @@ index c433ac4a..4ee05067 100644
+ }
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
index c0d37142..403ccba9 100644
index 3a802ca4..c23e6856 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
@@ -5,11 +5,11 @@ import io.netty.buffer.Unpooled;
@ -1708,7 +1708,7 @@ index fb81adee..173b47f3 100644
}
}
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 fa520992..2fc20af6 100644
index c0a50444..08aa4318 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -533,6 +533,11 @@ public class BungeeCord extends ProxyServer
@ -1962,10 +1962,10 @@ index 14e3004f..b61ed521 100644
{
boolean logExceptions = !( handler instanceof PingHandler );
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index ffea1599..f04fdd9c 100644
index 156ea2aa..3a025312 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -59,6 +59,20 @@ public class PipelineUtils
@@ -62,6 +62,20 @@ public class PipelineUtils
{
SocketAddress remoteAddress = ( ch.remoteAddress() == null ) ? ch.parent().localAddress() : ch.remoteAddress();

14
Waterfall-Proxy-Patches/0030-Disable-entity-Metadata-Rewrite.patch
View File

@ -1,11 +1,11 @@
From 54416b5037fd35a10bf3763fa55a9cfd4f8da531 Mon Sep 17 00:00:00 2001
From bc07ea7e84cdbce71415ceef9fa817a6211adb3d Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 10 Mar 2022 20:23:55 -0300
Subject: [PATCH] Disable entity Metadata Rewrite
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index e855cfb6..97176901 100644
index 469fe0e1..97bd384b 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -251,11 +251,6 @@ public interface ProxyConfig
@ -207,10 +207,10 @@ index 435b8578..00000000
- }
-}
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index e5662111..47d7d9d7 100644
index 966d2442..be337a68 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -43,7 +43,6 @@ public class WaterfallConfiguration extends Configuration {
@@ -42,7 +42,6 @@ public class WaterfallConfiguration extends Configuration {
private int tabThrottle = 1000;
private boolean disableModernTabLimiter = true;
@ -218,7 +218,7 @@ index e5662111..47d7d9d7 100644
private boolean disableTabListRewrite = true;
/*
@@ -75,7 +74,6 @@ public class WaterfallConfiguration extends Configuration {
@@ -74,7 +73,6 @@ public class WaterfallConfiguration extends Configuration {
// Throttling options
tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
disableModernTabLimiter = config.getBoolean("disable_modern_tab_limiter", disableModernTabLimiter);
@ -226,7 +226,7 @@ index e5662111..47d7d9d7 100644
disableTabListRewrite = config.getBoolean("disable_tab_list_rewrite", disableTabListRewrite);
pluginChannelLimit = config.getInt("registered_plugin_channels_limit", pluginChannelLimit);
pluginChannelNameLimit = config.getInt("plugin_channel_name_limit", pluginChannelNameLimit);
@@ -106,11 +104,6 @@ public class WaterfallConfiguration extends Configuration {
@@ -105,11 +103,6 @@ public class WaterfallConfiguration extends Configuration {
return disableModernTabLimiter;
}
@ -324,7 +324,7 @@ index 3a07c7c8..f51c668d 100644
// Waterfall end
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
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 b5e20ea1..18a29ae3 100644
index c006277f..8114095e 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -44,7 +44,6 @@ import net.md_5.bungee.api.event.ServerConnectEvent;

8
Waterfall-Proxy-Patches/0038-List-Command-Format.patch
View File

@ -1,11 +1,11 @@
From 10b29c21ab86559a31b3229ddd2f9bf156c01c97 Mon Sep 17 00:00:00 2001
From 4bdecd3bce63e87e3c1388cf7bf9c67a9fa2c6d0 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Sun, 15 Jan 2023 19:03:34 -0300
Subject: [PATCH] List Command Format
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java
index e42bb29d5..555319a7f 100644
index e42bb29d..555319a7 100644
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java
@@ -107,6 +107,9 @@ public class MessagesConfiguration extends FlameConfig {
@ -19,10 +19,10 @@ index e42bb29d5..555319a7f 100644
final Object value = configuration.get(key);
diff --git a/module/cmd-list/src/main/java/net/md_5/bungee/module/cmd/list/CommandList.java b/module/cmd-list/src/main/java/net/md_5/bungee/module/cmd/list/CommandList.java
index c4ac9173f..10a0cf4a8 100644
index 79d0bb21..97b775ee 100644
--- a/module/cmd-list/src/main/java/net/md_5/bungee/module/cmd/list/CommandList.java
+++ b/module/cmd-list/src/main/java/net/md_5/bungee/module/cmd/list/CommandList.java
@@ -28,6 +28,8 @@ public class CommandList extends Command implements TabExecutor
@@ -27,6 +27,8 @@ public class CommandList extends Command implements TabExecutor
public void execute(CommandSender sender, String[] args)
{
boolean hideEmptyServers = ( args.length == 0 ) || !args[0].equalsIgnoreCase( "all" );

171
Waterfall-Proxy-Patches/0040-Implement-libdeflate.patch
View File

@ -1,4 +1,4 @@
From 0f15af459b68ab1cb21f126380e32cf17d6939ef Mon Sep 17 00:00:00 2001
From 482102b6fca099a58b23ed16997e4d8f0b063da3 Mon Sep 17 00:00:00 2001
From: xIsm4 <soportexism4@gmail.com>
Date: Fri, 27 Jan 2023 14:12:44 +0100
Subject: [PATCH] Implement libdeflate
@ -2060,160 +2060,6 @@ mvE7bo|3AFL=DqtkrJea2sXUJADZOi#9b><VsJXG*i2n=T|AI6C
literal 0
HcmV?d00001
diff --git a/native/src/main/resources/native-cipher.so b/native/src/main/resources/native-cipher.so
index 573626fb15fdf9fd767dc58c0e85f2bad2e095df..8ac128df6f1ebb309238cda9816d083de4fb685d 100755
GIT binary patch
delta 7553
zcmZvh3wTu3wa53F$v_f9auV{IKw$EMBw(I|Ndl1>NzDWkm|OHp0wH4w7_34-tboV_
zfhGflCajj0e$|dGpVvP02FJEk5yGQ9u6h~4qM*R|Xqf=k^ebM`(w@8a*=vWx$o{@L
z|FeH<@3r6O?6YUzPffkAn|iH@IZO`@Axz!XS2)c%UlmcQjN%Gn3pd&L1%pk$4r_h6
zh}ZW$pI+}FTZCRu5L~L!_Xsqp8-!imAr(x@q(q`NqP87St(>wwEYkQRbPBI1hAB{B
za?7j+hg(f^rmYL*#;Z4H#_s)B)b@>?pS}Crx~V65o<#id=0@Q!8h;kWHrw|M>$Evs
zozJ)--aIWc3vn*~CgP8WeEb#QuMmGz;34zO=v|wFdme*FUWPs9lIZc#zm78xu519O
zDIJE)CCV1aiYitfhyTFqe!Ndp{-j@f^y?aag-}!p^skMAWJ{x$`^G?>%YI{KEQ!Ul
zl6iv12w|Nj!QB-CJk6Vc!Ae{$5%GmW*edKL?uU^d-Ygz|N4&pL#J#mb8SfvSp)*ea
z+5T#(kj)|Z86nI~oH+&fRh-aQP`IBU?=TE=F&z(nD!7+;slZ<L0N(Hne%|XCWQ+Gw
z%R*IxuNT5Ja-_Ni_#W{~l-^S<z-Po4qjLZK<o_t~NA>jHc;=ukl?Bh1HN9J;JWCly
zQHwij1Q>_uc-ThiZPc=Mf!P;SA@_6vCSaV0sl+?@ka_VZ$80Vcf;5)Pqj+-0PRR;U
ziytFLVOemINOz4Y#E9#27EM-RX2;1tn<GFQN(;Zul`Weo4E;jb4<)AzKcNB=sepc(
zD<te$*#H`{m_SVQQzqz$tqAnR{z?HgE(+VLFf)4#J*!m8YU?uW`Y3jmSn{%EqZy|8
znBq@laJz|J!#EFet@8!ULoW?%`VJA7+)bSI894862|_;*2L5ECuGT@=z(<KB`gO>_
z;|=_VfhQPvG!@KyO;!r}yP~}5y&}~}lr%#In}JhT>(+b&r?J<0iGfq+=)BUvX;SLk
zA-I?Ef-O1{7ndQ!WCM2_c)o$pH*ns2GI$I;OG4Ck16TDqPsR>|fmcd~H3lx%CAW1N
zc(zQ8+HK%+*txmaz++{4J_mkcFpQH1RKJ1CY0b?q8n|3foc9|zJpnmp`wTo&C*m@I
zT%UuywK)dE2}6cS1|BqUTo%LOeFGmqOc@Iq_!t8Z-{NH~*<cvDWnd`=e#5{E0()Cq
z;{%Ra_baccwJBwTUH{aygbAHI`9BiIf9-s*p(k@z8)FSUDKk8bIseo7fb;%_p1k6A
z#vX9>+%*Z7=6!Es|HF(m`UZXLbK_ixE?ba4w}9u#{PAKgtE);d|F(c>;tG>8Hn1u`
zOEJY<fz-U*)FWYDo?h1Alfz}h!Gdh%b@;d-+nTS#&AdX)wdrVdi*uo~#kpv(7cvXS
znyz1l>cR!egRrac3DZZHVf19L;(?yY&nOo_onlu~z%^y3k^~=2X-dz(rfGw}{I{k#
zeaEgIa2~j*Y1-A_hqIvJu0ACJF5cx)UWS=P0n^u?!1bazN+HZDeny!D$BGXq?Xacf
z)2zpFJbdR5@)hjr8NCc+uAYjeToP(eln#W?z}C{dQ7?sf5d*Fs%O-fObixQ5CI~Nr
zOQnmmpTik5?7*@eW9VQn7vbRR5VVz*#yp80&=AUj=gKli+>Q3|dN@?pnlXSg8cY5i
zmxOPfz%*C!7E8{7>hcQZCFm&6Oq+X2(|qR}e1B{3X|Ch7xs|-@!pmS!d1-VVE?!qp
zCW8y*4=UYIG1Xo9F!sZifz_X2mABRA#^G(MtEcANSjK977!UvWf~M7S%K;lU9DNEL
zgg2(nu#LgYqOD({=X&Mn;NF{>)*HSLGhyxafVJY$<jWXAw}HWbV&@;^t2MkCc2`to
z7H8n?k`HlMOqk2H@4JT%d|c%C`L3l2D=Zt}^NMjwBE(JmWAY4KnBi3);BduZ)h6;-
z8=RZw$@s5yy+3}&MfArNyv6>Ag?aW0)6`5@S)M+&Ay*Ag!`!~}u82-?!yER}=>NsG
zVyAS$|JlE-L_vM!x)FEd(>uHxPF7YGoKNM}l=o1?$S2eWv1z540t=dPUeg*Ee}*6l
zCRgPsMKHH2XVOp4@fIg+Nx;dA^I(Bq&5C5K_?*SLFW%Qv`xveYOB?L2%2UR}!K(bR
zmiMtEo1D!&*RHQMt-<%PK7wC{e*>oKdrUXphkL8Dt5)Me#>%WjF;*soajeW)bkex^
zQ`ffDxwhB%X2IqAywP_VYw#gFU!9>Gg8kLDJR7F+9p(k~;5!G6r!aSeaszw45`S(L
z(Kt}1=P571r0MmsefUuE-JhEuJ_75eS2SLDkGE-mF5kH7QzHB(5`BgYUb-O%xb7^D
zYSfo9TFIkdePfVU!p-U96r3e9HZHvflQiHwQyYDM8ch3_riFt@L`C1wSDd94Ya%L|
zjurLrieAG<VZCzPnNZNe@Ulc5oQ#tUXGuC5!gKzN#ZE+D2(%;wH9Kp{Do^n{3pZ{4
zLRRqXyBPiNuVnN%kG_ZX)u*eN@d0?GW~}QnS_}`!ZI&xb7~3-NMB%)B*x@YU7o`Kf
z(Wg19c?++{EywVxTYfaK;7G!RT0T-+YWf3j*QA-0?!aGW#+prE)WF~G$yK@nsk8nk
z?iKf*kzW2W#NT(F`>^tO?|DtrI#4@MySckJG|i8yqP~h6LcPi32Q)1mN5+9#f*Lxc
zX?&z?hc)eos2<c8Q9DuhqYj}4QA>_!+BMFPVL4`elXaZH1i1GIqFzTWIjLz=qVPTX
zwx+E|?MLlJEjg`eAyfzIb<_b=w*~EIuprbR_VW$YAsozF+)@N_vh<>M;w-$5>cOSr
zz;~wlS550j^`O2r5?_=-ya^%bz&FHA)FD(AcUzvTnwF2+i#h}TIDe8-0w2wvWDR3a
zsn{_x@K@nN{DmN^DJ^CG>zXF_8?{Kg@pnHoHq}*ph?a>MW8aEbzi(O?kFNFC=rz<K
zwB>Odg$C3p?B!@U*)+Fc{y|NnZxVga+m4pa$jT`-ug!X7{orgKld>Nz?PS5{0o#L?
zbXe9rR+#}?nl~xY5VPPu<+sqYpg3kK+E3tUyo)ir>E=;5w%}e+o1?7!<7^y`glr10
zP#dyzNLg5?r+5`(E*u+~Vm^0;tQM9me9)4MBh(Iu7S6NqF=SwExzF+z-UVS<OI>U_
zj?<o?rk!Q5yd?)Nv`nzHA*uvrQETi8yxaVarkxSSo<$QZ$vA%Luy@gSEt~OfK4i6~
z)%)>o`$bJ_L-#!JroM_Sj7<N`aK*dLTb0=OXy+*2K|!=Vitju5wa16;Q)KVM#?~>`
zn|N39iKb;C<$>o=aWXUnUTU2jKU;nw$S(ryQa$jm5FUm%ZZ<v2<UVW0JQ0^0K6M8)
zFQ1_7fOX4@vRr%yV8EjF5F%%Cn|T9HF1IPYaAkQ>qMtlsl|))7SW&F_p=reglOqn+
zt>{9hPE)G4#3m9rNZq6!(hky2(q2+OX+P-zX^=ETIz-B{m>yJ8n@}$+A>bf&lX^%y
zNIOY;N&Te#qywZu(h%tosr&{L)nKe{)~sq<KBTVPX_Xx*O<c|Rx#EIDE7M?TWvY23
z^TXd)rYRx3rkG<embEI~YcpmL_hvSV+3v`3$g}U1el%0>$m3Zk=T7Mpn4Bc~u3jcF
z^C{?&v0G}!BPe;Gb&K-$C9$Af_6CEQjT!#lHDFAi%;fhjaZ$b*_we!@?e+|*On&d)
z&T)g%Yb4^{%vWUJow$|R?#SWykC%HR`iOreoAB&K&Ar_dp9GxC1u3m|yixGHLYAPA
z;a;78qsi<s<lK*3;P}QCVJ(WH_Z_TTUFW5T^Ur9B9@ec^=Ank<Q?BF0{rnJ%2P*$f
z{npC-&+BxUpOXA#;{0KW;SBzGGyK2SqxhO6!+X;3f-p$_f#koqonMmt+1vRilJCBq
zUzS{skSN#7u1dp?ZqM*JMtKKz76>liQzNkDyaf(&MD=IMI#-$JVUfOs+~pDXFTI^l
z)45k=4l;Ns13zR_aFIBc2rxjrg*c=14&r=M!_(U$3f@RO6jAU_$=lEYUm6~A^h;@2
zEWiNq0C7LhfWe_(89PGUL+NFUFUs^0{Bz>$JHi2fw}_=_5-k`YgIshfaa#np5%)hN
z9C?JWQppL(3b}}fh|BcNCN@%Z^+Ry@$zp3j_>m*JLC=PBH2|?|ij_X7UQ=WmS^<x&
zDe}rko5+EO$9mdtJ{S(`{F@J+H<9y0_sA#SMe?J{X-WlL(fRNL>DEcq+7W!3;+xe*
zDW#aj*{;n2_pB{4F(<5AyU4`m!0ENc^|>OE+~K@NX**^L-cLS)(npa1@)Y$lad!pG
zURRXSd$%yl(_lMxAU{?fD1e>o7G*>p3jdtU?&%Qw)V<!0IU=__LH&Zvkw?8rxO?JW
zBM-gviR)*^=!)-Hd6-2!^0d8K=OPVW;nY)!-pB*<Zps^RBF~;B9(lTZmU!ej_f_e~
zEy|O}(@{8R!w+PvL+koPZ?H<Fk%LmEr-^5ghxRVw{WOS2sVQFKk!SWmT&2|@`{!li
z^sh$t@ZUOrAw%T<Bmahv)~8w1M~Y#P|B}>F@nw+sbXxWtvPS+#(@vZf24+9)GsW1a
zvBgDY<#v1EL+=Y_=!?yO?oD;DI#vz5x#?|_G6cK7Uz`}idB%g(b~uMr?k=U?0Bct<
zba$!BB53L=j`7o;)en7L_LvaGLhug8<ZjasiQSbkHr+ce9r$*)J&j^E(hxqacmQX2
z8vLO<DJ@&X<>pAGsBZuAmR)X=g2w!IUy_<5GRVzR6EyjXW94&X#yr^Rv&VSIsRvH`
z>?%Fb<uhUmShp4@$-R)&+>y|{wK!&n$f<6Com=fPmc9W_--_8bK+-mQ939Dr_@fs-
ziW&p$+p=PMso+k?>Pm$dk;n(oMmW9AE@SFONZLL#dZS2P2=8F_N4Mum;DX)T?J?aw
V!n_vFZMVlN^j;mUKt|X2{|D$~Sdst$
delta 7376
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
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index f33ce913..01b208ed 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@ -2272,7 +2118,7 @@ index 02625018..37abc9f7 100644
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-module-cmd-alert</artifactId>
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 77149dfb..252ae3b0 100644
index 27ca8755..a6b2c94e 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -17,6 +17,7 @@ import dev._2lstudios.flamecord.commands.FlameCordCommand;
@ -2605,19 +2451,18 @@ index b98ee6a7..ffe03816 100644
// Make the channel accessible
public Channel getChannel() {
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index f04fdd9c..9aebc9e1 100644
index 3a025312..5833b668 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -126,7 +126,8 @@ public class PipelineUtils
};
public static final Base BASE = new Base();
@@ -130,7 +130,7 @@ public class PipelineUtils
public static final Base BASE = new Base( false );
public static final Base BASE_SERVERSIDE = new Base( true );
private static final KickStringWriter legacyKicker = new KickStringWriter();
- private static final Varint21LengthFieldPrepender framePrepender = new Varint21LengthFieldPrepender();
+ // FlameCord - Implement Libdeflate
+ public static final Varint21LengthFieldPrepender framePrepender = new Varint21LengthFieldPrepender();
+ public static final Varint21LengthFieldPrepender framePrepender = new Varint21LengthFieldPrepender(); // FlameCord - Implement Libdeflate
private static final Varint21LengthFieldExtraBufPrepender serverFramePrepender = new Varint21LengthFieldExtraBufPrepender();
public static final String TIMEOUT_HANDLER = "timeout";
public static final String PACKET_DECODER = "packet-decoder";
public static final String PACKET_ENCODER = "packet-encoder";
--
2.37.3.windows.1

25
Waterfall-Proxy-Patches/0043-Optimize-PipelineUtils.patch
View File

@ -1,11 +1,11 @@
From f33e0d4b04817d111c1cd4b76b95c86193146299 Mon Sep 17 00:00:00 2001
From 0604d2c10875114e158a82a67cf7ac743c6c1e20 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 23 Mar 2023 22:35:42 -0300
Subject: [PATCH] Optimize PipelineUtils
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 9aebc9e1..8580344d 100644
index 5833b668..28223ec8 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -6,10 +6,12 @@ import dev._2lstudios.flamecord.FlameCord;
@ -21,7 +21,7 @@ index 9aebc9e1..8580344d 100644
import io.netty.channel.EventLoopGroup;
import io.netty.channel.ServerChannel;
import io.netty.channel.WriteBufferWaterMark;
@@ -50,7 +52,6 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
@@ -53,7 +55,6 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
public class PipelineUtils
{
@ -29,17 +29,11 @@ index 9aebc9e1..8580344d 100644
public static final AttributeKey<ListenerInfo> LISTENER = AttributeKey.newInstance( "ListerInfo" );
public static final ChannelInitializer<Channel> SERVER_CHILD = new ChannelInitializer<Channel>()
{
@@ -195,31 +196,35 @@ public class PipelineUtils
private static final int HIGH_MARK = Integer.getInteger( "net.md_5.bungee.high_mark", 2 << 20 ); // 2 mb
private static final WriteBufferWaterMark MARK = new WriteBufferWaterMark( LOW_MARK, HIGH_MARK );
+ // FlameCord start - Optimize PipelineUtils
public static final class Base extends ChannelInitializer<Channel>
{
@@ -209,26 +210,30 @@ public class PipelineUtils
@Override
public void initChannel(Channel ch) throws Exception
{
+ // FlameCord start - Optimize PipelineUtils
+ ChannelPipeline pipeline = ch.pipeline();
+ ChannelConfig channelConfig = ch.config();
try
@ -62,18 +56,19 @@ index 9aebc9e1..8580344d 100644
- ch.pipeline().addLast( FRAME_DECODER, new Varint21FrameDecoder() );
- ch.pipeline().addLast( TIMEOUT_HANDLER, new ReadTimeoutHandler( BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS ) );
- ch.pipeline().addLast( FRAME_PREPENDER, framePrepender );
+ pipeline.addLast( FRAME_DECODER, new Varint21FrameDecoder() );
+ pipeline.addLast( TIMEOUT_HANDLER, new ReadTimeoutHandler( BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS ) );
+ pipeline.addLast( FRAME_PREPENDER, framePrepender );
// No encryption bungee -> server, therefore use extra buffer to avoid copying everything for length prepending
// Not used bungee -> client as header would need to be encrypted separately through expensive JNI call
- ch.pipeline().addLast( FRAME_PREPENDER, ( toServer ) ? serverFramePrepender : framePrepender );
+ pipeline.addLast( FRAME_PREPENDER, ( toServer ) ? serverFramePrepender : framePrepender );
- ch.pipeline().addLast( BOSS_HANDLER, new HandlerBoss() );
+ pipeline.addLast( BOSS_HANDLER, new HandlerBoss() );
+ // FlameCord end - Optimize PipelineUtils
}
+ // FlameCord end - Optimize PipelineUtils
// FlameCord - Close on exception caught
@Override
--
2.37.3.windows.1