[fb31370] mojmap -> yarn

.github/workflows/build.yml

@@ -1,59 +1,32 @@
 name: Build
-on:
-    push:
-    pull_request:
-    workflow_dispatch:
-        inputs:
-            publish:
-                description: Publish to Modrinth and CurseForge
-                required: true
-                default: "false"
-            patch:
-                description: Patch number, 0 for first (ex. Create 1.19.2 v0.5.0.g Patch N)
-                required: true
+
+on: [ push, pull_request, workflow_dispatch ]
 
 jobs:
-    build:
+    Build:
         runs-on: ubuntu-latest
-        env:
-            PUBLISH_SUFFIX: snapshots
-            MAVEN_USER: ${{ secrets.MAVEN_USER }}
-            MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
-            MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-            CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
-            PATCH_NUMBER: ${{ github.event.inputs.patch }}
-            PUBLISHING: ${{ github.event.inputs.publish }}
-        steps:
-            -   name: Checkout Repository
-                uses: actions/checkout@v4
-
-            -   name: Setup Java
-                run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
-
-            -   name: Loom Cache
-                uses: actions/cache@v4
-                with:
-                    path: "**/.gradle/loom-cache"
-                    key: "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}"
-                    restore-keys: "${{ runner.os }}-gradle-"
-
-            -   name: Setup Gradle
-                uses: gradle/actions/setup-gradle@v3
-                with:
-                    gradle-home-cache-cleanup: true
 
-            -   name: Validate Gradle Wrapper Integrity
-                uses: gradle/wrapper-validation-action@v2
-
-            -   name: Build
-                run: ./gradlew buildOrPublish
-
-            -   name: Capture build artifacts
-                uses: actions/upload-artifact@v4
-                with:
-                    name: Artifacts
-                    path: build/libs/
-
-            -   name: Publish to Modrinth and CurseForge
-                if: ${{ github.event.inputs.publish }}
-                run: ./gradlew publishMod
+        steps:
+            - uses: actions/checkout@v4
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  distribution: 'zulu'
+                  java-version: 17
+            - name: Cache
+              uses: actions/cache@v4
+              with:
+                  path: |
+                      ~/.gradle/caches
+                      ~/.gradle/wrapper
+                      .gradle
+                  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'build.gradle') }}
+            - name: Build with Gradle
+              run: |
+                  chmod +x gradlew
+                  ./gradlew build
+            - name: Upload artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Artifacts
+                  path: ${{ github.workspace }}/build/libs

.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+name: Publish package to GitHub Packages
+on:
+    workflow_dispatch:
+    release:
+        types: [published]
+jobs:
+    publish:
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            packages: write
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-java@v4
+              with:
+                  java-version: '17'
+                  distribution: 'zulu'
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v3
+
+            - name: Publish package
+              run: ./gradlew publish
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,36 +1,10 @@
-<p align="center"><img src="https://i.imgur.com/SXaePW6.png" alt="Logo" width="200"></p>
-<h1 align="center">Create  <br>
-	<a href="https://www.patreon.com/simibubi"><img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dsimibubi%26type%3Dpatrons&style=flat&label=Supporters&color=ff5733" alt="Patreon"></a>
-	<a href="https://www.curseforge.com/minecraft/mc-mods/create-fabric/files"><img src="https://cf.way2muchnoise.eu/versions/624165(c70039).svg" alt="Supported Versions"></a>
-	<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://discord.gg/hmaD7Se"><img src="https://img.shields.io/discord/620934202875183104?color=5865f2&label=Discord&style=flat" alt="Discord"></a>
-	<a href="https://www.curseforge.com/minecraft/mc-mods/create-fabric"><img src="http://cf.way2muchnoise.eu/624165.svg" alt="CF"></a>
-    <a href="https://modrinth.com/mod/create-fabric"><img src="https://img.shields.io/modrinth/dt/create-fabric?logo=modrinth&label=&suffix=%20&style=flat&color=242629&labelColor=5ca424&logoColor=1c1c1c" alt="Modrinth"></a>
-    <br><br>
-    <a href="https://fabricmc.net/"><img
-        src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/fabric_64h.png"
-        alt="Available on Fabric"
-        width="200"
-    ></a>
-    <a href="https://quiltmc.org/"><img
-        src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/quilt_64h.png"
-        alt="Available on Quilt"
-        width="200"
-    ></a>
-</h1>
+# CreateFabricYarned
 
