diff --git a/build.gradle b/build.gradle
index ef4eecf395..313529f084 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,9 +44,9 @@ ext {
         ]
     }
     MAPPING_CHANNEL = 'official'
-    MAPPING_VERSION = '1.18'
-    MC_VERSION = '1.18'
-    MCP_VERSION = '20211130.085255'
+    MAPPING_VERSION = '1.18.1'
+    MC_VERSION = '1.18.1'
+    MCP_VERSION = '20211210.034407'
     SPI_VERSION = '4.0.10'
     ACCESSTRANSFORMERS_VERSION = '8.0.4'
     COREMODS_VERSION = '5.0.1'
diff --git a/patches/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch b/patches/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch
index 67564ba3c7..11fcabc332 100644
--- a/patches/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch
+++ b/patches/minecraft/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java.patch
@@ -1,7 +1,7 @@
 --- a/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
 +++ b/com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen.java
-@@ -69,6 +_,15 @@
-       return (new TextComponent("")).m_7220_(this.f_88666_).m_130946_(": ").m_7220_(this.f_88667_);
+@@ -67,6 +_,15 @@
+       return (new TextComponent("")).m_7220_(this.f_200947_.getFirst()).m_130946_(": ").m_7220_(this.f_200947_.getSecond());
     }
  
 +    @Override
@@ -15,4 +15,4 @@
 +
     public void m_6305_(PoseStack p_88679_, int p_88680_, int p_88681_, float p_88682_) {
        this.m_7333_(p_88679_);
-       m_93215_(p_88679_, this.f_96547_, this.f_88666_, this.f_96543_ / 2, 80, 16777215);
+       m_93215_(p_88679_, this.f_96547_, this.f_200947_.getFirst(), this.f_96543_ / 2, 80, 16777215);
diff --git a/patches/minecraft/net/minecraft/Util.java.patch b/patches/minecraft/net/minecraft/Util.java.patch
index 8fe0ff0b2d..ceadaf2afb 100644
--- a/patches/minecraft/net/minecraft/Util.java.patch
+++ b/patches/minecraft/net/minecraft/Util.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
-@@ -149,6 +_,9 @@
+@@ -158,6 +_,9 @@
        return 255;
     }
  
@@ -10,7 +10,7 @@
     public static ExecutorService m_183988_() {
        return f_137443_;
     }
-@@ -227,7 +_,7 @@
+@@ -236,7 +_,7 @@
        try {
           type = DataFixers.m_14512_().getSchema(DataFixUtils.makeKey(SharedConstants.m_183709_().getWorldVersion())).getChoiceType(p_137552_, p_137553_);
        } catch (IllegalArgumentException illegalargumentexception) {
diff --git a/patches/minecraft/net/minecraft/client/Options.java.patch b/patches/minecraft/net/minecraft/client/Options.java.patch
index 7de531fadf..50158c589b 100644
--- a/patches/minecraft/net/minecraft/client/Options.java.patch
+++ b/patches/minecraft/net/minecraft/client/Options.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Options.java
 +++ b/net/minecraft/client/Options.java
-@@ -186,6 +_,7 @@
+@@ -187,6 +_,7 @@
     public boolean f_92076_;
  
     public Options(Minecraft p_92138_, File p_92139_) {
@@ -8,7 +8,7 @@
        this.f_92060_ = p_92138_;
        this.f_92110_ = new File(p_92139_, "options.txt");
        if (p_92138_.m_91103_() && Runtime.getRuntime().maxMemory() >= 1000000000L) {
-@@ -299,10 +_,14 @@
+@@ -300,10 +_,14 @@
        this.f_193762_ = p_168428_.m_142682_("allowServerListing", this.f_193762_);
  
        for(KeyMapping keymapping : this.f_92059_) {
@@ -25,7 +25,7 @@
           }
        }
  
-@@ -490,6 +_,7 @@
+@@ -491,6 +_,7 @@
     }
  
     public void m_92169_() {
@@ -33,7 +33,7 @@
        try {
           final PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(this.f_92110_), StandardCharsets.UTF_8));
  
-@@ -638,6 +_,23 @@
+@@ -639,6 +_,23 @@
        }
  
        p_92146_.m_10509_(set);
