porting: use forge in common

realRobotix · realRobotix · commit 773dab82c4bb · 2025-05-02T21:38:40.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,10 +16,12 @@ version = "${mod.version}${if (release) "" else "-dev"}+mc.${minecraftVersion}-c
 group = "${group}.common"
 base.archivesName.set(mod.id)
 
-architectury.common(stonecutter.tree.branches.mapNotNull {
-	if (stonecutter.current.project !in it) null
-	else it.project.prop("loom.platform")
-})
+architectury{
+    common(stonecutter.tree.branches.mapNotNull {
+        if (stonecutter.current.project !in it) null
+        else it.project.prop("loom.platform")
+    })
+}
 
 repositories {
 	maven("https://mvn.devos.one/snapshots/") // Create Fabric
@@ -31,6 +33,14 @@ repositories {
 loom {
 	silentMojangMappingsLicense()
 	accessWidenerPath = rootProject.file("src/main/resources/createbigcannons.accesswidener")
+    forge.convertAccessWideners = true
+    forge.mixinConfigs("createbigcannons-common.mixins.json")
+    forge.useCustomMixin = false
+    runConfigs.all {
+        isIdeConfigGenerated = true
+        runDir = "../../../run"
+        vmArgs("-Dmixin.debug.export=true")
+    }
 }
 
 dependencies {
@@ -39,24 +49,32 @@ dependencies {
 		officialMojangMappings { nameSyntheticMembers = false }
 		parchment("org.parchmentmc.data:parchment-${minecraftVersion}:${mod.dep("parchment_version")}@zip")
 	})
+    forge("net.minecraftforge:forge:$minecraftVersion-${mod.dep("forge_loader")}")
 
-	modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader_version")}")
-	modImplementation("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_api_version")}")
-	modCompileOnly("com.simibubi.create:create-fabric-${mod.dep("minecraft_version")}:${mod.dep("create_fabric_version")}")
-	modCompileOnly("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_api_version")}")
+    modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader_version")}")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_api_version")}")
 
-	"io.github.llamalad7:mixinextras-common:${mod.dep("mixin_extras")}".let {
-		annotationProcessor(it)
-		implementation(it)
-	}
+    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")}")
+    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")}")
+
+    "io.github.llamalad7:mixinextras-common:${mod.dep("mixin_extras")}".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")}"){})
 
 	// Ritchie's Projectile Library
 	val rplSuffix = if (mod.dep("use_local_rpl_build").toBoolean()) "" else "-build.${mod.dep("rpl_build")}"
-	modImplementation("com.rbasamoyai:ritchiesprojectilelib:${mod.dep("rpl_version")}+mc.${minecraftVersion}-fabric$rplSuffix") {
+	modImplementation("com.rbasamoyai:ritchiesprojectilelib:${mod.dep("rpl_version")}+mc.${minecraftVersion}-forge$rplSuffix") {
 		isTransitive = false
 	}
 
-	modImplementation("com.copycatsplus:copycats:${mod.dep("copycats_version")}+mc.${minecraftVersion}-fabric") {isTransitive=false}
+	modImplementation("com.copycatsplus:copycats:${mod.dep("copycats_version")}+mc.${minecraftVersion}-forge") {isTransitive=false}
 }
 
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
+loom.platform = forge
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 org.gradle.caching=true
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -19,7 +19,7 @@ stonecutter {
 	create(rootProject) {
 		// Root `src/` functions as the 'common' project
 		versions("1.20.1")
-		branch("fabric") // Copies versions from root
+		//branch("fabric") // Copies versions from root
 		branch("forge") { versions("1.20.1") }
 		//branch("neoforge") { versions("1.21.1") }
 	}
diff --git a/src/main/java/rbasamoyai/createbigcannons/datagen/loot/BoringScrapLoot.java b/src/main/java/rbasamoyai/createbigcannons/datagen/loot/BoringScrapLoot.java
@@ -70,7 +70,7 @@ protected static ResourceLocation loc(Block block) {
 	}
 
 	protected static LootTable.Builder dropAmount(ItemLike drop, int min, int max) {
-		int maxSz = new ItemStack(drop).getMaxStackSize();
+		/*int maxSz = new ItemStack(drop).getMaxStackSize();
 		LootTable.Builder table = LootTable.lootTable();
 		for (int i = 0; i < Mth.floor((float) min / maxSz); ++i)
 			table.withPool(LootPool.lootPool()
@@ -86,7 +86,8 @@ protected static LootTable.Builder dropAmount(ItemLike drop, int min, int max) {
 		}
 		return table.withPool(LootPool.lootPool()
 				.add(LootItem.lootTableItem(drop))
-				.apply(SetItemCountFunction.setCount(UniformGenerator.between(base, base + diff))));
+				.apply(SetItemCountFunction.setCount(UniformGenerator.between(base, base + diff))));*/
+        return null;
 	}
 
 }
