GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-04 15:31:36 +00:00
Code Issues Releases Activity

Bump mcpl

Browse Source
This commit is contained in:
basaigh
2024-04-22 20:56:57 +01:00
committed by Camotoy
parent 8381a148fc
commit dac5f69d47
3 changed files with 8 additions and 8 deletions
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