0.1.0-beta.3

Lithium replaces some of the height-related methods used by WorldUtil to return fields initialized in their constructor hook. We need to apply afterward to have them return valid data.

Given the application-order sensitive nature of the issue, it only presented in-dev.

README.md

@@ -1,5 +1,10 @@
 Moonrise
 ==
+[![Modrinth](https://img.shields.io/badge/Modrinth-gray?logo=modrinth)](https://modrinth.com/mod/moonrise-opt)
+[![CurseForge](https://img.shields.io/badge/CurseForge-gray?logo=curseforge)](https://www.curseforge.com/minecraft/mc-mods/moonrise)
+[![Release](https://img.shields.io/github/v/release/Tuinity/Moonrise?include_prereleases)](https://github.com/Tuinity/Moonrise/releases)
+[![License](https://img.shields.io/github/license/Tuinity/Moonrise)](LICENSE.md)
+
 Fabric/NeoForge mod for optimising performance of the integrated (singleplayer/LAN) and dedicated server.
 
 
@@ -19,8 +24,9 @@ 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> |
+| Radium      | <details><summary>✅ compatible</summary>Radium is an unofficial port of Lithium to NeoForge. Radium will automatically disable conflicting parts of itself when Moonrise is present. Any compatibility issues should be reported to Radium first.</details>                                              |
 | FerriteCore | <details><summary>📝 requires config changes</summary>In `config/ferritecore-mixin.toml`:<br/>Set `replaceNeighborLookup` and `replacePropertyMap` to `false`</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>                                                        |
+| 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
 Moonrise provides documented configuration options for tuning the chunk system and enabling bugfixes in the config file `$mcdir$/config/moonrise.yml`.

build.gradle

@@ -112,16 +112,18 @@ subprojects {
         }
         changelog = providers.environmentVariable("RELEASE_NOTES")
 
+        List<String> supportedMcVersions = rootProject.supported_minecraft_versions.split(',')
+
         modrinth {
             projectId = "KOHu7RCS"
             accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-            minecraftVersions = [rootProject.minecraft_version]
+            minecraftVersions = supportedMcVersions
         }
 
         curseforge {
             projectId = "1096335"
             accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
-            minecraftVersions = [rootProject.minecraft_version]
+            minecraftVersions = supportedMcVersions
         }
     }
 }

fabric/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id("xyz.jpenilla.quiet-architectury-loom")
     id 'maven-publish'
-    id 'io.github.goooler.shadow'
+    id 'com.gradleup.shadow'
 }
 
 configurations.create("libs")

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

@@ -1,70 +1,73 @@
 {
-  "schemaVersion": 1,
-  "id": "moonrise",
-  "version": "${version}",
-  "name": "Moonrise",
-  "description": "Optimisation mod for the dedicated and integrated server.",
-  "authors": [
-    "Spottedleaf"
-  ],
-  "contact": {
-    "issues": "https://github.com/Tuinity/Moonrise/issues",
-    "sources": "https://github.com/Tuinity/Moonrise",
-    "discord": "https://discord.gg/tuinity",
-    "homepage": "https://www.curseforge.com/minecraft/mc-mods/moonrise"
-  },
-  "breaks": {
-    "notenoughcrashes": "*",
-    "starlight": "*",
-    "c2me": "*"
-  },
-  "license": "GPL-3.0-only",
-  "icon": "assets/moonrise/icon.png",
-  "environment": "*",
-  "entrypoints": {
-    "modmenu": [
-      "ca.spottedleaf.moonrise.fabric.MoonriseModMenuHook"
+    "schemaVersion": 1,
+    "id": "moonrise",
+    "version": "${version}",
+    "name": "Moonrise",
+    "description": "Optimisation mod for the dedicated and integrated server.",
+    "authors": [
+        "Spottedleaf"
     ],
-    "client": [
-      "ca.spottedleaf.moonrise.fabric.MoonriseFabricClient"
-    ]
-  },
-  "mixins": [
-    "moonrise.mixins.json",
-    "moonrise-fabric.mixins.json"
-  ],
-  "accessWidener": "moonrise.accesswidener",
-  "depends": {
-    "fabricloader": ">=${loader_version}",
-    "minecraft": ">=1.21 <=1.21.1",
-    "fabric-command-api-v2": "*"
-  },
-  "custom": {
-    "lithium:options": {
-      "mixin.collections.chunk_tickets": false,
-      "mixin.world.temperature_cache": false,
-      "mixin.block.flatten_states": false,
-      "mixin.math.fast_util": false,
-      "mixin.minimal_nonvanilla.collisions.empty_space": false,
-      "mixin.alloc.deep_passengers": false,
-      "mixin.math.fast_blockpos": false,
-      "mixin.shapes.blockstate_cache": false,
-      "mixin.world.block_entity_ticking": false,
-      "mixin.collections.entity_ticking": false,
-      "mixin.world.chunk_access": false,
-      "mixin.ai.poi": false,
-      "mixin.chunk.no_validation": false,
-      "mixin.minimal_nonvanilla.world.expiring_chunk_tickets": false,
-      "mixin.world.tick_scheduler": false,
-      "mixin.alloc.chunk_ticking": false,
-      "mixin.entity.replace_entitytype_predicates": false,
-      "mixin.util.block_tracking": false,
-      "mixin.shapes.specialized_shapes": false,
-      "mixin.shapes.optimized_matching": false,
-      "mixin.entity.collisions.intersection": false,
-      "mixin.entity.collisions.movement": false,
-      "mixin.entity.collisions.unpushable_cramming": false,
-      "mixin.chunk.entity_class_groups": false
+    "contact": {
+        "issues": "https://github.com/Tuinity/Moonrise/issues",
+        "sources": "https://github.com/Tuinity/Moonrise",
+        "discord": "https://discord.gg/tuinity",
+        "homepage": "https://www.curseforge.com/minecraft/mc-mods/moonrise"
+    },
+    "breaks": {
+        "notenoughcrashes": "*",
+        "starlight": "*",
+        "c2me": "*"
+    },
+    "license": "GPL-3.0-only",
+    "icon": "assets/moonrise/icon.png",
+    "environment": "*",
+    "entrypoints": {
+        "modmenu": [
+            "ca.spottedleaf.moonrise.fabric.MoonriseModMenuHook"
+        ],
+        "client": [
+            "ca.spottedleaf.moonrise.fabric.MoonriseFabricClient"
+        ]
+    },
+    "mixins": [
+        "moonrise.mixins.json",
+        "moonrise-fabric.mixins.json"
+    ],
+    "accessWidener": "moonrise.accesswidener",
+    "depends": {
+        "fabricloader": ">=${loader_version}",
+        "minecraft": ">=1.21 <=1.21.1",
+        "fabric-command-api-v2": "*"
+    },
+    "custom": {
+        "lithium:options": {
+            "mixin.collections.chunk_tickets": false,
+            "mixin.collections.entity_ticking": false,
+            "mixin.world.temperature_cache": false,
+            "mixin.world.block_entity_ticking": false,
+            "mixin.world.chunk_access": false,
+            "mixin.world.tick_scheduler": false,
+            "mixin.world.explosions.block_raycast": false,
+            "mixin.world.explosions.cache_exposure": false,
+            "mixin.block.flatten_states": false,
+            "mixin.math.fast_util": false,
+            "mixin.math.fast_blockpos": false,
+            "mixin.minimal_nonvanilla.collisions.empty_space": false,
+            "mixin.minimal_nonvanilla.world.expiring_chunk_tickets": false,
+            "mixin.alloc.deep_passengers": false,
+            "mixin.alloc.chunk_ticking": false,
+            "mixin.alloc.entity_tracker": false,
+            "mixin.shapes.blockstate_cache": false,
+            "mixin.shapes.specialized_shapes": false,
+            "mixin.shapes.optimized_matching": false,
+            "mixin.ai.poi": false,
+            "mixin.chunk.no_validation": false,
+            "mixin.chunk.entity_class_groups": false,
+            "mixin.util.block_tracking": false,
+            "mixin.entity.replace_entitytype_predicates": false,
+            "mixin.entity.collisions.intersection": false,
+            "mixin.entity.collisions.movement": false,
+            "mixin.entity.collisions.unpushable_cramming": false
+        }
     }
-  }
 }

gradle.properties

@@ -4,13 +4,14 @@ org.gradle.daemon=false
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 minecraft_version=1.21.1
-loader_version=0.15.11
-neoforge_version=21.1.20
+supported_minecraft_versions=1.21,1.21.1
+loader_version=0.16.5
+neoforge_version=21.1.42
 snakeyaml_version=2.2
 concurrentutil_version=0.0.2-SNAPSHOT
 cloth_version=15.0.128
 lithium_version=mc1.21.1-0.13.0
 # Mod Properties
-mod_version=0.1.0-beta.1
+mod_version=0.1.0-beta.3
 maven_group=ca.spottedleaf.moonrise
 archives_base_name=moonrise

neoforge/build.gradle

@@ -3,7 +3,7 @@ import net.fabricmc.loom.util.aw2at.Aw2At
 plugins {
     id("xyz.jpenilla.quiet-architectury-loom")
     id 'maven-publish'
-    id 'io.github.goooler.shadow'
+    id 'com.gradleup.shadow'
 }
 
 repositories {
@@ -53,17 +53,15 @@ publishMods {
     modrinth {
         incompatible(
             "notenoughcrashes",
-            "starlight-forge",
-            "canary",
-            "radium"
+            "starlight-neoforge",
+            "canary"
         )
     }
     curseforge {
         incompatible(
             "not-enough-crashes-forge",
-            "starlight-forge",
-            "canary",
-            "radium-reforged"
+            "starlight-neoforge",
+            "canary"
         )
     }
 }

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

@@ -45,11 +45,6 @@ type = "incompatible"
 modId = "canary"
 type = "incompatible"
 
-[[dependencies.moonrise]]
-# unofficial lithium port
-modId = "radium"
-type = "incompatible"
-
 [[dependencies.moonrise]]
 modId = "c2me"
 type = "incompatible"

settings.gradle

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

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java

@@ -39,7 +39,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-@Mixin(Level.class)
+// Higher priority to apply after Lithium mixin.world.inline_height.WorldMixin
+@Mixin(value = Level.class, priority = 1100)
 abstract class LevelMixin implements CollisionLevel, LevelAccessor, AutoCloseable {
 
     @Shadow