diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fc365f..ebe768c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,25 +15,27 @@ 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 - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: validate gradle wrapper uses: gradle/wrapper-validation-action@v1 - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: ${{ matrix.java }} + java-package: jdk - name: make gradle wrapper executable if: ${{ runner.os != 'Windows' }} run: chmod +x ./gradlew - 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 - uses: actions/upload-artifact@v2 + if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from Linux + uses: actions/upload-artifact@v3 with: name: Artifacts path: build/libs/ 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 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..2aadc0f 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 @@ -13,4 +15,4 @@ org.gradle.jvmargs=-Xmx4G archives_base_name = frozenblock-wild-mod-plus # Dependencies - fabric_version=0.44.0+1.18 + fabric_version=0.46.6+1.18 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85..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.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-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"