From 87d16d37241eb06b0dfff8f9a9f612c9d5554411 Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Sat, 9 Mar 2024 14:21:24 +0100 Subject: [PATCH] Updated Via NBT usage --- .../api/remapper/LegacyItemRewriter.java | 61 ++++++++----------- .../Protocolb1_0_1_1_1toa1_2_3_5_1_2_6.java | 2 +- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/src/main/java/net/raphimc/vialegacy/api/remapper/LegacyItemRewriter.java b/src/main/java/net/raphimc/vialegacy/api/remapper/LegacyItemRewriter.java index 3b538b2..67d6152 100644 --- a/src/main/java/net/raphimc/vialegacy/api/remapper/LegacyItemRewriter.java +++ b/src/main/java/net/raphimc/vialegacy/api/remapper/LegacyItemRewriter.java @@ -27,9 +27,9 @@ import com.viaversion.viaversion.api.rewriter.RewriterBase; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.libs.fastutil.objects.ObjectArrayList; import com.viaversion.viaversion.libs.fastutil.objects.ObjectList; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.*; - -import java.util.List; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; +import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag; public abstract class LegacyItemRewriter
extends RewriterBase
implements ItemRewriter
{ @@ -48,7 +48,7 @@ public abstract class LegacyItemRewriter
extends RewriterBas
public LegacyItemRewriter(final P protocol, final String protocolName, final Type extends RewriterBas
}
private void setRemappedNameRead(final Item item, final String name) {
- //Set ViaLegacy tag for later remapping
- final CompoundTag viaLegacyTag = (item.tag() != null && item.tag().contains(tagName) ? item.tag().get(tagName) : new CompoundTag());
- if (item.tag() == null || !item.tag().contains(tagName)) {
- viaLegacyTag.put("Id", new IntTag(item.identifier()));
- viaLegacyTag.put("Meta", new ShortTag(item.data()));
- }
+ final CompoundTag viaLegacyTag = new CompoundTag();
+ viaLegacyTag.putInt("Id", item.identifier());
+ viaLegacyTag.putShort("Meta", item.data());
- //Get Item tag
CompoundTag tag = item.tag();
if (tag == null) {
tag = new CompoundTag();
item.setTag(tag);
- viaLegacyTag.put("RemoveTag", new IntTag(0));
+ viaLegacyTag.putBoolean("RemoveTag", true);
}
- tag.put(tagName, viaLegacyTag);
+ tag.put(this.tagName, viaLegacyTag);
- //Set name/lore of item
- CompoundTag display = tag.get("display");
+ CompoundTag display = tag.getCompoundTag("display");
if (display == null) {
display = new CompoundTag();
tag.put("display", display);
- viaLegacyTag.put("RemoveDisplayTag", new IntTag(0));
+ viaLegacyTag.putBoolean("RemoveDisplayTag", true);
}
if (display.contains("Name")) {
- ListTag lore = display.get("Lore");
+ ListTag