[Fix] Crash with ferritecore

- Added one verison source.
- Fixed the crash.

Author: coredex-source

buildSrc/src/main/groovy/modernfix.common-conventions.gradle

@@ -16,23 +16,28 @@ architectury {
 }
 
 group = 'org.embeddedt'
-// extract base version from tag, generate other metadata ourselves
-def details = versionDetails()
-def plusIndex = details.lastTag.indexOf("+")
-if(plusIndex == -1) {
-    plusIndex = details.lastTag.length()
-}
-def baseVersion = details.lastTag.substring(0, plusIndex)
-def dirtyMarker = grgit.status().clean ? "" : ".dirty"
-def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash.substring(0, Math.min(4, details.gitHash.length()))) : ""
-def preMarker = (details.commitDistance > 0 || !details.isCleanTag) ? ("-beta." + details.commitDistance) : ""
-if(preMarker.length() > 0) {
-    // bump to next patch release
-    def versionParts = baseVersion.tokenize(".")
-    baseVersion = "${versionParts[0]}.${versionParts[1]}.${versionParts[2].toInteger() + 1}"
+// If an explicit version is provided (for example in gradle.properties), prefer it.
+if (project.hasProperty('version') && project.version != 'unspecified' && project.version.toString().trim()) {
+    // keep user-specified project.version
+} else {
+    // extract base version from tag, generate other metadata ourselves
+    def details = versionDetails()
+    def plusIndex = details.lastTag.indexOf("+")
+    if(plusIndex == -1) {
+        plusIndex = details.lastTag.length()
+    }
+    def baseVersion = details.lastTag.substring(0, plusIndex)
+    def dirtyMarker = grgit.status().clean ? "" : ".dirty"
+    def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash.substring(0, Math.min(4, details.gitHash.length()))) : ""
+    def preMarker = (details.commitDistance > 0 || !details.isCleanTag) ? ("-beta." + details.commitDistance) : ""
+    if(preMarker.length() > 0) {
+        // bump to next patch release
+        def versionParts = baseVersion.tokenize(".")
+        baseVersion = "${versionParts[0]}.${versionParts[1]}.${versionParts[2].toInteger() + 1}"
+    }
+    def versionString = "${baseVersion}${preMarker}+mc${minecraft_version}${commitHashMarker}${dirtyMarker}"
+    version = versionString
 }
-def versionString = "${baseVersion}${preMarker}+mc${minecraft_version}${commitHashMarker}${dirtyMarker}"
-version = versionString
 archivesBaseName = rootProject.archives_base_name + '-' + project.name
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/StateHolderMixin.java

@@ -4,6 +4,8 @@
 import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.Property;
 import org.embeddedt.modernfix.annotation.RequiresMod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -19,15 +21,27 @@
 @Mixin(StateHolder.class)
 @RequiresMod("!ferritecore")
 public class StateHolderMixin {
+    private static final Logger LOGGER = LoggerFactory.getLogger("ModernFix/StateHolderMixin");
     private static final Reference2ObjectArrayMap<Property<?>, ?> EMPTY_NEIGHBOURS = new Reference2ObjectArrayMap<>();
+    private static boolean hasLoggedFerriteCore = false;
 
     @Shadow private Map<Property<?>, ?> neighbours;
 
     /* optimize the case where block has no properties */
     @Inject(method = "populateNeighbours", at = @At("RETURN"), require = 0)
     private void replaceEmptyTable(CallbackInfo ci) {
-        if (this.neighbours.isEmpty()) {
-            this.neighbours = EMPTY_NEIGHBOURS;
+        // Check if the neighbors map is the actual implementation, not FerriteCore's wrapper
+        // FerriteCore replaces this with a crash-on-access map, so we need to detect and skip that
+        try {
+            if (this.neighbours.isEmpty()) {
+                this.neighbours = EMPTY_NEIGHBOURS;
+            }
+        } catch (UnsupportedOperationException e) {
+            // FerriteCore is active and using its own optimization, skip our optimization
+            if (!hasLoggedFerriteCore) {
+                LOGGER.debug("Disabling ModernFix neighbor table optimization (reason: FerriteCore is present)");
+                hasLoggedFerriteCore = true;
+            }
         }
     }
 }

gradle.properties

@@ -33,3 +33,7 @@ use_fabric_api_at_runtime=true
 
 # Look up maven coordinates when changing shadow_version
 shadow_version=7.1.2
+
+# Project version (single source of truth for ${version} in metadata)
+# Update this to bump the mod version.
+version=5.20.6

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java

@@ -13,7 +13,6 @@
 import net.neoforged.fml.ModLoadingIssue;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.neoforge.client.event.ClientTickEvent;
-import net.neoforged.neoforge.client.event.CustomizeGuiOverlayEvent;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 import net.neoforged.neoforge.client.event.RenderFrameEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;