GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Bump mcpl

This commit is contained in:
basaigh 2024-04-22 20:56:57 +01:00 committed by Camotoy
parent 8381a148fc
commit dac5f69d47
No known key found for this signature in database
GPG Key ID: 7EEFB66FE798081F
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/geysermc/geyser/item/type/ArmorItem.java
View File

@ -52,16 +52,15 @@ public class ArmorItem extends Item {
ArmorTrim trim = components.get(DataComponentType.TRIM);
if (trim != null) {
// TODO material IDs
String material = trim.getMaterial().getAssetName();
String pattern = trim.getPattern().getAssetId();
// discard custom trim patterns/materials to prevent visual glitches on bedrock
if (!material.startsWith("minecraft:")
|| !pattern.startsWith("minecraft:")) {
if (trim.getMaterial().isCustom() || trim.getPattern().isCustom()) {
return;
}
// TODO material IDs
String material = trim.getMaterial().getCustomValue().getAssetName();
String pattern = trim.getPattern().getCustomValue().getAssetId();
NbtMapBuilder trimBuilder = NbtMap.builder();
// bedrock has an uppercase first letter key, and the value is not namespaced
trimBuilder.put("Material", stripNamespace(material));

3
core/src/main/java/org/geysermc/geyser/item/type/GoatHornItem.java
View File

@ -25,6 +25,7 @@
package org.geysermc.geyser.item.type;
import com.github.steveice10.mc.protocol.data.game.Holder;
import com.github.steveice10.mc.protocol.data.game.item.ItemStack;
import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
@ -60,7 +61,7 @@ public class GoatHornItem extends Item {
if (components == null) {
return builder;
}
Instrument instrument = components.get(DataComponentType.INSTRUMENT);
Holder<Instrument> instrument = components.get(DataComponentType.INSTRUMENT);
// TODO registry
if (instrument != null) {
// Drop the Minecraft namespace if applicable

2
gradle/libs.versions.toml
View File

@ -15,7 +15,7 @@ protocol-connection = "3.0.0.Beta1-20240411.165033-128"
raknet = "1.0.0.CR3-20240416.144209-1"
blockstateupdater="1.20.80-20240411.142413-1"
mcauthlib = "d9d773e"
mcprotocollib = "2a7176f7ee" # Revert from jitpack after release
mcprotocollib = "8bc6990525" # Revert from jitpack after release
adventure = "4.14.0"
adventure-platform = "4.3.0"
junit = "5.9.2"