Initial 26.1 snapshot update pass

Author: jpenilla

fabric/src/main/java/ca/spottedleaf/moonrise/fabric/FabricHooks.java

@@ -86,8 +86,9 @@ public void setCurrentlyLoading(final GenerationChunkHolder holder, final LevelC
     @Override
     public void chunkFullStatusComplete(final LevelChunk newChunk, final ProtoChunk original) {
         if (HAS_FABRIC_LIFECYCLE_EVENTS) {
-            ServerChunkEvents.CHUNK_LOAD.invoker().onChunkLoad((ServerLevel)newChunk.getLevel(), newChunk);
-            if (!(original instanceof ImposterProtoChunk)) {
+            final boolean generated = !(original instanceof ImposterProtoChunk);
+            ServerChunkEvents.CHUNK_LOAD.invoker().onChunkLoad((ServerLevel)newChunk.getLevel(), newChunk, generated);
+            if (generated) {
                 ServerChunkEvents.CHUNK_GENERATE.invoker().onChunkGenerate((ServerLevel)newChunk.getLevel(), newChunk);
             }
         }

fabric/src/main/java/ca/spottedleaf/moonrise/fabric/mixin/collisions/EntityMixin.java

@@ -36,7 +36,7 @@
     "accessWidener": "moonrise.accesswidener",
     "depends": {
         "fabricloader": ">=${loader_version}",
-        "minecraft": ">1.21.10 <1.21.12",
+        "minecraft": ">1.21.11 <26.2",
         "fabric-command-api-v2": "*"
     },
     "custom": {

fabric/src/main/resources/fabric.mod.json

@@ -4,7 +4,6 @@
   "mixins": [
     "chunk_system.FabricMinecraftServerMixin",
     "chunk_system.FabricServerLevelMixin",
-    "collisions.EntityMixin",
     "tick_loop.PacketProcessorMixin"
   ],
   "client": [

fabric/src/main/resources/moonrise-fabric.mixins.json

@@ -109,7 +109,7 @@ public void onChunkHolderTicketChange(final ServerLevel world, final ChunkHolder
         final ChunkPos pos = holder.getPos();
 
         EventHooks.fireChunkTicketLevelUpdated(
-            world, CoordinateUtils.getChunkKey(pos.x, pos.z),
+            world, CoordinateUtils.getChunkKey(pos.x(), pos.z()),
             oldLevel, newLevel, holder
         );
     }

neoforge/src/main/java/ca/spottedleaf/moonrise/neoforge/NeoForgeHooks.java

@@ -28,7 +28,7 @@ side = "BOTH"
 [[dependencies.moonrise]]
 modId = "minecraft"
 type = "required"
-versionRange = "(1.21.10,1.21.12)"
+versionRange = "(1.21.11,26.2)"
 ordering = "NONE"
 side = "BOTH"
 

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -56,8 +56,8 @@ rootProject.name = "Moonrise"
 
 include("fabric")
 findProject(":fabric")!!.name = "Moonrise-Fabric"
-include("neoforge")
-findProject(":neoforge")!!.name = "Moonrise-NeoForge"
+//include("neoforge")
+//findProject(":neoforge")!!.name = "Moonrise-NeoForge"
 
 // includeBuild("../YamlConfig") // Uncomment to use local YamlConfig
 // includeBuild("../ConcurrentUtil") // Uncomment to use local ConcurrentUtil

settings.gradle.kts

@@ -82,7 +82,7 @@ public void addPlayer(final ServerPlayer player) {
 
         for (int i = 0; i < TOTAL_MAP_TYPES; ++i) {
             // use 0 for default, will be updated by tickPlayer
-            (newTrackers[i] = new TrackedPlayer(player, MAP_TYPES[i])).add(chunk.x, chunk.z, 0);
+            (newTrackers[i] = new TrackedPlayer(player, MAP_TYPES[i])).add(chunk.x(), chunk.z(), 0);
         }
 
         // update view distances
@@ -118,12 +118,12 @@ public void tickPlayer(final ServerPlayer player) {
 
         final ChunkPos chunk = player.chunkPosition();
 
-        players[NearbyMapType.GENERAL.ordinal()].update(chunk.x, chunk.z, GENERAL_AREA_VIEW_DISTANCE);
-        players[NearbyMapType.GENERAL_SMALL.ordinal()].update(chunk.x, chunk.z, GENERAL_SMALL_VIEW_DISTANCE);
-        players[NearbyMapType.GENERAL_REALLY_SMALL.ordinal()].update(chunk.x, chunk.z, GENERAL_REALLY_SMALL_VIEW_DISTANCE);
-        players[NearbyMapType.TICK_VIEW_DISTANCE.ordinal()].update(chunk.x, chunk.z, PlatformHooks.get().getTickViewDistance(player));
-        players[NearbyMapType.VIEW_DISTANCE.ordinal()].update(chunk.x, chunk.z, PlatformHooks.get().getViewDistance(player));
-        players[NearbyMapType.SPAWN_RANGE.ordinal()].update(chunk.x, chunk.z, ChunkTickConstants.PLAYER_SPAWN_TRACK_RANGE); // Moonrise - chunk tick iteration
+        players[NearbyMapType.GENERAL.ordinal()].update(chunk.x(), chunk.z(), GENERAL_AREA_VIEW_DISTANCE);
+        players[NearbyMapType.GENERAL_SMALL.ordinal()].update(chunk.x(), chunk.z(), GENERAL_SMALL_VIEW_DISTANCE);
+        players[NearbyMapType.GENERAL_REALLY_SMALL.ordinal()].update(chunk.x(), chunk.z(), GENERAL_REALLY_SMALL_VIEW_DISTANCE);
+        players[NearbyMapType.TICK_VIEW_DISTANCE.ordinal()].update(chunk.x(), chunk.z(), PlatformHooks.get().getTickViewDistance(player));
+        players[NearbyMapType.VIEW_DISTANCE.ordinal()].update(chunk.x(), chunk.z(), PlatformHooks.get().getViewDistance(player));
+        players[NearbyMapType.SPAWN_RANGE.ordinal()].update(chunk.x(), chunk.z(), ChunkTickConstants.PLAYER_SPAWN_TRACK_RANGE); // Moonrise - chunk tick iteration
     }
 
     public TrackedChunk getChunk(final ChunkPos pos) {
@@ -255,7 +255,7 @@ protected void removeCallback(final ServerPlayer parameter, final int chunkX, fi
 
             final TrackedChunk chunk = NearbyPlayers.this.byChunk.get(chunkKey);
             if (chunk == null) {
-                throw new IllegalStateException("Chunk should exist at " + new ChunkPos(chunkKey));
+                throw new IllegalStateException("Chunk should exist at " + ChunkPos.unpack(chunkKey));
             }
 
             final NearbyMapType type = this.type;

src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java

@@ -89,7 +89,7 @@ public void onChunkHolderDelete(final ServerLevel level, final ChunkHolder holde
     @Override
     public void onChunkPreBorder(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerChunkCache)((ServerLevel)chunk.getLevel()).getChunkSource())
-            .moonrise$setFullChunk(chunk.getPos().x, chunk.getPos().z, chunk);
+            .moonrise$setFullChunk(chunk.getPos().x(), chunk.getPos().z(), chunk);
     }
 
     @Override
@@ -111,7 +111,7 @@ public void onChunkNotBorder(final LevelChunk chunk, final ChunkHolder holder) {
     @Override
     public void onChunkPostNotBorder(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerChunkCache)((ServerLevel)chunk.getLevel()).getChunkSource())
-            .moonrise$setFullChunk(chunk.getPos().x, chunk.getPos().z, null);
+            .moonrise$setFullChunk(chunk.getPos().x(), chunk.getPos().z(), null);
     }
 
     @Override

src/main/java/ca/spottedleaf/moonrise/common/util/BaseChunkSystemHooks.java

@@ -17,11 +17,11 @@ public static long getChunkKey(final BlockPos pos) {
 
     public static long getChunkKey(final Entity entity) {
         final ChunkPos pos = entity.chunkPosition();
-        return ((long)pos.z << 32) | (pos.x & 0xFFFFFFFFL);
+        return ((long)pos.z() << 32) | (pos.x() & 0xFFFFFFFFL);
     }
 
     public static long getChunkKey(final ChunkPos pos) {
-        return ((long)pos.z << 32) | (pos.x & 0xFFFFFFFFL);
+        return ((long)pos.z() << 32) | (pos.x() & 0xFFFFFFFFL);
     }
 
     public static long getChunkKey(final SectionPos pos) {
@@ -71,9 +71,9 @@ public static long getChunkSectionKey(final SectionPos pos) {
     }
 
     public static long getChunkSectionKey(final ChunkPos pos, final int y) {
-        return ((pos.x & SECTION_X_MASK) << SECTION_X_SHIFT)
+        return ((pos.x() & SECTION_X_MASK) << SECTION_X_SHIFT)
                 | ((y & SECTION_Y_MASK) << SECTION_Y_SHIFT)
-                | ((pos.z & SECTION_Z_MASK) << SECTION_Z_SHIFT);
+                | ((pos.z() & SECTION_Z_MASK) << SECTION_Z_SHIFT);
     }
 
     public static long getChunkSectionKey(final BlockPos pos) {