From 660c10e17c09f498ff44326834255bebb3e15b5f Mon Sep 17 00:00:00 2001 From: Luck Date: Mon, 29 Apr 2024 20:02:00 +0100 Subject: Update Fabric/NeoForge to MC 1.20.6 --- .../spark/neoforge/NeoForgeCommandSender.java | 3 +- .../me/lucko/spark/neoforge/NeoForgeSparkMod.java | 2 - .../me/lucko/spark/neoforge/NeoForgeTickHook.java | 52 +++++++----------- .../lucko/spark/neoforge/NeoForgeTickReporter.java | 61 ++++++++++------------ .../neoforge/plugin/NeoForgeClientSparkPlugin.java | 5 +- .../neoforge/plugin/NeoForgeServerSparkPlugin.java | 5 +- .../src/main/resources/META-INF/mods.toml | 20 ------- .../src/main/resources/META-INF/neoforge.mods.toml | 20 +++++++ 8 files changed, 73 insertions(+), 95 deletions(-) delete mode 100644 spark-neoforge/src/main/resources/META-INF/mods.toml create mode 100644 spark-neoforge/src/main/resources/META-INF/neoforge.mods.toml (limited to 'spark-neoforge/src') diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeCommandSender.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeCommandSender.java index 2f6a411..8cc9788 100644 --- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeCommandSender.java +++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeCommandSender.java @@ -25,6 +25,7 @@ import me.lucko.spark.neoforge.plugin.NeoForgeSparkPlugin; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.minecraft.commands.CommandSource; +import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component.Serializer; import net.minecraft.network.chat.MutableComponent; import net.minecraft.server.MinecraftServer; @@ -65,7 +66,7 @@ public class NeoForgeCommandSender extends AbstractCommandSender @Override public void sendMessage(Component message) { - MutableComponent component = Serializer.fromJson(GsonComponentSerializer.gson().serializeToTree(message)); + MutableComponent component = Serializer.fromJson(GsonComponentSerializer.gson().serializeToTree(message), RegistryAccess.EMPTY); Objects.requireNonNull(component, "component"); super.delegate.sendSystemMessage(component); } diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeSparkMod.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeSparkMod.java index 16c19ec..1a03831 100644 --- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeSparkMod.java +++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeSparkMod.java @@ -49,8 +49,6 @@ public class NeoForgeSparkMod { eventBus.addListener(this::setup); eventBus.addListener(this::clientInit); NeoForge.EVENT_BUS.register(this); - - ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (a, b) -> true)); } public String getVersion() { diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeTickHook.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeTickHook.java index 84e1aff..987c42d 100644 --- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeTickHook.java +++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeTickHook.java @@ -23,51 +23,35 @@ package me.lucko.spark.neoforge; import me.lucko.spark.common.tick.AbstractTickHook; import me.lucko.spark.common.tick.TickHook; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.neoforge.client.event.ClientTickEvent; import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.TickEvent; +import net.neoforged.neoforge.event.tick.ServerTickEvent; -public class NeoForgeTickHook extends AbstractTickHook implements TickHook { - private final TickEvent.Type type; - - public NeoForgeTickHook(TickEvent.Type type) { - this.type = type; +public abstract class NeoForgeTickHook extends AbstractTickHook implements TickHook { + @Override + public void start() { + NeoForge.EVENT_BUS.register(this); } - @SubscribeEvent - public void onTick(TickEvent.ServerTickEvent e) { - if (e.phase != TickEvent.Phase.START) { - return; - } - - if (e.type != this.type) { - return; - } - - onTick(); + @Override + public void close() { + NeoForge.EVENT_BUS.unregister(this); } - @SubscribeEvent - public void onTick(TickEvent.ClientTickEvent e) { - if (e.phase != TickEvent.Phase.START) { - return; - } + public static final class Server extends NeoForgeTickHook { - if (e.type != this.type) { - return; + @SubscribeEvent + public void onTickStart(ServerTickEvent.Pre e) { + onTick(); } - - onTick(); } + public static final class Client extends NeoForgeTickHook { - @Override - public void start() { - NeoForge.EVENT_BUS.register(this); - } - - @Override - public void close() { - NeoForge.EVENT_BUS.unregister(this); + @SubscribeEvent + public void onTickStart(ClientTickEvent.Pre e) { + onTick(); + } } } diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeTickReporter.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeTickReporter.java index be61d3e..7d289fb 100644 --- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeTickReporter.java +++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeTickReporter.java @@ -23,40 +23,11 @@ package me.lucko.spark.neoforge; import me.lucko.spark.common.tick.SimpleTickReporter; import me.lucko.spark.common.tick.TickReporter; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.neoforge.client.event.ClientTickEvent; import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.TickEvent; +import net.neoforged.neoforge.event.tick.ServerTickEvent; -public class NeoForgeTickReporter extends SimpleTickReporter implements TickReporter { - private final TickEvent.Type type; - - public NeoForgeTickReporter(TickEvent.Type type) { - this.type = type; - } - - @SubscribeEvent - public void onTick(TickEvent.ServerTickEvent e) { - if (e.type != this.type) { - return; - } - - switch (e.phase) { - case START -> onStart(); - case END -> onEnd(); - default -> throw new AssertionError(e.phase); - } - } - @SubscribeEvent - public void onTick(TickEvent.ClientTickEvent e) { - if (e.type != this.type) { - return; - } - - switch (e.phase) { - case START -> onStart(); - case END -> onEnd(); - default -> throw new AssertionError(e.phase); - } - } +public abstract class NeoForgeTickReporter extends SimpleTickReporter implements TickReporter { @Override public void start() { @@ -69,4 +40,30 @@ public class NeoForgeTickReporter extends SimpleTickReporter implements TickRepo super.close(); } + public static final class Server extends NeoForgeTickReporter { + + @SubscribeEvent + public void onTickStart(ServerTickEvent.Pre e) { + onStart(); + } + + @SubscribeEvent + public void onTickEnd(ServerTickEvent.Post e) { + onEnd(); + } + } + + public static final class Client extends NeoForgeTickReporter { + + @SubscribeEvent + public void onTickStart(ClientTickEvent.Pre e) { + onStart(); + } + + @SubscribeEvent + public void onTickEnd(ClientTickEvent.Post e) { + onEnd(); + } + } + } diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeClientSparkPlugin.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeClientSparkPlugin.java index 92bd656..afc718d 100644 --- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeClientSparkPlugin.java +++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeClientSparkPlugin.java @@ -46,7 +46,6 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.neoforge.client.event.RegisterClientCommandsEvent; import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.TickEvent; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; @@ -123,12 +122,12 @@ public class NeoForgeClientSparkPlugin extends NeoForgeSparkPlugin implements Co @Override public TickHook createTickHook() { - return new NeoForgeTickHook(TickEvent.Type.CLIENT); + return new NeoForgeTickHook.Client(); } @Override public TickReporter createTickReporter() { - return new NeoForgeTickReporter(TickEvent.Type.CLIENT); + return new NeoForgeTickReporter.Client(); } @Override diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeServerSparkPlugin.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeServerSparkPlugin.java index 94522c1..28b6c26 100644 --- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeServerSparkPlugin.java +++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeServerSparkPlugin.java @@ -52,7 +52,6 @@ import net.minecraft.server.level.ServerPlayer; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.RegisterCommandsEvent; -import net.neoforged.neoforge.event.TickEvent; import net.neoforged.neoforge.event.server.ServerAboutToStartEvent; import net.neoforged.neoforge.event.server.ServerStoppingEvent; import net.neoforged.neoforge.server.permission.PermissionAPI; @@ -226,12 +225,12 @@ public class NeoForgeServerSparkPlugin extends NeoForgeSparkPlugin implements Co @Override public TickHook createTickHook() { - return new NeoForgeTickHook(TickEvent.Type.SERVER); + return new NeoForgeTickHook.Server(); } @Override public TickReporter createTickReporter() { - return new NeoForgeTickReporter(TickEvent.Type.SERVER); + return new NeoForgeTickReporter.Server(); } @Override diff --git a/spark-neoforge/src/main/resources/META-INF/mods.toml b/spark-neoforge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index f44574d..0000000 --- a/spark-neoforge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,20 +0,0 @@ -modLoader="javafml" -loaderVersion="[2,)" -authors="Luck" -license="GPLv3" - -[[mods]] -modId="spark" -displayName="spark" -version="${pluginVersion}" -description="${pluginDescription}" - -[[accessTransformers]] -file="META-INF/accesstransformer.cfg" - -[[dependencies.spark]] -modId = "neoforge" -mandatory=true -versionRange = "[20,)" -ordering = "NONE" -side = "BOTH" \ No newline at end of file diff --git a/spark-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/spark-neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..f44574d --- /dev/null +++ b/spark-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,20 @@ +modLoader="javafml" +loaderVersion="[2,)" +authors="Luck" +license="GPLv3" + +[[mods]] +modId="spark" +displayName="spark" +version="${pluginVersion}" +description="${pluginDescription}" + +[[accessTransformers]] +file="META-INF/accesstransformer.cfg" + +[[dependencies.spark]] +modId = "neoforge" +mandatory=true +versionRange = "[20,)" +ordering = "NONE" +side = "BOTH" \ No newline at end of file -- cgit