Update Fabric/NeoForge to MC 1.20.6

lucko · Apr 29, 2024 · 660c10e · 660c10e
1 parent 8af5bc5
commit 660c10e
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 100 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ subprojects {
         pluginDescription = 'spark is a performance profiling plugin/mod for Minecraft clients, servers and proxies.'
     }
 
-    tasks.withType(JavaCompile) {
+    tasks.withType(JavaCompile).configureEach {
         options.encoding = 'UTF-8'
         options.release = 8
     }

diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,6 @@
 pluginManagement {
     repositories {
+        gradlePluginPortal()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
@@ -12,7 +13,6 @@ pluginManagement {
             name = 'NeoForge'
             url = 'https://maven.neoforged.net/releases'
         }
-        gradlePluginPortal()
     }
 }
 

diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 dependencies {

diff --git a/spark-bungeecord/build.gradle b/spark-bungeecord/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 dependencies {

diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
@@ -2,7 +2,7 @@ import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
     id 'fabric-loom' version '1.6-SNAPSHOT'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 tasks.withType(JavaCompile) {
@@ -28,8 +28,8 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:1.20.5'
-    mappings 'net.fabricmc:yarn:1.20.5+build.1:v2'
+    minecraft 'com.mojang:minecraft:1.20.6'
+    mappings 'net.fabricmc:yarn:1.20.6+build.1:v2'
     modImplementation 'net.fabricmc:fabric-loader:0.15.10'
 
     Set<String> apiModules = [
@@ -40,7 +40,7 @@ dependencies {
 
     // Add each module as a dependency
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.97.5+1.20.5'))
+        modImplementation(fabricApi.module(it, '0.97.8+1.20.6'))
     }
 
     include(modImplementation('me.lucko:fabric-permissions-api:0.3.1'))

diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
 }
 

diff --git a/spark-minestom/build.gradle b/spark-minestom/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 tasks.withType(JavaCompile) {

diff --git a/spark-neoforge/build.gradle b/spark-neoforge/build.gradle
@@ -1,13 +1,17 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
-    id 'net.neoforged.gradle.userdev' version '7.0.97'
+    id 'io.github.goooler.shadow' version '8.1.7'
+    id 'net.neoforged.gradle.userdev' version '7.0.105'
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+tasks.withType(JavaCompile).configureEach {
+    // override, compile targeting J21
+    options.release = 21
+}
 
-tasks.withType(JavaCompile) {
-    // override, compile targeting J17
-    options.release = 17
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
 minecraft {
@@ -22,21 +26,21 @@ configurations {
 }
 
 dependencies {
-    implementation "net.neoforged:neoforge:20.4.223"
+    implementation "net.neoforged:neoforge:20.6.1-beta"
     shade project(':spark-common')
 }
 
 processResources {
     from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
+        include 'META-INF/neoforge.mods.toml'
         expand (
                 'pluginVersion': project.pluginVersion,
                 'pluginDescription': project.pluginDescription
         )
     }
 
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
+        exclude 'META-INF/neoforge.mods.toml'
     }
 }
 

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
@@ -25,6 +25,7 @@
 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 UUID getUniqueId() {
 
     @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
@@ -49,8 +49,6 @@ public NeoForgeSparkMod(IEventBus eventBus) {
         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
@@ -23,51 +23,35 @@
 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
@@ -23,40 +23,11 @@
 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 void close() {
         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
@@ -46,7 +46,6 @@
 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 ThreadDumper getDefaultThreadDumper() {
 
     @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
@@ -52,7 +52,6 @@
 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 ThreadDumper getDefaultThreadDumper() {
 
     @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/...rge/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...rge/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/spark-nukkit/build.gradle b/spark-nukkit/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 dependencies {

diff --git a/spark-sponge7/build.gradle b/spark-sponge7/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'net.kyori.blossom' version '1.3.0'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 dependencies {

diff --git a/spark-sponge8/build.gradle b/spark-sponge8/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 dependencies {

diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'net.kyori.blossom' version '1.3.0'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 dependencies {

diff --git a/spark-velocity4/build.gradle b/spark-velocity4/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'net.kyori.blossom' version '1.3.0'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 tasks.withType(JavaCompile) {

diff --git a/spark-waterdog/build.gradle b/spark-waterdog/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.7'
 }
 
 tasks.withType(JavaCompile) {