Skip to content

Commit ca62dbe

Browse files
committed
Use numeric tag
1 parent ea6a2b3 commit ca62dbe

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

mapper/mapper-minecraft/src/main/java/com/saicone/nbt/mapper/MinecraftTagMapper.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.minecraft.nbt.ListTag;
1414
import net.minecraft.nbt.LongArrayTag;
1515
import net.minecraft.nbt.LongTag;
16+
import net.minecraft.nbt.NumericTag;
1617
import net.minecraft.nbt.ShortTag;
1718
import net.minecraft.nbt.StringTag;
1819
import net.minecraft.nbt.Tag;
@@ -128,17 +129,17 @@ public Object extract(@Nullable Tag tag) {
128129
case Tag.TAG_END:
129130
return null;
130131
case Tag.TAG_BYTE:
131-
return ((ByteTag) tag).getAsByte();
132+
return ((NumericTag) tag).getAsByte();
132133
case Tag.TAG_SHORT:
133-
return ((ShortTag) tag).getAsShort();
134+
return ((NumericTag) tag).getAsShort();
134135
case Tag.TAG_INT:
135-
return ((IntTag) tag).getAsInt();
136+
return ((NumericTag) tag).getAsInt();
136137
case Tag.TAG_LONG:
137-
return ((LongTag) tag).getAsLong();
138+
return ((NumericTag) tag).getAsLong();
138139
case Tag.TAG_FLOAT:
139-
return ((FloatTag) tag).getAsFloat();
140+
return ((NumericTag) tag).getAsFloat();
140141
case Tag.TAG_DOUBLE:
141-
return ((DoubleTag) tag).getAsDouble();
142+
return ((NumericTag) tag).getAsDouble();
142143
case Tag.TAG_BYTE_ARRAY:
143144
return ((ByteArrayTag) tag).getAsByteArray();
144145
case Tag.TAG_STRING:

mapper/mapper-vianbt/src/main/java/com/saicone/nbt/mapper/ViaNbtTagMapper.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.viaversion.nbt.tag.ListTag;
1414
import com.viaversion.nbt.tag.LongArrayTag;
1515
import com.viaversion.nbt.tag.LongTag;
16+
import com.viaversion.nbt.tag.NumberTag;
1617
import com.viaversion.nbt.tag.ShortTag;
1718
import com.viaversion.nbt.tag.StringTag;
1819
import com.viaversion.nbt.tag.Tag;
@@ -85,17 +86,17 @@ public Object extract(@Nullable Tag tag) {
8586
case TagRegistry.END:
8687
return null;
8788
case ByteTag.ID:
88-
return ((ByteTag) tag).asByte();
89+
return ((NumberTag) tag).asByte();
8990
case ShortTag.ID:
90-
return ((ShortTag) tag).asShort();
91+
return ((NumberTag) tag).asShort();
9192
case IntTag.ID:
92-
return ((IntTag) tag).asInt();
93+
return ((NumberTag) tag).asInt();
9394
case LongTag.ID:
94-
return ((LongTag) tag).asLong();
95+
return ((NumberTag) tag).asLong();
9596
case FloatTag.ID:
96-
return ((FloatTag) tag).asFloat();
97+
return ((NumberTag) tag).asFloat();
9798
case DoubleTag.ID:
98-
return ((DoubleTag) tag).asDouble();
99+
return ((NumberTag) tag).asDouble();
99100
case ByteArrayTag.ID:
100101
return ((ByteArrayTag) tag).getValue();
101102
case StringTag.ID:

0 commit comments

Comments
 (0)