From 89b178dbd25541fc6844019f064a77d7b9ab0c6c Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sun, 12 Mar 2023 10:39:52 +0100 Subject: [PATCH] Update ViaVersion --- gradle.properties | 2 +- .../fabric/common/provider/AbstractFabricPlatform.java | 8 ++++++++ .../main/java/com/viaversion/fabric/mc114/ViaFabric.java | 8 ++++---- .../main/java/com/viaversion/fabric/mc115/ViaFabric.java | 8 ++++---- .../main/java/com/viaversion/fabric/mc116/ViaFabric.java | 8 ++++---- .../main/java/com/viaversion/fabric/mc117/ViaFabric.java | 8 ++++---- .../main/java/com/viaversion/fabric/mc118/ViaFabric.java | 8 ++++---- .../main/java/com/viaversion/fabric/mc119/ViaFabric.java | 8 ++++---- .../main/java/com/viaversion/fabric/mc18/ViaFabric.java | 8 ++++---- 9 files changed, 37 insertions(+), 29 deletions(-) diff --git a/gradle.properties b/gradle.properties index 96c38be..e13c963 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xms32M -Xmx3G -XX:+UseG1GC -XX:+UseStringDeduplication loader_version=0.14.12 -viaver_version=4.5.2-SNAPSHOT +viaver_version=4.6.0-1.19.4-rc2-SNAPSHOT yaml_version=1.33 # example: 1.19.1-rc2 diff --git a/src/main/java/com/viaversion/fabric/common/provider/AbstractFabricPlatform.java b/src/main/java/com/viaversion/fabric/common/provider/AbstractFabricPlatform.java index 1ccff20..f10f30d 100644 --- a/src/main/java/com/viaversion/fabric/common/provider/AbstractFabricPlatform.java +++ b/src/main/java/com/viaversion/fabric/common/provider/AbstractFabricPlatform.java @@ -76,6 +76,14 @@ public abstract class AbstractFabricPlatform implements ViaPlatform { })); } + @Override + public FutureTaskId runRepeatingAsync(Runnable runnable, long ticks) { + return new FutureTaskId(eventLoop() + .scheduleAtFixedRate(() -> runAsync(runnable), 0, ticks * 50, TimeUnit.MILLISECONDS) + .addListener(errorLogger()) + ); + } + @Override public FutureTaskId runSync(Runnable runnable, long ticks) { // ViaVersion seems to not need to run delayed tasks on main thread diff --git a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java index 5cbeeab..f1c914d 100644 --- a/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java +++ b/viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/ViaFabric.java @@ -14,7 +14,6 @@ import com.viaversion.fabric.mc114.platform.FabricPlatform; import com.viaversion.fabric.mc114.platform.VFLoader; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.data.MappingDataLoader; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.DefaultEventLoop; import io.netty.channel.EventLoop; @@ -67,9 +66,8 @@ public class ViaFabric implements ModInitializer { platform.init(); - FabricLoader.getInstance().getModContainer("viabackwards").ifPresent(mod -> MappingDataLoader.enableMappingsCache()); - - ((ViaManagerImpl) Via.getManager()).init(); + ViaManagerImpl manager = (ViaManagerImpl) Via.getManager(); + manager.init(); Via.getManager().getProtocolManager().registerBaseProtocol(HostnameParserProtocol.INSTANCE, Range.lessThan(Integer.MIN_VALUE)); ProtocolVersion.register(-2, "AUTO"); @@ -81,6 +79,8 @@ public class ViaFabric implements ModInitializer { config = new VFConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric") .resolve("viafabric.yml").toFile()); + manager.onServerLoaded(); + INIT_FUTURE.complete(null); } diff --git a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java index 4afc839..55ab8dd 100644 --- a/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java +++ b/viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/ViaFabric.java @@ -14,7 +14,6 @@ import com.viaversion.fabric.mc115.platform.FabricPlatform; import com.viaversion.fabric.mc115.platform.VFLoader; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.data.MappingDataLoader; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.DefaultEventLoop; import io.netty.channel.EventLoop; @@ -67,9 +66,8 @@ public class ViaFabric implements ModInitializer { platform.init(); - FabricLoader.getInstance().getModContainer("viabackwards").ifPresent(mod -> MappingDataLoader.enableMappingsCache()); - - ((ViaManagerImpl) Via.getManager()).init(); + ViaManagerImpl manager = (ViaManagerImpl) Via.getManager(); + manager.init(); Via.getManager().getProtocolManager().registerBaseProtocol(HostnameParserProtocol.INSTANCE, Range.lessThan(Integer.MIN_VALUE)); ProtocolVersion.register(-2, "AUTO"); @@ -81,6 +79,8 @@ public class ViaFabric implements ModInitializer { config = new VFConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric") .resolve("viafabric.yml").toFile()); + manager.onServerLoaded(); + INIT_FUTURE.complete(null); } diff --git a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java index 7089ee7..cc95474 100644 --- a/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java +++ b/viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/ViaFabric.java @@ -14,7 +14,6 @@ import com.viaversion.fabric.mc116.platform.FabricPlatform; import com.viaversion.fabric.mc116.platform.VFLoader; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.data.MappingDataLoader; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.DefaultEventLoop; import io.netty.channel.EventLoop; @@ -69,9 +68,8 @@ public class ViaFabric implements ModInitializer { platform.init(); - FabricLoader.getInstance().getModContainer("viabackwards").ifPresent(mod -> MappingDataLoader.enableMappingsCache()); - - ((ViaManagerImpl) Via.getManager()).init(); + ViaManagerImpl manager = (ViaManagerImpl) Via.getManager(); + manager.init(); Via.getManager().getProtocolManager().registerBaseProtocol(HostnameParserProtocol.INSTANCE, Range.lessThan(Integer.MIN_VALUE)); ProtocolVersion.register(-2, "AUTO"); @@ -83,6 +81,8 @@ public class ViaFabric implements ModInitializer { config = new VFConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric") .resolve("viafabric.yml").toFile()); + manager.onServerLoaded(); + INIT_FUTURE.complete(null); } diff --git a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java index 61de231..8d43147 100644 --- a/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java +++ b/viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/ViaFabric.java @@ -14,7 +14,6 @@ import com.viaversion.fabric.mc117.platform.FabricPlatform; import com.viaversion.fabric.mc117.platform.VFLoader; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.data.MappingDataLoader; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.DefaultEventLoop; import io.netty.channel.EventLoop; @@ -69,9 +68,8 @@ public class ViaFabric implements ModInitializer { platform.init(); - FabricLoader.getInstance().getModContainer("viabackwards").ifPresent(mod -> MappingDataLoader.enableMappingsCache()); - - ((ViaManagerImpl) Via.getManager()).init(); + ViaManagerImpl manager = (ViaManagerImpl) Via.getManager(); + manager.init(); Via.getManager().getProtocolManager().registerBaseProtocol(HostnameParserProtocol.INSTANCE, Range.lessThan(Integer.MIN_VALUE)); ProtocolVersion.register(-2, "AUTO"); @@ -83,6 +81,8 @@ public class ViaFabric implements ModInitializer { config = new VFConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric") .resolve("viafabric.yml").toFile()); + manager.onServerLoaded(); + INIT_FUTURE.complete(null); } diff --git a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java index 4a76912..6c2f0fb 100644 --- a/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java +++ b/viafabric-mc118/src/main/java/com/viaversion/fabric/mc118/ViaFabric.java @@ -14,7 +14,6 @@ import com.viaversion.fabric.mc118.platform.FabricPlatform; import com.viaversion.fabric.mc118.platform.VFLoader; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.data.MappingDataLoader; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.DefaultEventLoop; import io.netty.channel.EventLoop; @@ -69,9 +68,8 @@ public class ViaFabric implements ModInitializer { platform.init(); - FabricLoader.getInstance().getModContainer("viabackwards").ifPresent(mod -> MappingDataLoader.enableMappingsCache()); - - ((ViaManagerImpl) Via.getManager()).init(); + ViaManagerImpl manager = (ViaManagerImpl) Via.getManager(); + manager.init(); Via.getManager().getProtocolManager().registerBaseProtocol(HostnameParserProtocol.INSTANCE, Range.lessThan(Integer.MIN_VALUE)); ProtocolVersion.register(-2, "AUTO"); @@ -83,6 +81,8 @@ public class ViaFabric implements ModInitializer { config = new VFConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric") .resolve("viafabric.yml").toFile()); + manager.onServerLoaded(); + INIT_FUTURE.complete(null); } diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java index 605f665..e7a1d2f 100644 --- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java +++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/ViaFabric.java @@ -14,7 +14,6 @@ import com.viaversion.fabric.mc119.platform.FabricPlatform; import com.viaversion.fabric.mc119.platform.VFLoader; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.data.MappingDataLoader; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.DefaultEventLoop; import io.netty.channel.EventLoop; @@ -69,9 +68,8 @@ public class ViaFabric implements ModInitializer { platform.init(); - FabricLoader.getInstance().getModContainer("viabackwards").ifPresent(mod -> MappingDataLoader.enableMappingsCache()); - - ((ViaManagerImpl) Via.getManager()).init(); + ViaManagerImpl manager = (ViaManagerImpl) Via.getManager(); + manager.init(); Via.getManager().getProtocolManager().registerBaseProtocol(HostnameParserProtocol.INSTANCE, Range.lessThan(Integer.MIN_VALUE)); ProtocolVersion.register(-2, "AUTO"); @@ -83,6 +81,8 @@ public class ViaFabric implements ModInitializer { config = new VFConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric") .resolve("viafabric.yml").toFile()); + manager.onServerLoaded(); + INIT_FUTURE.complete(null); } diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java index b5b445b..8b48d20 100644 --- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java +++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/ViaFabric.java @@ -12,7 +12,6 @@ import com.viaversion.fabric.mc18.platform.FabricPlatform; import com.viaversion.fabric.mc18.platform.VFLoader; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.data.MappingDataLoader; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.channel.EventLoop; import io.netty.channel.local.LocalEventLoopGroup; @@ -53,9 +52,8 @@ public class ViaFabric implements ModInitializer { platform.init(); - FabricLoader.getInstance().getModContainer("viabackwards").ifPresent(mod -> MappingDataLoader.enableMappingsCache()); - - ((ViaManagerImpl) Via.getManager()).init(); + ViaManagerImpl manager = (ViaManagerImpl) Via.getManager(); + manager.init(); Via.getManager().getProtocolManager().registerBaseProtocol(HostnameParserProtocol.INSTANCE, Range.lessThan(Integer.MIN_VALUE)); ProtocolVersion.register(-2, "AUTO"); @@ -67,6 +65,8 @@ public class ViaFabric implements ModInitializer { config = new VFConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric") .resolve("viafabric.yml").toFile()); + manager.onServerLoaded(); + INIT_FUTURE.complete(null); }