Fix up immediate problems.

Signed-off-by: cpw <[email protected]>

patches/minecraft/net/minecraft/client/renderer/model/ModelBakery.java.patch

@@ -1,14 +1,6 @@
 --- a/net/minecraft/client/renderer/model/ModelBakery.java
 +++ b/net/minecraft/client/renderer/model/ModelBakery.java
-@@ -29,6 +29,7 @@
- import java.util.function.Predicate;
- import java.util.function.Supplier;
- import java.util.stream.Collectors;
-+import java.util.stream.Stream;
- import javax.annotation.Nullable;
- import net.minecraft.block.Block;
- import net.minecraft.block.BlockRenderType;
-@@ -97,7 +98,7 @@
+@@ -97,7 +97,7 @@
     private final Set<ResourceLocation> field_217848_D = Sets.newHashSet();
     private final BlockModelDefinition.ContainerHolder field_209610_F = new BlockModelDefinition.ContainerHolder();
     private final Map<ResourceLocation, IUnbakedModel> field_217849_F = Maps.newHashMap();
@@ -17,7 +9,7 @@
     private final Map<ResourceLocation, IUnbakedModel> field_217851_H = Maps.newHashMap();
     private final Map<ResourceLocation, IBakedModel> field_217852_I = Maps.newHashMap();
     private final AtlasTexture.SheetData field_217853_J;