diff --git a/patches/minecraft/net/minecraft/client/renderer/FogRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/FogRenderer.java.patch
index 15605bd35d..2b9cebf8b1 100644
--- a/patches/minecraft/net/minecraft/client/renderer/FogRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/FogRenderer.java.patch
@@ -42,7 +42,7 @@
        if (fogtype == FogType.WATER) {
           float f = 192.0F;
           if (entity instanceof LocalPlayer) {
-@@ -244,6 +_,7 @@
+@@ -245,6 +_,7 @@
  
           RenderSystem.m_157445_(f2);
           RenderSystem.m_157443_(f3);
diff --git a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch
index 3c29559cd6..9f9a446786 100644
--- a/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/GameRenderer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/GameRenderer.java
 +++ b/net/minecraft/client/renderer/GameRenderer.java
-@@ -285,6 +_,8 @@
+@@ -286,6 +_,8 @@
           this.m_109128_(new ResourceLocation("shaders/post/spider.json"));
        } else if (p_109107_ instanceof EnderMan) {
           this.m_109128_(new ResourceLocation("shaders/post/invert.json"));
@@ -9,7 +9,7 @@
        }
  
     }
-@@ -541,6 +_,7 @@
+@@ -542,6 +_,7 @@
           list1.add(Pair.of(new ShaderInstance(p_172768_, "rendertype_crumbling", DefaultVertexFormat.f_85811_), (p_172733_) -> {
              f_172607_ = p_172733_;
           }));
@@ -17,7 +17,7 @@
        } catch (IOException ioexception) {
           list1.forEach((p_172772_) -> {
              p_172772_.getFirst().close();
-@@ -703,7 +_,7 @@
+@@ -704,7 +_,7 @@
              d0 *= (double)Mth.m_14179_(this.f_109059_.f_91066_.f_92070_, 1.0F, 0.85714287F);
           }
  
@@ -26,7 +26,7 @@
        }
     }
  
-@@ -840,11 +_,11 @@
+@@ -841,11 +_,11 @@
  
           Window window = this.f_109059_.m_91268_();
           RenderSystem.m_69421_(256, Minecraft.f_91002_);
@@ -40,7 +40,7 @@
           RenderSystem.m_157182_();
           Lighting.m_84931_();
           PoseStack posestack1 = new PoseStack();
