Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-04-03 18:55:47 +02:00
Code Issues Projects Releases Wiki Activity

chore: rebase updates

Browse Source
This commit is contained in:
mworzala 2025-01-24 19:47:05 -05:00
parent ce3372523e
commit b7c38fd36b
No known key found for this signature in database
GPG Key ID: B148F922E64797C7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/gamedata/tags/Tag.java
View File

@ -112,7 +112,10 @@ public final class Tag implements ProtocolObject, Keyed {
.map(DynamicRegistry.Key::namespace) .map(DynamicRegistry.Key::namespace)
.map(registries.biome()::getId)), .map(registries.biome()::getId)),
INSTRUMENTS("minecraft:instrument", Registry.Resource.INSTRUMENT_TAGS, INSTRUMENTS("minecraft:instrument", Registry.Resource.INSTRUMENT_TAGS,
(name, registries) -> registries.instrument().getId(DynamicRegistry.Key.of(name))); (name, registries) -> Optional.of(DynamicRegistry.Key.of(name))
.map(DynamicRegistry.Key::namespace)
.map(registries.instrument()::getId)),
;
private static final BasicType[] VALUES = values(); private static final BasicType[] VALUES = values();
private final String identifier; private final String identifier;

2
src/main/java/net/minestom/server/network/ComponentNetworkBufferTypeImpl.java
View File

@ -150,7 +150,7 @@ record ComponentNetworkBufferTypeImpl() implements NetworkBufferTypeImpl<Compone
final ShadowColor shadowColor = style.shadowColor(); final ShadowColor shadowColor = style.shadowColor();
if (shadowColor != null) { if (shadowColor != null) {
buffer.write(BYTE, TAG_INT); buffer.write(BYTE, TAG_INT);
writeUtf(buffer, "shadow_color"); buffer.write(STRING_IO_UTF8, "shadow_color");
buffer.write(INT, shadowColor.value()); buffer.write(INT, shadowColor.value());
} }