Skip to content

Commit 11574bb

Browse files
gabizougabizou
committed
chore(git): merge upstream changes
Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
2 parents 6f5f4d6 + 0a42e85 commit 11574bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+776
-56
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
format = { version = "1.1" }
33

44
[versions]
5-
adventure = "4.21.0"
5+
adventure = "4.24.0"
66
caffeine = "3.1.8"
77
checker = "3.42.0"
88
checkstyle = "10.12.7"

‎gradle/verification-metadata.xml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,14 @@
913913
<sha256 value="fa52882aa51d8faf1baa697a76b14706741498d4ca3a41a0d8c4ab913afa995f" origin="Generated by Gradle"/>
914914
</artifact>
915915
</component>
916+
<component group="net.kyori" name="adventure-api" version="4.24.0">
917+
<artifact name="adventure-api-4.24.0.jar">
918+
<sha256 value="d8c1d66db0fbaf084e8179b3f2541d9ff64402a7881070a71e8b3c26c26d384e" origin="Generated by Gradle"/>
919+
</artifact>
920+
<artifact name="adventure-api-4.24.0.module">
921+
<sha256 value="734e974632e36621feed97b74e1acb49797ea73c3711447ca7e2c604b98b1055" origin="Generated by Gradle"/>
922+
</artifact>
923+
</component>
916924
<component group="net.kyori" name="adventure-bom" version="4.16.0">
917925
<artifact name="adventure-bom-4.16.0.module">
918926
<sha256 value="7bb0ff16b5787d447294343d96cae826946c78ff3dff47487d4a65a2fe5b58ff" origin="Generated by Gradle"/>
@@ -945,6 +953,14 @@
945953
<sha256 value="7e9b8fc45d74c863276f2e36c346b34edf91d94246c46823471bf8c358657a74" origin="Generated by Gradle"/>
946954
</artifact>
947955
</component>
956+
<component group="net.kyori" name="adventure-bom" version="4.24.0">
957+
<artifact name="adventure-bom-4.24.0.module">
958+
<sha256 value="125301e28b858fcf0f8e7182daea145d0a8e1d7cbfccf4c4397b231d4a50624c" origin="Generated by Gradle"/>
959+
</artifact>
960+
<artifact name="adventure-bom-4.24.0.pom">
961+
<sha256 value="d7ebadc65beb0af4a0f54a5335673bcff630a911f540a0f44c7ff7f02c4f3885" origin="Generated by Gradle"/>
962+
</artifact>
963+
</component>
948964
<component group="net.kyori" name="adventure-key" version="4.16.0">
949965
<artifact name="adventure-key-4.16.0-javadoc.jar">
950966
<sha256 value="79e45459b03781d6c4bb487306b5fda22be88eada46331ba47a2e070a9a30c01" origin="Generated by Gradle"/>
@@ -986,6 +1002,14 @@
9861002
<sha256 value="69ea5c88320dfdb15ffe552a44a7f41bc80142abba2ae76cea71b7838b85e07a" origin="Generated by Gradle"/>
9871003
</artifact>
9881004
</component>
1005+
<component group="net.kyori" name="adventure-key" version="4.24.0">
1006+
<artifact name="adventure-key-4.24.0.jar">
1007+
<sha256 value="d4f21f4281e89dab345a9004567668794819f9cc483eaff8bfd64c57494a9150" origin="Generated by Gradle"/>
1008+
</artifact>
1009+
<artifact name="adventure-key-4.24.0.module">
1010+
<sha256 value="d2023bf8e7f4a8af8f08ae43a483cc3a4f36eb5b15ac6f25d0d8741d96ba12f0" origin="Generated by Gradle"/>
1011+
</artifact>
1012+
</component>
9891013
<component group="net.kyori" name="adventure-text-minimessage" version="4.16.0">
9901014
<artifact name="adventure-text-minimessage-4.16.0-javadoc.jar">
9911015
<sha256 value="7a101cb27dcc27c99e96018e0a06e2e149e57849fde98be973b84b7297d7f42a" origin="Generated by Gradle"/>
@@ -1027,6 +1051,14 @@
10271051
<sha256 value="73f8bf3d93a62fbea1f242c7992ab4a8b361ba697dd875990a4bb6dad637a82b" origin="Generated by Gradle"/>
10281052
</artifact>
10291053
</component>
1054+
<component group="net.kyori" name="adventure-text-minimessage" version="4.24.0">
1055+
<artifact name="adventure-text-minimessage-4.24.0.jar">
1056+
<sha256 value="7a7f44dc3b78379b918f91dce38bff26a0963bfe303a3fe16c91d30a5c5e23e5" origin="Generated by Gradle"/>
1057+
</artifact>
1058+
<artifact name="adventure-text-minimessage-4.24.0.module">
1059+
<sha256 value="6af08da3aadb8fe873e10faa515735c9b37a2d65826cb1898735a6e197893d76" origin="Generated by Gradle"/>
1060+
</artifact>
1061+
</component>
10301062
<component group="net.kyori" name="adventure-text-serializer-commons" version="4.21.0">
10311063
<artifact name="adventure-text-serializer-commons-4.21.0.jar">
10321064
<sha256 value="2eeb26605c723a57e5b63d24c2dd64182153a1486ca8e9f30bcba42d207f2c2a" origin="Generated by Gradle"/>
@@ -1035,6 +1067,14 @@
10351067
<sha256 value="d92caf74eedd978f7a0b543d747e1b3460f6fa29dc50af4a0091172b2c9826a3" origin="Generated by Gradle"/>
10361068
</artifact>
10371069
</component>
1070+
<component group="net.kyori" name="adventure-text-serializer-commons" version="4.24.0">
1071+
<artifact name="adventure-text-serializer-commons-4.24.0.jar">
1072+
<sha256 value="1010202c73124d3e0789dfdabb2778a5fb8cfad8726d70af9beb5c5759d4ccfd" origin="Generated by Gradle"/>
1073+
</artifact>
1074+
<artifact name="adventure-text-serializer-commons-4.24.0.module">
1075+
<sha256 value="665b9a1fd22b30f1a7289185b8e93cceced9ad68dd53557939b4075dd309c71d" origin="Generated by Gradle"/>
1076+
</artifact>
1077+
</component>
10381078
<component group="net.kyori" name="adventure-text-serializer-gson" version="4.16.0">
10391079
<artifact name="adventure-text-serializer-gson-4.16.0-javadoc.jar">
10401080
<sha256 value="2681bc1e76f7a382c9a961815a56065aa24391dc3f05a355ab3664e4e3657c48" origin="Generated by Gradle"/>
@@ -1076,6 +1116,14 @@
10761116
<sha256 value="c52becfbbdd571ba66597cbb8877db1b178161f08d038e33608bfd3f9e1a0f6f" origin="Generated by Gradle"/>
10771117
</artifact>
10781118
</component>
1119+
<component group="net.kyori" name="adventure-text-serializer-gson" version="4.24.0">
1120+
<artifact name="adventure-text-serializer-gson-4.24.0.jar">
1121+
<sha256 value="2414c3ce5ffe1b7e31de86968ebd3e9f2a50e354939b276588ed2cd64c431821" origin="Generated by Gradle"/>
1122+
</artifact>
1123+
<artifact name="adventure-text-serializer-gson-4.24.0.module">
1124+
<sha256 value="2c8c5635e4278e58ab35f142403eb5bb5fac05788362907c553a5af69f0334dd" origin="Generated by Gradle"/>
1125+
</artifact>
1126+
</component>
10791127
<component group="net.kyori" name="adventure-text-serializer-json" version="4.16.0">
10801128
<artifact name="adventure-text-serializer-json-4.16.0-javadoc.jar">
10811129
<sha256 value="f90c521ef81035beae06b5c5a5de3e636e03a5b85ede2af9e468cc6b67e57f57" origin="Generated by Gradle"/>
@@ -1117,6 +1165,14 @@
11171165
<sha256 value="c138a6883680c8bbfe4c2bc608653f00ac61bbf406a9b5d81d28adc8f5e8dd0d" origin="Generated by Gradle"/>
11181166
</artifact>
11191167
</component>
1168+
<component group="net.kyori" name="adventure-text-serializer-json" version="4.24.0">
1169+
<artifact name="adventure-text-serializer-json-4.24.0.jar">
1170+
<sha256 value="ff6a80344cbf14d6a751947caf9db9669dd0740aeac8cc555c9b8648ff5771b2" origin="Generated by Gradle"/>
1171+
</artifact>
1172+
<artifact name="adventure-text-serializer-json-4.24.0.module">
1173+
<sha256 value="6aabd4d997d158997f51fd8f86e7bb6f5fa228d701fa09110084e7f5df4e67b9" origin="Generated by Gradle"/>
1174+
</artifact>
1175+
</component>
11201176
<component group="net.kyori" name="adventure-text-serializer-legacy" version="4.16.0">
11211177
<artifact name="adventure-text-serializer-legacy-4.16.0-javadoc.jar">
11221178
<sha256 value="0c309b1e595fda068dd876cf2d06f1781bc8508be08b964d8c447aa3e01b17f7" origin="Generated by Gradle"/>
@@ -1158,6 +1214,14 @@
11581214
<sha256 value="989bc28d42368eab6c644469737a2872f81ff814c2a7ec161b052a1d18244108" origin="Generated by Gradle"/>
11591215
</artifact>
11601216
</component>
1217+
<component group="net.kyori" name="adventure-text-serializer-legacy" version="4.24.0">
1218+
<artifact name="adventure-text-serializer-legacy-4.24.0.jar">
1219+
<sha256 value="40ed53afe2a7d668b814add69de15acf4bda8e9f951c4e5d4e224d777054685e" origin="Generated by Gradle"/>
1220+
</artifact>
1221+
<artifact name="adventure-text-serializer-legacy-4.24.0.module">
1222+
<sha256 value="bb006fe20f89fea38464cfddcff482bc35c01a1239c2df0310fe8d0601cd194e" origin="Generated by Gradle"/>
1223+
</artifact>
1224+
</component>
11611225
<component group="net.kyori" name="adventure-text-serializer-plain" version="4.16.0">
11621226
<artifact name="adventure-text-serializer-plain-4.16.0-javadoc.jar">
11631227
<sha256 value="5fc7a99e8742fd6800aefc385f58e3c332eb7aa2ddbb827768ae9c9b0e4edd9a" origin="Generated by Gradle"/>
@@ -1199,6 +1263,14 @@
11991263
<sha256 value="aadc2f7ce23ce708859f773f06d8bacbaaf57d6b067c6d6fb52c31e34802aede" origin="Generated by Gradle"/>
12001264
</artifact>
12011265
</component>
1266+
<component group="net.kyori" name="adventure-text-serializer-plain" version="4.24.0">
1267+
<artifact name="adventure-text-serializer-plain-4.24.0.jar">
1268+
<sha256 value="7e52a98e590d088ff07be1f8b0e759864717466fd35db1862fbb6ebb41b245db" origin="Generated by Gradle"/>
1269+
</artifact>
1270+
<artifact name="adventure-text-serializer-plain-4.24.0.module">
1271+
<sha256 value="de2afb5035431cbbc723a5a048160607df721de8872d381e1bb98808246871f8" origin="Generated by Gradle"/>
1272+
</artifact>
1273+
</component>
12021274
<component group="net.kyori" name="examination-api" version="1.3.0">
12031275
<artifact name="examination-api-1.3.0-javadoc.jar">
12041276
<sha256 value="c5c108f156947f8fa939ca9f5d0eaee772430e0647fee19c063c5718deac0142" origin="Generated by Gradle"/>
@@ -2008,11 +2080,24 @@
20082080
<sha256 value="f482314b5079c1455f6fb0d4257a745d101c6124ce961522ba86f9dc90901e47" origin="Generated by Gradle"/>
20092081
</artifact>
20102082
</component>
2083+
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.21">
2084+
<artifact name="kotlin-stdlib-2.0.21.jar">
2085+
<sha256 value="f31cc53f105a7e48c093683bbd5437561d1233920513774b470805641bedbc09" origin="Generated by Gradle"/>
2086+
</artifact>
2087+
<artifact name="kotlin-stdlib-2.0.21.module">
2088+
<sha256 value="81fd6d181012487ee3246eff4e2bacb64b58c46e5b5aa72971a4ddf1bd1541ed" origin="Generated by Gradle"/>
2089+
</artifact>
2090+
</component>
20112091
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.22">
20122092
<artifact name="kotlin-stdlib-common-1.9.22.module">
20132093
<sha256 value="f93c9e9abf8d52d8e8fd8e851aa802ecec55132161c4aeee7d3cd924bf794246" origin="Generated by Gradle"/>
20142094
</artifact>
20152095
</component>
2096+
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="2.0.21">
2097+
<artifact name="kotlin-stdlib-common-2.0.21.module">
2098+
<sha256 value="6f5df8af633600a6b9cfb0fcc764af3d5119f376677677b91b6aee816b1d30ab" origin="Generated by Gradle"/>
2099+
</artifact>
2100+
</component>
20162101
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.0">
20172102
<artifact name="kotlin-stdlib-jdk7-1.8.0.jar">
20182103
<sha256 value="4c889d1d9803f5f2eb6c1592a6b7e62369ac7660c9eee15aba16fec059163666" origin="Generated by Gradle"/>

