From 2d1f675834618118380a75424411678351bf4ff2 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sun, 5 Mar 2023 15:21:06 +0100 Subject: [PATCH] Mapping fixes --- .../viaversion/viabackwards/BukkitPlugin.java | 2 -- .../viaversion/viabackwards/BungeePlugin.java | 1 - .../api/data/BackwardsMappings.java | 15 ++++++++++++--- .../data/BackwardsMappings.java | 2 +- .../data/mappings-1.13.2to1.13.nbt | Bin 618 -> 618 bytes .../viabackwards/data/mappings-1.13to1.12.nbt | Bin 85211 -> 85217 bytes .../data/mappings-1.14to1.13.2.nbt | Bin 15127 -> 15127 bytes .../viabackwards/data/mappings-1.15to1.14.nbt | Bin 5293 -> 5293 bytes .../viabackwards/data/mappings-1.16to1.15.nbt | Bin 59752 -> 59760 bytes .../data/mappings-1.17to1.16.2.nbt | Bin 22934 -> 22934 bytes .../viabackwards/data/mappings-1.18to1.17.nbt | Bin 901 -> 901 bytes .../data/mappings-1.19.3to1.19.nbt | Bin 10757 -> 10757 bytes .../data/mappings-1.19.4to1.19.3.nbt | Bin 6485 -> 6485 bytes .../viabackwards/data/mappings-1.19to1.18.nbt | Bin 12214 -> 12214 bytes .../viaversion/viabackwards/SpongePlugin.java | 1 - .../viabackwards/VelocityPlugin.java | 1 - 16 files changed, 13 insertions(+), 9 deletions(-) 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 2fa38a736f3c621482ec3be8f9c88d0822dee59b..10fd51c3900b048d1dc7e0654b45961702eae76a 100644 GIT binary patch delta 132 zcmaFG@``1HAfw2CEMT%KW32^9oPmL%9E&_qoN+fqo=FlW&%nTB4`NTg#h9gr5M&U8 Pu|YJ@KyfIo%)kHu8{J!~ delta 132 zcmaFG@``1HAfpHa7BE?rvDN}AUXDc`D8#rMBF-dNd IUzvdc0Ji=I{r~^~ 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 2dbc1734aa7d3cb09bd6f7646d944509a136d2c2..6b5d115664e930551e5e96d9c50671276811214e 100644 GIT binary patch delta 27 icmcaTll9?DR$eX!24)8KvecsD%>2AY_O0xUS9}0>kqCtV delta 21 ccmaDjllAsYR(38124)7vvPRymyo^_T07n!B^#A|> 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 ef11b74303ffd6ee6a918ea652ba6ae489e2291f..27c1ab8caf4479f1aaeef089a255a00eed23236c 100644 GIT binary patch delta 481 zcmbPUHoa_vB4@;ZB*4JH(165+GlAmM;T$9eP<##$UjyO`Kzs{H>i^_QPK$bw00RT# zCMdlHO7CW1U~&awYasRqiNOGn9|U7lfv%^58I%|yg{m3oyHJ?O=965j*;zom#T7zK gG9U&ppjx4H2bAsv(VM4;7%=OASj2+OAH>y_0eD7?{r~^~ delta 481 zcmbPUHoa_vB4-2xDri9E!gpK}01OruX8-^I 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 28bc0d898d617c45d4bedb1944bd74706065dd9e..bdf82eac52049fc1bd8c2523006b1e97334f993a 100644 GIT binary patch delta 43 fcmZ3hxmI(79IwECG_YBZSDcvxCb-#GAb|w{gr*$? delta 43 fcmZ3hxmI(79IpTa8rZDIE6&UT6Wr`8kiY@}f{X;D4*0|SE+lt#AAa(PuEfbg-k5BgAVb3VAxqZhICdcEH zI0hI+jFS)S5u3bk_cIodL7P|XsbCZUv4B#`K{N<#HrS^R7Zrwx0Y&ro|I`EkaAC;d delta 529 zcmexxiTTAP<_)%+>lq+G2}<`vX>{r!RNys)W||MB7eK|yrC|1xtDjVTOba18n3h0j zdfU&%z?xZ-np@1wz?GX=P>{NL*Om#)jK?N>@37z8x8os`?J-h)gsgt@hTVTyKmwaL b?5SWBfJ!ZgDcNkXPaiHS3>Pim|5FnHYH%c7 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 456a4927d3d457641b8703ef05866e5c7d6ff473..643a25fe4a26d6b5b1fb09c129a627dda78c1862 100644 GIT binary patch delta 649 zcmbQXnQ_`?#tjR_>i+`)0|SEslvae&N+22pfO3vd+7(JqgVI}}^e+$%0}Kp|Y#=s} z=7ZAJQ2H~7Mg#R|e0p<7y8R)v2=L7xC5*XPKqhb2Q2xOPW=&R6b$~E3RF^{J1l3xN E0a@}vaR2}S delta 166 zcmbQXnQ_`?#tjR_au^^$0ZJ=EX(cEPq8y=YS13IVN^gbIzo0afVq}9b82O-dHI)9m n`61U+#?7B3jJQ}pLYp;|e=veslT}n5AdC#vr4TtmwN_&Qp)C|6 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 0141df14ddb2770c35a0aae9b1dc67e1f827a06a..202d2baafe19ee0988b1915a0eab72197f62bc17 100644 GIT binary patch delta 89 zcmZo=Z)M*g!|3xL2{14)%m;B97#L4OXr@vI2BsPi8yx_}t6*Y4b~T8-IfGG_2>>LY BI+6eY delta 89 wcmZo=Z)M*g!|20+3g$z&jHe+qQz-)jQw^#T7>}t6#saFT2C+A1Fv>Ck09Nh>#sB~S 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 52e42b8610873c0a376bc90a39bfc8df3de70116..bd561a97046d9e3aa1d523555d8b547677641263 100644 GIT binary patch delta 547 zcmZn-X${%%P_+I(6fiI_h=7BG1GErMW=#=B;AN%=I7^xd7;zL{jtu)o(;oUysIzaDfW1VwE6L i5EvA{iBoEXT^R!d(`D>3|Nl?skPZb0y-*X6L+PIonlTc}2U3iwNbH$N z>^BfL6AP5)0@0hdiYYTAdkrE<8ktC%a)ym)>T%kC6-^qBV^DD4QPJ)pEdlKGwh0-Qa+73c9F9p$?Uoy)>yaW+tSO%i$4C=x5 z0mJk;E{ho$7*(;!0mV0C7iZcF5@%pw`VOI)MX;%Zh>2mBnk>Wd2ppJT6Sx>SCfjmI KY*ykl761U7d48S% delta 312 zcmca=bk%5sEOR{r1PDQCX(+7-rS+k-1(bG#(jHLSA4+#a=`B$D0F*ufr7uD02N0T3 z7)twwKpBxxx&%sZhtNzsP+AR2>q2Q0C~XI!nU{j-%`chdnV~ws;>#v)WOSH(fYA_$ zxfq`Vc~VS_sz6GNiE%TC5@Om5F@Whigk}~23L8z9<9L8Dhl_z@vMq6R 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 3f67dfddfbf3c4661034180fb0967e8085f58561..574aa039cf11c97c73c1a6e3ed7c296f8098905c 100644 GIT binary patch delta 286 zcmdlMzb$?PD`)+GAYfo%5Qfr{AQ}dM;yNHUkT!zS7Esy_O1nVm6;OH;l->=c-+*Wk z0GjauLNl^KXp5r{?x3=GU>AU=>zM;3>% gH-F^3%f2G9dQmlR|H00MAUbUH||9 delta 286 zcmdlMzb$?PD`!0e1PDWENhl4Ybf63)C~X0y?Vz*^lwJX)H$my$Q2Gs&22md%Y(_RH ztqY`cftb-9D$oX{Z$Rk>Q2HH|{tTsmKxn2#5E_|eHiPh((~(7C?9CrJ@3L{gdDjFU TGYUX?=0I8o#NK>T=&cL@#;O 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())); }