From 4c7919fe825653d6b387c0d319ea4677204548c9 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 24 Mar 2021 16:54:07 +0100 Subject: [PATCH] Update VV usage --- .../nl/matsv/viabackwards/BukkitPlugin.java | 7 ++- .../viabackwards/api/BackwardsProtocol.java | 4 +- .../api/ViaBackwardsPlatform.java | 52 +++++++++---------- .../api/data/BackwardsMappings.java | 4 +- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java b/bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java index 38d8c166..45e71864 100644 --- a/bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java +++ b/bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java @@ -24,7 +24,6 @@ import nl.matsv.viabackwards.listener.FireExtinguishListener; import nl.matsv.viabackwards.listener.LecternInteractListener; import org.bukkit.plugin.java.JavaPlugin; import us.myles.ViaVersion.api.Via; -import us.myles.ViaVersion.api.protocol.ProtocolRegistry; import us.myles.ViaVersion.api.protocol.ProtocolVersion; import us.myles.ViaVersion.bukkit.platform.BukkitViaLoader; @@ -38,13 +37,13 @@ public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform { private void onServerLoaded() { BukkitViaLoader loader = (BukkitViaLoader) Via.getManager().getLoader(); - if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_16.getVersion()) { + if (Via.getAPI().getServerVersion() >= ProtocolVersion.v1_16.getVersion()) { loader.storeListener(new FireExtinguishListener(this)).register(); } - if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_14.getVersion()) { + if (Via.getAPI().getServerVersion() >= ProtocolVersion.v1_14.getVersion()) { loader.storeListener(new LecternInteractListener(this)).register(); } - if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_12.getVersion()) { + if (Via.getAPI().getServerVersion() >= ProtocolVersion.v1_12.getVersion()) { loader.storeListener(new FireDamageListener(this)).register(); } } diff --git a/common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java b/common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java index 403c06b4..a32cc25d 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java @@ -20,10 +20,10 @@ package nl.matsv.viabackwards.api; import nl.matsv.viabackwards.api.data.BackwardsMappings; import nl.matsv.viabackwards.api.entities.storage.EntityTracker; import org.jetbrains.annotations.Nullable; +import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.protocol.ClientboundPacketType; import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.ViaVersion.api.protocol.ProtocolRegistry; import us.myles.ViaVersion.api.protocol.ServerboundPacketType; public abstract class BackwardsProtocol @@ -41,7 +41,7 @@ public abstract class BackwardsProtocol protocolClass, Runnable runnable) { - ProtocolRegistry.addMappingLoaderFuture(getClass(), protocolClass, runnable); + Via.getManager().getProtocolManager().addMappingLoaderFuture(getClass(), protocolClass, runnable); } protected void initEntityTracker(UserConnection user) { diff --git a/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java b/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java index 9cd9c5cf..a90bffc2 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java @@ -38,21 +38,20 @@ import nl.matsv.viabackwards.protocol.protocol1_14to1_14_1.Protocol1_14To1_14_1; import nl.matsv.viabackwards.protocol.protocol1_15_1to1_15_2.Protocol1_15_1To1_15_2; import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.Protocol1_15_2To1_16; import nl.matsv.viabackwards.protocol.protocol1_15to1_15_1.Protocol1_15To1_15_1; +import nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.Protocol1_16_1To1_16_2; import nl.matsv.viabackwards.protocol.protocol1_16_2to1_16_3.Protocol1_16_2To1_16_3; import nl.matsv.viabackwards.protocol.protocol1_16_3to1_16_4.Protocol1_16_3To1_16_4; import nl.matsv.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4To1_17; import nl.matsv.viabackwards.protocol.protocol1_16to1_16_1.Protocol1_16To1_16_1; -import nl.matsv.viabackwards.protocol.protocol1_16_1to1_16_2.Protocol1_16_1To1_16_2; import nl.matsv.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10; import us.myles.ViaVersion.api.Via; +import us.myles.ViaVersion.api.protocol.ProtocolManager; import us.myles.ViaVersion.api.protocol.ProtocolVersion; import us.myles.ViaVersion.update.Version; import java.io.File; import java.util.logging.Logger; -import static us.myles.ViaVersion.api.protocol.ProtocolRegistry.registerProtocol; - public interface ViaBackwardsPlatform { String MINIMUM_VV_VERSION = "3.3.0"; @@ -75,36 +74,37 @@ public interface ViaBackwardsPlatform { TranslatableRewriter.loadTranslatables(); getLogger().info("Registering protocols..."); - registerProtocol(new Protocol1_9_4To1_10(), ProtocolVersion.v1_9_3, ProtocolVersion.v1_10); + ProtocolManager protocolManager = Via.getManager().getProtocolManager(); + protocolManager.registerProtocol(new Protocol1_9_4To1_10(), ProtocolVersion.v1_9_3, ProtocolVersion.v1_10); - registerProtocol(new Protocol1_10To1_11(), ProtocolVersion.v1_10, ProtocolVersion.v1_11); - registerProtocol(new Protocol1_11To1_11_1(), ProtocolVersion.v1_11, ProtocolVersion.v1_11_1); + protocolManager.registerProtocol(new Protocol1_10To1_11(), ProtocolVersion.v1_10, ProtocolVersion.v1_11); + protocolManager.registerProtocol(new Protocol1_11To1_11_1(), ProtocolVersion.v1_11, ProtocolVersion.v1_11_1); - registerProtocol(new Protocol1_11_1To1_12(), ProtocolVersion.v1_11_1, ProtocolVersion.v1_12); - registerProtocol(new Protocol1_12To1_12_1(), ProtocolVersion.v1_12, ProtocolVersion.v1_12_1); - registerProtocol(new Protocol1_12_1To1_12_2(), ProtocolVersion.v1_12_1, ProtocolVersion.v1_12_2); + protocolManager.registerProtocol(new Protocol1_11_1To1_12(), ProtocolVersion.v1_11_1, ProtocolVersion.v1_12); + protocolManager.registerProtocol(new Protocol1_12To1_12_1(), ProtocolVersion.v1_12, ProtocolVersion.v1_12_1); + protocolManager.registerProtocol(new Protocol1_12_1To1_12_2(), ProtocolVersion.v1_12_1, ProtocolVersion.v1_12_2); - registerProtocol(new Protocol1_12_2To1_13(), ProtocolVersion.v1_12_2, ProtocolVersion.v1_13); - registerProtocol(new Protocol1_13To1_13_1(), ProtocolVersion.v1_13, ProtocolVersion.v1_13_1); - registerProtocol(new Protocol1_13_1To1_13_2(), ProtocolVersion.v1_13_1, ProtocolVersion.v1_13_2); + protocolManager.registerProtocol(new Protocol1_12_2To1_13(), ProtocolVersion.v1_12_2, ProtocolVersion.v1_13); + protocolManager.registerProtocol(new Protocol1_13To1_13_1(), ProtocolVersion.v1_13, ProtocolVersion.v1_13_1); + protocolManager.registerProtocol(new Protocol1_13_1To1_13_2(), ProtocolVersion.v1_13_1, ProtocolVersion.v1_13_2); - registerProtocol(new Protocol1_13_2To1_14(), ProtocolVersion.v1_13_2, ProtocolVersion.v1_14); - registerProtocol(new Protocol1_14To1_14_1(), ProtocolVersion.v1_14, ProtocolVersion.v1_14_1); - registerProtocol(new Protocol1_14_1To1_14_2(), ProtocolVersion.v1_14_1, ProtocolVersion.v1_14_2); - registerProtocol(new Protocol1_14_2To1_14_3(), ProtocolVersion.v1_14_2, ProtocolVersion.v1_14_3); - registerProtocol(new Protocol1_14_3To1_14_4(), ProtocolVersion.v1_14_3, ProtocolVersion.v1_14_4); + protocolManager.registerProtocol(new Protocol1_13_2To1_14(), ProtocolVersion.v1_13_2, ProtocolVersion.v1_14); + protocolManager.registerProtocol(new Protocol1_14To1_14_1(), ProtocolVersion.v1_14, ProtocolVersion.v1_14_1); + protocolManager.registerProtocol(new Protocol1_14_1To1_14_2(), ProtocolVersion.v1_14_1, ProtocolVersion.v1_14_2); + protocolManager.registerProtocol(new Protocol1_14_2To1_14_3(), ProtocolVersion.v1_14_2, ProtocolVersion.v1_14_3); + protocolManager.registerProtocol(new Protocol1_14_3To1_14_4(), ProtocolVersion.v1_14_3, ProtocolVersion.v1_14_4); - registerProtocol(new Protocol1_14_4To1_15(), ProtocolVersion.v1_14_4, ProtocolVersion.v1_15); - registerProtocol(new Protocol1_15To1_15_1(), ProtocolVersion.v1_15, ProtocolVersion.v1_15_1); - registerProtocol(new Protocol1_15_1To1_15_2(), ProtocolVersion.v1_15_1, ProtocolVersion.v1_15_2); + protocolManager.registerProtocol(new Protocol1_14_4To1_15(), ProtocolVersion.v1_14_4, ProtocolVersion.v1_15); + protocolManager.registerProtocol(new Protocol1_15To1_15_1(), ProtocolVersion.v1_15, ProtocolVersion.v1_15_1); + protocolManager.registerProtocol(new Protocol1_15_1To1_15_2(), ProtocolVersion.v1_15_1, ProtocolVersion.v1_15_2); - registerProtocol(new Protocol1_15_2To1_16(), ProtocolVersion.v1_15_2, ProtocolVersion.v1_16); - registerProtocol(new Protocol1_16To1_16_1(), ProtocolVersion.v1_16, ProtocolVersion.v1_16_1); - registerProtocol(new Protocol1_16_1To1_16_2(), ProtocolVersion.v1_16_1, ProtocolVersion.v1_16_2); - registerProtocol(new Protocol1_16_2To1_16_3(), ProtocolVersion.v1_16_2, ProtocolVersion.v1_16_3); - registerProtocol(new Protocol1_16_3To1_16_4(), ProtocolVersion.v1_16_3, ProtocolVersion.v1_16_4); + protocolManager.registerProtocol(new Protocol1_15_2To1_16(), ProtocolVersion.v1_15_2, ProtocolVersion.v1_16); + protocolManager.registerProtocol(new Protocol1_16To1_16_1(), ProtocolVersion.v1_16, ProtocolVersion.v1_16_1); + protocolManager.registerProtocol(new Protocol1_16_1To1_16_2(), ProtocolVersion.v1_16_1, ProtocolVersion.v1_16_2); + protocolManager.registerProtocol(new Protocol1_16_2To1_16_3(), ProtocolVersion.v1_16_2, ProtocolVersion.v1_16_3); + protocolManager.registerProtocol(new Protocol1_16_3To1_16_4(), ProtocolVersion.v1_16_3, ProtocolVersion.v1_16_4); - registerProtocol(new Protocol1_16_4To1_17(), ProtocolVersion.v1_16_4, ProtocolVersion.v1_17); + protocolManager.registerProtocol(new Protocol1_16_4To1_17(), ProtocolVersion.v1_16_4, ProtocolVersion.v1_17); } /** diff --git a/common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java b/common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java index 2f25df76..c6445e28 100644 --- a/common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java @@ -20,10 +20,10 @@ package nl.matsv.viabackwards.api.data; import com.google.common.base.Preconditions; import nl.matsv.viabackwards.api.BackwardsProtocol; import org.jetbrains.annotations.Nullable; +import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.data.MappingData; import us.myles.ViaVersion.api.data.Mappings; import us.myles.ViaVersion.api.protocol.Protocol; -import us.myles.ViaVersion.api.protocol.ProtocolRegistry; import us.myles.viaversion.libs.fastutil.ints.Int2ObjectMap; import us.myles.viaversion.libs.gson.JsonObject; @@ -64,7 +64,7 @@ public class BackwardsMappings extends MappingData { // Just re-use ViaVersion's item id map if (vvProtocolClass != null) { - itemMappings = ProtocolRegistry.getProtocol(vvProtocolClass).getMappingData().getItemMappings().inverse(); + itemMappings = Via.getManager().getProtocolManager().getProtocol(vvProtocolClass).getMappingData().getItemMappings().inverse(); } loadVBExtras(oldMappings, newMappings);