Skip to content

Commit 3ff5ac5

Browse files
Justsnoopy30Justsnoopy30
committed
Minecraft 1.16 Prerelease 6 Support! (fix build due to missing a few things)
1 parent ed081b5 commit 3ff5ac5

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

‎Waterfall-Proxy-Patches/0003-Minecraft-1.16-Support.patch‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From fb51b66d1c2b29b2139b036c76076735c0e980c8 Mon Sep 17 00:00:00 2001
1+
From c628c8f28657c0788929517edf02a93c484ce5ff Mon Sep 17 00:00:00 2001
22
From: Justsnoopy30 <everettallen30@gmail.com>
33
Date: Sun, 16 Feb 2020 16:45:16 -0600
44
Subject: [PATCH] Minecraft 1.16 Support
@@ -2152,7 +2152,7 @@ index 519f1a76..2ab5a17b 100644
21522152

21532153
<name>HyperFall-Proxy</name>
21542154
diff --git a/proxy/src/main/java/net/md_5/bungee/PacketConstants.java b/proxy/src/main/java/net/md_5/bungee/PacketConstants.java
2155-
index 000c450e..85d10ed2 100644
2155+
index 000c450e..254e9878 100644
21562156
--- a/proxy/src/main/java/net/md_5/bungee/PacketConstants.java
21572157
+++ b/proxy/src/main/java/net/md_5/bungee/PacketConstants.java
21582158
@@ -7,8 +7,8 @@ import net.md_5.bungee.protocol.packet.Respawn;
@@ -2161,21 +2161,21 @@ index 000c450e..85d10ed2 100644
21612161

21622162
- public static final Respawn DIM1_SWITCH = new Respawn( (byte) 1, 0, (byte) 0, (byte) 0, "default" );
21632163
- public static final Respawn DIM2_SWITCH = new Respawn( (byte) -1, 0, (byte) 0, (byte) 0, "default" );
2164-
+ public static final Respawn DIM1_SWITCH = new Respawn( (byte) 1, 0, (byte) 0, (byte) 0, "default", false, /* HyperFall 20w18a+ */ false, false, /* HyperFall 20w20a+ */ "minecraft:overworld", /* HyperFall 20w21a+ */ "bungeecord:dimension_switch1" /* HyperFall 20w22a+ */);
2165-
+ public static final Respawn DIM2_SWITCH = new Respawn( (byte) -1, 0, (byte) 0, (byte) 0, "default", false, /* HyperFall 20w18a+ */ false, false, /* HyperFall 20w20a+ */ "minecraft:overworld", /* HyperFall 20w21a+ */ "bungeecord:dimension_switch1" /* HyperFall 20w22a+ */);
2164+
+ public static final Respawn DIM1_SWITCH = new Respawn( (byte) 1, 0, (byte) 0, (byte) 0, "default", false, /* HyperFall 20w18a+ */ false, false, /* HyperFall 20w20a+ */ "minecraft:overworld", /* HyperFall 20w21a+ */ "bungeecord:dimension_switch1" /* HyperFall 20w22a+ */, (short) -1 /* HyperFall 1.16 Pre6+ */);
2165+
+ public static final Respawn DIM2_SWITCH = new Respawn( (byte) -1, 0, (byte) 0, (byte) 0, "default", false, /* HyperFall 20w18a+ */ false, false, /* HyperFall 20w20a+ */ "minecraft:overworld", /* HyperFall 20w21a+ */ "bungeecord:dimension_switch1" /* HyperFall 20w22a+ */, (short) -1 /* HyperFall 1.16 Pre6+ */);
21662166
public static final ClientStatus CLIENT_LOGIN = new ClientStatus( (byte) 0 );
21672167
public static final PluginMessage FORGE_MOD_REQUEST = new PluginMessage( "FML", new byte[]
21682168
{
21692169
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
2170-
index 35a19224..b0ffa4e8 100644
2170+
index 35a19224..09dd7662 100644
21712171
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
21722172
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
21732173
@@ -246,7 +246,7 @@ public class ServerConnector extends PacketHandler
21742174

21752175
// Set tab list size, TODO: what shall we do about packet mutability
21762176
Login modLogin = new Login( login.getEntityId(), login.getGameMode(), (byte) login.getDimension(), login.getSeed(), login.getDifficulty(),
21772177
- (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn() );
2178-
+ (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), login.getCodecTag(), /* HyperFall 20w21a+ */ login.getWorldNamesList(), login.getWorldName() /* HyperFall 20w22a+ */);
2178+
+ (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), login.getCodecTag(), /* HyperFall 20w21a+ */ login.getWorldNamesList(), login.getWorldName(), /* HyperFall 20w22a+ */ login.getOldGameMode() /* HyperFall 1.16 Pre6+ */);
21792179

21802180
user.unsafe().sendPacket( modLogin );
21812181

@@ -2184,7 +2184,7 @@ index 35a19224..b0ffa4e8 100644
21842184
if ( !user.isDisableEntityMetadataRewrite() && login.getDimension() == user.getDimension() ) // Waterfall - defer
21852185
{
21862186
- user.unsafe().sendPacket( new Respawn( ( login.getDimension() >= 0 ? -1 : 0 ), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) );
2187-
+ user.unsafe().sendPacket( new Respawn( ( login.getDimension() >= 0 ? -1 : 0 ), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType(), false, /* HyperFall 20w18a+ */ login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), /* HyperFall 20w21a+ */ login.getWorldName() /* HyperFall 20w22a+ */ ));
2187+
+ user.unsafe().sendPacket( new Respawn( ( login.getDimension() >= 0 ? -1 : 0 ), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType(), false, /* HyperFall 20w18a+ */ login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), /* HyperFall 20w21a+ */ login.getWorldName(), /* HyperFall 20w22a+ */ login.getOldGameMode() /* HyperFall 1.16 Pre6+ */ ));
21882188
}
21892189