diff --git a/src/main/java/rbasamoyai/createbigcannons/mixin/client/ValueSettingsClientMixin.java b/src/main/java/rbasamoyai/createbigcannons/mixin/client/ValueSettingsClientMixin.java
@@ -1,5 +1,6 @@
 package rbasamoyai.createbigcannons.mixin.client;
 
+/*
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -35,3 +36,4 @@ public class ValueSettingsClientMixin {
 
 }
 
+*/
diff --git a/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/ChassisBlockEntityMixin.java b/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/ChassisBlockEntityMixin.java
@@ -1,4 +1,5 @@
 package rbasamoyai.createbigcannons.mixin.compat.create;
+/*
 
 import java.util.HashSet;
 import java.util.List;
@@ -108,3 +109,4 @@ private static boolean checkBlock(Level level, @Nullable Direction forcedMovemen
 
 
 }
+*/
diff --git a/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/ContraptionMixin.java b/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/ContraptionMixin.java
@@ -1,4 +1,5 @@
 package rbasamoyai.createbigcannons.mixin.compat.create;
+/*
 
 import java.util.List;
 import java.util.Queue;
@@ -287,3 +288,4 @@ public abstract class ContraptionMixin {
 	}
 
 }
+*/
diff --git a/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/FilterItemMixin.java b/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/FilterItemMixin.java
@@ -1,4 +1,5 @@
 package rbasamoyai.createbigcannons.mixin.compat.create;
+/*
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -29,3 +30,4 @@ public class FilterItemMixin {
 	}
 
 }
+*/
diff --git a/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/PulleyBlockEntityMixin.java b/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/PulleyBlockEntityMixin.java
@@ -1,4 +1,5 @@
 package rbasamoyai.createbigcannons.mixin.compat.create;
+/*
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
@@ -101,3 +102,4 @@ public abstract class PulleyBlockEntityMixin extends LinearActuatorBlockEntity {
 	}
 
 }
+*/
diff --git a/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/rotation_propagation/RotationPropagatorMixin.java b/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/rotation_propagation/RotationPropagatorMixin.java
@@ -1,4 +1,5 @@
 package rbasamoyai.createbigcannons.mixin.compat.create.rotation_propagation;
+/*
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -104,3 +105,4 @@ public class RotationPropagatorMixin {
 	}
 
 }
+*/
diff --git a/src/main/resources/createbigcannons-common.mixins.json b/src/main/resources/createbigcannons-common.mixins.json
@@ -15,7 +15,6 @@
     "client.LightingMixin",
     "client.RPLClientHandlersMixin",
     "client.SoundEngineMixin",
