update flywheel version

FABRIC_CHANGELOG.txt

@@ -5,6 +5,6 @@ No formatting, just plain text. CurseForge support for it is terrible.
 
 Change logging starts below:
 ----------
-- update porting-lib version 2.1.1127+1.20 -> 2.1.1142+1.20-entity-refactor to fix Hephaestus compat (maybe), and config-api from forge-config-api-port move to porting-lib-config
-- flywheel -> flywheel-fabric-unofficial.
-- update fabric-api version 0.86.0+1.20.1 -> 0.89.3+1.20.1
+- update Flywheel version
+- (Flywheel) sync from 0.6.10 forge version
+- (Flywheel) fix sodium 0.5.x compat

README.md

@@ -1,6 +1,6 @@
 <p align="center"><img src="icon/400x400.png" alt="Logo" width="200"></p>
 <h1 align="center">Create Fabric DM-Earth Edition<br>
-	<a href="https://github.com/Creators-of-Create/Create/blob/master/LICENSE"><img src="https://img.shields.io/github/license/Creators-of-Create/Create?style=flat&color=900c3f" alt="License"></a>
+	<a href="https://github.com/DM-Earth/create-fabric-dme-edition/blob/master/LICENSE"><img src="https://img.shields.io/github/license/Creators-of-Create/Create?style=flat&color=900c3f" alt="License"></a>
     <br><br>
     <a href="https://fabricmc.net/"><img
         src="https://cdn.discordapp.com/attachments/705864145169416313/969720133998239794/fabric_supported.png"
@@ -14,14 +14,19 @@
     ></a>
 </h1>
 