-<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>
-<p align="center"><a href="https://github.com/Fabricators-of-Create/Create/issues"><img src="https://i.imgur.com/qPmjSXy.png" width="160" /></a> <a href="https://www.youtube.com/channel/UCrKV2QTuyGcv4E3eSJpBiYA/playlists"><img src="https://i.imgur.com/L1bU9mr.png" width="160" /></a><a href="https://discord.gg/hmaD7Se"><img src="https://i.imgur.com/uf6V9ZX.png" width="160" /></a> <a href="https://github.com/Creators-of-Create/Create/wiki/Supporting-the-Project"><img src="https://i.imgur.com/fHQ45KR.png" width="227" /></a></p>
+Upstream version: [mc1.20.1/fabric/dev~fb31370](https://github.com/Fabricators-of-Create/Create/commit/fb31370fc1acbe8144cd6798629f1758f16e432b)
 
-<h4 align="center">Find out more about Create on our <a href="https://www.curseforge.com/minecraft/mc-mods/create-fabric">CurseForge</a> or <a href="https://modrinth.com/mod/create-fabric">Modrinth</a> page</h4>
-<h4 align="center">Looking for the Forge version? <a href="https://github.com/Creators-of-Create/Create">Find it here</a></h4>
+### This program is only for use in a development environment and cannot be used in a production environment!
 
-<h3 align="center">Development</h3>
-
-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).
+## Progress
+- [x] code remapped
+- [x] mixin remapped
+- [x] AW remapped

build.gradle

@@ -74,11 +74,14 @@ def dependencies(DependencyHandler deps) {
 // initial project setup
 def setup(DependencyHandler deps) {
     deps.minecraft("com.mojang:minecraft:$minecraft_version")
+    deps.mappings("net.fabricmc:yarn:$minecraft_version+build.$yarn_version:v2")
+    /*
     deps.mappings(loom.layered {
         it.mappings("org.quiltmc:quilt-mappings:$minecraft_version+build.$qm_version:intermediary-v2")
         it.parchment("org.parchmentmc.data:parchment-$minecraft_version:$parchment_version@zip")
         it.officialMojangMappings { nameSyntheticMembers = false }
     })
+    */
     deps.modImplementation("net.fabricmc:fabric-loader:$loader_version")
 }
 
@@ -139,7 +142,7 @@ machete {
 
 tasks.register("buildOrPublish") {
     group = "build"
-    String mavenUser = System.getenv("MAVEN_USER")
+    String mavenUser = System.getenv("GITHUB_ACTOR")
     if (mavenUser != null && !mavenUser.isEmpty()) {
         dependsOn(tasks.named("publish"))
         println("prepared for publish")
@@ -271,5 +274,6 @@ tasks.remapJar.configure {
 }
 
 // see gradle/publishing.gradle for publishing
-apply from: "gradle/publishing/publishing.gradle"
+//apply from: "gradle/publishing/publishing.gradle"
+apply from: "gradle/publishing/maven.gradle"
 apply from: "gradle/compat/compat.gradle"

gradle.properties

@@ -14,10 +14,8 @@ maven_group = com.simibubi.create
 # Dependencies
 
 # Mappings
-# https://lambdaurora.dev/tools/import_quilt.html
-qm_version = 23
-# https://parchmentmc.org/docs/getting-started
-parchment_version = 2023.09.03
+# https://fabricmc.net/develop/
+yarn_version = 10
 
 # Dependencies
 # https://ci.tterrag.com/job/Flywheel/job/Fabric/

gradle/publishing/maven.gradle

@@ -7,6 +7,7 @@ publishing {
     }
 
     repositories {
+        /*
         maven {
             url = "https://mvn.devos.one/${System.getenv("PUBLISH_SUFFIX")}/"
             credentials {
@@ -15,5 +16,15 @@ publishing {
             }
             authentication { basic(BasicAuthentication) }
         }
+         */
+
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/dm-earth/CreateFabricYarned")
+            credentials {
+                username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
+                password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
+            }
+        }
     }
 }