From db9141ec7dbe0ab0f3bdfda16dcc3a1dafe834c5 Mon Sep 17 00:00:00 2001 From: IvanTopGaming <85171599+IvanTopGaming@users.noreply.github.com> Date: Fri, 27 Dec 2024 16:49:38 +0300 Subject: [PATCH 1/7] Port to 1.21.4 --- build.gradle | 2 +- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 1b0ea54..8bd9263 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.5-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 89994cd..ff4cceb 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ org.gradle.jvmargs=-Xmx2G -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 -loader_version=0.15.7 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.2 +loader_version=0.16.9 #Fabric api -fabric_version=0.96.4+1.20.4 +fabric_version=0.113.0+1.21.4 #Dependencies kyrptconfig=1.6.0-1.20.4 # Mod Properties -mod_version=1.6.3-1.20.4 +mod_version=1.6.4-1.21.4 maven_group=net.kyrptonaught archives_base_name=cmdkeybind diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7cf0814..adda1f2 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 9b45e00ebd2fe2e3822a8e3e0961297856b87955 Mon Sep 17 00:00:00 2001 From: ellie is not coding in the slightest <166862894+eleanordoesntcode@users.noreply.github.com> Date: Fri, 27 Dec 2024 14:59:28 +0100 Subject: [PATCH 2/7] Create build.yml --- .github/workflows/build.yml | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..094028c --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +# mostly stolen from Sodium +name: build-commit + +on: [ push ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Extract current branch name + shell: bash + # bash pattern expansion to grab branch name without slashes + run: ref="${GITHUB_REF#refs/heads/}" && echo "branch=${ref////-}" >> $GITHUB_OUTPUT + id: ref + - name: Checkout sources + uses: actions/checkout@v4 + + - name: Validate Gradle Wrapper + uses: gradle/actions/wrapper-validation@v3 + + - name: Setup Java 21 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 21 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + with: + cache-read-only: false + + - name: Execute Gradle build + run: ./gradlew build + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: cmdkeybinds-artifacts-${{ steps.ref.outputs.branch }} + path: build/mods/*.jar From 4ab4d6c459dd0c0e983697ec0f95f5a0a9ec5a7a Mon Sep 17 00:00:00 2001 From: ellie is not coding in the slightest <166862894+eleanordoesntcode@users.noreply.github.com> Date: Fri, 27 Dec 2024 15:06:38 +0100 Subject: [PATCH 3/7] fix build dir --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 094028c..26e1f43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,4 +37,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: cmdkeybinds-artifacts-${{ steps.ref.outputs.branch }} - path: build/mods/*.jar + path: build/*.jar From 29e36005e4b860926eb21fe9f8b7c0bf4bf76c5e Mon Sep 17 00:00:00 2001 From: ellie is not coding in the slightest <166862894+eleanordoesntcode@users.noreply.github.com> Date: Fri, 27 Dec 2024 15:07:54 +0100 Subject: [PATCH 4/7] just going to upload everything to test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26e1f43..8520a60 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,4 +37,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: cmdkeybinds-artifacts-${{ steps.ref.outputs.branch }} - path: build/*.jar + path: . From c9441bc580d8e7c83f06c2740439a237c1e7517f Mon Sep 17 00:00:00 2001 From: ellie is not coding in the slightest <166862894+eleanordoesntcode@users.noreply.github.com> Date: Fri, 27 Dec 2024 15:42:19 +0100 Subject: [PATCH 5/7] found it --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8520a60..e7164e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,4 +37,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: cmdkeybinds-artifacts-${{ steps.ref.outputs.branch }} - path: . + path: build/libs/*.jar From 9da271df04932027340090b8555d58f0c16c03a6 Mon Sep 17 00:00:00 2001 From: IvanTopGaming <85171599+IvanTopGaming@users.noreply.github.com> Date: Thu, 13 Feb 2025 17:09:41 +0300 Subject: [PATCH 6/7] Port to 1.21.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ff4cceb..7532c73 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ loader_version=0.16.9 fabric_version=0.113.0+1.21.4 #Dependencies -kyrptconfig=1.6.0-1.20.4 +kyrptconfig=1.6.1-1.21.4 # Mod Properties mod_version=1.6.4-1.21.4 From d666b6ba74468e8093a9d7be1391973eeb54ad08 Mon Sep 17 00:00:00 2001 From: IvanTopGaming <85171599+IvanTopGaming@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:35:15 +0000 Subject: [PATCH 7/7] Port to 1.21.4 --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3e1de9e..d3ff41e 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "cmdkeybind", - "version": "1.6.3-1.20.4", + "version": "1.6.4-1.21.4", "name": "Command Macros", "description": "Command Macros!", "authors": [