From 450e3b61fe4591359003f037d7207d7e69ba3b8d Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Fri, 20 Oct 2023 20:14:16 +0200
Subject: [PATCH 1/3] Bring back accidentally removed MTU option (#4229)

---
 .../java/org/geysermc/geyser/network/netty/GeyserServer.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java b/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
index 6fbb29157..c89da0bdd 100644
--- a/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
+++ b/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
@@ -171,10 +171,12 @@ public final class GeyserServer {
 
         GeyserServerInitializer serverInitializer = new GeyserServerInitializer(this.geyser);
         playerGroup = serverInitializer.getEventLoopGroup();
+        this.geyser.getLogger().debug("Setting MTU to " + this.geyser.getConfig().getMtu());
         return new ServerBootstrap()
                 .channelFactory(RakChannelFactory.server(TRANSPORT.datagramChannel()))
                 .group(group)
                 .option(RakChannelOption.RAK_HANDLE_PING, true)
+                .option(RakChannelOption.RAK_MAX_MTU, this.geyser.getConfig().getMtu())
                 .childHandler(serverInitializer);
     }
 

From 51236f7a5997f6405427838932c072c73e49c0b5 Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Fri, 20 Oct 2023 22:17:43 +0200
Subject: [PATCH 2/3] Let the fabric module really use Java 17 (#4231)

* Let the fabric module really use java 17

* Remove unnecessary target/source compat; handled by indra instead
---
 bootstrap/fabric/build.gradle.kts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bootstrap/fabric/build.gradle.kts b/bootstrap/fabric/build.gradle.kts
index e392a4ef9..07de70f60 100644
--- a/bootstrap/fabric/build.gradle.kts
+++ b/bootstrap/fabric/build.gradle.kts
@@ -5,9 +5,10 @@ plugins {
     id("com.modrinth.minotaur") version "2.+"
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_17
-    sourceCompatibility = JavaVersion.VERSION_17
+indra {
+    javaVersions {
+        target(17)
+    }
 }
 
 dependencies {

From b4290d5be462b8352fd0a2dd8b30ac61c98b8041 Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Tue, 24 Oct 2023 01:41:02 +0200
Subject: [PATCH 3/3] Versioned potion mappings (#4239)

---
 .../geyser/registry/loader/PotionMixRegistryLoader.java        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/registry/loader/PotionMixRegistryLoader.java b/core/src/main/java/org/geysermc/geyser/registry/loader/PotionMixRegistryLoader.java
index 88d2ef29d..7d5061382 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/loader/PotionMixRegistryLoader.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/loader/PotionMixRegistryLoader.java
@@ -31,7 +31,6 @@ import org.cloudburstmc.protocol.bedrock.data.inventory.crafting.PotionMixData;
 import org.geysermc.geyser.inventory.item.Potion;
 import org.geysermc.geyser.item.Items;
 import org.geysermc.geyser.item.type.Item;
-import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.registry.type.ItemMappings;
@@ -115,7 +114,7 @@ public class PotionMixRegistryLoader implements RegistryLoader<Object, Int2Objec
     }
 
     private static ItemMapping getNonNull(ItemMappings mappings, Item javaItem) {
-        ItemMapping itemMapping = Registries.ITEMS.forVersion(GameProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()).getMapping(javaItem);
+        ItemMapping itemMapping = mappings.getMapping(javaItem);
         if (itemMapping == null)
             throw new NullPointerException("No item entry exists for java identifier: " + javaItem.javaIdentifier());