Mirrors/Geyser
3
0
Fork 0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-12-26 00:00:41 +01:00
Code Issues Projekte Releases Wiki Aktivität

Bump mcpl

Quellcode durchsuchen
Dieser Commit ist enthalten in:
basaigh 2024-04-22 20:56:57 +01:00 committet von Camotoy
Ursprung 8381a148fc
Commit dac5f69d47
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 7EEFB66FE798081F
3 geänderte Dateien mit 8 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

11
core/src/main/java/org/geysermc/geyser/item/type/ArmorItem.java
Datei anzeigen

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

3
core/src/main/java/org/geysermc/geyser/item/type/GoatHornItem.java
Datei anzeigen

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

2
gradle/libs.versions.toml
Datei anzeigen

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