diff --git a/.forgejo/workflows/java-build.yml b/.forgejo/workflows/java-build.yml deleted file mode 100644 index fc4be96..0000000 --- a/.forgejo/workflows/java-build.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: build-java -on: [ push, pull_request ] - -jobs: - build: - runs-on: docker - steps: - - name: checkout repository - uses: https://code.forgejo.org/actions/checkout@v4 - - name: setup jdk - uses: https://github.com/actions/setup-java@v4 - with: - java-version: | - 8 - 21 - distribution: temurin - - name: restore cached dependencies - uses: https://code.forgejo.org/actions/cache/restore@v4 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-Gradle - - name: build - run: ./gradlew build --no-daemon --warning-mode=all - - name: capture build artifacts - uses: https://code.forgejo.org/forgejo/upload-artifact@v4 - with: - name: build-artifacts.zip - path: | - build/libs - !build/libs/*-all.jar - if-no-files-found: error - - name: cache downloaded dependencies - if: ${{ github.ref_name == github.event.repository.default_branch }} - uses: https://code.forgejo.org/actions/cache/save@v4 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-Gradle diff --git a/build.gradle b/build.gradle index 3ec77f6..eedf08e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.10-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } @@ -19,7 +19,7 @@ repositories { } loom { - splitEnvironmentSourceSets() + splitEnvironmentSourceSets() mods { "modid" { @@ -31,8 +31,6 @@ loom { } dependencies { - implementation 'org.projectlombok:lombok:1.18.38' - annotationProcessor 'org.projectlombok:lombok:1.18.38' // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" @@ -41,13 +39,16 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + compileOnly 'org.projectlombok:lombok:1.18.32' + annotationProcessor 'org.projectlombok:lombok:1.18.32' + } processResources { inputs.property "version", project.version filesMatching("fabric.mod.json") { - expand "version": inputs.properties.version + expand "version": project.version } } @@ -66,10 +67,8 @@ java { } jar { - inputs.property "archivesName", project.base.archivesName - from("LICENSE") { - rename { "${it}_${inputs.properties.archivesName}"} + rename { "${it}_${project.base.archivesName.get()}"} } } diff --git a/gradle.properties b/gradle.properties index 8162b23..a84eff9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.5 -yarn_mappings=1.21.5+build.1 -loader_version=0.16.14 -loom_version=1.10-SNAPSHOT +minecraft_version=1.21 +yarn_mappings=1.21+build.2 +loader_version=0.15.11 # Mod Properties -mod_version = 0.3.6 +mod_version = 0.3.5 maven_group = me.jonasjones archives_base_name = mcwebserver-fabric-quilt # Dependencies -fabric_version=0.126.0+1.21.5 \ No newline at end of file +fabric_version=0.100.3+1.21 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc25..b82aa23 100644 --- 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -15,8 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# SPDX-License-Identifier: Apache-2.0 -# ############################################################################## # @@ -57,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -86,7 +84,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 9b42019..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,6 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################