diff options
5 files changed, 10 insertions, 12 deletions
diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle index 792f147..97b257d 100644 --- a/spark-fabric/build.gradle +++ b/spark-fabric/build.gradle @@ -1,7 +1,7 @@ import net.fabricmc.loom.task.RemapJarTask plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.3-SNAPSHOT' id 'com.github.johnrengelman.shadow' version '8.1.1' } @@ -28,9 +28,9 @@ configurations { dependencies { // https://modmuss50.me/fabric.html - minecraft 'com.mojang:minecraft:1.20.1' - mappings 'net.fabricmc:yarn:1.20.1+build.2:v2' - modImplementation 'net.fabricmc:fabric-loader:0.14.21' + minecraft 'com.mojang:minecraft:1.20.2' + mappings 'net.fabricmc:yarn:1.20.2+build.1:v2' + modImplementation 'net.fabricmc:fabric-loader:0.14.22' Set<String> apiModules = [ "fabric-api-base", @@ -40,7 +40,7 @@ dependencies { // Add each module as a dependency apiModules.forEach { - modImplementation(fabricApi.module(it, '0.83.1+1.20.1')) + modImplementation(fabricApi.module(it, '0.89.1+1.20.2')) } include(modImplementation('me.lucko:fabric-permissions-api:0.1-SNAPSHOT')) diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricPlayerPingProvider.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricPlayerPingProvider.java index bae6c41..fefe284 100644 --- a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricPlayerPingProvider.java +++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricPlayerPingProvider.java @@ -40,7 +40,7 @@ public class FabricPlayerPingProvider implements PlayerPingProvider { public Map<String, Integer> poll() { ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder(); for (ServerPlayerEntity player : this.server.getPlayerManager().getPlayerList()) { - builder.put(player.getGameProfile().getName(), player.pingMilliseconds); + builder.put(player.getGameProfile().getName(), player.networkHandler.getLatency()); } return builder.build(); } diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle index 76e5054..120def3 100644 --- a/spark-forge/build.gradle +++ b/spark-forge/build.gradle @@ -9,7 +9,7 @@ tasks.withType(JavaCompile) { } minecraft { - mappings channel: 'official', version: '1.20.1' + mappings channel: 'official', version: '1.20.2' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') } @@ -19,7 +19,7 @@ configurations { } dependencies { - minecraft 'net.minecraftforge:forge:1.20.1-47.0.1' + minecraft 'net.minecraftforge:forge:1.20.2-48.0.1' shade project(':spark-common') } diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgePlayerPingProvider.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgePlayerPingProvider.java index f31cc5b..bb2cfc6 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgePlayerPingProvider.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgePlayerPingProvider.java @@ -40,7 +40,7 @@ public class ForgePlayerPingProvider implements PlayerPingProvider { public Map<String, Integer> poll() { ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder(); for (ServerPlayer player : this.server.getPlayerList().getPlayers()) { - builder.put(player.getGameProfile().getName(), player.latency); + builder.put(player.getGameProfile().getName(), player.connection.latency()); } return builder.build(); } diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkMod.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkMod.java index 3321d12..4462588 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkMod.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkMod.java @@ -22,7 +22,6 @@ package me.lucko.spark.forge; import me.lucko.spark.forge.plugin.ForgeClientSparkPlugin; import me.lucko.spark.forge.plugin.ForgeServerSparkPlugin; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.server.ServerAboutToStartEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -34,7 +33,6 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.loading.FMLPaths; -import net.minecraftforge.network.NetworkConstants; import java.nio.file.Path; @@ -49,7 +47,7 @@ public class ForgeSparkMod { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientInit); MinecraftForge.EVENT_BUS.register(this); - ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true)); + ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (a, b) -> true)); } public String getVersion() { |