Update for 1.20(.1)

gradle.properties

@@ -1,9 +1,9 @@
 org.gradle.jvmargs=-Xmx1G
 org.gradle.daemon=false
-minecraft_version=1.19.4
-forge_version=1.19.4-45.0.44
+minecraft_version=1.20
+forge_version=1.20-46.0.14
 mod_version=0.2.5
 maven_group=com.abdelaziz.canary
-archives_base_name=canary-mc1.19.4
+archives_base_name=canary-mc1.20(.1)
 mod_id=canary
 mod_author=AbdElAziz

src/main/java/com/abdelaziz/canary/common/config/CanaryConfig.java

@@ -29,7 +29,6 @@ public class CanaryConfig {
     private CanaryConfig() {
         // Defines the default rules which can be configured by the user or other mods.
         // You must manually add a rule for any new mixins not covered by an existing package rule.
-
         this.addMixinRule("ai", true);
         this.addMixinRule("ai.goals", true);
         this.addMixinRule("ai.pathing", true);
@@ -137,8 +136,6 @@ private CanaryConfig() {
         this.addMixinRule("gen.cached_generator_settings", false);
         this.addMixinRule("gen.chunk_region", true);
 
-        this.addMixinRule("item", true);
-
         this.addMixinRule("math", true);
         this.addMixinRule("math.fast_blockpos", true);
         this.addMixinRule("math.fast_util", true);

src/main/java/com/abdelaziz/canary/common/entity/CanaryEntityCollisions.java

@@ -113,7 +113,7 @@ protected VoxelShape computeNext() {
                                 //get the world border at the end
                                 if (includeWorldBorder && !this.consumedWorldBorder) {
                                     this.consumedWorldBorder = true;
-                                    WorldBorder worldBorder = entity.level.getWorldBorder();
+                                    WorldBorder worldBorder = entity.level().getWorldBorder();
                                     if (!isWithinWorldBorder(worldBorder, box) && isWithinWorldBorder(worldBorder, entity.getBoundingBox())) {
                                         return worldBorder.getCollisionShape();
                                     }

src/main/java/com/abdelaziz/canary/mixin/alloc/enum_values/piston_block/PistonBaseBlockMixin.java

@@ -11,7 +11,7 @@
 public class PistonBaseBlockMixin {
 
     @Redirect(
-            method = "getNeighborSignal(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)Z",
+            method = "getNeighborSignal(Lnet/minecraft/world/level/SignalGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)Z",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/core/Direction;values()[Lnet/minecraft/core/Direction;"

src/main/java/com/abdelaziz/canary/mixin/entity/collisions/unpushable_cramming/LivingEntityMixin.java

@@ -75,7 +75,7 @@ public void canaryOnBlockCacheSet(BlockState newState) {
     }
 
     private void updateClimbingMobCachingSection(BlockState newState) {
-        EntitySectionStorage<Entity> entityCacheOrNull = WorldHelper.getEntityCacheOrNull(this.level);
+        EntitySectionStorage<Entity> entityCacheOrNull = WorldHelper.getEntityCacheOrNull(this.level());
         if (entityCacheOrNull != null) {
             EntitySection<Entity> trackingSection = entityCacheOrNull.getSection(SectionPos.asLong(this.blockPosition()));
             if (trackingSection != null) {

src/main/java/com/abdelaziz/canary/mixin/entity/inactive_navigations/MobMixin.java

@@ -63,11 +63,11 @@ public void updateNavigationRegistration() {
         if (this.isRegisteredToWorld()) {
             PathNavigation navigation = this.getNavigation();
             if (this.registeredNavigation != navigation) {
-                ((ServerWorldExtended) this.level).setNavigationInactive((Mob) (Object) this);
+                ((ServerWorldExtended) this.level()).setNavigationInactive((Mob) (Object) this);
                 this.registeredNavigation = navigation;
 
                 if (navigation.getPath() != null) {
-                    ((ServerWorldExtended) this.level).setNavigationActive((Mob) (Object) this);
+                    ((ServerWorldExtended) this.level()).setNavigationActive((Mob) (Object) this);
                 }
             }
         }

src/main/java/com/abdelaziz/canary/mixin/entity/inactive_navigations/ServerLevelMixin.java

@@ -11,6 +11,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.progress.ChunkProgressListener;
 import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.world.RandomSequences;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
 import net.minecraft.world.level.Level;
@@ -21,6 +22,7 @@
 import net.minecraft.world.level.storage.ServerLevelData;
 import net.minecraft.world.level.storage.WritableLevelData;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
@@ -84,7 +86,7 @@ private Iterator<Mob> getActiveListeners(Set<Mob> set) {
 
     @SuppressWarnings("rawtypes")
     @Inject(method = "<init>", at = @At("TAIL"))
-    private void init(MinecraftServer server, Executor workerExecutor, LevelStorageSource.LevelStorageAccess session, ServerLevelData properties, ResourceKey<Level> worldKey, LevelStem dimensionOptions, ChunkProgressListener worldGenerationProgressListener, boolean debugWorld, long seed, List spawners, boolean shouldTickTime, CallbackInfo ci) {
+    private void init(MinecraftServer server, Executor workerExecutor, LevelStorageSource.LevelStorageAccess session, ServerLevelData properties, ResourceKey<Level> worldKey, LevelStem dimensionOptions, ChunkProgressListener worldGenerationProgressListener, boolean debugWorld, long seed, List spawners, boolean shouldTickTime, @Nullable RandomSequences randomSequences, CallbackInfo ci) {
         this.navigatingMobs = new ReferenceOpenHashSet<>(this.navigatingMobs);
         this.activeNavigations = new ReferenceOpenHashSet<>();
     }

src/main/java/com/abdelaziz/canary/mixin/world/block_entity_ticking/world_border/BoundTickingBlockEntityMixin.java

@@ -2,7 +2,7 @@
 
 import com.abdelaziz.canary.common.world.listeners.WorldBorderListenerOnce;
 import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ChunkHolder;
+import net.minecraft.server.level.FullChunkStatus;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
@@ -38,7 +38,8 @@ private boolean cachedCanTickBlockEntity(LevelChunk instance, BlockPos pos) {
         if (this.isInsideWorldBorder()) {
             Level world = this.this$0.getLevel();
             if (world instanceof ServerLevel serverWorld) {
-                return this.this$0.getFullStatus().isOrAfter(ChunkHolder.FullChunkStatus.TICKING) && serverWorld.areEntitiesLoaded(ChunkPos.asLong(pos));
+                return this.this$0.getFullStatus().isOrAfter(FullChunkStatus.BLOCK_TICKING)
+                        && serverWorld.areEntitiesLoaded(ChunkPos.asLong(pos));
             }
             return true;
         } else {

src/main/java/com/abdelaziz/canary/mixin/world/chunk_access/ServerChunkCacheMixin.java

@@ -178,7 +178,7 @@ private ChunkAccess getChunkBlocking(int x, int z, ChunkStatus status, boolean c
 
         // Create a future to load the chunk if none exists
         if (loadFuture == null) {
-            if (ChunkHolder.getStatus(holder.getTicketLevel()).isOrAfter(status)) {
+            if (ChunkLevel.generationStatus(holder.getTicketLevel()).isOrAfter(status)) {
                 // Create a new future which upgrades the chunk from the previous status level to the desired one
                 CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> mergedFuture = this.chunkMap.schedule(holder, status);
 

src/main/java/com/abdelaziz/canary/mixin/world/player_chunk_tick/ChunkMapMixin.java

@@ -76,7 +76,7 @@ public void move(ServerPlayer player) {
 
         // We can only send chunks if the world matches. This hoists a check that
         // would otherwise be performed every time we try to send a chunk over.
-        if (player.level == this.level) {
+        if (player.level() == this.level) {
             this.sendChunks(oldPos, player);
         }
     }

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

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[45,)"
+loaderVersion = "[46,)"
 license = "LGPL-3.0-only"
 issueTrackerURL = "https://github.com/AbdElAziz333/Canary/issues"
 [[mods]]
@@ -20,13 +20,13 @@ Canary is a free and open-source optimization mod for Minecraft which makes a wi
 [[dependencies.canary]]
 modId = "forge"
 mandatory = true
-versionRange = "[45,)"
+versionRange = "[46,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.canary]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.4,1.20)"
+versionRange = "[1.20,1.21)"
 ordering = "NONE"
 side = "BOTH"

src/main/resources/canary.mixins.json

@@ -120,7 +120,6 @@
     "entity.skip_fire_check.EntityMixin",
     "gen.cached_generator_settings.NoiseBasedChunkGeneratorMixin",
     "gen.chunk_region.WorldGenRegionMixin",
-    "item.ItemStackMixin",
     "math.fast_blockpos.BlockPosMixin",
     "math.fast_blockpos.DirectionMixin",
     "math.fast_util.AABBMixin",