diff --git a/bukkit/src/main/java/com/viaversion/viabackwards/BukkitPlugin.java b/bukkit/src/main/java/com/viaversion/viabackwards/BukkitPlugin.java index 921a6769..8e6bfb9e 100644 --- a/bukkit/src/main/java/com/viaversion/viabackwards/BukkitPlugin.java +++ b/bukkit/src/main/java/com/viaversion/viabackwards/BukkitPlugin.java @@ -32,7 +32,7 @@ import org.bukkit.plugin.java.JavaPlugin; public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform { public BukkitPlugin() { - // MappingDataLoader caching is enabled in ViaVersion on versions that construct the plugin on load + // This is the only place we can enable this before ViaVersion is loaded and registers protocols MappingDataLoader.enableMappingsCache(); } diff --git a/common/src/main/java/com/viaversion/viabackwards/ViaBackwards.java b/common/src/main/java/com/viaversion/viabackwards/ViaBackwards.java index 98be01a9..db1d9c67 100644 --- a/common/src/main/java/com/viaversion/viabackwards/ViaBackwards.java +++ b/common/src/main/java/com/viaversion/viabackwards/ViaBackwards.java @@ -22,7 +22,7 @@ import com.google.common.base.Preconditions; import com.viaversion.viabackwards.api.ViaBackwardsConfig; import com.viaversion.viabackwards.api.ViaBackwardsPlatform; -public class ViaBackwards { +public final class ViaBackwards { private static ViaBackwardsPlatform platform; private static ViaBackwardsConfig config; diff --git a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java index 8020909c..9afb24a9 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java @@ -82,6 +82,7 @@ public interface ViaBackwardsPlatform { getLogger().info("Loading translations..."); TranslatableRewriter.loadTranslatables(); + getLogger().info("Registering protocols..."); final ProtocolManager protocolManager = Via.getManager().getProtocolManager(); protocolManager.registerProtocol(new Protocol1_9_4To1_10(), ProtocolVersion.v1_9_3, ProtocolVersion.v1_10); diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java index f64a63a0..1a5ea9a9 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java @@ -29,11 +29,12 @@ import com.viaversion.viaversion.libs.gson.JsonObject; import com.viaversion.viaversion.rewriter.ComponentRewriter; import java.util.HashMap; import java.util.Map; +import org.checkerframework.checker.nullness.qual.Nullable; public class TranslatableRewriter extends ComponentRewriter { private static final Map> TRANSLATABLES = new HashMap<>(); - protected final Map newTranslatables; + private final Map newTranslatables; public static void loadTranslatables() { JsonObject jsonObject = VBMappingDataLoader.loadFromDataDir("translation-mappings.json"); @@ -111,9 +112,13 @@ public class TranslatableRewriter extends Compo @Override protected void handleTranslate(JsonObject root, String translate) { - String newTranslate = newTranslatables.get(translate); + String newTranslate = mappedTranslationKey(translate); if (newTranslate != null) { root.addProperty("translate", newTranslate); } } + + public @Nullable String mappedTranslationKey(final String translationKey) { + return newTranslatables.get(translationKey); + } } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java index 28dee107..018b1e0e 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java @@ -64,7 +64,7 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol translatableRewriter = new TranslatableRewriter(this) { @Override protected void handleTranslate(JsonObject root, String translate) { - String newTranslate = newTranslatables.get(translate); + String newTranslate = mappedTranslationKey(translate); if (newTranslate != null || (newTranslate = getMappingData().getTranslateMappings().get(translate)) != null) { root.addProperty("translate", newTranslate); } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java index 326f4d1e..d1d7f0c2 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java @@ -130,6 +130,11 @@ public final class EntityPackets1_19_4 extends EntityRewriter { + final int blockState = meta.value(); + meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState)); + }); + filter().type(Entity1_19_4Types.TEXT_DISPLAY).index(22).handler(((event, meta) -> { // Send as custom display name event.setIndex(2);