-<p>Welcome to Create, a mod offering a variety of tools and blocks for Building, Decoration, and Aesthetic Automation.</p>
-<p>The added elements of tech are designed to leave as many design choices to the player as possible. With Create, the game isn't played inside a bunch of UIs, it challenges you to set up contraptions of animated components working together in many possible arrangements.</p>
-<p>Create's visual in-game documentation called 'Ponder' will guide you through all added mechanics and gadgets.</p>
-<p>&nbsp;</p>
+This mod is a forked version of [Create Fabric](https://modrinth.com/mod/create-fabric). Since it is a forked version, it **cannot be used with the original version**.
+This is a replacement program, not an add-on.
 
-<h3 align="center">Development</h3>
+The mod may be archived after the issue with [Create Fabric](https://modrinth.com/mod/create-fabric) itself is fixed, but for now,
+this is the only solution for 1.20.1 with [Create Fabric](https://modrinth.com/mod/create-fabric) using [Hephaestus](https://modrinth.com/mod/hephaestus) and [Sodium](https://modrinth.com/mod/sodium) 0.5.x.
+
+**Mods developed based on the original mod will also be unavailable (this has to do with the version of `PortingLib`)**.
+
+<h3 align="center">This fork fixes the following issues</h3>
+- Fixed a crash that occurred when installing with [Hephaestus](https://modrinth.com/mod/hephaestus). **(This was due to a problem with the version of `PortingLib` used by Create Fabric.)**
+- Fixed compatibility with [Sodium](https://modrinth.com/mod/sodium) 0.5.x **(this issue was caused by Flywheel Fabric)**.
+
+<h3 align="center">Development to compatible this version</h3>
+Change the PortingLib version of your Addon to `2.1.1142+1.20-entity-refactor` and change the version of your Create Fabric to this fork,
+then base the fix on this version of PortingLib.
 
-Looking to make an addon for Create? A template mod for a Fabric addon can be found
-[here](https://github.com/Fabricators-of-Create/create-fabric-addon-template),
-and a template for a multi-loader addon with Architectury can be found
-[here](https://github.com/Fabricators-of-Create/create-multiloader-addon-template).

build.gradle

@@ -30,7 +30,7 @@ repositories {
         content {
             includeGroup("com.github.Chocohead")
             includeGroup("com.github.llamalad7.mixinextras")
-            includeGroup("com.github.KessokuTeaTime")
+            includeGroup("com.github.DM-Earth")
         }
     } // Flywheel Fabric Unofficial, for Porting Lib: Mixin Extras, Fabric ASM
     maven { url = "https://cursemaven.com" } // Forge Config API Port
@@ -77,8 +77,7 @@ def dependencies(DependencyHandler deps) {
 
     deps.modApi(deps.include("com.electronwill.night-config:core:$night_config_version"))
     deps.modApi(deps.include("com.electronwill.night-config:toml:$night_config_version"))
-    //deps.modApi(deps.include("com.jozufozu.flywheel:flywheel-fabric-$flywheel_minecraft_version:$flywheel_version"))
-    deps.modApi(deps.include("com.github.KessokuTeaTime:flywheel-fabric:$flywheel_version"))
+    deps.modApi(deps.include("com.github.DM-Earth:flywheel-fabric-dme-edition:$flywheel_version-$flywheel_minecraft_version"))
     deps.modApi(deps.include("com.jamieswhiteshirt:reach-entity-attributes:$reach_entity_attributes_version"))
     deps.modApi(deps.include("io.github.tropheusj:milk-lib:$milk_lib_version"))
     deps.api(deps.include("com.google.code.findbugs:jsr305:$jsr305_version"))

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs = -Xmx4G
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
 minecraft_version = 1.20.1
-loader_version = 0.14.21
+loader_version = 0.14.22
 fabric_version = 0.89.3+1.20.1
 
 # Mod Properties
@@ -15,12 +15,12 @@ maven_group = dm.earth.create-fabric
 
 # Mappings
 # https://lambdaurora.dev/tools/import_quilt.html
-qm_version = 20
+qm_version = 23
 # https://parchmentmc.org/docs/getting-started
-parchment_version = 2023.07.09
+parchment_version = 2023.09.03
 
 # Dependencies
-# https://github.com/KessokuTeaTime/flywheel-fabric/releases/
+# https://github.com/DM-Earth/flywheel-fabric-dme-edition/releases/
 flywheel_minecraft_version = 1.20.1
 flywheel_version = 0.6.10
 # https://maven.jamieswhiteshirt.com/libs-release/com/jamieswhiteshirt/reach-entity-attributes/
@@ -38,29 +38,29 @@ jsr305_version = 3.0.2
 
 # Compat
 # https://modrinth.com/mod/cc-tweaked/versions
-cc_version = 1.106.1
+cc_version = 1.108.1
 # for CC - https://modrinth.com/mod/cloth-config/versions
 cloth_version = 11.1.106+fabric
 
 # https://modrinth.com/mod/jei/versions
-jei_version = 15.2.0.22
+jei_version = 15.2.0.27
 # https://modrinth.com/mod/rei/versions
-rei_version = 12.0.626
+rei_version = 12.0.665
 # https://modrinth.com/mod/emi/versions
-emi_version = 1.0.9+1.20.1
+emi_version = 1.0.21+1.20.1
 
 # https://modrinth.com/mod/botania
 botania_version = 1.19.2-436-FABRIC
 # https://modrinth.com/mod/modmenu/versions
-modmenu_version = 7.1.0
+modmenu_version = 7.2.2
 # https://modrinth.com/mod/sandwichable/versions
 sandwichable_version = 1.3.1+1.20.1
 # https://modrinth.com/mod/sodium
 sodium_version = mc1.20.1-0.5.3
 # https://github.com/emilyploszaj/trinkets/releases/
-trinkets_version = 3.7.0
+trinkets_version = 3.7.1
 # for Trinkets - https://modrinth.com/mod/cardinal-components-api/versions
-cca_version = 5.2.1
+cca_version = 5.2.2
 
 # Whether CC: Tweaked should be enabled in dev or not
 cc_enabled = false

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/com/simibubi/create/Create.java

@@ -85,10 +85,8 @@ public class Create implements ModInitializer {
 	public static final CreateRegistrate REGISTRATE = CreateRegistrate.create(ID);
 
 	static {
-		REGISTRATE.setTooltipModifierFactory(item -> {
-			return new ItemDescription.Modifier(item, Palette.STANDARD_CREATE)
-				.andThen(TooltipModifier.mapNull(KineticStats.create(item)));
-		});
+		REGISTRATE.setTooltipModifierFactory(item -> new ItemDescription.Modifier(item, Palette.STANDARD_CREATE)
+			.andThen(TooltipModifier.mapNull(KineticStats.create(item))));
 	}
 
 	public static final ServerSchematicLoader SCHEMATIC_RECEIVER = new ServerSchematicLoader();

src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderDispatcher.java

@@ -36,7 +36,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 
 @Environment(EnvType.CLIENT)
@@ -114,7 +113,7 @@ public static VirtualRenderWorld setupRenderWorld(Level world, Contraption c) {
 		BlockPos origin = c.anchor;
 		int height = contraptionWorld.getHeight();
 		int minBuildHeight = contraptionWorld.getMinBuildHeight();
-		VirtualRenderWorld renderWorld = new VirtualRenderWorld(world, origin, height, minBuildHeight) {
+		VirtualRenderWorld renderWorld = new VirtualRenderWorld(world, minBuildHeight, height, origin) {
 			@Override
 			public boolean supportsFlywheel() {
 				return canInstance();
@@ -128,7 +127,7 @@ public boolean supportsFlywheel() {
 			// FIXME 1.20 this '0' used to be Block.UPDATE_SUPPRESS_LIGHT, yet VirtualRenderWorld didn't actually parse the flags at all
 			renderWorld.setBlock(info.pos(), info.state(), 0);
 
-		renderWorld.runLightingEngine();
+		renderWorld.runLightEngine();
 		return renderWorld;
 	}
 

src/main/resources/fabric.mod.json

@@ -3,20 +3,20 @@
   "id": "create",
   "version": "${version}",
 
-  "name": "Create Fabric Unofficial",
+  "name": "Create Fabric DM-Earth Edition",
   "description": "Create Fabric Unofficial version. Technology that empowers the player.",
   "authors": [
-    "KessokuTeaTime",
+    "DM-Earth",
     "Fabricators of Create",
     "Creators of Create"
   ],
   "contact": {
-    "issues": "https://github.com/KessokuTeaTime/create-fabric/issues",
-    "sources": "https://github.com/KessokuTeaTime/create-fabric"
+    "issues": "https://github.com/DM-Earth/create-fabric-dme-edition/issues",
+    "sources": "https://github.com/DM-Earth/create-fabric-dme-edition"
   },
 
   "license": "MIT",
-  "icon": "logo.png",
+  "icon": "icon.png",
 
   "environment": "*",
   "entrypoints": {
@@ -74,7 +74,9 @@
 
   "breaks": {
     "optifabric": "*",
-    "colormatic": "<=3.1.1"
+    "colormatic": "<=3.1.1",
+    "iris": "<=1.2.5",
+    "sodium": "<0.5.0"
   },
 
   "custom": {