aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuck <git@lucko.me>2024-08-12 19:36:33 +0100
committerLuck <git@lucko.me>2024-08-12 19:36:33 +0100
commit46704df73c9346075d39a82c5e95c6d77c284b3c (patch)
tree7da7b96b783dfd27152b4376a4f43de6e12f1cea
parent0eeba9e3e4013121569e5536ac6b0244b7d8ae36 (diff)
downloadspark-46704df73c9346075d39a82c5e95c6d77c284b3c.tar.gz
spark-46704df73c9346075d39a82c5e95c6d77c284b3c.tar.bz2
spark-46704df73c9346075d39a82c5e95c6d77c284b3c.zip
Update to Minecraft 1.21.1
-rw-r--r--.gitattributes5
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin43453 -> 43504 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rwxr-xr-xgradlew7
-rw-r--r--gradlew.bat2
-rw-r--r--spark-bukkit/build.gradle2
-rw-r--r--spark-bungeecord/build.gradle2
-rw-r--r--spark-fabric/build.gradle12
-rw-r--r--spark-forge/build.gradle6
-rw-r--r--spark-minestom/build.gradle2
-rw-r--r--spark-neoforge/build.gradle6
-rw-r--r--spark-nukkit/build.gradle2
-rw-r--r--spark-paper/build.gradle2
-rw-r--r--spark-sponge7/build.gradle2
-rw-r--r--spark-sponge8/build.gradle2
-rw-r--r--spark-velocity/build.gradle2
-rw-r--r--spark-velocity4/build.gradle2
-rw-r--r--spark-waterdog/build.gradle2
18 files changed, 35 insertions, 25 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..022b841
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat text eol=crlf
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e644113..2c35211 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23..09523c0 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.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4..f5feea6 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# SPDX-License-Identifier: Apache-2.0
+#
##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || 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 25da30d..9d21a21 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
@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 ##########################################################################
diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle
index c5ea325..99f3871 100644
--- a/spark-bukkit/build.gradle
+++ b/spark-bukkit/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
}
dependencies {
diff --git a/spark-bungeecord/build.gradle b/spark-bungeecord/build.gradle
index 0bfb285..8438d5e 100644
--- a/spark-bungeecord/build.gradle
+++ b/spark-bungeecord/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
}
dependencies {
diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
index 479b458..a9cef99 100644
--- a/spark-fabric/build.gradle
+++ b/spark-fabric/build.gradle
@@ -1,8 +1,8 @@
import net.fabricmc.loom.task.RemapJarTask
plugins {
- id 'fabric-loom' version '1.6-SNAPSHOT'
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'fabric-loom' version '1.7-SNAPSHOT'
+ id 'com.gradleup.shadow' version '8.3.0'
}
tasks.withType(JavaCompile) {
@@ -28,8 +28,8 @@ configurations {
dependencies {
// https://modmuss50.me/fabric.html
- minecraft 'com.mojang:minecraft:1.21'
- mappings 'net.fabricmc:yarn:1.21+build.1:v2'
+ minecraft 'com.mojang:minecraft:1.21.1'
+ mappings 'net.fabricmc:yarn:1.21.1+build.3:v2'
modImplementation 'net.fabricmc:fabric-loader:0.15.11'
Set<String> apiModules = [
@@ -40,12 +40,12 @@ dependencies {
// Add each module as a dependency
apiModules.forEach {
- modImplementation(fabricApi.module(it, '0.100.1+1.21'))
+ modImplementation(fabricApi.module(it, '0.102.1+1.21.1'))
}
include(modImplementation('me.lucko:fabric-permissions-api:0.3.1'))
- modImplementation('eu.pb4:placeholder-api:2.4.0-pre.2+1.21')
+ modImplementation('eu.pb4:placeholder-api:2.4.1+1.21')
shade project(':spark-common')
}
diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle
index 71b559a..1d627b1 100644
--- a/spark-forge/build.gradle
+++ b/spark-forge/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
}
@@ -9,7 +9,7 @@ tasks.withType(JavaCompile) {
}
minecraft {
- mappings channel: 'official', version: '1.21'
+ mappings channel: 'official', version: '1.21.1'
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
}
@@ -19,7 +19,7 @@ configurations {
}
dependencies {
- minecraft 'net.minecraftforge:forge:1.21-51.0.8'
+ minecraft 'net.minecraftforge:forge:1.21.1-52.0.2'
shade project(':spark-common')
}
diff --git a/spark-minestom/build.gradle b/spark-minestom/build.gradle
index c08baf5..6e0d7e6 100644
--- a/spark-minestom/build.gradle
+++ b/spark-minestom/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
}
tasks.withType(JavaCompile) {
diff --git a/spark-neoforge/build.gradle b/spark-neoforge/build.gradle
index 39c2867..ee90d39 100644
--- a/spark-neoforge/build.gradle
+++ b/spark-neoforge/build.gradle
@@ -1,6 +1,6 @@
plugins {
- id 'io.github.goooler.shadow' version '8.1.7'
- id 'net.neoforged.gradle.userdev' version '7.0.142'
+ id 'com.gradleup.shadow' version '8.3.0'
+ id 'net.neoforged.gradle.userdev' version '7.0.145'
}
tasks.withType(JavaCompile).configureEach {
@@ -26,7 +26,7 @@ configurations {
}
dependencies {
- implementation "net.neoforged:neoforge:21.0.10-beta"
+ implementation "net.neoforged:neoforge:21.1.8"
shade project(':spark-common')
}
diff --git a/spark-nukkit/build.gradle b/spark-nukkit/build.gradle
index 0db25e7..c11e02e 100644
--- a/spark-nukkit/build.gradle
+++ b/spark-nukkit/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
}
dependencies {
diff --git a/spark-paper/build.gradle b/spark-paper/build.gradle
index e57b3fe..4ca3dd6 100644
--- a/spark-paper/build.gradle
+++ b/spark-paper/build.gradle
@@ -1,6 +1,6 @@
plugins {
id 'net.kyori.blossom' version '1.3.0'
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
id 'maven-publish'
}
diff --git a/spark-sponge7/build.gradle b/spark-sponge7/build.gradle
index f9873fc..da2f3d5 100644
--- a/spark-sponge7/build.gradle
+++ b/spark-sponge7/build.gradle
@@ -1,6 +1,6 @@
plugins {
id 'net.kyori.blossom' version '1.3.0'
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
}
dependencies {
diff --git a/spark-sponge8/build.gradle b/spark-sponge8/build.gradle
index 56222dd..a455e41 100644
--- a/spark-sponge8/build.gradle
+++ b/spark-sponge8/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
}
dependencies {
diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle
index 4ed64e7..f0d2a35 100644
--- a/spark-velocity/build.gradle
+++ b/spark-velocity/build.gradle
@@ -1,6 +1,6 @@
plugins {
id 'net.kyori.blossom' version '1.3.0'
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
}
dependencies {
diff --git a/spark-velocity4/build.gradle b/spark-velocity4/build.gradle
index 76c9e38..a10d73b 100644
--- a/spark-velocity4/build.gradle
+++ b/spark-velocity4/build.gradle
@@ -1,6 +1,6 @@
plugins {
id 'net.kyori.blossom' version '1.3.0'
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
}
tasks.withType(JavaCompile) {
diff --git a/spark-waterdog/build.gradle b/spark-waterdog/build.gradle
index 396edc0..0f0dee2 100644
--- a/spark-waterdog/build.gradle
+++ b/spark-waterdog/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'io.github.goooler.shadow' version '8.1.7'
+ id 'com.gradleup.shadow' version '8.3.0'
}
tasks.withType(JavaCompile) {