From 72a070da3e5c47abaa09904e23d5c09c3c33e21a Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Fri, 4 Sep 2020 19:36:09 +0200
Subject: [PATCH] Fix joins not waiting for mappings to be loaded

---
 .../nl/matsv/viabackwards/api/BackwardsProtocol.java     | 6 ++++++
 .../matsv/viabackwards/api/data/BackwardsMappings.java   | 9 ---------
 .../protocol1_12_2to1_13/Protocol1_12_2To1_13.java       | 2 +-
 .../protocol1_13_2to1_14/Protocol1_13_2To1_14.java       | 2 +-
 .../protocol1_13to1_13_1/Protocol1_13To1_13_1.java       | 2 +-
 .../protocol1_14_4to1_15/Protocol1_14_4To1_15.java       | 2 +-
 .../protocol1_15_2to1_16/Protocol1_15_2To1_16.java       | 2 +-
 .../protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java   | 2 +-
 8 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java b/core/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java
index eb38485e..345f994b 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java
@@ -25,6 +25,12 @@ public abstract class BackwardsProtocol<C1 extends ClientboundPacketType, C2 ext
         ProtocolRegistry.addMappingLoaderFuture(getClass(), protocolClass, runnable);
     }
 
+    @Override
+    public boolean hasMappingDataToLoad() {
+        // Manually load them later, since they depend on VV's mappings
+        return false;
+    }
+
     @Override
     public BackwardsMappings getMappingData() {
         return null;
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java b/core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java
index fb74f6f7..ed077a55 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java
@@ -30,15 +30,6 @@ public class BackwardsMappings extends MappingData {
         loadItems = false;
     }
 
-    @Override
-    public void load() {
-        // Load them later
-    }
-
-    public void loadVBMappings() {
-        super.load();
-    }
-
     @Override
     protected void loadExtras(JsonObject oldMappings, JsonObject newMappings, @Nullable JsonObject diffMappings) {
         if (diffMappings != null) {
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
index 97dca18f..07eba7ce 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
@@ -46,7 +46,7 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
     @Override
     protected void registerPackets() {
         executeAsyncAfterLoaded(Protocol1_13To1_12_2.class, () -> {
-            MAPPINGS.loadVBMappings();
+            MAPPINGS.load();
             PaintingMapping.init();
             Via.getManager().getProviders().register(BackwardsBlockEntityProvider.class, new BackwardsBlockEntityProvider());
         });
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java
index b41e8cc8..8eaeace1 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java
@@ -34,7 +34,7 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     protected void registerPackets() {
-        executeAsyncAfterLoaded(Protocol1_14To1_13_2.class, MAPPINGS::loadVBMappings);
+        executeAsyncAfterLoaded(Protocol1_14To1_13_2.class, MAPPINGS::load);
 
         TranslatableRewriter translatableRewriter = new TranslatableRewriter(this);
         translatableRewriter.registerBossBar(ClientboundPackets1_14.BOSSBAR);
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java
index 60ec3c3f..d7a6277e 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java
@@ -30,7 +30,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     protected void registerPackets() {
-        executeAsyncAfterLoaded(Protocol1_13_1To1_13.class, MAPPINGS::loadVBMappings);
+        executeAsyncAfterLoaded(Protocol1_13_1To1_13.class, MAPPINGS::load);
 
         new EntityPackets1_13_1(this).register();
         InventoryPackets1_13_1.register(this);
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
index f8f391a0..ea96a1e8 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
@@ -31,7 +31,7 @@ public class Protocol1_14_4To1_15 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     protected void registerPackets() {
-        executeAsyncAfterLoaded(Protocol1_15To1_14_4.class, MAPPINGS::loadVBMappings);
+        executeAsyncAfterLoaded(Protocol1_15To1_14_4.class, MAPPINGS::load);
 
         TranslatableRewriter translatableRewriter = new TranslatableRewriter(this);
         translatableRewriter.registerBossBar(ClientboundPackets1_15.BOSSBAR);
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
index 4047575f..41697f85 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
@@ -39,7 +39,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     protected void registerPackets() {
-        executeAsyncAfterLoaded(Protocol1_16To1_15_2.class, MAPPINGS::loadVBMappings);
+        executeAsyncAfterLoaded(Protocol1_16To1_15_2.class, MAPPINGS::load);
 
         translatableRewriter = new TranslatableRewriter1_16(this);
         translatableRewriter.registerBossBar(ClientboundPackets1_16.BOSSBAR);
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java
index a1b8e180..041b43cf 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java
@@ -32,7 +32,7 @@ public class Protocol1_16_1To1_16_2 extends BackwardsProtocol<ClientboundPackets
 
     @Override
     protected void registerPackets() {
-        executeAsyncAfterLoaded(Protocol1_16_2To1_16_1.class, MAPPINGS::loadVBMappings);
+        executeAsyncAfterLoaded(Protocol1_16_2To1_16_1.class, MAPPINGS::load);
 
         translatableRewriter = new TranslatableRewriter(this);
         translatableRewriter.registerBossBar(ClientboundPackets1_16_2.BOSSBAR);