mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 15:00:13 +01:00
Temp adventure update
This commit is contained in:
parent
29018cf64c
commit
812519d14f
6 changed files with 41 additions and 21 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -10,3 +10,6 @@
|
||||||
[submodule "work/Spigot"]
|
[submodule "work/Spigot"]
|
||||||
path = work/Spigot
|
path = work/Spigot
|
||||||
url = https://hub.spigotmc.org/stash/scm/spigot/spigot.git
|
url = https://hub.spigotmc.org/stash/scm/spigot/spigot.git
|
||||||
|
[submodule "adventure-temp"]
|
||||||
|
path = adventure-temp
|
||||||
|
url = https://github.com/KyoriPowered/adventure.git
|
||||||
|
|
1
adventure-temp
Submodule
1
adventure-temp
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 6feacda2eedef5edfb20e280540d00933861886e
|
|
@ -5,6 +5,9 @@ mcVersion=1.20.3
|
||||||
# Set to true while updating Minecraft version
|
# Set to true while updating Minecraft version
|
||||||
updatingMinecraft=false
|
updatingMinecraft=false
|
||||||
|
|
||||||
|
# TODO remove with adventure included build
|
||||||
|
org.gradle.jvmargs=-Xmx1G
|
||||||
|
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
org.gradle.vfs.watch=false
|
org.gradle.vfs.watch=false
|
||||||
|
|
29
patches/api/Temp-adventure-update.patch
Normal file
29
patches/api/Temp-adventure-update.patch
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
||||||
|
Date: Wed, 6 Dec 2023 13:38:10 -0700
|
||||||
|
Subject: [PATCH] Temp adventure update
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/build.gradle.kts
|
||||||
|
+++ b/build.gradle.kts
|
||||||
|
@@ -0,0 +0,0 @@ val apiAndDocs: Configuration by configurations.creating {
|
||||||
|
configurations.api {
|
||||||
|
extendsFrom(apiAndDocs)
|
||||||
|
}
|
||||||
|
+val extraRuntime: Configuration by configurations.creating
|
||||||
|
+configurations.runtimeClasspath {
|
||||||
|
+ extendsFrom(extraRuntime)
|
||||||
|
+}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// api dependencies are listed transitively to API consumers
|
||||||
|
@@ -0,0 +0,0 @@ dependencies {
|
||||||
|
}
|
||||||
|
api("it.unimi.dsi:fastutil:8.5.6")
|
||||||
|
apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
|
||||||
|
+ extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
|
||||||
|
apiAndDocs("net.kyori:adventure-api")
|
||||||
|
apiAndDocs("net.kyori:adventure-text-minimessage")
|
||||||
|
apiAndDocs("net.kyori:adventure-text-serializer-gson")
|
|
@ -1,21 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nassim Jahnke <nassim@njahnke.dev>
|
|
||||||
Date: Wed, 6 Dec 2023 21:24:54 +0100
|
|
||||||
Subject: [PATCH] HACK id string codec in hover event
|
|
||||||
|
|
||||||
Temporary hack to remove serialization to the int array, since adventure has not been updated to deserialize this format
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
|
||||||
+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
|
||||||
@@ -0,0 +0,0 @@ public class HoverEvent {
|
|
||||||
public static final Codec<HoverEvent.EntityTooltipInfo> CODEC = RecordCodecBuilder.create((instance) -> {
|
|
||||||
return instance.group(BuiltInRegistries.ENTITY_TYPE.byNameCodec().fieldOf("type").forGetter((content) -> {
|
|
||||||
return content.type;
|
|
||||||
- }), UUIDUtil.LENIENT_CODEC.fieldOf("id").forGetter((content) -> {
|
|
||||||
+ }), UUIDUtil.STRING_CODEC.fieldOf("id").forGetter((content) -> {
|
|
||||||
return content.id;
|
|
||||||
}), ExtraCodecs.strictOptionalField(ComponentSerialization.CODEC, "name").forGetter((content) -> {
|
|
||||||
return content.name;
|
|
|
@ -7,6 +7,11 @@ pluginManagement {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// todo 1.20.3
|
||||||
|
if (file("adventure-temp").exists()) {
|
||||||
|
includeBuild("adventure-temp")
|
||||||
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
|
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue