0.1.0-beta.9

New versions of FC added this mechanism

closes #66

README.md

@@ -24,7 +24,7 @@ patches. Listed below are notable patches:
 | Mod         | Status                                                                                                                                                                                                                                                                                                   |
 |-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Lithium     | <details><summary>✅ compatible</summary>Lithium optimises many of the same parts of the game as Moonrise, for example the chunk system. Moonrise will automatically disable conflicting parts of Lithium. This mechanism needs to be manually validated for each Moonrise and Lithium release.</details> |
-| FerriteCore | <details><summary>📝 requires config changes</summary>In `config/ferritecore-mixin.toml`:<br/>Set `replaceNeighborLookup` and `replacePropertyMap` to `false`</details>                                                                                                                                  |
+| FerriteCore | <details><summary>✅ compatible</summary>FerriteCore optimises some of the same parts of the game as Moonrise. Moonrise will automatically disable conflicting parts of FerriteCore. This mechanism needs to be manually validated for each Moonrise and FerriteCore release.</details>                   |
 | C2ME        | <details><summary>❌ incompatible</summary>C2ME is based around modifications to the chunk system, which Moonrise replaces wholesale. This makes them fundamentally incompatible.</details>                                                                                                               |
 
 ## Configuration

fabric/build.gradle

@@ -24,7 +24,8 @@ dependencies {
     include "me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_version}"
     modImplementation "com.terraformersmc:modmenu:11.0.1"
 
-    modImplementation fabricApiLibs.fabric.api
+    modImplementation fabricApiLibs.command.api.v2
+    modImplementation fabricApiLibs.lifecycle.events.v1
     include fabricApiLibs.command.api.v2
     include fabricApiLibs.base
 }
@@ -59,7 +60,7 @@ publishMods {
         incompatible(
             "not-enough-crashes",
             "starlight",
-            "c2me-fabric"
+            "c2me"
         )
     }
 }

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

@@ -6,6 +6,7 @@ import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.GenerationChunkHolder;
@@ -18,6 +19,7 @@ import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ImposterProtoChunk;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.entity.EntityTypeTest;
@@ -28,6 +30,8 @@ import java.util.function.Predicate;
 
 public final class FabricHooks implements PlatformHooks {
 
+    private static final boolean HAS_FABRIC_LIFECYCLE_EVENTS = FabricLoader.getInstance().isModLoaded("fabric-lifecycle-events-v1");
+
     public interface OnExplosionDetonate {
         void onExplosion(final Level world, final Explosion explosion, final List<Entity> possiblyAffecting, final double diameter);
     }
@@ -85,7 +89,12 @@ public final class FabricHooks implements PlatformHooks {
 
     @Override
     public void chunkFullStatusComplete(final LevelChunk newChunk, final ProtoChunk original) {
-        ServerChunkEvents.CHUNK_LOAD.invoker().onChunkLoad((ServerLevel) newChunk.getLevel(), newChunk);
+        if (HAS_FABRIC_LIFECYCLE_EVENTS) {
+            ServerChunkEvents.CHUNK_LOAD.invoker().onChunkLoad((ServerLevel) newChunk.getLevel(), newChunk);
+            if (!(original instanceof ImposterProtoChunk)) {
+                ServerChunkEvents.CHUNK_GENERATE.invoker().onChunkGenerate((ServerLevel)newChunk.getLevel(), newChunk);
+            }
+        }
     }
 
     @Override
@@ -100,7 +109,9 @@ public final class FabricHooks implements PlatformHooks {
 
     @Override
     public void chunkUnloadFromWorld(final LevelChunk chunk) {
-        ServerChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload((ServerLevel) chunk.getLevel(), chunk);
+        if (HAS_FABRIC_LIFECYCLE_EVENTS) {
+            ServerChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload((ServerLevel) chunk.getLevel(), chunk);
+        }
     }
 
     @Override

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

@@ -69,6 +69,10 @@
             "mixin.world.explosions.cache_exposure": false,
             "mixin.world.temperature_cache": false,
             "mixin.world.tick_scheduler": false
-        }
+        },
+        "ferritecore:disabled_options": [
+            "replaceNeighborLookup",
+            "replacePropertyMap"
+        ]
     }
 }

gradle.properties

@@ -6,14 +6,14 @@ org.gradle.daemon=false
 minecraft_version=1.21.1
 supported_minecraft_versions=1.21,1.21.1
 loader_version=0.16.5
-neoforge_version=21.1.62
+neoforge_version=21.1.79
 snakeyaml_version=2.2
 concurrentutil_version=0.0.2-SNAPSHOT
 cloth_version=15.0.128
 # version ids from modrinth
-fabric_lithium_version=mc1.21.1-0.14.0-beta.1
-neo_lithium_version=BrMIoIMv
+fabric_lithium_version=frXUdgvL
+neo_lithium_version=KhdehJ6l
 # Mod Properties
-mod_version=0.1.0-SNAPSHOT
+mod_version=0.1.0-beta.9
 maven_group=ca.spottedleaf.moonrise
 archives_base_name=moonrise

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

@@ -13,6 +13,10 @@ displayURL = "https://github.com/Tuinity/Moonrise"
 authors = "Spottedleaf"
 description = "Optimisation mod for the dedicated and integrated server."
 displayTest = "IGNORE_ALL_VERSION"
+"ferritecore:disabled_options" = [
+    "replaceNeighborLookup",
+    "replacePropertyMap"
+]
 
 [[dependencies.moonrise]]
 modId = "neoforge"
@@ -51,7 +55,7 @@ config = "moonrise.mixins.json"
 [[mixins]]
 config = "moonrise-neoforge.mixins.json"
 
-[mods."lithium:options"]
+["lithium:options"]
 "mixin.ai.poi" = false
 "mixin.alloc.chunk_ticking" = false
 "mixin.alloc.deep_passengers" = false

settings.gradle

@@ -24,7 +24,7 @@ pluginManagement {
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-    id("xyz.jpenilla.quiet-architectury-loom") version "1.7.295" apply false
+    id("xyz.jpenilla.quiet-architectury-loom") version "1.7.300" apply false
     id 'com.gradleup.shadow' version '8.3.0' apply false
 }
 
@@ -37,7 +37,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("fabricApiLibs") {
-            from("net.fabricmc.fabric-api:fabric-api-catalog:0.103.0+1.21.1")
+            from("net.fabricmc.fabric-api:fabric-api-catalog:0.107.0+1.21.1")
         }
     }
 }

src/main/java/ca/spottedleaf/moonrise/patches/blockstate_propertyaccess/util/ZeroCollidingReferenceStateTable.java

@@ -9,7 +9,7 @@ import it.unimi.dsi.fastutil.objects.AbstractReference2ObjectMap;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 import it.unimi.dsi.fastutil.objects.ObjectSet;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
-import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
+import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -27,7 +27,7 @@ public final class ZeroCollidingReferenceStateTable<O, S> {
 
     public ZeroCollidingReferenceStateTable(final Collection<Property<?>> properties) {
         this.propertyToIndexer = new Int2ObjectOpenHashMap<>(properties.size());
-        this.properties = new ReferenceOpenHashSet<>(properties);
+        this.properties = new ReferenceArrayList<>(properties);
 
         final List<Property<?>> sortedProperties = new ArrayList<>(properties);