From b6c2d3408aee781734d2fc8008857af3b2c91dee Mon Sep 17 00:00:00 2001 From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com> Date: Wed, 16 Mar 2022 11:58:45 -0500 Subject: [PATCH 1/8] make changes --- .github/workflows/build.yml | 6 ++++-- build.gradle | 4 +++- gradle.properties | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fc365f..4d5af41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: 17, # Current Java LTS & minimum supported by Minecraft ] # and run on both Linux and Windows - os: [ubuntu-20.04, windows-2022] + os: [ubuntu-latest, windows-2022] runs-on: ${{ matrix.os }} steps: - name: checkout repository @@ -23,9 +23,11 @@ jobs: - name: validate gradle wrapper uses: gradle/wrapper-validation-action@v1 - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: `zulu` java-version: ${{ matrix.java }} + java-package: jdk - name: make gradle wrapper executable if: ${{ runner.os != 'Windows' }} run: chmod +x ./gradlew diff --git a/build.gradle b/build.gradle index 44f19f4..a95ed0c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '0.11-SNAPSHOT' id 'maven-publish' } @@ -44,6 +44,8 @@ processResources { tasks.withType(JavaCompile).configureEach { // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. it.options.release = 17 + options.fork = true + options.incremental = true } java { diff --git a/gradle.properties b/gradle.properties index 0754559..08c43f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,12 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx4G +# Done to possibly help with build times. +org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/versions.html minecraft_version=1.18.1 - yarn_mappings=1.18.1+build.1 + yarn_mappings=1.18.1+build.22 loader_version=0.13.3 # Mod Properties diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85..00e33ed 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a20d692..49ae83f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,7 +30,7 @@ "mixins": ["twmplus.mixins.json"], "depends": { - "fabricloader": ">=0.11.3", + "fabricloader": ">=0.13.3", "fabric": "*", "minecraft": "1.18.x", "java": ">=17" From 4c66745e2624c177388e4a3385acfcf7bd81376f Mon Sep 17 00:00:00 2001 From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com> Date: Wed, 16 Mar 2022 12:02:33 -0500 Subject: [PATCH 2/8] fabric api 0.46.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 08c43f0..fb3ab9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,4 @@ org.gradle.parallel=true archives_base_name = frozenblock-wild-mod-plus # Dependencies - fabric_version=0.44.0+1.18 + fabric_version=0.46.4+1.18 From ee7ff0a886f7711210db1047f4a59eee4f1eeb7a Mon Sep 17 00:00:00 2001 From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com> Date: Wed, 16 Mar 2022 12:03:52 -0500 Subject: [PATCH 3/8] oops --- .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 4d5af41..3f97c26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: setup jdk ${{ matrix.java }} uses: actions/setup-java@v2 with: - distribution: `zulu` + distribution: 'zulu' java-version: ${{ matrix.java }} java-package: jdk - name: make gradle wrapper executable From e0761c178648eda9bbedb464372ca2a65c34e8f6 Mon Sep 17 00:00:00 2001 From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com> Date: Wed, 16 Mar 2022 12:18:34 -0500 Subject: [PATCH 4/8] Add README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..a41287c --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# The Wild Mod Plus + +An addon for The Wild Mod. Bring extra features from (and features not in) the 1.19 "Wild Update" to 1.18 ! + +--- +Building: +* Clone the repository +* Run the "gradlew build" command in the repository folder +* Look in ./build/libs for the mod .jar \ No newline at end of file From d2567b65a496b634b2fd7c52be87fd2bc2d4817c Mon Sep 17 00:00:00 2001 From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com> Date: Wed, 16 Mar 2022 12:22:28 -0500 Subject: [PATCH 5/8] Fabric API 0.46.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fb3ab9e..2aadc0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,4 @@ org.gradle.parallel=true archives_base_name = frozenblock-wild-mod-plus # Dependencies - fabric_version=0.46.4+1.18 + fabric_version=0.46.6+1.18 From 69258a8947e3982b24ab6552ffa04435f7080957 Mon Sep 17 00:00:00 2001 From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com> Date: Fri, 25 Mar 2022 10:19:36 -0600 Subject: [PATCH 6/8] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f97c26..1941811 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: validate gradle wrapper uses: gradle/wrapper-validation-action@v1 - name: setup jdk ${{ matrix.java }} @@ -35,7 +35,7 @@ jobs: run: ./gradlew build - name: capture build artifacts if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Artifacts path: build/libs/ From ff04f0a5da606588e541476e8047d32510b4a224 Mon Sep 17 00:00:00 2001 From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com> Date: Thu, 7 Apr 2022 15:43:56 -0500 Subject: [PATCH 7/8] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1941811..ebe768c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: - name: validate gradle wrapper uses: gradle/wrapper-validation-action@v1 - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ matrix.java }} @@ -34,7 +34,7 @@ jobs: - name: build run: ./gradlew build - name: capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS + if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from Linux uses: actions/upload-artifact@v3 with: name: Artifacts From 6d44a6711243c2bd26b8f29d89e23303fc188633 Mon Sep 17 00:00:00 2001 From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com> Date: Thu, 7 Apr 2022 23:26:25 -0500 Subject: [PATCH 8/8] Gradle 7.4.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33ed..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists