buildscript, bug: Fixed Forge mixin option crashing game before launch in dev

Author: rbasamoyai

build.gradle.kts

@@ -43,26 +43,16 @@ dependencies {
 		officialMojangMappings { nameSyntheticMembers = false }
 		parchment("org.parchmentmc.data:parchment-${minecraftVersion}:2023.09.03@zip")
 	})
-    //forge("net.minecraftforge:forge:$minecraftVersion-${mod.dep("forge_loader_version")}")
 
     modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader_version")}")
     modImplementation("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_api_version")}")
 
-    modImplementation("com.simibubi.create:create-fabric:${mod.dep("create_fabric_version")}")
-    //modImplementation("com.simibubi.create:create-${minecraftVersion}:${mod.dep("create_forge_version")}:slim") { isTransitive = false }
-    //modCompileOnly("net.createmod.ponder:Ponder-Forge-${minecraftVersion}:${mod.dep("ponder_forge_version")}")
-	//modImplementation("com.jozufozu.flywheel:flywheel-forge-${minecraftVersion}:${mod.dep("flywheel_forge_version")}")
-    //modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${minecraftVersion}:${mod.dep("flywheel_forge_version")}")
-    //modRuntimeOnly("dev.engine-room.flywheel:flywheel-forge-${minecraftVersion}:${mod.dep("flywheel_forge_version")}")
-    //modCompileOnly("com.tterrag.registrate:Registrate:${mod.dep("registrate_forge_version")}")
+    modCompileOnly("com.simibubi.create:create-fabric:${mod.dep("create_fabric_version")}")
 
     "io.github.llamalad7:mixinextras-common:${mod.dep("mixinextras_version")}".let {
         annotationProcessor(it)
         implementation(it)
     }
-
-    //compileOnly("io.github.llamalad7:mixinextras-common:${mod.dep("mixinextras_version")}")
-    //annotationProcessor(include("io.github.llamalad7:mixinextras-forge:${mod.dep("mixinextras_version")}"){})
 }
 
 

fabric/src/main/java/rbasamoyai/escalated/index/fabric/EscalatedBlockEntitiesImpl.java

@@ -0,0 +1,21 @@
+package rbasamoyai.escalated.index.fabric;
+
+import com.simibubi.create.foundation.data.CreateBlockEntityBuilder;
+import com.tterrag.registrate.builders.BlockEntityBuilder;
+import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
+import rbasamoyai.escalated.handrails.HandrailBlockEntity;
+import rbasamoyai.escalated.handrails.HandrailVisual;
+import rbasamoyai.escalated.walkways.WalkwayBlockEntity;
+import rbasamoyai.escalated.walkways.WalkwayVisual;
+
+public class EscalatedBlockEntitiesImpl {
+
+    public static <T> NonNullUnaryOperator<BlockEntityBuilder<WalkwayBlockEntity, T>> walkwayVisual() {
+        return b -> ((CreateBlockEntityBuilder<WalkwayBlockEntity, T>) b).visual(() -> WalkwayVisual::new);
+    }
+
+    public static <T> NonNullUnaryOperator<BlockEntityBuilder<HandrailBlockEntity, T>> handrailVisual() {
+        return b -> ((CreateBlockEntityBuilder<HandrailBlockEntity, T>) b).visual(() -> HandrailVisual::new);
+    }
+
+}

forge/build.gradle.kts

@@ -52,7 +52,6 @@ loom {
 		"escalated-common.mixins.json",
 		"escalated.mixins.json",
 	)