‎gradle/wrapper/gradle-wrapper.jar‎

311 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
3+
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in #(
112114
NONSTOP* ) nonstop=true ;;
113115
esac
114116

115-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
116118

117119

118120
# Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
203205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204206

205207
# Collect all arguments for the java command:
206-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207209
# and any embedded shellness will be escaped.
208210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209211
# treated as '${Hostname}' itself on the command line.
210212

211213
set -- \
212214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
213215
-classpath "$CLASSPATH" \
214-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
215217
"$@"
216218

217219
# Stop when "xargs" is not available.

‎gradlew.bat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -68,11 +70,11 @@ goto fail
6870
:execute
6971
@rem Setup the command line
7072

71-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7274

7375

7476
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7678

7779
:end
7880
@rem End local scope for the variables with windows NT shell

‎settings.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ plugins {
1313
}
1414

1515
dependencyResolutionManagement {
16-
repositories {
17-
mavenLocal()
18-
}
1916
repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
2017
pluginManagement.repositories.forEach(repositories::add)
2118
}

‎src/main/java/org/spongepowered/api/advancement/AdvancementType.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
package org.spongepowered.api.advancement;
2626

2727
import net.kyori.adventure.text.format.TextColor;
28+
import org.spongepowered.api.data.type.StringRepresentable;
2829
import org.spongepowered.api.registry.DefaultedRegistryValue;
2930
import org.spongepowered.api.util.annotation.CatalogedBy;
3031

