Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-12-23 17:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix inventory titles being overriden

Browse Source 
Fixes #175
This commit is contained in:
KennyTV 2019-12-25 12:01:04 +01:00
parent 5d8f86e9eb
commit edc4f71403
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,8 @@ import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.data.MappingData; import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.data.MappingData;
import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type; import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type;
import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
import us.myles.ViaVersion.util.GsonUtil;
import us.myles.viaversion.libs.gson.JsonObject;
import us.myles.viaversion.libs.opennbt.conversion.ConverterRegistry; import us.myles.viaversion.libs.opennbt.conversion.ConverterRegistry;
import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag; import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag; import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag;
@ -54,14 +56,15 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
handler(new PacketHandler() { handler(new PacketHandler() {
@Override @Override
public void handle(PacketWrapper wrapper) throws Exception { public void handle(PacketWrapper wrapper) throws Exception {
int id = wrapper.read(Type.VAR_INT); int windowId = wrapper.read(Type.VAR_INT);
wrapper.write(Type.UNSIGNED_BYTE, (short) id); wrapper.write(Type.UNSIGNED_BYTE, (short) windowId);
int type = wrapper.read(Type.VAR_INT); int type = wrapper.read(Type.VAR_INT);
String stringType = null; String stringType = null;
String title = null; String containerTitle = null;
int slotSize = 0; int slotSize = 0;
if (type < 6) { if (type < 6) {
if (type == 2) title = "Barrel"; if (type == 2) containerTitle = "Barrel";
stringType = "minecraft:container"; stringType = "minecraft:container";
slotSize = (type + 1) * 9; slotSize = (type + 1) * 9;
} else } else
@ -73,9 +76,9 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
case 20: //smoker case 20: //smoker
case 13: //furnace case 13: //furnace
case 14: //grindstone case 14: //grindstone
if (type == 9) title = "Blast Furnace"; if (type == 9) containerTitle = "Blast Furnace";
if (type == 20) title = "Smoker"; else if (type == 20) containerTitle = "Smoker";
if (type == 14) title = "Grindstone"; else if (type == 14) containerTitle = "Grindstone";
stringType = "minecraft:furnace"; stringType = "minecraft:furnace";
slotSize = 3; slotSize = 3;
break; break;
@ -99,7 +102,7 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
break; break;
case 21: //cartography_table case 21: //cartography_table
case 7: case 7:
if (type == 21) title = "Cartography Table"; if (type == 21) containerTitle = "Cartography Table";
stringType = "minecraft:anvil"; stringType = "minecraft:anvil";
break; break;
case 15: case 15:
@ -119,9 +122,20 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
} }
wrapper.write(Type.STRING, stringType); wrapper.write(Type.STRING, stringType);
String t = wrapper.read(Type.STRING);
if (title != null) t = ChatRewriter.legacyTextToJson(title); String title = wrapper.read(Type.STRING);
wrapper.write(Type.STRING, t); if (containerTitle != null) {
// Don't rewrite renamed, only translatable titles
JsonObject object = GsonUtil.getGson().fromJson(title, JsonObject.class);
if (object.has("translate")) {
// Don't rewrite other 9x3 translatable containers
if (type != 2 || object.getAsJsonPrimitive("translate").getAsString().equals("container.barrel")) {
title = ChatRewriter.legacyTextToJson(containerTitle);
}
}
}
wrapper.write(Type.STRING, title);
wrapper.write(Type.UNSIGNED_BYTE, (short) slotSize); wrapper.write(Type.UNSIGNED_BYTE, (short) slotSize);
} }
}); });