Working 1.21 port (for the most part)

.github/workflows/pr.yml

@@ -12,7 +12,7 @@ on:
     branches: main
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: '21.0.5'
 
 jobs:
   build:
@@ -35,7 +35,7 @@ jobs:
       - name: Prepare artifacts for upload
         run: |
           mkdir -p dist
-          cp {Common,Forge,Fabric}/build/libs/*.jar dist
+          cp {Common,Neoforge,Fabric}/build/libs/*.jar dist
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4

Common/build.gradle

@@ -2,8 +2,18 @@ architectury {
     common(["fabric", "neoforge"])
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/hexplat.accesswidener")
+}
+
+pkSubproj {
+    platform = "common"
+    pkPublish = false
+}
+
 repositories {
     mavenCentral()
+    mavenLocal()
 
     maven { url 'https://maven.blamejared.com' }
 
@@ -25,17 +35,25 @@ repositories {
     maven { url = "https://maven.terraformersmc.com/releases/" }
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/hexplat.accesswidener")
+}
+
 dependencies {
     // === MANDATORY DEPS ===
-    compileOnly "at.petra-k:paucal:$paucalVersion+$minecraftVersion-common"
+    // We depend on Fabric Loader here to use the Fabric @Environment annotations,
+    // which get remapped to the correct annotations on each platform.
+    // Do NOT use other classes from Fabric Loader.
+    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
+
+    modCompileOnly "at.petra-k:paucal:$paucalVersion+$minecraftVersion-common"
     // i do not know why the xplat and mod jars are in different coordinates
-    compileOnly "vazkii.patchouli:Patchouli-xplat:1.21-$patchouliVersion-SNAPSHOT"
-    // inline isn't out for 1.21 yet shaking my sm my shaking smh head
-//    compileOnly "com.samsthenerd.inline:inline-forge:$minecraftVersion-$inlineVersion"
+    modCompileOnly "vazkii.patchouli:Patchouli-xplat:1.21-$patchouliVersion-SNAPSHOT"
+    modCompileOnly "com.samsthenerd.inline:inline-common:1.21.1-1.2.2-74"
 
     // === OPTIONAL DEPS ===
     modCompileOnly "dev.emi:emi-xplat-intermediary:${emiVersion}:api"
-    compileOnly "io.wispforest:accessories-common:$accessoriesVersion"
+    modCompileOnly "io.wispforest:accessories-common:$accessoriesVersion"
 
     // === OTHER STUFF ===
     compileOnly "org.jetbrains:annotations:$jetbrainsAnnotationsVersion"
@@ -60,4 +78,4 @@ processResources {
 }
 
 // it wants a task by this name to exist for some reason
-task("prepareWorkspace") {}
+tasks.register('prepareWorkspace') {}