fix: mixins issues with multiple mods to be able to run Stoneblock 4

Hexeption · Hexeption · commit fe5f73fa8585 · 2025-12-15T08:09:08.000Z
diff --git a/patches/net/minecraft/server/level/ChunkMap.java.patch b/patches/net/minecraft/server/level/ChunkMap.java.patch
@@ -91,7 +91,7 @@
          p_294215_.connection.chunkSender.dropChunk(p_294215_, p_294758_);
      }
  
-@@ -907,19 +_,35 @@
+@@ -907,18 +_,35 @@
      }
  
      private CompletableFuture<Optional<CompoundTag>> readChunk(ChunkPos p_214964_) {
@@ -125,32 +125,32 @@
              return false;
          } else {
              for (ServerPlayer serverplayer : this.playerMap.getAllPlayers()) {
--                if (this.playerIsCloseEnoughForSpawning(serverplayer, p_183880_)) {
-+                if (this.playerIsCloseEnoughForSpawning(serverplayer, p_183880_, blockRange)) {
++                magma$range.set(blockRange);
+                 if (this.playerIsCloseEnoughForSpawning(serverplayer, p_183880_)) {
                      return true;
                  }
-             }
-@@ -936,7 +_,7 @@
+@@ -936,6 +_,7 @@
              Builder<ServerPlayer> builder = ImmutableList.builder();
  
              for (ServerPlayer serverplayer : this.playerMap.getAllPlayers()) {
--                if (this.playerIsCloseEnoughForSpawning(serverplayer, p_183889_)) {
-+                if (this.playerIsCloseEnoughForSpawning(serverplayer, p_183889_, 16384.0D)) { // Spigot
++                magma$range.set(16384.0D);
+                 if (this.playerIsCloseEnoughForSpawning(serverplayer, p_183889_)) {
                      builder.add(serverplayer);
                  }
-             }
-@@ -945,12 +_,12 @@
+@@ -945,12 +_,15 @@
          }
      }
  
--    private boolean playerIsCloseEnoughForSpawning(ServerPlayer p_183752_, ChunkPos p_183753_) {
-+    private boolean playerIsCloseEnoughForSpawning(ServerPlayer p_183752_, ChunkPos p_183753_, double range) { // Spigot
++    // Magma
++    private final com.google.common.util.concurrent.AtomicDouble magma$range = new com.google.common.util.concurrent.AtomicDouble(0);
++
+     private boolean playerIsCloseEnoughForSpawning(ServerPlayer p_183752_, ChunkPos p_183753_) {
          if (p_183752_.isSpectator()) {
              return false;
          } else {
              double d0 = euclideanDistanceSquared(p_183753_, p_183752_);
 -            return d0 < 16384.0;
-+            return d0 < range; // Spigot
++            return d0 < magma$range.getAndSet(0); // Spigot
          }
      }
  
diff --git a/patches/net/minecraft/server/level/ServerPlayerGameMode.java.patch b/patches/net/minecraft/server/level/ServerPlayerGameMode.java.patch
@@ -253,7 +253,7 @@
 +
 +            BlockState blockstate = block.playerWillDestroy(this.level, p_9281_, blockstate1, this.player);
 +
-+            boolean flag = this.level.removeBlock(p_9281_, false);
++            boolean flag = removeBlock(p_9281_, blockstate, false);
 +
 +            if (this.isCreative()) {
 +                // return true; // CraftBukkit
diff --git a/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -75,25 +75,20 @@
      }
  
      private int getMaximumFlyingTicks(Entity p_326388_) {
-@@ -394,6 +_,13 @@
-             Entity entity = this.player.getRootVehicle();
-             if (entity != this.player && entity.getControllingPassenger() == this.player && entity == this.lastVehicle) {
-                 ServerLevel serverlevel = this.player.serverLevel();
+@@ -407,7 +_,40 @@
+                 double d8 = d5 - this.vehicleFirstGoodZ;
+                 double d9 = entity.getDeltaMovement().lengthSqr();
+                 double d10 = d6 * d6 + d7 * d7 + d8 * d8;
+-                if (d10 - d9 > 100.0 && !this.isSingleplayerOwner()) {
++
 +                // CraftBukkit - store current player position
 +                double prevX = player.getX();
 +                double prevY = player.getY();
 +                double prevZ = player.getZ();
 +                float prevYaw = player.getYRot();
 +                float prevPitch = player.getXRot();
 +                // CraftBukkit end
-                 double d0 = entity.getX();
-                 double d1 = entity.getY();
-                 double d2 = entity.getZ();
-@@ -407,7 +_,31 @@
-                 double d8 = d5 - this.vehicleFirstGoodZ;
-                 double d9 = entity.getDeltaMovement().lengthSqr();
-                 double d10 = d6 * d6 + d7 * d7 + d8 * d8;
--                if (d10 - d9 > 100.0 && !this.isSingleplayerOwner()) {
++
 +
 +                // CraftBukkit start - handle custom speeds and skipped ticks
 +                this.allowedPlayerTicks += (System.currentTimeMillis() / 50) - this.lastTick;
@@ -729,7 +724,7 @@
          LOGGER.info("{} lost connection: {}", this.player.getName().getString(), p_350554_.reason().getString());
          this.removePlayerFromWorld();
          super.onDisconnect(p_350554_);
-@@ -1185,12 +_,19 @@
+@@ -1185,12 +_,21 @@
  
      private void removePlayerFromWorld() {
          this.chatMessageChain.close();
@@ -741,8 +736,9 @@
              .broadcastSystemMessage(Component.translatable("multiplayer.player.left", this.player.getDisplayName()).withStyle(ChatFormatting.YELLOW), false);
 +        */
          this.player.disconnect();
--        this.server.getPlayerList().remove(this.player);
-+        String quitMessage = this.server.getPlayerList().remove(this.player);
+         this.server.getPlayerList().remove(this.player);
++        String quitMessage = this.server.getPlayerList().magma$removeString;
++        this.server.getPlayerList().magma$removeString = null;
 +        if ((quitMessage != null) && (quitMessage.length() > 0)) {
 +            this.server.getPlayerList().broadcastMessage(org.bukkit.craftbukkit.util.CraftChatMessage.fromString(quitMessage));
 +        }
diff --git a/patches/net/minecraft/server/players/PlayerList.java.patch b/patches/net/minecraft/server/players/PlayerList.java.patch
@@ -225,12 +225,14 @@
          this.playerIo.save(p_11277_);
          ServerStatsCounter serverstatscounter = this.stats.get(p_11277_.getUUID());
          if (serverstatscounter != null) {
-@@ -350,16 +_,29 @@
+@@ -350,16 +_,32 @@
          }
      }
  
--    public void remove(ServerPlayer p_11287_) {
-+    public String remove(ServerPlayer p_11287_) { // CraftBukkit - return string
++    // Magma
++    public String magma$removeString = null;
++
+     public void remove(ServerPlayer p_11287_) {
 +        net.neoforged.neoforge.event.EventHooks.firePlayerLoggedOut(p_11287_);
          ServerLevel serverlevel = p_11287_.serverLevel();
          p_11287_.awardStat(Stats.LEAVE_GAME);
@@ -285,7 +287,7 @@
 +        cserver.getScoreboardManager().removePlayer(p_11287_.getBukkitEntity());
 +        // CraftBukkit end
 +
-+        return playerQuitEvent.getQuitMessage(); // CraftBukkit
++        magma$removeString = playerQuitEvent.getQuitMessage(); // CraftBukkit
      }
  
 -    @Nullable
diff --git a/patches/net/minecraft/world/entity/EntityType.java.patch b/patches/net/minecraft/world/entity/EntityType.java.patch
@@ -79,51 +79,37 @@
          Consumer<T> consumer;
          if (p_20594_ != null) {
              consumer = createDefaultStackConfig(p_20593_, p_20594_, p_20595_);
-@@ -892,7 +_,7 @@
+@@ -892,6 +_,7 @@
              };
          }
  
--        return this.spawn(p_20593_, consumer, p_20596_, p_20597_, p_20598_, p_20599_);
-+        return this.spawn(p_20593_, consumer, p_20596_, p_20597_, p_20598_, p_20599_, spawnReason); // CraftBukkit
++        magma$setSpawnReason(spawnReason);
+         return this.spawn(p_20593_, consumer, p_20596_, p_20597_, p_20598_, p_20599_);
      }
  
-     public static <T extends Entity> Consumer<T> createDefaultStackConfig(ServerLevel p_263583_, ItemStack p_263568_, @Nullable Player p_263575_) {
-@@ -915,19 +_,37 @@
+@@ -915,7 +_,15 @@
          Consumer<T> p_263579_, ServerLevel p_263571_, ItemStack p_263582_, @Nullable Player p_263574_
      ) {
          CustomData customdata = p_263582_.getOrDefault(DataComponents.ENTITY_DATA, CustomData.EMPTY);
 -        return !customdata.isEmpty() ? p_263579_.andThen(p_329995_ -> updateCustomEntityTag(p_263571_, p_263574_, p_329995_, customdata)) : p_263579_;
 +        return !customdata.isEmpty() ? p_263579_.andThen(p_329995_ -> {
 +            try { updateCustomEntityTag(p_263571_, p_263574_, p_329995_, customdata); } catch (Throwable t) { LOGGER.warn("Error loading spawn egg NBT", t); } // CraftBukkit - SPIGOT-5665
 +        }) : p_263579_;
-     }
- 
-     @Nullable
-     public T spawn(ServerLevel p_262634_, BlockPos p_262707_, MobSpawnType p_262597_) {
--        return this.spawn(p_262634_, null, p_262707_, p_262597_, false, false);
-+        // CraftBukkit start
-+        return this.spawn(p_262634_, p_262707_, p_262597_, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
 +    }
 +
-+    @Nullable
-+    public T spawn(ServerLevel worldserver, BlockPos blockposition, MobSpawnType enummobspawn, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
-+        return this.spawn(worldserver, (Consumer<T>) null, blockposition, enummobspawn, false, false, spawnReason); // CraftBukkit - decompile error
-+        // CraftBukkit end
++    // Magma
++    private org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason magma$spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
++    public void magma$setSpawnReason(org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
++        this.magma$spawnReason = reason;
      }
  
      @Nullable
+@@ -927,7 +_,9 @@
      public T spawn(ServerLevel p_262704_, @Nullable Consumer<T> p_262621_, BlockPos p_262672_, MobSpawnType p_262644_, boolean p_262690_, boolean p_262590_) {
-+        // CraftBukkit start
-+        return this.spawn(p_262704_, p_262621_, p_262672_, p_262644_, p_262690_, p_262590_, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
-+    }
-+
-+    @Nullable
-+    public T spawn(ServerLevel p_262704_, @Nullable Consumer<T> p_262621_, BlockPos p_262672_, MobSpawnType p_262644_, boolean p_262690_, boolean p_262590_, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
-+        // CraftBukkit end
          T t = this.create(p_262704_, p_262621_, p_262672_, p_262644_, p_262690_, p_262590_);
          if (t != null) {
 -            p_262704_.addFreshEntityWithPassengers(t);
-+            p_262704_.addFreshEntityWithPassengers(t, spawnReason);
++            p_262704_.addFreshEntityWithPassengers(t, magma$spawnReason);
 +            return !t.isRemoved() ? t : null; // Don't return an entity when CreatureSpawnEvent is canceled
 +            // CraftBukkit end
          }
diff --git a/patches/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch b/patches/net/minecraft/world/entity/npc/WanderingTraderSpawner.java.patch
@@ -1,14 +1,14 @@
 --- a/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 +++ b/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-@@ -103,14 +_,14 @@
+@@ -103,6 +_,7 @@
                      return false;
                  }
  
--                WanderingTrader wanderingtrader = EntityType.WANDERING_TRADER.spawn(p_35916_, blockpos2, MobSpawnType.EVENT);
-+                WanderingTrader wanderingtrader = EntityType.WANDERING_TRADER.spawn(p_35916_, blockpos2, MobSpawnType.EVENT, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
++                net.minecraft.world.entity.EntityType.WANDERING_TRADER.magma$setSpawnReason(org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL);
+                 WanderingTrader wanderingtrader = EntityType.WANDERING_TRADER.spawn(p_35916_, blockpos2, MobSpawnType.EVENT);
                  if (wanderingtrader != null) {
                      for (int j = 0; j < 2; j++) {
-                         this.tryToSpawnLlamaFor(p_35916_, wanderingtrader, 4);
+@@ -110,7 +_,7 @@
                      }
  
                      this.serverLevelData.setWanderingTraderId(wanderingtrader.getUUID());
@@ -17,12 +17,11 @@
                      wanderingtrader.setWanderTarget(blockpos1);
                      wanderingtrader.restrictTo(blockpos1, 16);
                      return true;
-@@ -124,7 +_,7 @@
+@@ -124,6 +_,7 @@
      private void tryToSpawnLlamaFor(ServerLevel p_35918_, WanderingTrader p_35919_, int p_35920_) {
          BlockPos blockpos = this.findSpawnPositionNear(p_35918_, p_35919_.blockPosition(), p_35920_);
          if (blockpos != null) {
--            TraderLlama traderllama = EntityType.TRADER_LLAMA.spawn(p_35918_, blockpos, MobSpawnType.EVENT);
-+            TraderLlama traderllama = EntityType.TRADER_LLAMA.spawn(p_35918_, blockpos, MobSpawnType.EVENT, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
++            net.minecraft.world.entity.EntityType.TRADER_LLAMA.magma$setSpawnReason(org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL);
+             TraderLlama traderllama = EntityType.TRADER_LLAMA.spawn(p_35918_, blockpos, MobSpawnType.EVENT);
              if (traderllama != null) {
                  traderllama.setLeashedTo(p_35919_, true);
-             }
diff --git a/patches/net/minecraft/world/level/NaturalSpawner.java.patch b/patches/net/minecraft/world/level/NaturalSpawner.java.patch
@@ -53,16 +53,16 @@
          p_47030_.getProfiler().pop();
      }
  
-@@ -197,9 +_,14 @@
+@@ -197,9 +_,15 @@
                                      );
                                      j++;
                                      l1++;
--                                    p_47040_.addFreshEntityWithPassengers(mob);
--                                    p_47044_.run(mob, p_47041_);
--                                    if (j >= mob.getMaxSpawnClusterSize()) {
 +                                    // CraftBukkit start
 +                                    // SPIGOT-7045: Give ocelot babies back their special spawn reason. Note: This is the only modification required as ocelots count as monsters which means they only spawn during normal chunk ticking and do not spawn during chunk generation as starter mobs.
-+                                    p_47040_.addFreshEntityWithPassengers(mob, (mob instanceof net.minecraft.world.entity.animal.Ocelot && !((org.bukkit.entity.Ageable) mob.getBukkitEntity()).isAdult()) ? org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.OCELOT_BABY : org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL);
++                                    p_47040_.setSpawnReason((mob instanceof net.minecraft.world.entity.animal.Ocelot && !((org.bukkit.entity.Ageable) mob.getBukkitEntity()).isAdult()) ? org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.OCELOT_BABY : org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL);
+                                     p_47040_.addFreshEntityWithPassengers(mob);
+-                                    p_47044_.run(mob, p_47041_);
+-                                    if (j >= mob.getMaxSpawnClusterSize()) {
 +                                    if (!mob.isRemoved()) {
 +                                        p_47044_.run(mob, p_47041_);
 +                                    }
diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionType.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionType.java
@@ -27,8 +27,11 @@ public static PotionType minecraftToBukkit(Potion minecraft) {
         Preconditions.checkArgument(minecraft != null);
 
         net.minecraft.core.Registry<Potion> registry = CraftRegistry.getMinecraftRegistry(Registries.POTION);
-        PotionType bukkit = Registry.POTION.get(CraftNamespacedKey.fromMinecraft(registry.getResourceKey(minecraft).orElseThrow().location()));
-
+        var key = registry.getResourceKey(minecraft).orElseThrow().location();
+        PotionType bukkit = Registry.POTION.get(CraftNamespacedKey.fromMinecraft(key));
+        if (bukkit == null) {
+            bukkit = CraftPotionUtil.modded.get(key);
+        }
         Preconditions.checkArgument(bukkit != null);
 
         return bukkit;
diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
@@ -3,7 +3,10 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
+import java.util.HashMap;
+import java.util.Map;
 import net.minecraft.core.Holder;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
 import org.bukkit.potion.PotionData;
@@ -39,6 +42,8 @@ public class CraftPotionUtil {
             .put(PotionType.SLOW_FALLING, PotionType.LONG_SLOW_FALLING)
             .build();
 
+    public static Map<ResourceLocation, PotionType> modded = new HashMap<>();
+
     public static PotionType fromBukkit(PotionData data) {
         if (data == null) {
             return null;
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
@@ -67,7 +67,7 @@ public enum PotionType implements Keyed {
     private final Supplier<InternalPotionData> internalPotionDataSupplier;
 
     PotionType(String key) {
-        this.key = NamespacedKey.minecraft(key);
+        this.key = NamespacedKey.fromString(key);
         this.internalPotionDataSupplier = Suppliers.memoize(() -> Bukkit.getUnsafe().getInternalPotionData(this.key));
     }
 
diff --git a/src/main/java/org/magmafoundation/magma/neoforge/NeoInject.java b/src/main/java/org/magmafoundation/magma/neoforge/NeoInject.java
@@ -21,11 +21,13 @@
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.World;
+import org.bukkit.craftbukkit.potion.CraftPotionUtil;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.craftbukkit.util.CraftSpawnCategory;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.SpawnCategory;
+import org.bukkit.potion.PotionType;
 import org.magmafoundation.magma.util.ResourceLocationUtil;
 
 public class NeoInject {
@@ -57,6 +59,8 @@ public static void init() {
         addNeoForgeEntities();
         log("Injecting NeoForge Mob Categorys into Bukkit");
         addNeoForgeMobCategorys();
+        log("Injecting NeoForge Potion Types into Bukkit");
+        addNeoForgePotionTypes();
     }
 
     private static void log(String message) {
@@ -163,6 +167,30 @@ private static void addNeoForgeMobCategorys() {
         }
     }
 
+    private static void addNeoForgePotionTypes() {
+        var potionRegistry = BuiltInRegistries.POTION;
+        for (var potion : potionRegistry) {
+            ResourceLocation potionResourceName = potionRegistry.getKey(potion);
+            String potionName = ResourceLocationUtil.standardize(potionResourceName);
+            if (!isModded(potionResourceName)) {
+                continue;
+            }
+
+            try {
+                PotionType.valueOf(potionName);
+            } catch (Exception e) {
+                PotionType potionType = EnumHelper.addEnum(PotionType.class, potionName, List.of(String.class), List.of(potionResourceName.toString()));
+                if (potionType != null) {
+                    CraftPotionUtil.modded.put(potionResourceName, potionType);
+                    log("Added NeoForge Potion Type: " + potionType.name() + " - " + potionType.getKey());
+
+                } else {
+                    log("Failed to add NeoForge Potion Type: " + potionName);
+                }
+            }
+        }
+    }
+
     private static boolean isModded(ResourceLocation resourceLocation) {
         return !resourceLocation.getNamespace().equals(NamespacedKey.MINECRAFT);
     }

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@`
`253`	`253`	`+`
`254`	`254`	`+ BlockState blockstate = block.playerWillDestroy(this.level, p_9281_, blockstate1, this.player);`
`255`	`255`	`+`
`256`		`-+ boolean flag = this.level.removeBlock(p_9281_, false);`
	`256`	`++ boolean flag = removeBlock(p_9281_, blockstate, false);`
`257`	`257`	`+`
`258`	`258`	`+ if (this.isCreative()) {`
`259`	`259`	`+ // return true; // CraftBukkit`
Original file line number	Diff line number	Diff line change
`@@ -225,12 +225,14 @@`
`225`	`225`	`this.playerIo.save(p_11277_);`
`226`	`226`	`ServerStatsCounter serverstatscounter = this.stats.get(p_11277_.getUUID());`
`227`	`227`	`if (serverstatscounter != null) {`
`228`		`-@@ -350,16 +_,29 @@`
	`228`	`+@@ -350,16 +_,32 @@`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`
`232`		`-- public void remove(ServerPlayer p_11287_) {`
`233`		`-+ public String remove(ServerPlayer p_11287_) { // CraftBukkit - return string`
	`232`	`++ // Magma`
	`233`	`++ public String magma$removeString = null;`
	`234`	`++`
	`235`	`+ public void remove(ServerPlayer p_11287_) {`
`234`	`236`	`+ net.neoforged.neoforge.event.EventHooks.firePlayerLoggedOut(p_11287_);`
`235`	`237`	`ServerLevel serverlevel = p_11287_.serverLevel();`
`236`	`238`	`p_11287_.awardStat(Stats.LEAVE_GAME);`
`@@ -285,7 +287,7 @@`
`285`	`287`	`+ cserver.getScoreboardManager().removePlayer(p_11287_.getBukkitEntity());`
`286`	`288`	`+ // CraftBukkit end`
`287`	`289`	`+`
`288`		`-+ return playerQuitEvent.getQuitMessage(); // CraftBukkit`
	`290`	`++ magma$removeString = playerQuitEvent.getQuitMessage(); // CraftBukkit`
`289`	`291`	`}`
`290`	`292`
`291`	`293`	`- @Nullable`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public enum PotionType implements Keyed {`
`67`	`67`	`private final Supplier<InternalPotionData> internalPotionDataSupplier;`
`68`	`68`
`69`	`69`	`PotionType(String key) {`
`70`		`- this.key = NamespacedKey.minecraft(key);`
	`70`	`+ this.key = NamespacedKey.fromString(key);`
`71`	`71`	`this.internalPotionDataSupplier = Suppliers.memoize(() -> Bukkit.getUnsafe().getInternalPotionData(this.key));`
`72`	`72`	`}`
`73`	`73`