Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,25 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6.0.2
with:
fetch-depth: 0

- uses: gradle/actions/wrapper-validation@v3

- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5.2.0
with:
distribution: 'microsoft'
java-version: '21'
java-version: '25'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v6.0.1
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' }}

- name: Build with Gradle
run: ./gradlew build

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7.0.0
with:
name: dist
path: build/libs/
Expand All @@ -58,7 +56,7 @@ jobs:

# Auto-Release when pushed to main
- name: Release
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v2.6.1
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
with:
tag_name: v${{ steps.get_version.outputs.version }}
Expand Down
12 changes: 7 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

plugins {
id 'maven-publish'
id 'net.neoforged.gradleutils'
id 'net.neoforged.moddev'
id 'io.github.goooler.shadow'
id 'com.gradleup.shadow'
}

gradleutils {
Expand All @@ -19,7 +18,6 @@ gradleutils {
}

version = gradleutils.version.toString()

group = 'net.forgecraft.serverpacklocator'

sourceSets {
Expand All @@ -29,6 +27,7 @@ sourceSets {
neoForge {
version = project.neoforgeVersion
accessTransformers.from("src/utilmod/resources/META-INF/accesstransformer.cfg")
validateAccessTransformers = true

mods {
spl {
Expand Down Expand Up @@ -80,7 +79,7 @@ def copyUtilMod = tasks.register("copyUtilMod", Copy) {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
languageVersion = JavaLanguageVersion.of(25)
}
withSourcesJar()
}
Expand All @@ -105,12 +104,15 @@ shadowJar {
}

dependencies {
shadow("io.netty:netty-codec-http:4.1.118.Final") {
shadow("io.netty:netty-codec-http:4.2.7.Final") {
transitive = false
}
shadow("com.electronwill.night-config:json:3.8.3") {
transitive = false
}
implementation("com.electronwill.night-config:json:3.8.3") {
transitive = false
}

utilmodCompileOnly sourceSets.main.output
runtimeOnly sourceSets.utilmod.output
Expand Down
10 changes: 6 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=false

neoforgeVersion=21.8.47

neoForge.parchment.minecraftVersion=1.21.8
neoForge.parchment.mappingsVersion=2025.07.18
neoforgeVersion=26.1.0.18-beta
3 changes: 0 additions & 3 deletions gradle/daemon-jvm.properties

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading