OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-04-17 19:12:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add some tests for components and debug some things

Browse source
This commit is contained in:
Eclipse 2025-03-28 11:08:54 +00:00
parent a2d5aab2f1
commit 497ff7bb35
No known key found for this signature in database
GPG key ID: 95E6998F82EC938A
3 changed files with 46 additions and 12 deletions
core/src/main/java/org/geysermc/geyser/item/hashing
ComponentHasher.javaDataComponentHashers.javaMapHasher.java

2
core/src/main/java/org/geysermc/geyser/item/hashing/ComponentHasher.java
View file

@ -136,7 +136,7 @@ public interface ComponentHasher {
MinecraftHasher<NBTComponent<?, ?>> NBT_COMPONENT = component("nbt", builder -> builder
.accept("nbt", MinecraftHasher.STRING, NBTComponent::nbtPath)
.optional("interpret", MinecraftHasher.BOOL, NBTComponent::interpret, false)
.optionalNullable("separator", COMPONENT, NBTComponent::separator)); // TODO source, needs kyori update?
.optionalNullable("separator", COMPONENT, NBTComponent::separator)); // TODO source key, needs kyori update?
MinecraftHasher<Component> ACTUAL_COMPONENT = (component, encoder) -> {
if (component instanceof TextComponent text) {

34
core/src/main/java/org/geysermc/geyser/item/hashing/DataComponentHashers.java
View file

@ -26,6 +26,11 @@
package org.geysermc.geyser.item.hashing;
import com.google.common.hash.HashCode;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import org.cloudburstmc.math.vector.Vector3i;
import org.cloudburstmc.nbt.NbtList;
import org.cloudburstmc.nbt.NbtMap;
import org.cloudburstmc.nbt.NbtType;
@ -37,6 +42,7 @@ import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.util.MinecraftKey;
import org.geysermc.mcprotocollib.protocol.data.game.entity.Effect;
import org.geysermc.mcprotocollib.protocol.data.game.entity.EquipmentSlot;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.GlobalPos;
import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.Consumable;
@ -78,7 +84,7 @@ public class DataComponentHashers {
registerInt(DataComponentTypes.DAMAGE);
registerUnit(DataComponentTypes.UNBREAKABLE);
register(DataComponentTypes.CUSTOM_NAME, ComponentHasher.COMPONENT); // TODO test
register(DataComponentTypes.CUSTOM_NAME, ComponentHasher.COMPONENT);
register(DataComponentTypes.ITEM_NAME, ComponentHasher.COMPONENT);
register(DataComponentTypes.ITEM_MODEL, MinecraftHasher.KEY);
register(DataComponentTypes.LORE, ComponentHasher.COMPONENT.list());
@ -155,7 +161,7 @@ public class DataComponentHashers {
registerInt(DataComponentTypes.MAP_ID);
register(DataComponentTypes.MAP_DECORATIONS, MinecraftHasher.NBT_MAP);
register(DataComponentTypes.CHARGED_PROJECTILES, RegistryHasher.ITEM_STACK.list()); // TODO test one of these, preferably bundle contents which is more complicated
register(DataComponentTypes.CHARGED_PROJECTILES, RegistryHasher.ITEM_STACK.list());
register(DataComponentTypes.BUNDLE_CONTENTS, RegistryHasher.ITEM_STACK.list());
registerMap(DataComponentTypes.POTION_CONTENTS, builder -> builder
@ -254,6 +260,14 @@ public class DataComponentHashers {
testHash(session, DataComponentTypes.DAMAGE, 459, 1211405277);
testHash(session, DataComponentTypes.UNBREAKABLE, Unit.INSTANCE, -982207288);
testHash(session, DataComponentTypes.CUSTOM_NAME, Component.text("simple component test!"), 950545066);
testHash(session, DataComponentTypes.CUSTOM_NAME, Component.translatable("a.translatable"), 1983484873);
testHash(session, DataComponentTypes.CUSTOM_NAME, Component.text("component with *style*")
.style(style -> style.color(NamedTextColor.RED).decorate(TextDecoration.ITALIC)), -886479206);
testHash(session, DataComponentTypes.CUSTOM_NAME, Component.text("component with more stuff")
.children(List.of(Component.translatable("a.translate.string", "fallback!")
.style(style -> style.color(TextColor.color(0x446688)).decorate(TextDecoration.BOLD)))), -1261457500);
testHash(session, DataComponentTypes.ITEM_MODEL, MinecraftKey.key("testing"), -689946239);
testHash(session, DataComponentTypes.RARITY, Rarity.COMMON.ordinal(), 75150990);
@ -328,6 +342,15 @@ public class DataComponentHashers {
testHash(session, DataComponentTypes.MAP_DECORATIONS, mapDecorations, -625782954);
ItemStack bundleStack1 = new ItemStack(Items.PUMPKIN.javaId());
ItemStack bundleStack2 = new ItemStack(Items.MELON.javaId(), 24);
DataComponents bundleStackComponents = new DataComponents(new HashMap<>());
bundleStackComponents.put(DataComponentTypes.CUSTOM_NAME, Component.text("magic potato!"));
ItemStack bundleStack3 = new ItemStack(Items.POTATO.javaId(), 30, bundleStackComponents);
testHash(session, DataComponentTypes.BUNDLE_CONTENTS, List.of(bundleStack1, bundleStack2, bundleStack3), 1817891504);
testHash(session, DataComponentTypes.POTION_CONTENTS, new PotionContents(Potion.FIRE_RESISTANCE.ordinal(), -1, List.of(), null), -772576502);
testHash(session, DataComponentTypes.POTION_CONTENTS, new PotionContents(-1, 20,
List.of(new MobEffectInstance(Effect.CONDUIT_POWER, new MobEffectDetails(0, 0, false, true, true, null))),
@ -338,6 +361,13 @@ public class DataComponentHashers {
testHash(session, DataComponentTypes.POTION_CONTENTS, new PotionContents(-1, 87,
List.of(new MobEffectInstance(Effect.SPEED, new MobEffectDetails(29, 1004, false, true, true, null))),
"testing"), 2007296036);
// TODO testing trim, instrument, trim material, jukebox playable requires registries
testHash(session, DataComponentTypes.LODESTONE_TRACKER,
new LodestoneTracker(new GlobalPos(MinecraftKey.key("overworld"), Vector3i.from(5, 6, 7)), true), 63561894);
testHash(session, DataComponentTypes.LODESTONE_TRACKER,
new LodestoneTracker(null, false), 1595667667);
}
private static <T> void testHash(GeyserSession session, DataComponentType<T> component, T value, int expected) {

22
core/src/main/java/org/geysermc/geyser/item/hashing/MapHasher.java
View file

@ -38,15 +38,17 @@ public class MapHasher<T> {
private final MinecraftHashEncoder encoder;
private final T object;
private final Map<HashCode, HashCode> map;
private final Map<String, Object> unhashed;
MapHasher(T object, MinecraftHashEncoder encoder) {
this(object, encoder, new HashMap<>());
this(object, encoder, new HashMap<>(), new HashMap<>());
}
private MapHasher(T object, MinecraftHashEncoder encoder, Map<HashCode, HashCode> map) {
private MapHasher(T object, MinecraftHashEncoder encoder, Map<HashCode, HashCode> map, Map<String, Object> unhashed) {
this.encoder = encoder;
this.object = object;
this.map = map;
this.unhashed = unhashed;
}
public MapHasher<T> accept(String key, HashCode hash) {
@ -55,11 +57,12 @@ public class MapHasher<T> {
}
public <V> MapHasher<T> acceptConstant(String key, MinecraftHasher<V> hasher, V value) {
unhashed.put(key, value);
return accept(key, hasher.hash(value, encoder));
}
public <V> MapHasher<T> accept(String key, MinecraftHasher<V> hasher, Function<T, V> extractor) {
return accept(key, hasher.hash(extractor.apply(object), encoder));
return acceptConstant(key, hasher, extractor.apply(object));
}
// Adds keys and values from the builder directly to this map (document me properly)
@ -70,7 +73,7 @@ public class MapHasher<T> {
// Adds keys and values from the builder directly to this map (document me properly)
public <V> MapHasher<T> accept(MapBuilder<V> builder, Function<T, V> extractor) {
builder.apply(new MapHasher<>(extractor.apply(object), encoder, map));
builder.apply(new MapHasher<>(extractor.apply(object), encoder, map, unhashed));
return this;
}
@ -83,38 +86,39 @@ public class MapHasher<T> {
public <V> MapHasher<T> optionalNullable(String key, MinecraftHasher<V> hasher, Function<T, V> extractor) {
V value = extractor.apply(object);
if (value != null) {
accept(key, hasher.hash(value, encoder));
acceptConstant(key, hasher, value);
}
return this;
}
public <V> MapHasher<T> optional(String key, MinecraftHasher<V> hasher, Function<T, Optional<V>> extractor) {
Optional<V> value = extractor.apply(object);
value.ifPresent(v -> accept(key, hasher.hash(v, encoder)));
value.ifPresent(v -> acceptConstant(key, hasher, v));
return this;
}
public <V> MapHasher<T> optional(String key, MinecraftHasher<V> hasher, Function<T, V> extractor, V defaultValue) {
V value = extractor.apply(object);
if (!value.equals(defaultValue)) {
accept(key, hasher.hash(value, encoder));
acceptConstant(key, hasher, value);
}
return this;
}
public <V> MapHasher<T> acceptList(String key, MinecraftHasher<V> valueHasher, Function<T, List<V>> extractor) {
return accept(key, valueHasher.list().hash(extractor.apply(object), encoder));
return acceptConstant(key, valueHasher.list(), extractor.apply(object));
}
public <V> MapHasher<T> optionalList(String key, MinecraftHasher<V> valueHasher, Function<T, List<V>> extractor) {
List<V> list = extractor.apply(object);
if (!list.isEmpty()) {
accept(key, valueHasher.list().hash(list, encoder));
acceptConstant(key, valueHasher.list(), list);
}
return this;
}
public HashCode build() {
System.out.println(unhashed);
return encoder.map(map);
}
}