Skip to content

Commit 7016f20

Browse files
PierreSchwangPierreSchwang
authored
fix: pasting of colored signs (#3244)
1 parent 408aceb commit 7016f20

File tree

2 files changed

+2
-80
lines changed
  • worldedit-bukkit/adapters

2 files changed

+2
-80
lines changed

‎worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_5/PaperweightAdapter.java‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -959,46 +959,7 @@ public LinTag<?> toNativeLin(net.minecraft.nbt.Tag foreign) {
959959
*/
960960
@Override
961961
public net.minecraft.nbt.Tag fromNativeLin(LinTag<?> foreign) {
962-
if (foreign == null) {
963-
return null;
964-
}
965-
if (foreign instanceof LinCompoundTag compoundTag) {
966-
net.minecraft.nbt.CompoundTag tag = new net.minecraft.nbt.CompoundTag();
967-
for (var entry : compoundTag.value().entrySet()) {
968-
tag.put(entry.getKey(), fromNativeLin(entry.getValue()));
969-
}
970-
return tag;
971-
} else if (foreign instanceof LinByteTag byteTag) {
972-
return net.minecraft.nbt.ByteTag.valueOf(byteTag.valueAsByte());
973-
} else if (foreign instanceof LinByteArrayTag byteArrayTag) {
974-
return new net.minecraft.nbt.ByteArrayTag(byteArrayTag.value());
975-
} else if (foreign instanceof LinDoubleTag doubleTag) {
976-
return net.minecraft.nbt.DoubleTag.valueOf(doubleTag.valueAsDouble());
977-
} else if (foreign instanceof LinFloatTag floatTag) {
978-
return net.minecraft.nbt.FloatTag.valueOf(floatTag.valueAsFloat());
979-
} else if (foreign instanceof LinIntTag intTag) {
980-
return net.minecraft.nbt.IntTag.valueOf(intTag.valueAsInt());
981-
} else if (foreign instanceof LinIntArrayTag intArrayTag) {
982-
return new net.minecraft.nbt.IntArrayTag(intArrayTag.value());
983-
} else if (foreign instanceof LinLongArrayTag longArrayTag) {
984-
return new net.minecraft.nbt.LongArrayTag(longArrayTag.value());
985-
} else if (foreign instanceof LinListTag<?> listTag) {
986-
net.minecraft.nbt.ListTag tag = new net.minecraft.nbt.ListTag();
987-
for (var t : listTag.value()) {
988-
tag.add(fromNativeLin(t));
989-
}
990-
return tag;
991-
} else if (foreign instanceof LinLongTag longTag) {
992-
return net.minecraft.nbt.LongTag.valueOf(longTag.valueAsLong());
993-
} else if (foreign instanceof LinShortTag shortTag) {
994-
return net.minecraft.nbt.ShortTag.valueOf(shortTag.valueAsShort());
995-
} else if (foreign instanceof LinStringTag stringTag) {
996-
return net.minecraft.nbt.StringTag.valueOf(stringTag.value());
997-
} else if (foreign instanceof LinEndTag) {
998-
return net.minecraft.nbt.EndTag.INSTANCE;
999-
} else {
1000-
throw new IllegalArgumentException("Don't know how to make NMS " + foreign.getClass().getCanonicalName());
1001-
}
962+
return this.fromNative(foreign);
1002963
}
1003964

1004965
private static byte identifyRawElementType(net.minecraft.nbt.ListTag list) {

‎worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_6/PaperweightAdapter.java‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -988,46 +988,7 @@ public LinTag<?> toNativeLin(net.minecraft.nbt.Tag foreign) {
988988
*/
989989
@Override
990990
public net.minecraft.nbt.Tag fromNativeLin(LinTag<?> foreign) {
991-
if (foreign == null) {
992-
return null;
993-
}
994-
if (foreign instanceof LinCompoundTag compoundTag) {
995-
net.minecraft.nbt.CompoundTag tag = new net.minecraft.nbt.CompoundTag();
996-
for (var entry : compoundTag.value().entrySet()) {
997-
tag.put(entry.getKey(), fromNativeLin(entry.getValue()));
998-
}
999-
return tag;
1000-
} else if (foreign instanceof LinByteTag byteTag) {
1001-
return net.minecraft.nbt.ByteTag.valueOf(byteTag.valueAsByte());
1002-
} else if (foreign instanceof LinByteArrayTag byteArrayTag) {
1003-
return new net.minecraft.nbt.ByteArrayTag(byteArrayTag.value());
1004-
} else if (foreign instanceof LinDoubleTag doubleTag) {
1005-
return net.minecraft.nbt.DoubleTag.valueOf(doubleTag.valueAsDouble());
1006-
} else if (foreign instanceof LinFloatTag floatTag) {
1007-
return net.minecraft.nbt.FloatTag.valueOf(floatTag.valueAsFloat());
1008-
} else if (foreign instanceof LinIntTag intTag) {
1009-
return net.minecraft.nbt.IntTag.valueOf(intTag.valueAsInt());
1010-
} else if (foreign instanceof LinIntArrayTag intArrayTag) {
1011-
return new net.minecraft.nbt.IntArrayTag(intArrayTag.value());
1012-
} else if (foreign instanceof LinLongArrayTag longArrayTag) {
1013-
return new net.minecraft.nbt.LongArrayTag(longArrayTag.value());
1014-
} else if (foreign instanceof LinListTag<?> listTag) {
1015-
net.minecraft.nbt.ListTag tag = new net.minecraft.nbt.ListTag();
1016-
for (var t : listTag.value()) {
1017-
tag.add(fromNativeLin(t));
1018-
}
1019-
return tag;
1020-
} else if (foreign instanceof LinLongTag longTag) {
1021-
return net.minecraft.nbt.LongTag.valueOf(longTag.valueAsLong());
1022-
} else if (foreign instanceof LinShortTag shortTag) {
1023-
return net.minecraft.nbt.ShortTag.valueOf(shortTag.valueAsShort());
1024-
} else if (foreign instanceof LinStringTag stringTag) {
1025-
return net.minecraft.nbt.StringTag.valueOf(stringTag.value());
1026-
} else if (foreign instanceof LinEndTag) {
1027-
return net.minecraft.nbt.EndTag.INSTANCE;
1028-
} else {
1029-
throw new IllegalArgumentException("Don't know how to make NMS " + foreign.getClass().getCanonicalName());
1030-
}
991+
return this.fromNative(foreign);
1031992
}
1032993

1033994
private static byte identifyRawElementType(net.minecraft.nbt.ListTag list) {

0 commit comments

Comments
 (0)