diff --git a/bukkit/src/main/java/com/viaversion/viabackwards/BukkitPlugin.java b/bukkit/src/main/java/com/viaversion/viabackwards/BukkitPlugin.java index bc62c95a..c0c0955d 100644 --- a/bukkit/src/main/java/com/viaversion/viabackwards/BukkitPlugin.java +++ b/bukkit/src/main/java/com/viaversion/viabackwards/BukkitPlugin.java @@ -33,8 +33,6 @@ import org.bukkit.plugin.java.JavaPlugin; public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform { public BukkitPlugin() { - // This is the only place we can enable this before ViaVersion is loaded and registers protocols - // MappingDataLoader.enableMappingsCache(); } @Override diff --git a/bungee/src/main/java/com/viaversion/viabackwards/BungeePlugin.java b/bungee/src/main/java/com/viaversion/viabackwards/BungeePlugin.java index 5744ab6e..1ace01d7 100644 --- a/bungee/src/main/java/com/viaversion/viabackwards/BungeePlugin.java +++ b/bungee/src/main/java/com/viaversion/viabackwards/BungeePlugin.java @@ -27,7 +27,6 @@ public class BungeePlugin extends Plugin implements ViaBackwardsPlatform { @Override public void onLoad() { - // MappingDataLoader.enableMappingsCache(); Via.getManager().addEnableListener(() -> this.init(getDataFolder())); } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/data/BackwardsMappings.java b/common/src/main/java/com/viaversion/viabackwards/api/data/BackwardsMappings.java index 589d760e..572cebfe 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/data/BackwardsMappings.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/data/BackwardsMappings.java @@ -61,6 +61,14 @@ public class BackwardsMappings extends MappingDataBase { @Override protected void loadExtras(final CompoundTag data) { + if (vvProtocolClass != null) { + // Reuse item mappings + //TODO rest + final MappingData mappingData = Via.getManager().getProtocolManager().getProtocol(vvProtocolClass).getMappingData(); + final BiMappings vvItemMappings = mappingData.getItemMappings(); + this.itemMappings = vvItemMappings != null ? vvItemMappings.inverse() : null; + } + final CompoundTag itemNames = data.get("itemnames"); if (itemNames != null) { backwardsItemMappings = new Int2ObjectOpenHashMap<>(itemNames.size()); @@ -120,10 +128,11 @@ public class BackwardsMappings extends MappingDataBase { return mappings != null ? mappings.createInverse() : null; } - /*@Override + @Override protected boolean shouldLoad(final String key) { - return !TO_REUSE.contains(key); - }/*/ + return !key.equals("items"); + //return !TO_REUSE.contains(key); //TODO + } /** * @see #getMappedItem(int) for custom backwards mappings diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java index a5d74671..de585f06 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java @@ -157,6 +157,6 @@ public class BackwardsMappings extends com.viaversion.viabackwards.api.data.Back @Override protected boolean shouldLoad(final String key) { - return super.shouldLoad(key) && !key.equals("blocks"); + return !key.equals("blocks"); } } diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.13.2to1.13.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.13.2to1.13.nbt index 2fa38a73..10fd51c3 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.13.2to1.13.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.13.2to1.13.nbt differ diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.13to1.12.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.13to1.12.nbt index 2dbc1734..6b5d1156 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.13to1.12.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.13to1.12.nbt differ diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.14to1.13.2.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.14to1.13.2.nbt index ef11b743..27c1ab8c 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.14to1.13.2.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.14to1.13.2.nbt differ diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.15to1.14.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.15to1.14.nbt index 28bc0d89..bdf82eac 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.15to1.14.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.15to1.14.nbt differ diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.16to1.15.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.16to1.15.nbt index f046797d..ebe0d1c8 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.16to1.15.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.16to1.15.nbt differ diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.17to1.16.2.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.17to1.16.2.nbt index 456a4927..643a25fe 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.17to1.16.2.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.17to1.16.2.nbt differ diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.18to1.17.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.18to1.17.nbt index 0141df14..202d2baa 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.18to1.17.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.18to1.17.nbt differ diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.19.3to1.19.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.19.3to1.19.nbt index 52e42b86..bd561a97 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.19.3to1.19.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.19.3to1.19.nbt differ diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.19.4to1.19.3.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.19.4to1.19.3.nbt index 1e98a521..994af996 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.19.4to1.19.3.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.19.4to1.19.3.nbt differ diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.19to1.18.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.19to1.18.nbt index 3f67dfdd..574aa039 100644 Binary files a/common/src/main/resources/assets/viabackwards/data/mappings-1.19to1.18.nbt and b/common/src/main/resources/assets/viabackwards/data/mappings-1.19to1.18.nbt differ diff --git a/sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java b/sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java index 1bbc200a..7296eb6f 100644 --- a/sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java +++ b/sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java @@ -47,7 +47,6 @@ public class SpongePlugin implements ViaBackwardsPlatform { @Listener public void constructPlugin(ConstructPluginEvent event) { - // MappingDataLoader.enableMappingsCache(); Via.getManager().addEnableListener(() -> this.init(getDataFolder())); } diff --git a/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java b/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java index cceba1d7..8afd8522 100644 --- a/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java +++ b/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java @@ -52,7 +52,6 @@ public class VelocityPlugin implements ViaBackwardsPlatform { @Subscribe(order = PostOrder.LATE) public void onProxyStart(ProxyInitializeEvent event) { this.logger = new LoggerWrapper(loggerSlf4j); - // MappingDataLoader.enableMappingsCache(); Via.getManager().addEnableListener(() -> this.init(getDataFolder())); }