diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/server/0005-MC-Dev-fixes.patch
index 6082088c6..1f95add23 100644
--- a/patches/server/0005-MC-Dev-fixes.patch
+++ b/patches/server/0005-MC-Dev-fixes.patch
@@ -217,79 +217,6 @@ index 92650d816113a0f1c2b589691895ebba3424d661..7ef0075cc16613709e145714204a728d
          }));
          this.byName = Maps.newHashMap(builder.build()); // CraftBukkit
          RecipeManager.LOGGER.info("Loaded {} recipes", map1.size());
-diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
-index 0422d787593cc65aadcae9f7517ec67a52f1f72b..95bbc1b6964614f3cf520034156e97a0ef32af40 100644
---- a/src/main/java/net/minecraft/world/level/biome/Biome.java
-+++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
-@@ -35,8 +35,32 @@ import net.minecraft.world.level.material.FluidState;
- import net.minecraft.world.level.material.Fluids;
- 
- public final class Biome {
--    public static final Codec<Biome> DIRECT_CODEC;
--    public static final Codec<Biome> NETWORK_CODEC;
-+    // Paper start - decompile fix: move up verbatim from static block
-+    public static final Codec<Biome> DIRECT_CODEC = RecordCodecBuilder.create((instance) -> {
-+        return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> {
-+            return biome.climateSettings;
-+        }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
-+            return biome.biomeCategory;
-+        }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
-+            return biome.specialEffects;
-+        }), BiomeGenerationSettings.CODEC.forGetter((biome) -> {
-+            return biome.generationSettings;
-+        }), MobSpawnSettings.CODEC.forGetter((biome) -> {
-+            return biome.mobSettings;
-+        })).apply(instance, Biome::new);
-+    });
-+    public static final Codec<Biome> NETWORK_CODE = RecordCodecBuilder.create((instance) -> {
-+        return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> {
-+            return biome.climateSettings;
-+        }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
-+            return biome.biomeCategory;
-+        }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
-+            return biome.specialEffects;
-+        })).apply(instance, (weather, category, effects) -> {
-+            return new Biome(weather, category, effects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
-+        });
-+    });
-+    // Paper end
-     public static final Codec<Holder<Biome>> CODEC = RegistryFileCodec.create(Registry.BIOME_REGISTRY, DIRECT_CODEC);
-     public static final Codec<HolderSet<Biome>> LIST_CODEC = RegistryCodecs.homogeneousList(Registry.BIOME_REGISTRY, DIRECT_CODEC);
-     private static final PerlinSimplexNoise TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(new LegacyRandomSource(1234L)), ImmutableList.of(0));
-@@ -253,33 +277,6 @@ public final class Biome {
-         return biomeEntry.value().getBiomeCategory();
-     }
- 
--    static {
--        DIRECT_CODEC = RecordCodecBuilder.create((instance) -> {
--            return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> {
--                return biome.climateSettings;
--            }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
--                return biome.biomeCategory;
--            }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
--                return biome.specialEffects;
--            }), BiomeGenerationSettings.CODEC.forGetter((biome) -> {
--                return biome.generationSettings;
--            }), MobSpawnSettings.CODEC.forGetter((biome) -> {
--                return biome.mobSettings;
--            })).apply(instance, Biome::new);
--        });
--        NETWORK_CODEC = RecordCodecBuilder.create((instance) -> {
--            return instance.group(Biome.ClimateSettings.CODEC.forGetter((biome) -> {
--                return biome.climateSettings;
--            }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
--                return biome.biomeCategory;
--            }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
--                return biome.specialEffects;
--            })).apply(instance, (weather, category, effects) -> {
--                return new Biome(weather, category, effects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
--            });
--        });
--    }
--
-     public static class BiomeBuilder {
-         @Nullable
-         private Biome.Precipitation precipitation;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 index 57bc78e1a189386443abb02744e88b2fdf803a95..911bf2b7bbe627f98d21681b0c6d5b8a5170c8a8 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java