-@@ -879,7 +_,7 @@
+@@ -880,7 +_,7 @@
              }
           } else if (this.f_109059_.f_91080_ != null) {
              try {
@@ -49,7 +49,7 @@
              } catch (Throwable throwable1) {
                 CrashReport crashreport1 = CrashReport.m_127521_(throwable1, "Rendering screen");
                 CrashReportCategory crashreportcategory1 = crashreport1.m_127514_("Screen render details");
-@@ -1036,10 +_,17 @@
+@@ -1037,6 +_,11 @@
        Matrix4f matrix4f = posestack.m_85850_().m_85861_();
        this.m_109111_(matrix4f);
        camera.m_90575_(this.f_109059_.f_91073_, (Entity)(this.f_109059_.m_91288_() == null ? this.f_109059_.f_91074_ : this.f_109059_.m_91288_()), !this.f_109059_.f_91066_.m_92176_().m_90612_(), this.f_109059_.f_91066_.m_92176_().m_90613_(), p_109090_);
@@ -60,6 +60,9 @@
 +
        p_109092_.m_85845_(Vector3f.f_122223_.m_122240_(camera.m_90589_()));
        p_109092_.m_85845_(Vector3f.f_122225_.m_122240_(camera.m_90590_() + 180.0F));
+       Matrix3f matrix3f = p_109092_.m_85850_().m_85864_().m_8183_();
+@@ -1046,6 +_,8 @@
+ 
        this.f_109059_.f_91060_.m_172961_(p_109092_, camera.m_90583_(), this.m_172716_(Math.max(d0, this.f_109059_.f_91066_.f_92068_)));
        this.f_109059_.f_91060_.m_109599_(p_109092_, p_109090_, p_109091_, flag, camera, this, this.f_109074_, matrix4f);
 +      this.f_109059_.m_91307_().m_6182_("forge_render_last");
diff --git a/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch
index 6a70fb89fe..3b3f712d7f 100644
--- a/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/LevelRenderer.java.patch
@@ -28,15 +28,16 @@
        RenderSystem.m_69421_(16640, Minecraft.f_91002_);
        float f = p_109605_.m_109152_();
        boolean flag2 = this.f_109461_.f_91073_.m_104583_().m_5781_(Mth.m_14107_(d0), Mth.m_14107_(d1)) || this.f_109461_.f_91065_.m_93090_().m_93715_();
-+      FogRenderer.setupFog(p_109604_, FogRenderer.FogMode.FOG_SKY, f, flag1, p_109601_);
++      FogRenderer.setupFog(p_109604_, FogRenderer.FogMode.FOG_SKY, f, flag2, p_109601_);
        profilerfiller.m_6182_("sky");
        RenderSystem.m_157427_(GameRenderer::m_172808_);
        this.m_181409_(p_109600_, p_109607_, p_109601_, () -> {
-          FogRenderer.m_109024_(p_109604_, FogRenderer.FogMode.FOG_SKY, f, flag2);
+-         FogRenderer.m_109024_(p_109604_, FogRenderer.FogMode.FOG_SKY, f, flag2);
++         FogRenderer.setupFog(p_109604_, FogRenderer.FogMode.FOG_SKY, f, flag2, p_109601_);
        });
        profilerfiller.m_6182_("fog");
--      FogRenderer.m_109024_(p_109604_, FogRenderer.FogMode.FOG_TERRAIN, Math.max(f - 16.0F, 32.0F), flag2);
-+      FogRenderer.setupFog(p_109604_, FogRenderer.FogMode.FOG_TERRAIN, Math.max(f - 16.0F, 32.0F), flag1, p_109601_);
+-      FogRenderer.m_109024_(p_109604_, FogRenderer.FogMode.FOG_TERRAIN, Math.max(f, 32.0F), flag2);
++      FogRenderer.setupFog(p_109604_, FogRenderer.FogMode.FOG_TERRAIN, Math.max(f, 32.0F), flag2, p_109601_);
        profilerfiller.m_6182_("terrain_setup");
        this.m_194338_(p_109604_, frustum, flag1, this.f_109461_.f_91074_.m_5833_());
        profilerfiller.m_6182_("compilechunks");
diff --git a/patches/minecraft/net/minecraft/client/renderer/ShaderInstance.java.patch b/patches/minecraft/net/minecraft/client/renderer/ShaderInstance.java.patch
index efbb139bfd..40c17495f7 100644
--- a/patches/minecraft/net/minecraft/client/renderer/ShaderInstance.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/ShaderInstance.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/ShaderInstance.java
 +++ b/net/minecraft/client/renderer/ShaderInstance.java
-@@ -91,10 +_,14 @@
+@@ -94,10 +_,14 @@
     @Nullable
     public final Uniform f_173320_;
  
@@ -17,7 +17,7 @@
        Resource resource = null;
  
        try {
-@@ -202,8 +_,9 @@
+@@ -206,8 +_,9 @@
        Program program1 = p_173342_.m_85570_().get(p_173343_);
        Program program;
        if (program1 == null) {
diff --git a/patches/minecraft/net/minecraft/server/ServerAdvancementManager.java.patch b/patches/minecraft/net/minecraft/server/ServerAdvancementManager.java.patch
index 2764339c43..0a8cbf74da 100644
--- a/patches/minecraft/net/minecraft/server/ServerAdvancementManager.java.patch
+++ b/patches/minecraft/net/minecraft/server/ServerAdvancementManager.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/ServerAdvancementManager.java
 +++ b/net/minecraft/server/ServerAdvancementManager.java
-@@ -39,6 +_,10 @@
+@@ -38,6 +_,10 @@
           try {
              JsonObject jsonobject = GsonHelper.m_13918_(p_136040_, "advancement");
              Advancement.Builder advancement$builder = Advancement.Builder.m_138380_(jsonobject, new DeserializationContext(p_136039_, this.f_136024_));
@@ -9,5 +9,5 @@
 +                return;
 +            }
              map.put(p_136039_, advancement$builder);
-          } catch (IllegalArgumentException | JsonParseException jsonparseexception) {
-             f_136021_.error("Parsing error loading custom advancement {}: {}", p_136039_, jsonparseexception.getMessage());
+          } catch (Exception exception) {
+             f_136021_.error("Parsing error loading custom advancement {}: {}", p_136039_, exception.getMessage());
diff --git a/patches/minecraft/net/minecraft/server/level/ChunkMap.java.patch b/patches/minecraft/net/minecraft/server/level/ChunkMap.java.patch
index d9a883666f..d3db6cf8fd 100644
--- a/patches/minecraft/net/minecraft/server/level/ChunkMap.java.patch
+++ b/patches/minecraft/net/minecraft/server/level/ChunkMap.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
-@@ -473,6 +_,7 @@
+@@ -440,6 +_,7 @@
              if (this.f_140131_.remove(p_140182_, p_140183_) && p_198809_ != null) {
                 if (p_198809_ instanceof LevelChunk) {
                    ((LevelChunk)p_198809_).m_62913_(false);
@@ -8,7 +8,7 @@
                 }
  
                 this.m_140258_(p_198809_);
-@@ -654,8 +_,14 @@
+@@ -621,8 +_,14 @@
              levelchunk.m_62952_();
              if (this.f_140132_.add(chunkpos.m_45588_())) {
                 levelchunk.m_62913_(true);
@@ -23,7 +23,7 @@
              }
  
              return levelchunk;
-@@ -745,6 +_,7 @@
+@@ -712,6 +_,7 @@
  
              this.f_140133_.m_46473_().m_6174_("chunkSave");
              CompoundTag compoundtag = ChunkSerializer.m_63454_(this.f_140133_, p_140259_);
@@ -31,7 +31,7 @@
              this.m_63502_(chunkpos, compoundtag);
              this.m_140229_(chunkpos, chunkstatus.m_62494_());
              return true;
-@@ -800,6 +_,7 @@
+@@ -768,6 +_,7 @@
  
     protected void m_183754_(ServerPlayer p_183755_, ChunkPos p_183756_, MutableObject<ClientboundLevelChunkWithLightPacket> p_183757_, boolean p_183758_, boolean p_183759_) {
        if (p_183755_.f_19853_ == this.f_140133_) {
@@ -39,7 +39,7 @@
           if (p_183759_ && !p_183758_) {
              ChunkHolder chunkholder = this.m_140327_(p_183756_.m_45588_());
              if (chunkholder != null) {
-@@ -1054,7 +_,7 @@
+@@ -1020,7 +_,7 @@
     }
  
     protected void m_140199_(Entity p_140200_) {
diff --git a/patches/minecraft/net/minecraft/server/level/ServerLevel.java.patch b/patches/minecraft/net/minecraft/server/level/ServerLevel.java.patch
index 1291de74f7..f66a7934dc 100644
--- a/patches/minecraft/net/minecraft/server/level/ServerLevel.java.patch
+++ b/patches/minecraft/net/minecraft/server/level/ServerLevel.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -176,10 +_,11 @@
+@@ -179,10 +_,11 @@
     private final List<CustomSpawner> f_8558_;
     @Nullable
     private final EndDragonFight f_8559_;
@@ -13,7 +13,7 @@
  
     public ServerLevel(MinecraftServer p_8571_, Executor p_8572_, LevelStorageSource.LevelStorageAccess p_8573_, ServerLevelData p_8574_, ResourceKey<Level> p_8575_, DimensionType p_8576_, ChunkProgressListener p_8577_, ChunkGenerator p_8578_, boolean p_8579_, long p_8580_, List<CustomSpawner> p_8581_, boolean p_8582_) {
        super(p_8574_, p_8575_, p_8576_, p_8571_::m_129905_, false, p_8579_, p_8580_);
-@@ -217,6 +_,7 @@
+@@ -220,6 +_,7 @@
        }
  
        this.f_143245_ = new SleepStatus();
@@ -21,7 +21,7 @@
     }
  
     public void m_8606_(int p_8607_, int p_8608_, boolean p_8609_, boolean p_8610_) {
-@@ -245,8 +_,8 @@
+@@ -248,8 +_,8 @@
        int i = this.m_46469_().m_46215_(GameRules.f_151486_);
        if (this.f_143245_.m_144002_(i) && this.f_143245_.m_144004_(i, this.f_8546_)) {
           if (this.m_46469_().m_46207_(GameRules.f_46140_)) {
@@ -32,7 +32,7 @@
           }
  
           this.m_8804_();
-@@ -275,7 +_,7 @@
+@@ -278,7 +_,7 @@
        this.m_8807_();
        this.f_8557_ = false;
        profilerfiller.m_7238_();
@@ -41,7 +41,7 @@
        if (flag) {
           this.m_8886_();
        }
-@@ -307,7 +_,9 @@
+@@ -310,7 +_,9 @@
                       }
  
                       profilerfiller.m_6180_("tick");
@@ -52,7 +52,7 @@
                       profilerfiller.m_7238_();
                    }
                 }
-@@ -396,6 +_,7 @@
+@@ -399,6 +_,7 @@
           BlockPos blockpos2 = this.m_5452_(Heightmap.Types.MOTION_BLOCKING, this.m_46496_(i, 0, j, 15));
           BlockPos blockpos3 = blockpos2.m_7495_();
           Biome biome = this.m_46857_(blockpos2);
@@ -60,7 +60,7 @@
           if (biome.m_47477_(this, blockpos3)) {
              this.m_46597_(blockpos3, Blocks.f_50126_.m_49966_());
           }
-@@ -586,15 +_,19 @@
+@@ -589,15 +_,19 @@
           this.f_8548_.m_6846_().m_11270_(new ClientboundGameEventPacket(ClientboundGameEventPacket.f_132161_, this.f_46440_), this.m_46472_());
        }
  
@@ -84,7 +84,7 @@
        }
  
     }
-@@ -650,9 +_,10 @@
+@@ -653,9 +_,10 @@
              ++p_8664_.f_19797_;
              ProfilerFiller profilerfiller = this.m_46473_();
              profilerfiller.m_6521_(() -> {
@@ -96,7 +96,7 @@
              p_8664_.m_6083_();
              profilerfiller.m_7238_();
  
-@@ -689,6 +_,7 @@
+@@ -692,6 +_,7 @@
              this.f_143244_.m_157554_();
           }
  
@@ -104,7 +104,7 @@
        }
     }
  
-@@ -761,7 +_,48 @@
+@@ -764,7 +_,48 @@
        this.m_8853_(p_8846_);
     }
  
@@ -153,7 +153,7 @@
        Entity entity = this.m_142646_().m_142694_(p_8854_.m_142081_());
        if (entity != null) {
           f_8566_.warn("Force-added player with duplicate UUID {}", (Object)p_8854_.m_142081_().toString());
-@@ -769,7 +_,8 @@
+@@ -772,7 +_,8 @@
           this.m_143261_((ServerPlayer)entity, Entity.RemovalReason.DISCARDED);
        }
  
@@ -163,7 +163,7 @@
     }
  
     private boolean m_8872_(Entity p_8873_) {
-@@ -777,7 +_,12 @@
+@@ -780,7 +_,12 @@
           f_8566_.warn("Tried to add entity {} but it was marked as removed already", (Object)EntityType.m_20613_(p_8873_.m_6095_()));
           return false;
        } else {
@@ -177,7 +177,7 @@
        }
     }
  
-@@ -814,10 +_,20 @@
+@@ -817,10 +_,20 @@
     }
  
     public void m_6263_(@Nullable Player p_8675_, double p_8676_, double p_8677_, double p_8678_, SoundEvent p_8679_, SoundSource p_8680_, float p_8681_, float p_8682_) {
@@ -198,7 +198,7 @@
        this.f_8548_.m_6846_().m_11241_(p_8689_, p_8690_.m_20185_(), p_8690_.m_20186_(), p_8690_.m_20189_(), p_8693_ > 1.0F ? (double)(16.0F * p_8693_) : 16.0D, this.m_46472_(), new ClientboundSoundEntityPacket(p_8691_, p_8692_, p_8690_, p_8693_, p_8694_));
     }
  
-@@ -862,6 +_,7 @@
+@@ -882,6 +_,7 @@
  
     public Explosion m_7703_(@Nullable Entity p_8653_, @Nullable DamageSource p_8654_, @Nullable ExplosionDamageCalculator p_8655_, double p_8656_, double p_8657_, double p_8658_, float p_8659_, boolean p_8660_, Explosion.BlockInteraction p_8661_) {
        Explosion explosion = new Explosion(this, p_8653_, p_8654_, p_8655_, p_8656_, p_8657_, p_8658_, p_8659_, p_8660_, p_8661_);
@@ -206,7 +206,7 @@
        explosion.m_46061_();
        explosion.m_46075_(false);
        if (p_8661_ == Explosion.BlockInteraction.NONE) {
-@@ -1389,6 +_,12 @@
+@@ -1409,6 +_,12 @@
        });
     }
  