-	forge.useCustomMixin = false
 
 	runConfigs.all {
 		isIdeConfigGenerated = true

forge/src/main/java/rbasamoyai/escalated/index/forge/EscalatedBlockEntitiesImpl.java

@@ -0,0 +1,21 @@
+package rbasamoyai.escalated.index.forge;
+
+import com.simibubi.create.foundation.data.CreateBlockEntityBuilder;
+import com.tterrag.registrate.builders.BlockEntityBuilder;
+import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
+import rbasamoyai.escalated.handrails.HandrailBlockEntity;
+import rbasamoyai.escalated.handrails.HandrailVisual;
+import rbasamoyai.escalated.walkways.WalkwayBlockEntity;
+import rbasamoyai.escalated.walkways.WalkwayVisual;
+
+public class EscalatedBlockEntitiesImpl {
+
+    public static <T> NonNullUnaryOperator<BlockEntityBuilder<WalkwayBlockEntity, T>> walkwayVisual() {
+        return b -> ((CreateBlockEntityBuilder<WalkwayBlockEntity, T>) b).visual(() -> WalkwayVisual::new);
+    }
+
+    public static <T> NonNullUnaryOperator<BlockEntityBuilder<HandrailBlockEntity, T>> handrailVisual() {
+        return b -> ((CreateBlockEntityBuilder<HandrailBlockEntity, T>) b).visual(() -> HandrailVisual::new);
+    }
+
+}

src/main/java/rbasamoyai/escalated/index/EscalatedBlockEntities.java

@@ -1,20 +1,22 @@
 package rbasamoyai.escalated.index;
 
+import com.tterrag.registrate.builders.BlockEntityBuilder;
 import com.tterrag.registrate.util.entry.BlockEntityEntry;
+import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import rbasamoyai.escalated.handrails.HandrailBlockEntity;
 import rbasamoyai.escalated.handrails.HandrailRenderer;
-import rbasamoyai.escalated.handrails.HandrailVisual;
 import rbasamoyai.escalated.walkways.WalkwayBlockEntity;
 import rbasamoyai.escalated.walkways.WalkwayRenderer;
-import rbasamoyai.escalated.walkways.WalkwayVisual;
 
 import static rbasamoyai.escalated.CreateEscalated.REGISTRATE;
 
 public class EscalatedBlockEntities {
 
     public static final BlockEntityEntry<WalkwayBlockEntity> WALKWAY = REGISTRATE
             .blockEntity("walkway", WalkwayBlockEntity::new)
-            .visual(() -> WalkwayVisual::new)
+            .transform(walkwayVisual())
+            //.visual(() -> WalkwayVisual::new)
             .renderer(() -> WalkwayRenderer::new)
             .validBlocks(EscalatedBlocks.METAL_WALKWAY_TERMINAL, EscalatedBlocks.METAL_NARROW_WALKWAY,
                     EscalatedBlocks.METAL_WIDE_WALKWAY_SIDE, EscalatedBlocks.METAL_WIDE_WALKWAY_CENTER,
@@ -26,13 +28,18 @@ public class EscalatedBlockEntities {
 
     public static final BlockEntityEntry<HandrailBlockEntity> HANDRAIL = REGISTRATE
             .blockEntity("handrail", HandrailBlockEntity::new)
-            .visual(() -> HandrailVisual::new)
+            .transform(handrailVisual())
+            //.visual(() -> HandrailVisual::new)
             .renderer(() -> HandrailRenderer::new)
             .validBlocks(EscalatedBlocks.METAL_WALKWAY_HANDRAIL, EscalatedBlocks.METAL_ESCALATOR_HANDRAIL,
                     EscalatedBlocks.WOODEN_WALKWAY_HANDRAIL, EscalatedBlocks.WOODEN_ESCALATOR_HANDRAIL,
                     EscalatedBlocks.GLASS_WALKWAY_HANDRAIL, EscalatedBlocks.GLASS_ESCALATOR_HANDRAIL)
             .register();
 
+    @ExpectPlatform public static <T> NonNullUnaryOperator<BlockEntityBuilder<WalkwayBlockEntity, T>> walkwayVisual() { throw new AssertionError(); }
+
+    @ExpectPlatform public static <T> NonNullUnaryOperator<BlockEntityBuilder<HandrailBlockEntity, T>> handrailVisual() { throw new AssertionError(); }
+
     public static void register() {}
 
 }