Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-11-02 09:09:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-add translatable handler to 1.14 item handling

Browse Source 
Reeeee
This commit is contained in:
KennyTV 2020-06-03 08:56:28 +02:00
parent 3d50c36ce3
commit e25abe57e0
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriter.java
View File

@ -47,6 +47,8 @@ public abstract class ItemRewriter<T extends BackwardsProtocol> extends ItemRewr
ListTag lore = tag.get("Lore"); ListTag lore = tag.get("Lore");
if (lore != null) { if (lore != null) {
for (Tag loreEntry : lore) { for (Tag loreEntry : lore) {
if (!(loreEntry instanceof StringTag)) continue;
StringTag stringTag = (StringTag) loreEntry; StringTag stringTag = (StringTag) loreEntry;
String newValue = translatableRewriter.processText(stringTag.getValue()); String newValue = translatableRewriter.processText(stringTag.getValue());
if (stringTag.getValue().equals(newValue)) { if (stringTag.getValue().equals(newValue)) {

2
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java
View File

@ -38,7 +38,7 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol {
translatableRewriter.registerTitle(0x4F, 0x4B); translatableRewriter.registerTitle(0x4F, 0x4B);
translatableRewriter.registerPing(); translatableRewriter.registerPing();
blockItemPackets = new BlockItemPackets1_14(this); blockItemPackets = new BlockItemPackets1_14(this, translatableRewriter);
blockItemPackets.register(); blockItemPackets.register();
entityPackets = new EntityPackets1_14(this); entityPackets = new EntityPackets1_14(this);
entityPackets.register(); entityPackets.register();

5
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
View File

@ -5,6 +5,7 @@ import nl.matsv.viabackwards.ViaBackwards;
import nl.matsv.viabackwards.api.entities.storage.EntityTracker; import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
import nl.matsv.viabackwards.api.rewriters.EnchantmentRewriter; import nl.matsv.viabackwards.api.rewriters.EnchantmentRewriter;
import nl.matsv.viabackwards.api.rewriters.RecipeRewriter; import nl.matsv.viabackwards.api.rewriters.RecipeRewriter;
import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter;
import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2To1_14; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2To1_14;
import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.data.BackwardsMappings; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.data.BackwardsMappings;
import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.data.RecipeRewriter1_14; import nl.matsv.viabackwards.protocol.protocol1_13_2to1_14.data.RecipeRewriter1_14;
@ -47,8 +48,8 @@ public class BlockItemPackets1_14 extends nl.matsv.viabackwards.api.rewriters.It
private EnchantmentRewriter enchantmentRewriter; private EnchantmentRewriter enchantmentRewriter;
public BlockItemPackets1_14(Protocol1_13_2To1_14 protocol) { public BlockItemPackets1_14(Protocol1_13_2To1_14 protocol, TranslatableRewriter translatableRewriter) {
super(protocol, null, BlockItemPackets1_14::getOldItemId, BlockItemPackets1_14::getNewItemId, id -> BackwardsMappings.itemMappings.getMappedItem(id)); super(protocol, translatableRewriter, BlockItemPackets1_14::getOldItemId, BlockItemPackets1_14::getNewItemId, id -> BackwardsMappings.itemMappings.getMappedItem(id));
} }
@Override @Override