@@ -33,7 +34,7 @@
3334
* also the appearance in the notifications.
3435
*/
3536
@CatalogedBy(AdvancementTypes.class)
36-
public interface AdvancementType extends DefaultedRegistryValue<AdvancementType> {
37+
public interface AdvancementType extends DefaultedRegistryValue<AdvancementType>, StringRepresentable {
3738

3839
/**
3940
* Gets the {@link TextColor} of the advancement type.

‎src/main/java/org/spongepowered/api/command/parameter/ArgumentReader.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ interface Immutable extends ArgumentReader {
139139
*/
140140
interface Mutable extends ArgumentReader {
141141

142+
/**
143+
* Moves the cursor to the next character.
144+
*/
145+
void skipChar();
146+
142147
/**
143148
* Moves the cursor to the next non-whitespace character. The cursor
144149
* will not advance if it already refers to a non-whitespace character.

‎src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionTypes.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ public final class ClientCompletionTypes {
6666
*/
6767
public static final DefaultedRegistryReference<ClientCompletionType> NONE = ClientCompletionTypes.key(ResourceKey.sponge("none"));
6868

69+
/**
70+
* Indicates to the client that the {@link ValueParser} is a greedy
71+
* string.
72+
*/
73+
public static final DefaultedRegistryReference<ClientCompletionType> REMAINING_JOINED_STRINGS = ClientCompletionTypes.key(ResourceKey.sponge("remaining_joined_strings"));
74+
6975
/**
7076
* Indicates to the client that the {@link ValueParser} is a
7177
* {@link ResourceKey}.

0 commit comments

Comments
 (0)