build: 24w33a

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
         run: ./gradlew build
       - name: upload to modrinth and curseforge
         run: ./gradlew modrinth curseforge
-        if: github.ref == 'refs/heads/ver/1.21.1'
+        if: github.ref == 'refs/heads/ver/1.21.2'
         env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_API_TOKEN }}

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.github.johnrengelman.shadow' version '7.1.0'
 	id 'com.modrinth.minotaur' version '2.+'

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.1
-loader_version=0.15.11
+minecraft_version=24w33a
+yarn_mappings=24w33a+build.26
+loader_version=0.16.2
 
 # Mod Properties
 mod_version = 0.2.0+beta.7

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/ishland/vmp/VMPMod.java

@@ -17,6 +17,6 @@ public void onInitialize() {
             NearbyEntityTracking.init();
         }
 
-//        MixinEnvironment.getCurrentEnvironment().audit();
+        MixinEnvironment.getCurrentEnvironment().audit();
     }
 }

src/main/java/com/ishland/vmp/common/config/Config.java

@@ -19,7 +19,6 @@ public class Config {
     private static final Logger LOGGER = LogManager.getLogger();
 
     public static final int TARGET_CHUNK_SEND_RATE;
-    public static final boolean USE_OPTIMIZED_CHUNK_TICKING_ITERATION;
     public static final boolean USE_ASYNC_LOGGING;
     public static final boolean USE_OPTIMIZED_ENTITY_TRACKING;
     public static final boolean OPTIMIZED_ENTITY_TRACKING_USE_STAGING_AREA;
@@ -42,7 +41,6 @@ public class Config {
             }
         }
         TARGET_CHUNK_SEND_RATE = getInt(properties, newProperties, "target_chunk_send_rate", -1);
-        USE_OPTIMIZED_CHUNK_TICKING_ITERATION = getBoolean(properties, newProperties, "exp_use_optimized_chunk_ticking_iteration", false);
         USE_ASYNC_LOGGING = getBoolean(properties, newProperties, "use_async_logging", true);
         USE_OPTIMIZED_ENTITY_TRACKING = getBoolean(properties, newProperties, "use_optimized_entity_tracking", true);
         OPTIMIZED_ENTITY_TRACKING_USE_STAGING_AREA = getBoolean(properties, newProperties, "optimized_entity_tracking_use_staging_area", true);

src/main/java/com/ishland/vmp/mixins/VMPMixinPlugin.java

@@ -33,8 +33,6 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
             return Config.USE_MULTIPLE_NETTY_EVENT_LOOPS;
         if (mixinClassName.startsWith("com.ishland.vmp.mixins.chunk.loading.portals."))
             return Config.USE_ASYNC_PORTALS;
-        if (mixinClassName.startsWith("com.ishland.vmp.mixins.chunk.iteration."))
-            return Config.USE_OPTIMIZED_CHUNK_TICKING_ITERATION;
         if (mixinClassName.startsWith("com.ishland.vmp.mixins.chunk.loading.async_chunk_on_player_login"))
             return Config.USE_ASYNC_CHUNKS_ON_LOGIN && !isClassExist("com.ishland.c2me.opts.chunkio.common.async_chunk_on_player_login.IAsyncChunkPlayer");
         if (mixinClassName.startsWith("com.ishland.vmp.mixins.chunk.loading.command"))

src/main/java/com/ishland/vmp/mixins/chunk/loading/MixinPointOfInterestStorage.java

@@ -26,15 +26,16 @@
 
 import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 
 @Mixin(PointOfInterestStorage.class)
-public abstract class MixinPointOfInterestStorage extends SerializingRegionBasedStorage<PointOfInterestSet> implements IPOIAsyncPreload {
+public abstract class MixinPointOfInterestStorage extends SerializingRegionBasedStorage<PointOfInterestSet, PointOfInterestSet.Serialized> implements IPOIAsyncPreload {
 
     @Shadow @Final private LongSet preloadedChunks;
 
-    public MixinPointOfInterestStorage(ChunkPosKeyedStorage storageAccess, Function<Runnable, Codec<PointOfInterestSet>> codecFactory, Function<Runnable, PointOfInterestSet> factory, DynamicRegistryManager registryManager, ChunkErrorHandler errorHandler, HeightLimitView world) {
-        super(storageAccess, codecFactory, factory, registryManager, errorHandler, world);
+    public MixinPointOfInterestStorage(ChunkPosKeyedStorage storageAccess, Codec<PointOfInterestSet.Serialized> codec, Function<PointOfInterestSet, PointOfInterestSet.Serialized> serializer, BiFunction<PointOfInterestSet.Serialized, Runnable, PointOfInterestSet> deserializer, Function<Runnable, PointOfInterestSet> factory, DynamicRegistryManager registryManager, ChunkErrorHandler errorHandler, HeightLimitView world) {
+        super(storageAccess, codec, serializer, deserializer, factory, registryManager, errorHandler, world);
     }
 
     @Override