diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9229ee9f..11179cb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,14 +23,14 @@ jobs: - name: setup / checkout repository uses: actions/checkout@v4 - name: setup / validate gradle wrapper - uses: gradle/actions/wrapper-validation@v3 + uses: gradle/actions/wrapper-validation@v4 - name: setup / jdk ${{ env.RUNTIME_VERSION }} uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{ env.RUNTIME_VERSION }} - name: setup / gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 with: cache-read-only: ${{ !(startsWith(github.ref, 'refs/heads/mc/') || github.ref == 'refs/heads/master') || github.event_name == 'pull_request' }} - name: run gradle build diff --git a/gradle.properties b/gradle.properties index 5a0b9224..c57a9d41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ targetJavaVersion=21 enabledPlatforms=fabric,neoforge # Gradle -org.gradle.jvmargs=-Xmx1G \ No newline at end of file +org.gradle.jvmargs=-Xmx2G diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 470a5b59..f02cde02 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,36 +3,36 @@ format = { version = "1.1" } [versions] indra = "3.1.3" -minecraft = "1.21.3" -fabricLoader = "0.16.7" -fabricApi = "0.106.1+1.21.3" -modmenu = "12.0.0-beta.1" +minecraft = "1.21.4" +fabricLoader = "0.16.9" +fabricApi = "0.112.2+1.21.4" +modmenu = "13.0.0-beta.1" viafabricplus = "3.3.0" vineflower = "1.10.1" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } -parchment = { module = "org.parchmentmc.data:parchment-1.21", version = "2024.07.28" } +parchment = { module = "org.parchmentmc.data:parchment-1.21.4", version = "2024.12.07" } fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabricLoader" } fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabricApi" } fabric-api-bom = { module = "net.fabricmc.fabric-api:fabric-api-bom", version.ref = "fabricApi" } fabric-api-networking = { module = "net.fabricmc.fabric-api:fabric-networking-api-v1" } modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" } -neoforge = { module = "net.neoforged:neoforge", version = "21.3.3-beta"} +neoforge = { module = "net.neoforged:neoforge", version = "21.4.38-beta"} viafabricplus-api = { module = "de.florianmichael:ViaFabricPlus", version.ref = "viafabricplus" } viaversion = { module = "com.viaversion:viaversion-common", version = "5.0.5" } vineflower = { module = "org.vineflower:vineflower", version.ref = "vineflower" } worldedit = { module = "com.sk89q.worldedit:worldedit-fabric-mc1.21", version = "7.3.7" } [plugins] -architecturyPlugin = { id = "architectury-plugin", version = "3.4.159" } -curseForgeGradle = { id = "net.darkhax.curseforgegradle", version = "1.1.25" } +architecturyPlugin = { id = "architectury-plugin", version = "3.4.160" } +curseForgeGradle = { id = "net.darkhax.curseforgegradle", version = "1.1.26" } indra-git = { id = "net.kyori.indra.git", version.ref = "indra" } indra-spotlessLicenser = { id = "net.kyori.indra.licenser.spotless", version.ref = "indra" } jvmConflictResolution = { id = "org.gradlex.jvm-dependency-conflict-resolution", version = "2.1.2" } -loom = { id = "dev.architectury.loom", version = "1.7.413" } +loom = { id = "dev.architectury.loom", version = "1.9.420" } minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" } publishGithubRelease = { id = "ca.stellardrift.publish-github-release", version = "0.1.0" } -shadow = { id = "com.gradleup.shadow", version = "8.3.3" } +shadow = { id = "com.gradleup.shadow", version = "8.3.5" } spotless = { id = "com.diffplug.spotless", version = "6.25.0" } versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b..cea7a793 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.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d..f3b75f3b 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,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 -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/gui/CUIConfigList.java b/worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/gui/CUIConfigList.java index ce2b1bb3..cda0bae1 100644 --- a/worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/gui/CUIConfigList.java +++ b/worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/gui/CUIConfigList.java @@ -68,11 +68,6 @@ private CUIConfigList(CUIConfigPanel panel, Minecraft minecraft) { this.configuration = panel.configuration; } - @Override - protected int getScrollbarPosition() { - return super.getScrollbarPosition() + 15; - } - @Override public int getRowWidth() { return super.getRowWidth() + 32; diff --git a/worldeditcui-protocol-common/build.gradle.kts b/worldeditcui-protocol-common/build.gradle.kts index d3fb36cf..c4df5d99 100644 --- a/worldeditcui-protocol-common/build.gradle.kts +++ b/worldeditcui-protocol-common/build.gradle.kts @@ -1,3 +1,5 @@ +import dev.architectury.plugin.TransformingTask + plugins { alias(libs.plugins.architecturyPlugin) alias(libs.plugins.loom) @@ -12,6 +14,10 @@ architectury { common(enabledPlatforms.split(',')) } +tasks.withType(TransformingTask::class).configureEach { + taskActions.removeIf { it.displayName == "Execute copy" } // why do i have to do this +} + dependencies { modImplementation(libs.fabric.loader) } \ No newline at end of file