-@@ -288,7 +289,7 @@
+@@ -288,7 +288,7 @@
                       {
                          lvt_13_5_ = this.field_177598_f.func_199004_b(resourcelocation1).stream().map((p_217839_1_) -> {
                             try (InputStream inputstream = p_217839_1_.func_199027_b()) {
@@ -26,7 +18,7 @@
                                return pair2;
                             } catch (Exception exception1) {
                                throw new ModelBakery.BlockStateDefinitionException(String.format("Exception loading blockstate definition: '%s' in resourcepack: '%s': %s", p_217839_1_.func_199029_a(), p_217839_1_.func_199026_d(), exception1.getMessage()));
-@@ -404,7 +405,12 @@
+@@ -404,7 +404,12 @@
  
     @Nullable
     public IBakedModel func_217845_a(ResourceLocation p_217845_1_, ISprite p_217845_2_) {
@@ -40,7 +32,7 @@
        if (this.field_217850_G.containsKey(triple)) {
           return this.field_217850_G.get(triple);
        } else {
-@@ -412,11 +418,11 @@
+@@ -412,11 +417,11 @@
           if (iunbakedmodel instanceof BlockModel) {
              BlockModel blockmodel = (BlockModel)iunbakedmodel;
              if (blockmodel.func_178310_f() == field_177606_o) {

patches/minecraft/net/minecraft/world/end/DragonFightManager.java.patch

@@ -1,48 +1,23 @@
 --- a/net/minecraft/world/end/DragonFightManager.java
 +++ b/net/minecraft/world/end/DragonFightManager.java
-@@ -76,36 +76,37 @@
+@@ -76,7 +76,7 @@
     private int field_186123_q;
     private List<EnderCrystalEntity> field_186124_r;
  
 -   public DragonFightManager(ServerWorld p_i46669_1_, CompoundNBT p_i46669_2_) {
--      this.field_186110_d = p_i46669_1_;
--      if (p_i46669_2_.func_150297_b("DragonKilled", 99)) {
--         if (p_i46669_2_.func_186855_b("DragonUUID")) {
--            this.field_186119_m = p_i46669_2_.func_186857_a("DragonUUID");
-+   public DragonFightManager(ServerWorld worldIn, CompoundNBT compound, net.minecraft.world.dimension.EndDimension dim) {
-+      this.field_186110_d = worldIn;
-+      if (compound.func_150297_b("DragonKilled", 99)) {
-+         if (compound.func_186855_b("DragonUUID")) {
-+            this.field_186119_m = compound.func_186857_a("DragonUUID");
-          }
++   public DragonFightManager(ServerWorld p_i46669_1_, CompoundNBT p_i46669_2_, net.minecraft.world.dimension.EndDimension dim) {
+       this.field_186110_d = p_i46669_1_;
+       if (p_i46669_2_.func_150297_b("DragonKilled", 99)) {
+          if (p_i46669_2_.func_186855_b("DragonUUID")) {
+@@ -85,6 +85,7 @@
  
--         this.field_186117_k = p_i46669_2_.func_74767_n("DragonKilled");
--         this.field_186118_l = p_i46669_2_.func_74767_n("PreviouslyKilled");
--         if (p_i46669_2_.func_74767_n("IsRespawning")) {
-+         this.field_186117_k = compound.func_74767_n("DragonKilled");
-+         this.field_186118_l = compound.func_74767_n("PreviouslyKilled");
-+         this.field_186120_n = !compound.func_74767_n("LegacyScanPerformed"); // Forge: fix MC-105080
-+         if (compound.func_74767_n("IsRespawning")) {
+          this.field_186117_k = p_i46669_2_.func_74767_n("DragonKilled");
+          this.field_186118_l = p_i46669_2_.func_74767_n("PreviouslyKilled");
++         this.field_186120_n = !p_i46669_2_.func_74767_n("LegacyScanPerformed"); // Forge: fix MC-105080
+          if (p_i46669_2_.func_74767_n("IsRespawning")) {
              this.field_186122_p = DragonSpawnState.START;
           }
- 
--         if (p_i46669_2_.func_150297_b("ExitPortalLocation", 10)) {
--            this.field_186121_o = NBTUtil.func_186861_c(p_i46669_2_.func_74775_l("ExitPortalLocation"));
-+         if (compound.func_150297_b("ExitPortalLocation", 10)) {
-+            this.field_186121_o = NBTUtil.func_186861_c(compound.func_74775_l("ExitPortalLocation"));
-          }
-       } else {
-          this.field_186117_k = true;
-          this.field_186118_l = true;
-       }
- 
--      if (p_i46669_2_.func_150297_b("Gateways", 9)) {
--         ListNBT listnbt = p_i46669_2_.func_150295_c("Gateways", 3);
-+      if (compound.func_150297_b("Gateways", 9)) {
-+         ListNBT listnbt = compound.func_150295_c("Gateways", 3);
- 
-          for(int i = 0; i < listnbt.size(); ++i) {
-             this.field_186111_e.add(listnbt.func_186858_c(i));
+@@ -105,7 +106,7 @@
           }
        } else {
           this.field_186111_e.addAll(ContiguousSet.create(Range.closedOpen(0, 20), DiscreteDomain.integers()));

patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch

@@ -152,22 +152,19 @@
              p_217479_1_.func_70071_h_();
              this.func_217381_Z().func_76319_b();
           }
-@@ -633,15 +645,21 @@
+@@ -633,6 +645,11 @@
     }
  
     public boolean func_175660_a(PlayerEntity p_175660_1_, BlockPos p_175660_2_) {
--      return !this.field_73061_a.func_175579_a(this, p_175660_2_, p_175660_1_) && this.func_175723_af().func_177746_a(p_175660_2_);
 +       return super.func_175660_a(p_175660_1_, p_175660_2_);
-    }
- 
-+   @Override
-+   public boolean canMineBlockBody(PlayerEntity player, BlockPos pos) {
-+      return !this.field_73061_a.func_175579_a(this, pos, player) && this.func_175723_af().func_177746_a(pos);
 +   }
 +
-    public void func_73052_b(WorldSettings p_73052_1_) {
-       if (!this.field_73011_w.func_76567_e()) {
-          this.field_72986_A.func_176143_a(BlockPos.field_177992_a.func_177981_b(this.field_73020_y.func_201711_g().func_205470_d()));
++   @Override
++   public boolean canMineBlockBody(PlayerEntity p_175660_1_, BlockPos p_175660_2_) {
+       return !this.field_73061_a.func_175579_a(this, p_175660_2_, p_175660_1_) && this.func_175723_af().func_177746_a(p_175660_2_);
+    }
+ 
+@@ -642,6 +659,7 @@
        } else if (this.field_72986_A.func_76067_t() == WorldType.field_180272_g) {
           this.field_72986_A.func_176143_a(BlockPos.field_177992_a.func_177984_a());
        } else {
@@ -216,47 +213,32 @@
           this.func_217465_m(p_217440_1_);
           return true;
        }
-@@ -916,24 +938,29 @@
+@@ -916,11 +938,15 @@
     }
  
     public void func_217484_g(Entity p_217484_1_) {
--      if (p_217484_1_ instanceof EnderDragonEntity) {
--         for(EnderDragonPartEntity enderdragonpartentity : ((EnderDragonEntity)p_217484_1_).func_213404_dT()) {
--            enderdragonpartentity.func_70106_y();
 +      removeEntityComplete(p_217484_1_, false);
 +   }
-+   public void removeEntityComplete(Entity entityIn, boolean keepData) {
-+      if (entityIn instanceof EnderDragonEntity) {
-+         for(EnderDragonPartEntity enderdragonpartentity : ((EnderDragonEntity)entityIn).func_213404_dT()) {
++   public void removeEntityComplete(Entity p_217484_1_, boolean keepData) {
+       if (p_217484_1_ instanceof EnderDragonEntity) {
+          for(EnderDragonPartEntity enderdragonpartentity : ((EnderDragonEntity)p_217484_1_).func_213404_dT()) {
+-            enderdragonpartentity.func_70106_y();
 +            enderdragonpartentity.remove(keepData);
           }
        }
-+      entityIn.remove(keepData);
++      p_217484_1_.remove(keepData);
  
--      this.field_175741_N.remove(p_217484_1_.func_110124_au());
--      this.func_72863_F().func_217226_b(p_217484_1_);
--      if (p_217484_1_ instanceof ServerPlayerEntity) {
--         ServerPlayerEntity serverplayerentity = (ServerPlayerEntity)p_217484_1_;
-+      this.field_175741_N.remove(entityIn.func_110124_au());
-+      this.func_72863_F().func_217226_b(entityIn);
-+      if (entityIn instanceof ServerPlayerEntity) {
-+         ServerPlayerEntity serverplayerentity = (ServerPlayerEntity)entityIn;
-          this.field_217491_A.remove(serverplayerentity);
+       this.field_175741_N.remove(p_217484_1_.func_110124_au());
+       this.func_72863_F().func_217226_b(p_217484_1_);
+@@ -934,6 +960,7 @@
+          this.field_217495_I.remove(((MobEntity)p_217484_1_).func_70661_as());
        }
  
--      this.func_96441_U().func_181140_a(p_217484_1_);
--      if (p_217484_1_ instanceof MobEntity) {
--         this.field_217495_I.remove(((MobEntity)p_217484_1_).func_70661_as());
-+      this.func_96441_U().func_181140_a(entityIn);
-+      if (entityIn instanceof MobEntity) {
-+         this.field_217495_I.remove(((MobEntity)entityIn).func_70661_as());
-       }
- 
-+      entityIn.onRemovedFromWorld();
++      p_217484_1_.onRemovedFromWorld();
     }
  
     private void func_217465_m(Entity p_217465_1_) {
-@@ -954,15 +981,19 @@
+@@ -954,9 +981,13 @@
           }
        }
  
@@ -266,33 +248,22 @@
     public void func_217467_h(Entity p_217467_1_) {
 +      removeEntity(p_217467_1_, false);
 +   }
-+   public void removeEntity(Entity entityIn, boolean keepData) {
++   public void removeEntity(Entity p_217467_1_, boolean keepData) {
        if (this.field_217492_a) {
           throw new IllegalStateException("Removing entity while ticking!");
        } else {
--         this.func_217454_n(p_217467_1_);
--         this.field_217498_x.remove(p_217467_1_.func_145782_y());
--         this.func_217484_g(p_217467_1_);
-+         this.func_217454_n(entityIn);
-+         this.field_217498_x.remove(entityIn.func_145782_y());
-+         this.func_217484_g(entityIn);
-       }
-    }
- 
-@@ -975,8 +1006,11 @@
+@@ -975,7 +1006,10 @@
     }
  
     public void func_217434_e(ServerPlayerEntity p_217434_1_) {
 -      p_217434_1_.func_70106_y();
--      this.func_217467_h(p_217434_1_);
 +      removePlayer(p_217434_1_, false);
 +   }
-+   public void removePlayer(ServerPlayerEntity player, boolean keepData) {
-+      player.remove(keepData);
-+      this.func_217467_h(player);
++   public void removePlayer(ServerPlayerEntity p_217434_1_, boolean keepData) {
++      p_217434_1_.remove(keepData);
+       this.func_217467_h(p_217434_1_);
        this.func_72854_c();
     }
- 
 @@ -1000,10 +1034,20 @@
     }
  

patches/minecraft/net/minecraft/world/spawner/WorldEntitySpawner.java.patch

@@ -18,17 +18,27 @@
                                break label115;
                             }
  
-@@ -122,7 +122,8 @@
+@@ -122,15 +122,17 @@
                             }
  
                             mobentity.func_70012_b((double)f, (double)k, (double)f1, p_222263_1_.field_73012_v.nextFloat() * 360.0F, 0.0F);
 -                           if (d0 > 16384.0D && mobentity.func_213397_c(d0) || !mobentity.func_213380_a(p_222263_1_, SpawnReason.NATURAL) || !mobentity.func_205019_a(p_222263_1_)) {
 +                            int canSpawn = net.minecraftforge.common.ForgeHooks.canEntitySpawn(mobentity, p_222263_1_, f, k, f1, null);
-+                            if (d0 > 16384.0D && (canSpawn == -1 || (canSpawn == 0 && (mobentity.func_213397_c(d0) || !mobentity.func_213380_a(p_222263_1_, SpawnReason.NATURAL) || !mobentity.func_205019_a(p_222263_1_))))) {
++                            if (canSpawn == -1 || (canSpawn == 0 && d0 > 16384.0D && (mobentity.func_213397_c(d0) || !mobentity.func_213380_a(p_222263_1_, SpawnReason.NATURAL) || !mobentity.func_205019_a(p_222263_1_)))) {
                                break label115;
                             }
  
-@@ -153,13 +154,15 @@
++                           if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(mobentity, p_222263_1_, f, k, f1, null))
+                            ilivingentitydata = mobentity.func_213386_a(p_222263_1_, p_222263_1_.func_175649_E(new BlockPos(mobentity)), SpawnReason.NATURAL, ilivingentitydata, (CompoundNBT)null);
+                            ++i;
+                            ++j2;
+                            p_222263_1_.func_217376_c(mobentity);
+-                           if (i >= mobentity.func_70641_bl()) {
++                           if (i >= net.minecraftforge.event.ForgeEventFactory.getMaxSpawnPackSize(mobentity)) {
+                               return;
+                            }
+ 
+@@ -153,13 +155,15 @@
     }
  
     @Nullable
@@ -46,7 +56,7 @@
        return list.isEmpty() ? false : list.contains(p_222261_2_);
     }
  
-@@ -188,6 +191,13 @@
+@@ -188,6 +192,13 @@
        if (p_209382_0_ == EntitySpawnPlacementRegistry.PlacementType.NO_RESTRICTIONS) {
           return true;
        } else if (p_209382_3_ != null && p_209382_1_.func_175723_af().func_177746_a(p_209382_2_)) {
@@ -60,7 +70,7 @@
           BlockState blockstate = p_209382_1_.func_180495_p(p_209382_2_);
           IFluidState ifluidstate = p_209382_1_.func_204610_c(p_209382_2_);
           BlockPos blockpos = p_209382_2_.func_177984_a();
-@@ -198,14 +208,12 @@
+@@ -198,14 +209,12 @@
           case ON_GROUND:
           default:
              BlockState blockstate1 = p_209382_1_.func_180495_p(blockpos1);
@@ -76,7 +86,7 @@
        }
     }
  
-@@ -248,6 +256,7 @@
+@@ -248,6 +257,7 @@
                       entity.func_70012_b(d0, (double)blockpos.func_177956_o(), d1, p_77191_4_.nextFloat() * 360.0F, 0.0F);
                       if (entity instanceof MobEntity) {
                          MobEntity mobentity = (MobEntity)entity;

src/fmllauncher/java/net/minecraftforge/fml/loading/FMLClientLaunchProvider.java

@@ -62,10 +62,10 @@ public class FMLClientLaunchProvider extends FMLCommonLaunchHandler implements I
     public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder)
     {
         super.configureTransformationClassLoader(builder);
-        Path realms = LibraryFinder.findJarPathFor("com/mojang/realmsclient/plugin/RealmsPluginImpl.class", "realms");
-        Path mapped = Paths.get(realms.toString().substring(0, realms.toString().length() - 4) + '-' + FMLLoader.getMcpVersion() + ".jar");
-        LOGGER.debug(CORE, "Found realms library at {}", Files.exists(mapped) ? mapped : realms);
-        builder.addTransformationPath(Files.exists(mapped) ? mapped : realms);
+        Path patchy = LibraryFinder.findJarPathFor("com/mojang/patch/LegacyXMLLayout.class", "patchy");
+        Path mapped = Paths.get(patchy.toString().substring(0, patchy.toString().length() - 4) + '-' + FMLLoader.getMcpVersion() + ".jar");
+        LOGGER.debug(CORE, "Found patchy library at {}", Files.exists(mapped) ? mapped : patchy);
+        builder.addTransformationPath(Files.exists(mapped) ? mapped : patchy);
     }
 
     @SuppressWarnings("unchecked")

src/main/resources/META-INF/accesstransformer.cfg

@@ -104,8 +104,8 @@ protected net.minecraft.util.ObjectIntIdentityMap field_148749_a # internal map
 protected net.minecraft.util.ObjectIntIdentityMap field_195868_a # nextId
 public net.minecraft.util.WeightedRandom$Item field_76292_a #probability
 public net.minecraft.util.concurrent.ThreadTaskExecutor func_213165_a(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; # func_213165_a
-public net.minecraft.village.PointOfInterestType <init>(Ljava/lang/String;Ljava/util/Set;ILnet/minecraft/util/SoundEvent;)V
-public net.minecraft.village.PointOfInterestType <init>(Ljava/lang/String;Ljava/util/Set;ILnet/minecraft/util/SoundEvent;Ljava/util/function/Predicate;)V
+public net.minecraft.village.PointOfInterestType <init>(Ljava/lang/String;Ljava/util/Set;ILnet/minecraft/util/SoundEvent;I)V
+public net.minecraft.village.PointOfInterestType <init>(Ljava/lang/String;Ljava/util/Set;ILnet/minecraft/util/SoundEvent;Ljava/util/function/Predicate;I)V
 public net.minecraft.world.GameRules func_223595_a(Ljava/lang/String;Lnet/minecraft/world/GameRules$RuleType;)Lnet/minecraft/world/GameRules$RuleKey; # register
 protected net.minecraft.world.Teleporter field_77187_a # random
 protected net.minecraft.world.Teleporter field_85191_c # destinationCoordinateCache
@@ -117,15 +117,15 @@ public net.minecraft.world.World field_73018_p #prevThunderingStrength
 public net.minecraft.world.World func_175701_a(Lnet/minecraft/util/math/BlockPos;)Z # isValid
 public net.minecraft.world.World func_189509_E(Lnet/minecraft/util/math/BlockPos;)Z # isOutsideBuildHeight
 public-f net.minecraft.world.WorldType field_77139_a #worldTypes
-public net.minecraft.world.biome.provider.BiomeProvider field_201540_a # BIOMES_TO_SPAWN_IN
-private-f net.minecraft.world.server.ChunkHolder field_219320_o # block update location
-public net.minecraft.world.chunk.ChunkStatus <init>(Ljava/lang/String;Lnet/minecraft/world/chunk/ChunkStatus;ILjava/util/EnumSet;Lnet/minecraft/world/chunk/ChunkStatus$Type;Lnet/minecraft/world/chunk/ChunkStatus$IGenerationWorker;Lnet/minecraft/world/chunk/ChunkStatus$ILoadingWorker;)V
-public net.minecraft.world.chunk.ServerChunkProvider field_186029_c # chunkGenerator
-public net.minecraft.world.chunk.ServerChunkProvider field_73251_h # worldObj
-public net.minecraft.world.gen.IChunkGeneratorFactory
-public net.minecraft.world.gen.layer.LayerUtil func_202829_a(JLnet/minecraft/world/gen/layer/traits/IAreaTransformer1;Lnet/minecraft/world/gen/area/IAreaFactory;ILjava/util/function/LongFunction;)Lnet/minecraft/world/gen/area/IAreaFactory; # repeat
-private-f net.minecraft.world.storage.loot.LootPool field_186455_c # rolls
-private-f net.minecraft.world.storage.loot.LootPool field_186456_d # bonusRolls
 public net.minecraft.world.biome.Biome func_180626_a(Lnet/minecraft/util/math/BlockPos;)F # getTemperature
 public net.minecraft.world.biome.DeepFrozenOceanBiome func_180626_a(Lnet/minecraft/util/math/BlockPos;)F # getTemperature
-public net.minecraft.world.biome.FrozenOceanBiome func_180626_a(Lnet/minecraft/util/math/BlockPos;)F # getTemperature
+public net.minecraft.world.biome.FrozenOceanBiome func_180626_a(Lnet/minecraft/util/math/BlockPos;)F # getTemperature
+public net.minecraft.world.biome.provider.BiomeProvider field_201540_a # BIOMES_TO_SPAWN_IN
+public net.minecraft.world.chunk.ChunkStatus <init>(Ljava/lang/String;Lnet/minecraft/world/chunk/ChunkStatus;ILjava/util/EnumSet;Lnet/minecraft/world/chunk/ChunkStatus$Type;Lnet/minecraft/world/chunk/ChunkStatus$IGenerationWorker;Lnet/minecraft/world/chunk/ChunkStatus$ILoadingWorker;)V
+public net.minecraft.world.gen.IChunkGeneratorFactory
+public net.minecraft.world.gen.layer.LayerUtil func_202829_a(JLnet/minecraft/world/gen/layer/traits/IAreaTransformer1;Lnet/minecraft/world/gen/area/IAreaFactory;ILjava/util/function/LongFunction;)Lnet/minecraft/world/gen/area/IAreaFactory; # repeat
+private-f net.minecraft.world.server.ChunkHolder field_219320_o # block update location
+public net.minecraft.world.server.ServerChunkProvider field_186029_c # chunkGenerator
+public net.minecraft.world.server.ServerChunkProvider field_73251_h # worldObj
+private-f net.minecraft.world.storage.loot.LootPool field_186455_c # rolls
+private-f net.minecraft.world.storage.loot.LootPool field_186456_d # bonusRolls

src/main/resources/forge.exc

@@ -58,15 +58,15 @@ net/minecraft/world/World.markAndNotifyBlock(Lnet/minecraft/util/math/BlockPos;L
 net/minecraft/world/World.getSunBrightnessBody(F)F=|p_72971_1_
 net/minecraft/world/World.getSkyColorBody(Lnet/minecraft/util/math/BlockPos;F)Lnet/minecraft/util/math/Vec3d;=|p_217382_1_,p_217382_2_
 net/minecraft/world/World.getCloudColorBody(F)Lnet/minecraft/util/math/Vec3d;=|p_72824_1_
-net/minecraft/world/ServerWorld.canMineBlockBody(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/math/BlockPos;)Z=|p_175660_1_,p_175660_2_
-net/minecraft/world/ServerWorld.removeEntityComplete(Lnet/minecraft/entity/Entity;Z)V=|p_217484_1_,keepData
-net/minecraft/world/ServerWorld.removeEntity(Lnet/minecraft/entity/Entity;Z)V=|p_217467_1_,keepData
-net/minecraft/world/ServerWorld.removePlayer(Lnet/minecraft/entity/player/ServerPlayerEntity;Z)V=|p_217434_1_,keepData
+net/minecraft/world/server/ServerWorld.canMineBlockBody(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/math/BlockPos;)Z=|p_175660_1_,p_175660_2_
+net/minecraft/world/server/ServerWorld.removeEntityComplete(Lnet/minecraft/entity/Entity;Z)V=|p_217484_1_,keepData
+net/minecraft/world/server/ServerWorld.removeEntity(Lnet/minecraft/entity/Entity;Z)V=|p_217467_1_,keepData
+net/minecraft/world/server/ServerWorld.removePlayer(Lnet/minecraft/entity/player/ServerPlayerEntity;Z)V=|p_217434_1_,keepData
 
 net/minecraft/world/dimension/DimensionType.<init>(ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;ZLnet/minecraftforge/common/ModDimension;Lnet/minecraft/network/PacketBuffer;)V=|p_i49935_1_,p_i49935_2_,p_i49935_3_,p_i49935_4_,p_i49935_5_,modType,data
 net/minecraft/world/chunk/BlockStateContainer.setBits(IZ)V=|p_186012_1_,forceBits
 
-net/minecraft/world/end/DragonFightManager.<init>(Lnet/minecraft/world/ServerWorld;Lnet/minecraft/nbt/CompoundNBT;Lnet/minecraft/world/dimension/EndDimension;)V=|p_i46669_1_,p_i46669_2_,dim
+net/minecraft/world/end/DragonFightManager.<init>(Lnet/minecraft/world/server/ServerWorld;Lnet/minecraft/nbt/CompoundNBT;Lnet/minecraft/world/dimension/EndDimension;)V=|p_i46669_1_,p_i46669_2_,dim
 
 net/minecraft/entity/EntityType.<init>(Lnet/minecraft/entity/EntityType$IFactory;Lnet/minecraft/entity/EntityClassification;ZZZLcom/mojang/datafixers/types/Type;Lnet/minecraft/entity/EntitySize;Ljava/util/function/Predicate;Ljava/util/function/ToIntFunction;Ljava/util/function/ToIntFunction;Ljava/util/function/BiFunction;)V=|p_i50385_1_,p_i50385_2_,p_i50385_3_,p_i50385_4_,p_i50385_5_,p_i50385_6_,p_i50385_7_,velocityUpdateSupplier,trackingRangeSupplier,updateIntervalSupplier,customClientFactory
 net/minecraft/world/spawner/WorldEntitySpawner.getSpawnList(Lnet/minecraft/world/gen/ChunkGenerator;Lnet/minecraft/entity/EntityClassification;Ljava/util/Random;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;)Z|p_222264_0_,p_222264_1_,p_222264_2_,p_222264_3_,world

src/userdev/java/net/minecraftforge/userdev/FMLDevClientLaunchProvider.java

@@ -71,7 +71,6 @@ public class FMLDevClientLaunchProvider extends FMLCommonLaunchHandler implement
     public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder)
     {
         super.configureTransformationClassLoader(builder);
-        builder.addTransformationPath(LibraryFinder.findJarPathFor("com/mojang/realmsclient/plugin/RealmsPluginImpl.class", "realms"));
     }
 
     @Override

src/userdev/java/net/minecraftforge/userdev/FMLUserdevClientLaunchProvider.java

@@ -61,6 +61,5 @@ public class FMLUserdevClientLaunchProvider extends FMLUserdevLaunchProvider imp
     public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder)
     {
         super.configureTransformationClassLoader(builder);
-        builder.addTransformationPath(LibraryFinder.findJarPathFor("com/mojang/realmsclient/plugin/RealmsPluginImpl.class", "realms"));
     }
 }