21902190
user.setServerEntityId( login.getEntityId() );
@@ -2193,25 +2193,25 @@ index 35a19224..b0ffa4e8 100644
21932193
// Only send if we are not in the same dimension
21942194
if (user.getDimension() != login.getDimension()) {
21952195
- user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType()));
2196-
+ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType(), false, /* HyperFall 20w18a+ */ login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), /* HyperFall 20w21a+ */ login.getWorldName() /* HyperFall 20w22a+ */ ));
2196+
+ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType(), false, /* HyperFall 20w18a+ */ login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), /* HyperFall 20w21a+ */ login.getWorldName(), /* HyperFall 20w22a+ */ login.getOldGameMode() /* HyperFall 1.16 Pre6+ */ ));
21972197
}
21982198

21992199
+ // Set tab list size, TODO: what shall we do about packet mutability
22002200
Login modLogin = new Login( login.getEntityId(),login.getGameMode(), login.getDimension(), login.getSeed(),
22012201
- login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn() );
2202-
+ login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), login.getCodecTag(), /* HyperFall 20w21a+ */ login.getWorldNamesList(), login.getWorldName() /* HyperFall 20w22a+ */);
2202+
+ login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), login.getCodecTag(), /* HyperFall 20w21a+ */ login.getWorldNamesList(), login.getWorldName(), /* HyperFall 20w22a+ */ login.getOldGameMode() /* HyperFall 1.16 Pre6+ */);
22032203
+
22042204
user.unsafe().sendPacket(modLogin);
22052205

22062206
// Only send if we're in the same dimension
22072207
if (user.getDimension() == login.getDimension()) {
22082208
- user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType()));
2209-
+ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType(), false, /* HyperFall 20w18a+ */ login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), /* HyperFall 20w21a+ */ login.getWorldName() /* HyperFall 20w22a+ */ ));
2209+
+ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType(), false, /* HyperFall 20w18a+ */ login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), /* HyperFall 20w21a+ */ login.getWorldName(), /* HyperFall 20w22a+ */ login.getOldGameMode() /* HyperFall 1.16 Pre6+ */));
22102210
}
22112211
}
22122212
// Waterfall end
22132213
- user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) );
2214-
+ user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType(), false, /* HyperFall 20w18a+ */ login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), /* HyperFall 20w21a+ */ login.getWorldName() /* HyperFall 20w22a+ */ ));
2214+
+ user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType(), false, /* HyperFall 20w18a+ */ login.isDebug(), login.isFlat(), /* HyperFall 20w20a+ */ login.getDimensionCodecName(), /* HyperFall 20w21a+ */ login.getWorldName(), /* HyperFall 20w22a+ */ login.getOldGameMode() /* HyperFall 1.16 Pre6+ */));
22152215
if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
22162216
{
22172217
user.unsafe().sendPacket( new ViewDistance( login.getViewDistance() ) );

0 commit comments

Comments
 (0)