Mirrors/ViaBackwards
3
0
Fork 0
Mirror von https://github.com/ViaVersion/ViaBackwards.git synchronisiert 2024-12-26 00:00:33 +01:00
Code Issues Releases Aktivität

Fix spawn egg conversion from 1.13->1.12.2, some cleanup

Quellcode durchsuchen
Dieser Commit ist enthalten in:
KennyTV 2020-03-05 19:03:09 +01:00
Ursprung 9a5d4197fc
Commit af88a57983
1 geänderte Dateien mit 95 neuen und 98 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

193
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
Datei anzeigen

@ -529,46 +529,31 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
} }
} }
if (rawId == null) {
Integer oldId = MappingData.oldToNewItems.inverse().get(item.getIdentifier());
if (oldId != null) {
// Handle spawn eggs
Optional<String> eggEntityId = SpawnEggRewriter.getEntityId(oldId);
if (eggEntityId.isPresent()) {
rawId = 383 << 16;
if (tag == null)
item.setTag(tag = new CompoundTag("tag"));
if (!tag.contains("EntityTag")) {
CompoundTag entityTag = new CompoundTag("EntityTag");
entityTag.put(new StringTag("id", eggEntityId.get()));
tag.put(entityTag);
}
} else {
rawId = (oldId >> 4) << 16 | oldId & 0xF;
}
} else if (item.getIdentifier() == 362) { // base/colorless shulker box
rawId = 0xe50000; // purple shulker box
}
}
if (rawId == null) { if (rawId == null) {
// Look for custom mappings // Look for custom mappings
super.handleItemToClient(item); super.handleItemToClient(item);
// No custom mapping found either // No custom mapping found, look at VV mappings
if (item.getIdentifier() == originalId) { if (item.getIdentifier() == originalId) {
if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { Integer oldId = MappingData.oldToNewItems.inverse().get(item.getIdentifier());
ViaBackwards.getPlatform().getLogger().warning("Failed to get 1.12 item for " + originalId); if (oldId != null) {
} rawId = itemIdToRaw(oldId, item, tag);
} else if (item.getIdentifier() == 362) { // base/colorless shulker box
rawId = 0xe50000; // purple shulker box
} else {
if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
ViaBackwards.getPlatform().getLogger().warning("Failed to get 1.12 item for " + originalId);
}
rawId = 0x10000; rawId = 0x10000;
} else { }
// Use the custom mapping } else { // Use the found custom mapping
rawId = (item.getIdentifier() >> 4) << 16 | item.getIdentifier() & 0xF;
// Take the newly added tag // Take the newly added tag
if (tag == null) { if (tag == null) {
tag = item.getTag(); tag = item.getTag();
} }
rawId = itemIdToRaw(item.getIdentifier(), item, tag);
} }
} }
@ -578,47 +563,29 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
// NBT changes // NBT changes
if (tag != null) { if (tag != null) {
if (isDamageable(item.getIdentifier())) { if (isDamageable(item.getIdentifier())) {
if (tag.get("Damage") instanceof IntTag) { Tag damageTag = tag.remove("Damage");
if (!gotRawIdFromTag) if (!gotRawIdFromTag && damageTag instanceof IntTag) {
item.setData((short) (int) tag.get("Damage").getValue()); item.setData((short) (int) damageTag.getValue());
tag.remove("Damage");
} }
} }
if (item.getIdentifier() == 358) { // map if (item.getIdentifier() == 358) { // map
if (tag.get("map") instanceof IntTag) { Tag mapTag = tag.remove("map");
if (!gotRawIdFromTag) if (!gotRawIdFromTag && mapTag instanceof IntTag) {
item.setData((short) (int) tag.get("map").getValue()); item.setData((short) (int) mapTag.getValue());
tag.remove("map");
} }
} }
if (item.getIdentifier() == 442 || item.getIdentifier() == 425) { // shield / banner // Shield and banner
if (tag.get("BlockEntityTag") instanceof CompoundTag) { invertShieldAndBannerId(item, tag);
CompoundTag blockEntityTag = tag.get("BlockEntityTag");
if (blockEntityTag.get("Base") instanceof IntTag) {
IntTag base = blockEntityTag.get("Base");
base.setValue(15 - base.getValue()); // invert color id
}
if (blockEntityTag.get("Patterns") instanceof ListTag) {
for (Tag pattern : (ListTag) blockEntityTag.get("Patterns")) {
if (pattern instanceof CompoundTag) {
IntTag c = ((CompoundTag) pattern).get("Color");
c.setValue(15 - c.getValue()); // Invert color id
}
}
}
}
}
// Display Name now uses JSON // Display Name now uses JSON
if (tag.get("display") instanceof CompoundTag) { CompoundTag display = tag.get("display");
CompoundTag display = tag.get("display"); if (display != null) {
if (display.get("Name") instanceof StringTag) { StringTag name = display.get("Name");
StringTag name = display.get("Name"); if (name instanceof StringTag) {
StringTag via = display.get(NBT_TAG_NAME + "|Name"); StringTag via = display.remove(NBT_TAG_NAME + "|Name");
name.setValue(via != null ? via.getValue() : ChatRewriter.jsonTextToLegacy(name.getValue())); name.setValue(via != null ? via.getValue() : ChatRewriter.jsonTextToLegacy(name.getValue()));
display.remove(NBT_TAG_NAME + "|Name");
} }
} }
@ -632,6 +599,23 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
return item; return item;
} }
private int itemIdToRaw(int oldId, Item item, CompoundTag tag) {
Optional<String> eggEntityId = SpawnEggRewriter.getEntityId(oldId);
if (eggEntityId.isPresent()) {
if (tag == null) {
item.setTag(tag = new CompoundTag("tag"));
}
if (!tag.contains("EntityTag")) {
CompoundTag entityTag = new CompoundTag("EntityTag");
entityTag.put(new StringTag("id", eggEntityId.get()));
tag.put(entityTag);
}
return 0x17f0000; // 383 << 16;
}
return (oldId >> 4) << 16 | oldId & 0xF;
}
private void rewriteCanPlaceToClient(CompoundTag tag, String tagName) { private void rewriteCanPlaceToClient(CompoundTag tag, String tagName) {
ListTag blockTag = tag.get(tagName); ListTag blockTag = tag.get(tagName);
if (blockTag == null) return; if (blockTag == null) return;
@ -681,16 +665,18 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
// Some custom-enchant plugins write it into the lore manually, which would double its entry // Some custom-enchant plugins write it into the lore manually, which would double its entry
if (ViaBackwards.getConfig().addCustomEnchantsToLore()) { if (ViaBackwards.getConfig().addCustomEnchantsToLore()) {
String name = newId; String name = newId;
if (name.contains(":")) if (name.contains(":")) {
name = name.split(":")[1]; name = name.split(":")[1];
}
name = "§7" + Character.toUpperCase(name.charAt(0)) + name.substring(1).toLowerCase(Locale.ENGLISH); name = "§7" + Character.toUpperCase(name.charAt(0)) + name.substring(1).toLowerCase(Locale.ENGLISH);
lore.add(new StringTag("", name + " " lore.add(new StringTag("", name + " "
+ EnchantmentRewriter.getRomanNumber((Short) ((CompoundTag) enchantmentEntry).get("lvl").getValue()))); + EnchantmentRewriter.getRomanNumber((Short) ((CompoundTag) enchantmentEntry).get("lvl").getValue())));
} }
if (Via.getManager().isDebug()) if (Via.getManager().isDebug()) {
ViaBackwards.getPlatform().getLogger().warning("Found unknown enchant: " + newId); ViaBackwards.getPlatform().getLogger().warning("Found unknown enchant: " + newId);
}
continue; continue;
} else { } else {
oldId = Short.valueOf(newId.substring(18)); oldId = Short.valueOf(newId.substring(18));
@ -698,8 +684,9 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
} }
Short level = (Short) ((CompoundTag) enchantmentEntry).get("lvl").getValue(); Short level = (Short) ((CompoundTag) enchantmentEntry).get("lvl").getValue();
if (level != 0) if (level != 0) {
hasValidEnchants = true; hasValidEnchants = true;
}
enchEntry.put(new ShortTag("id", oldId)); enchEntry.put(new ShortTag("id", oldId));
enchEntry.put(new ShortTag("lvl", level)); enchEntry.put(new ShortTag("lvl", level));
newEnchantments.add(enchEntry); newEnchantments.add(enchEntry);
@ -781,24 +768,9 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
// NBT Changes // NBT Changes
if (tag != null) { if (tag != null) {
// Invert shield color id // Shield and banner
if (item.getIdentifier() == 442 || item.getIdentifier() == 425) { invertShieldAndBannerId(item, tag);
if (tag.get("BlockEntityTag") instanceof CompoundTag) {
CompoundTag blockEntityTag = tag.get("BlockEntityTag");
if (blockEntityTag.get("Base") instanceof IntTag) {
IntTag base = blockEntityTag.get("Base");
base.setValue(15 - base.getValue());
}
if (blockEntityTag.get("Patterns") instanceof ListTag) {
for (Tag pattern : (ListTag) blockEntityTag.get("Patterns")) {
if (pattern instanceof CompoundTag) {
IntTag c = ((CompoundTag) pattern).get("Color");
c.setValue(15 - c.getValue()); // Invert color id
}
}
}
}
}
// Display Name now uses JSON // Display Name now uses JSON
Tag display = tag.get("display"); Tag display = tag.get("display");
if (display instanceof CompoundTag) { if (display instanceof CompoundTag) {
@ -819,21 +791,17 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
// Handle SpawnEggs // Handle SpawnEggs
if (item.getIdentifier() == 383) { if (item.getIdentifier() == 383) {
if (tag.get("EntityTag") instanceof CompoundTag) { CompoundTag entityTag = tag.get("EntityTag");
CompoundTag entityTag = tag.get("EntityTag"); StringTag identifier;
if (entityTag.get("id") instanceof StringTag) { if (entityTag != null && (identifier = entityTag.get("id")) != null) {
StringTag identifier = entityTag.get("id"); rawId = SpawnEggRewriter.getSpawnEggId(identifier.getValue());
rawId = SpawnEggRewriter.getSpawnEggId(identifier.getValue()); if (rawId == -1) {
if (rawId == -1) { rawId = 25100288; // Bat fallback
rawId = 25100288; // Bat fallback
} else {
entityTag.remove("id");
if (entityTag.isEmpty())
tag.remove("EntityTag");
}
} else { } else {
// Fallback to bat entityTag.remove("id");
rawId = 25100288; if (entityTag.isEmpty()) {
tag.remove("EntityTag");
}
} }
} else { } else {
// Fallback to bat // Fallback to bat
@ -969,20 +937,49 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
if (lore == null) { if (lore == null) {
tag.put(lore = new ListTag("Lore")); tag.put(lore = new ListTag("Lore"));
} }
lore.setValue(oldLore.getValue()); lore.setValue(oldLore.getValue());
tag.remove(NBT_TAG_NAME + "|OldLore"); tag.remove(NBT_TAG_NAME + "|OldLore");
} else if (tag.contains(NBT_TAG_NAME + "|DummyLore")) { } else if (tag.contains(NBT_TAG_NAME + "|DummyLore")) {
display.remove("Lore"); display.remove("Lore");
if (display.isEmpty()) if (display.isEmpty()) {
tag.remove("display"); tag.remove("display");
}
tag.remove(NBT_TAG_NAME + "|DummyLore"); tag.remove(NBT_TAG_NAME + "|DummyLore");
} }
if (!storedEnch) if (!storedEnch) {
tag.remove("ench"); tag.remove("ench");
}
tag.put(newEnchantments); tag.put(newEnchantments);
} }
private void invertShieldAndBannerId(Item item, CompoundTag tag) {
if (item.getIdentifier() != 442 && item.getIdentifier() != 425) return;
Tag blockEntityTag = tag.get("BlockEntityTag");
if (!(blockEntityTag instanceof CompoundTag)) return;
CompoundTag blockEntityCompoundTag = (CompoundTag) blockEntityTag;
Tag base = blockEntityCompoundTag.get("Base");
if (base instanceof IntTag) {
IntTag baseTag = (IntTag) base;
baseTag.setValue(15 - baseTag.getValue()); // invert color id
}
Tag patterns = blockEntityCompoundTag.get("Patterns");
if (patterns instanceof ListTag) {
ListTag patternsTag = (ListTag) patterns;
for (Tag pattern : patternsTag) {
if (!(pattern instanceof CompoundTag)) continue;
IntTag colorTag = ((CompoundTag) pattern).get("Color");
colorTag.setValue(15 - colorTag.getValue()); // Invert color id
}
}
}
// TODO find a less hacky way to do this (https://bugs.mojang.com/browse/MC-74231) // TODO find a less hacky way to do this (https://bugs.mojang.com/browse/MC-74231)
private static void flowerPotSpecialTreatment(UserConnection user, int blockState, Position position) throws Exception { private static void flowerPotSpecialTreatment(UserConnection user, int blockState, Position position) throws Exception {
if (FlowerPotHandler.isFlowah(blockState)) { if (FlowerPotHandler.isFlowah(blockState)) {