diff options
| author | Luck <git@lucko.me> | 2023-09-22 20:40:50 +0100 |
|---|---|---|
| committer | Luck <git@lucko.me> | 2023-09-22 20:40:50 +0100 |
| commit | 74a7011aa5f82f3b60099fe02e7dce499d0bdf26 (patch) | |
| tree | 6e74ce0e9a63e3c39d085b4a0142d3517bbc8574 /spark-forge | |
| parent | 8c253aec4db3450dc640c4b66f74f9c8908514fa (diff) | |
| download | spark-74a7011aa5f82f3b60099fe02e7dce499d0bdf26.tar.gz spark-74a7011aa5f82f3b60099fe02e7dce499d0bdf26.tar.bz2 spark-74a7011aa5f82f3b60099fe02e7dce499d0bdf26.zip | |
Update Forge/Fabric to 1.20.2
Diffstat (limited to 'spark-forge')
| -rw-r--r-- | spark-forge/build.gradle | 4 | ||||
| -rw-r--r-- | spark-forge/src/main/java/me/lucko/spark/forge/ForgePlayerPingProvider.java | 2 | ||||
| -rw-r--r-- | spark-forge/src/main/java/me/lucko/spark/forge/ForgeSparkMod.java | 4 |
3 files changed, 4 insertions, 6 deletions
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() { |