-    "client.ValueSettingsClientMixin",
     "client.PitchOrientedContraptionEntityMixin"
   ],
   "mixins": [
@@ -30,23 +29,18 @@
     "compat.create.AbstractContraptionEntityMixin",
     "compat.create.AllSoundEventsMixin",
     "compat.create.BeltMovementHandlerMixin",
-    "compat.create.ChassisBlockEntityMixin",
     "compat.create.ContraptionColliderMixin",
-    "compat.create.ContraptionMixin",
-    "compat.create.FilterItemMixin",
     "compat.create.GantryContraptionMixin",
     "compat.create.MechanicalBearingBlockEntityMixin",
     "compat.create.MechanicalPistonBlockMixin",
     "compat.create.PistonContraptionMixin",
-    "compat.create.PulleyBlockEntityMixin",
     "compat.create.PulleyBlockMixin",
     "compat.create.PulleyContraptionMixin",
     "compat.create.RopeBlockBaseMixin",
     "compat.create.TranslatingContraptionMixin",
     "compat.create.rotation_propagation.KineticBlockAccessor",
     "compat.create.rotation_propagation.KineticBlockEntityMixin",
     "compat.create.rotation_propagation.KineticNetworkMixin",
-    "compat.create.rotation_propagation.RotationPropagatorMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
@@ -23,6 +23,7 @@ subprojects {
 		maven("https://maven.blamejared.com/")
 		maven("https://maven.tterrag.com/")
 		maven("https://maven.createmod.net/")
+        maven("https://maven.minecraftforge.net/")
 		strictMaven("https://api.modrinth.com/maven", "maven.modrinth")
 		strictMaven("https://cursemaven.com", "curse.maven")
 		flatDir{

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+loom.platform = forge`
`1`	`2`	`org.gradle.jvmargs=-Xmx4G`
`2`	`3`	`org.gradle.parallel=true`
`3`	`4`	`org.gradle.caching=true`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ stonecutter {`
`19`	`19`	`create(rootProject) {`
`20`	`20`	// Root `src/` functions as the 'common' project
`21`	`21`	`versions("1.20.1")`
`22`		`- branch("fabric") // Copies versions from root`
	`22`	`+ //branch("fabric") // Copies versions from root`
`23`	`23`	`branch("forge") { versions("1.20.1") }`
`24`	`24`	`//branch("neoforge") { versions("1.21.1") }`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected static ResourceLocation loc(Block block) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`protected static LootTable.Builder dropAmount(ItemLike drop, int min, int max) {`
`73`		`- int maxSz = new ItemStack(drop).getMaxStackSize();`
	`73`	`+ /*int maxSz = new ItemStack(drop).getMaxStackSize();`
`74`	`74`	`LootTable.Builder table = LootTable.lootTable();`
`75`	`75`	`for (int i = 0; i < Mth.floor((float) min / maxSz); ++i)`
`76`	`76`	`table.withPool(LootPool.lootPool()`
`@@ -86,7 +86,8 @@ protected static LootTable.Builder dropAmount(ItemLike drop, int min, int max) {`
`86`	`86`	`}`
`87`	`87`	`return table.withPool(LootPool.lootPool()`
`88`	`88`	`.add(LootItem.lootTableItem(drop))`
`89`		`- .apply(SetItemCountFunction.setCount(UniformGenerator.between(base, base + diff))));`
	`89`	`+ .apply(SetItemCountFunction.setCount(UniformGenerator.between(base, base + diff))));*/`
	`90`	`+ return null;`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package rbasamoyai.createbigcannons.mixin.client;`
`2`	`2`
	`3`	`+/*`
`3`	`4`	`import org.spongepowered.asm.mixin.Mixin;`
`4`	`5`	`import org.spongepowered.asm.mixin.Shadow;`
`5`	`6`	`import org.spongepowered.asm.mixin.injection.At;`
`@@ -35,3 +36,4 @@ public class ValueSettingsClientMixin {`
`35`	`36`
`36`	`37`	`}`
`37`	`38`
	`39`	`+*/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`package rbasamoyai.createbigcannons.mixin.compat.create;`
	`2`	`+/*`
`2`	`3`
`3`	`4`	`import java.util.HashSet;`
`4`	`5`	`import java.util.List;`
`@@ -108,3 +109,4 @@ private static boolean checkBlock(Level level, @Nullable Direction forcedMovemen`
`108`	`109`
`109`	`110`
`110`	`111`	`}`
	`112`	`+*/`