@@ -219,23 +219,27 @@
     public LevelEntityGetter<Entity> m_142646_() {
        return this.f_143244_.m_157567_();
     }
-@@ -1463,8 +_,8 @@
-             ServerLevel.this.f_143246_.add((Mob)p_143371_);
+@@ -1490,10 +_,8 @@
+             ServerLevel.this.f_143246_.add(mob);
           }
  
 -         if (p_143371_ instanceof EnderDragon) {
--            for(EnderDragonPart enderdragonpart : ((EnderDragon)p_143371_).m_31156_()) {
+-            EnderDragon enderdragon = (EnderDragon)p_143371_;
+-
+-            for(EnderDragonPart enderdragonpart : enderdragon.m_31156_()) {
 +         if (p_143371_.isMultipartEntity()) {
 +            for(net.minecraftforge.entity.PartEntity<?> enderdragonpart : p_143371_.getParts()) {
                 ServerLevel.this.f_143247_.put(enderdragonpart.m_142049_(), enderdragonpart);
              }
           }
-@@ -1483,8 +_,8 @@
-             ServerLevel.this.f_143246_.remove(p_143375_);
+@@ -1518,10 +_,8 @@
+             ServerLevel.this.f_143246_.remove(mob);
           }
  
 -         if (p_143375_ instanceof EnderDragon) {
--            for(EnderDragonPart enderdragonpart : ((EnderDragon)p_143375_).m_31156_()) {
+-            EnderDragon enderdragon = (EnderDragon)p_143375_;
+-
+-            for(EnderDragonPart enderdragonpart : enderdragon.m_31156_()) {
 +         if (p_143375_.isMultipartEntity()) {
 +            for(net.minecraftforge.entity.PartEntity<?> enderdragonpart : p_143375_.getParts()) {
                 ServerLevel.this.f_143247_.remove(enderdragonpart.m_142049_());
diff --git a/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
index e045652ee8..532d349ec8 100644
--- a/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
+++ b/patches/minecraft/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -379,9 +_,11 @@
+@@ -380,9 +_,11 @@
              }
  
              entity.m_19890_(d3, d4, d5, f, f1);
@@ -12,7 +12,7 @@
                 this.f_9742_.m_129512_(new ClientboundMoveVehiclePacket(entity));
                 return;
              }
-@@ -398,7 +_,7 @@
+@@ -399,7 +_,7 @@
     }
  
     private boolean m_9793_(Entity p_9794_) {
@@ -21,7 +21,7 @@
     }
  
     public void m_7376_(ServerboundAcceptTeleportationPacket p_9835_) {
-@@ -966,7 +_,9 @@
+@@ -967,7 +_,9 @@
        this.f_9743_.m_9243_();
        int i = this.f_9743_.f_19853_.m_151558_();
        if (blockpos.m_123342_() < i) {
@@ -32,7 +32,7 @@
              InteractionResult interactionresult = this.f_9743_.f_8941_.m_7179_(this.f_9743_, serverlevel, itemstack, interactionhand, blockhitresult);
              if (direction == Direction.UP && !interactionresult.m_19077_() && blockpos.m_123342_() >= i - 1 && m_9790_(this.f_9743_, itemstack)) {
                 Component component = (new TranslatableComponent("build.tooHigh", i - 1)).m_130940_(ChatFormatting.RED);
-@@ -1080,7 +_,7 @@
+@@ -1081,7 +_,7 @@
     }
  
     public void m_7388_(ServerboundChatPacket p_9841_) {
@@ -41,7 +41,7 @@
  
        for(int i = 0; i < s.length(); ++i) {
           if (!SharedConstants.m_136188_(s.charAt(i))) {
-@@ -1110,8 +_,10 @@
+@@ -1111,8 +_,10 @@
              String s1 = p_143629_.m_143722_();
              Component component = s1.isEmpty() ? null : new TranslatableComponent("chat.type.text", this.f_9743_.m_5446_(), s1);
              Component component1 = new TranslatableComponent("chat.type.text", this.f_9743_.m_5446_(), s);
@@ -53,7 +53,7 @@
              }, ChatType.CHAT, this.f_9743_.m_142081_());
           }
  
-@@ -1203,6 +_,7 @@
+@@ -1204,6 +_,7 @@
                 private void m_143678_(InteractionHand p_143679_, ServerGamePacketListenerImpl.EntityInteraction p_143680_) {
                    ItemStack itemstack = ServerGamePacketListenerImpl.this.f_9743_.m_21120_(p_143679_).m_41777_();
                    InteractionResult interactionresult = p_143680_.m_143694_(ServerGamePacketListenerImpl.this.f_9743_, entity, p_143679_);
@@ -61,7 +61,7 @@
                    if (interactionresult.m_19077_()) {
                       CriteriaTriggers.f_10565_.m_61494_(ServerGamePacketListenerImpl.this.f_9743_, itemstack, entity);
                       if (interactionresult.m_19080_()) {
-@@ -1404,6 +_,8 @@
+@@ -1405,6 +_,8 @@
     }
  
     public void m_7423_(ServerboundCustomPayloadPacket p_9860_) {
diff --git a/patches/minecraft/net/minecraft/server/packs/AbstractPackResources.java.patch b/patches/minecraft/net/minecraft/server/packs/AbstractPackResources.java.patch
index 964e74f517..842b44eded 100644
--- a/patches/minecraft/net/minecraft/server/packs/AbstractPackResources.java.patch
+++ b/patches/minecraft/net/minecraft/server/packs/AbstractPackResources.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/packs/AbstractPackResources.java
 +++ b/net/minecraft/server/packs/AbstractPackResources.java
-@@ -120,4 +_,10 @@
+@@ -119,4 +_,10 @@
     public String m_8017_() {
        return this.f_10203_.getName();
     }
diff --git a/patches/minecraft/net/minecraft/world/entity/ai/navigation/PathNavigation.java.patch b/patches/minecraft/net/minecraft/world/entity/ai/navigation/PathNavigation.java.patch
index b1aedebe7b..0627cb0f22 100644
--- a/patches/minecraft/net/minecraft/world/entity/ai/navigation/PathNavigation.java.patch
+++ b/patches/minecraft/net/minecraft/world/entity/ai/navigation/PathNavigation.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 +++ b/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-@@ -229,10 +_,10 @@
+@@ -225,10 +_,10 @@
        Vec3 vec3 = this.m_7475_();
        this.f_26505_ = this.f_26494_.m_20205_() > 0.75F ? this.f_26494_.m_20205_() / 2.0F : 0.75F - this.f_26494_.m_20205_() / 2.0F;
        Vec3i vec3i = this.f_26496_.m_77400_();
diff --git a/patches/minecraft/net/minecraft/world/inventory/BeaconMenu.java.patch b/patches/minecraft/net/minecraft/world/inventory/BeaconMenu.java.patch
index 6a0d8ebe96..bb6fbbcd97 100644
--- a/patches/minecraft/net/minecraft/world/inventory/BeaconMenu.java.patch
+++ b/patches/minecraft/net/minecraft/world/inventory/BeaconMenu.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/inventory/BeaconMenu.java
 +++ b/net/minecraft/world/inventory/BeaconMenu.java
-@@ -89,10 +_,8 @@
+@@ -90,10 +_,8 @@
              }
  
              slot.m_40234_(itemstack1, itemstack);
diff --git a/patches/minecraft/net/minecraft/world/item/ItemStack.java.patch b/patches/minecraft/net/minecraft/world/item/ItemStack.java.patch
index 97ad17f991..ae94cbe45b 100644
--- a/patches/minecraft/net/minecraft/world/item/ItemStack.java.patch
+++ b/patches/minecraft/net/minecraft/world/item/ItemStack.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/ItemStack.java
 +++ b/net/minecraft/world/item/ItemStack.java
-@@ -71,7 +_,7 @@
+@@ -70,7 +_,7 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -9,7 +9,7 @@
     public static final Codec<ItemStack> f_41582_ = RecordCodecBuilder.create((p_41697_) -> {
        return p_41697_.group(Registry.f_122827_.m_194605_().fieldOf("id").forGetter((p_150946_) -> {
           return p_150946_.f_41589_;
-@@ -81,6 +_,9 @@
+@@ -80,6 +_,9 @@
           return Optional.ofNullable(p_150939_.f_41590_);
        })).apply(p_41697_, ItemStack::new);
     });
@@ -19,7 +19,7 @@
     private static final Logger f_41585_ = LogManager.getLogger();
     public static final ItemStack f_41583_ = new ItemStack((Item)null);
     public static final DecimalFormat f_41584_ = Util.m_137469_(new DecimalFormat("#.##"), (p_41704_) -> {
-@@ -127,10 +_,15 @@
+@@ -126,10 +_,15 @@
        p_41606_.ifPresent(this::m_41751_);
     }
  
@@ -39,7 +39,7 @@
           this.m_41721_(this.m_41773_());
        }
  
-@@ -143,14 +_,19 @@
+@@ -142,14 +_,19 @@
     }
  
     private ItemStack(CompoundTag p_41608_) {
@@ -60,7 +60,7 @@
           this.m_41721_(this.m_41773_());
        }
  
-@@ -185,7 +_,7 @@
+@@ -184,7 +_,7 @@
     }
  
     public Item m_41720_() {
@@ -69,7 +69,7 @@
     }
  
     public boolean m_150922_(Tag<Item> p_150923_) {
-@@ -197,6 +_,15 @@
+@@ -196,6 +_,15 @@
     }
  
     public InteractionResult m_41661_(UseOnContext p_41662_) {
@@ -85,7 +85,7 @@
        Player player = p_41662_.m_43723_();
        BlockPos blockpos = p_41662_.m_8083_();
        BlockInWorld blockinworld = new BlockInWorld(p_41662_.m_43725_(), blockpos, false);
-@@ -204,7 +_,7 @@
+@@ -203,7 +_,7 @@
           return InteractionResult.PASS;
        } else {
           Item item = this.m_41720_();
@@ -94,7 +94,7 @@
           if (player != null && interactionresult.m_146666_()) {
              player.m_36246_(Stats.f_12982_.m_12902_(item));
           }
-@@ -233,11 +_,15 @@
+@@ -232,11 +_,15 @@
           p_41740_.m_128365_("tag", this.f_41590_.m_6426_());
        }
  
@@ -111,7 +111,7 @@
     }
  
     public boolean m_41753_() {
-@@ -245,7 +_,7 @@
+@@ -244,7 +_,7 @@
     }
  
     public boolean m_41763_() {
@@ -120,7 +120,7 @@
           CompoundTag compoundtag = this.m_41783_();
           return compoundtag == null || !compoundtag.m_128471_("Unbreakable");
        } else {
-@@ -254,19 +_,19 @@
+@@ -253,19 +_,19 @@
     }
  
     public boolean m_41768_() {
@@ -144,7 +144,7 @@
     }
  
     public boolean m_41629_(int p_41630_, Random p_41631_, @Nullable ServerPlayer p_41632_) {
-@@ -302,6 +_,7 @@
+@@ -301,6 +_,7 @@
     public <T extends LivingEntity> void m_41622_(int p_41623_, T p_41624_, Consumer<T> p_41625_) {
        if (!p_41624_.f_19853_.f_46443_ && (!(p_41624_ instanceof Player) || !((Player)p_41624_).m_150110_().f_35937_)) {
           if (this.m_41763_()) {
@@ -152,7 +152,7 @@
              if (this.m_41629_(p_41623_, p_41624_.m_21187_(), p_41624_ instanceof ServerPlayer ? (ServerPlayer)p_41624_ : null)) {
                 p_41625_.accept(p_41624_);
                 Item item = this.m_41720_();
-@@ -354,7 +_,7 @@
+@@ -353,7 +_,7 @@
     }
  
     public boolean m_41735_(BlockState p_41736_) {
@@ -161,7 +161,7 @@
     }
  
     public InteractionResult m_41647_(Player p_41648_, LivingEntity p_41649_, InteractionHand p_41650_) {
-@@ -365,7 +_,7 @@
+@@ -364,7 +_,7 @@
        if (this.m_41619_()) {
           return f_41583_;
        } else {
@@ -170,7 +170,7 @@
           itemstack.m_41754_(this.m_41612_());
           if (this.f_41590_ != null) {
              itemstack.f_41590_ = this.f_41590_.m_6426_();
-@@ -382,7 +_,7 @@
+@@ -381,7 +_,7 @@
           if (p_41659_.f_41590_ == null && p_41660_.f_41590_ != null) {
              return false;
           } else {
@@ -179,7 +179,7 @@
           }
        } else {
           return false;
-@@ -405,7 +_,7 @@
+@@ -404,7 +_,7 @@
        } else if (this.f_41590_ == null && p_41745_.f_41590_ != null) {
           return false;
        } else {
@@ -188,7 +188,7 @@
        }
     }
  
-@@ -529,7 +_,7 @@
+@@ -528,7 +_,7 @@
  
     public void m_41751_(@Nullable CompoundTag p_41752_) {
        this.f_41590_ = p_41752_;
@@ -197,7 +197,7 @@
           this.m_41721_(this.m_41773_());
        }
  
-@@ -729,6 +_,7 @@
+@@ -728,6 +_,7 @@
           }
        }
  
@@ -205,7 +205,7 @@
        return list;
     }
  
-@@ -866,9 +_,10 @@
+@@ -865,9 +_,10 @@
              }
           }
        } else {
@@ -217,7 +217,7 @@
        return multimap;
     }
  
-@@ -955,6 +_,23 @@
+@@ -954,6 +_,23 @@
  
     public boolean m_41614_() {
        return this.m_41720_().m_41472_();