Add shared module for Fabric, NeoForge and Forge

Author: lucko

build.gradle

@@ -1,5 +1,7 @@
 plugins {
     id 'org.cadixdev.licenser' version '0.6.1' apply false
+    id 'com.gradleup.shadow' version '8.3.8' apply false
+    id 'fabric-loom' version '1.11-SNAPSHOT' apply false
 }
 
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat

settings.gradle

@@ -28,6 +28,7 @@ include (
         'spark-common',
         'spark-fabric',
         'spark-forge',
+        'spark-minecraft',
         'spark-neoforge',
         'spark-paper',
         'spark-sponge',

spark-bukkit/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.gradleup.shadow' version '8.3.8'
+    id 'com.gradleup.shadow'
 }
 
 java {

spark-bungeecord/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.gradleup.shadow' version '8.3.8'
+    id 'com.gradleup.shadow'
 }
 
 dependencies {

spark-fabric/build.gradle

@@ -1,8 +1,8 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id 'fabric-loom' version '1.11-SNAPSHOT'
-    id 'com.gradleup.shadow' version '8.3.8'
+    id 'fabric-loom'
+    id 'com.gradleup.shadow'
 }
 
 tasks.withType(JavaCompile) {
@@ -29,7 +29,7 @@ configurations {
 dependencies {
     // https://modmuss50.me/fabric.html
     minecraft 'com.mojang:minecraft:1.21.10'
-    mappings 'net.fabricmc:yarn:1.21.10+build.2:v2'
+    mappings loom.officialMojangMappings()
     modImplementation 'net.fabricmc:fabric-loader:0.17.3'
 
     Set<String> apiModules = [
@@ -48,6 +48,7 @@ dependencies {
     modImplementation('eu.pb4:placeholder-api:2.8.0+1.21.9')
 
     shade project(':spark-common')
+    shade project(':spark-minecraft')
 }
 
 processResources {

spark-fabric/src/main/java/me/lucko/spark/fabric/FabricClientCommandSender.java

@@ -26,10 +26,9 @@
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import net.minecraft.client.network.ClientCommandSource;
-import net.minecraft.registry.DynamicRegistryManager;
-import net.minecraft.text.Text;
-import net.minecraft.text.TextCodecs;
+import net.minecraft.client.multiplayer.ClientSuggestionProvider;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.network.chat.ComponentSerialization;
 
 import java.util.UUID;
 
@@ -38,7 +37,7 @@ public FabricClientCommandSender(FabricClientCommandSource commandSource) {
         super(commandSource);
     }
 
-    public FabricClientCommandSender(ClientCommandSource commandSource) {
+    public FabricClientCommandSender(ClientSuggestionProvider commandSource) {
         this((FabricClientCommandSource) commandSource);
     }
 
@@ -49,13 +48,13 @@ public String getName() {
 
     @Override
     public UUID getUniqueId() {
-        return this.delegate.getPlayer().getUuid();
+        return this.delegate.getPlayer().getUUID();
     }
 
     @Override
     public void sendMessage(Component message) {
-        Text component = TextCodecs.CODEC.decode(
-                DynamicRegistryManager.EMPTY.getOps(JsonOps.INSTANCE),
+        net.minecraft.network.chat.Component component = ComponentSerialization.CODEC.decode(
+                RegistryAccess.EMPTY.createSerializationContext(JsonOps.INSTANCE),
                 GsonComponentSerializer.gson().serializeToTree(message)
         ).getOrThrow(JsonParseException::new).getFirst();
         this.delegate.sendFeedback(component);

spark-fabric/src/main/java/me/lucko/spark/fabric/FabricPlayerPingProvider.java

@@ -20,76 +20,29 @@
 
 package me.lucko.spark.fabric;
 
-import com.google.gson.JsonParseException;
-import com.mojang.serialization.JsonOps;
 import me.lucko.fabric.api.permissions.v0.Permissions;
-import me.lucko.spark.common.command.sender.AbstractCommandSender;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import net.minecraft.entity.Entity;
-import net.minecraft.registry.DynamicRegistryManager;
+import me.lucko.spark.minecraft.sender.MinecraftServerCommandSender;
+import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
-import net.minecraft.text.TextCodecs;
+import net.minecraft.server.level.ServerPlayer;
 
-import java.util.UUID;
-
-public class FabricServerCommandSender extends AbstractCommandSender<ServerCommandSource> {
-    public FabricServerCommandSender(ServerCommandSource commandSource) {
+public class FabricServerCommandSender extends MinecraftServerCommandSender {
+    public FabricServerCommandSender(CommandSourceStack commandSource) {
         super(commandSource);
     }
 
-    @Override
-    public String getName() {
-        String name = this.delegate.getName();
-        if (this.delegate.getEntity() != null && name.equals("Server")) {
-            return "Console";
-        }
-        return name;
-    }
-
-    @Override
-    public UUID getUniqueId() {
-        Entity entity = this.delegate.getEntity();
-        return entity != null ? entity.getUuid() : null;
-    }
-
-    @Override
-    public void sendMessage(Component message) {
-        Text component = TextCodecs.CODEC.decode(
-                DynamicRegistryManager.EMPTY.getOps(JsonOps.INSTANCE),
-                GsonComponentSerializer.gson().serializeToTree(message)
-        ).getOrThrow(JsonParseException::new).getFirst();
-        this.delegate.sendMessage(component);
-    }
-
     @Override
     public boolean hasPermission(String permission) {
         return Permissions.getPermissionValue(this.delegate, permission).orElseGet(() -> {
-            ServerPlayerEntity player = this.delegate.getPlayer();
+            ServerPlayer player = this.delegate.getPlayer();
             MinecraftServer server = this.delegate.getServer();
             if (player != null) {
-                if (server != null && server.isHost(player.getPlayerConfigEntry())) {
+                if (server != null && server.isSingleplayerOwner(player.nameAndId())) {
                     return true;
                 }
-                return player.hasPermissionLevel(4);
+                return player.hasPermissions(4);
             }
             return true;
         });
     }
-
-    @Override
-    protected Object getObjectForComparison() {
-        UUID uniqueId = getUniqueId();
-        if (uniqueId != null) {
-            return uniqueId;
-        }
-        Entity entity = this.delegate.getEntity();
-        if (entity != null) {
-            return entity;
-        }
-        return getName();
-    }
 }

spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerCommandSender.java

@@ -23,21 +23,22 @@
 import com.mojang.brigadier.CommandDispatcher;
 import me.lucko.spark.fabric.plugin.FabricClientSparkPlugin;
 import me.lucko.spark.fabric.plugin.FabricServerSparkPlugin;
+import me.lucko.spark.minecraft.SparkMinecraftMod;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.command.CommandRegistryAccess;
+import net.minecraft.client.Minecraft;
+import net.minecraft.commands.CommandBuildContext;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands.CommandSelection;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.command.CommandManager.RegistrationEnvironment;
-import net.minecraft.server.command.ServerCommandSource;
 
 import java.nio.file.Path;
 import java.util.Objects;
 
-public class FabricSparkMod implements ModInitializer {
+public class FabricSparkMod implements ModInitializer, SparkMinecraftMod {
     private static FabricSparkMod mod;
 
     private ModContainer container;
@@ -63,12 +64,12 @@ public void onInitialize() {
     // client (called by entrypoint defined in fabric.mod.json)
     public static void initializeClient() {
         Objects.requireNonNull(FabricSparkMod.mod, "mod");
-        FabricClientSparkPlugin.register(FabricSparkMod.mod, MinecraftClient.getInstance());
+        FabricClientSparkPlugin.init(FabricSparkMod.mod, Minecraft.getInstance());
     }
 
     // server
     public void initializeServer(MinecraftServer server) {
-        this.activeServerPlugin = FabricServerSparkPlugin.register(this, server);
+        this.activeServerPlugin = FabricServerSparkPlugin.init(this, server);
     }
 
     public void onServerStopping(MinecraftServer stoppingServer) {
@@ -78,16 +79,18 @@ public void onServerStopping(MinecraftServer stoppingServer) {
         }
     }
 
-    public void onServerCommandRegister(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess access, RegistrationEnvironment env) {
+    public void onServerCommandRegister(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext ctx, CommandSelection env) {
         if (this.activeServerPlugin != null) {
             this.activeServerPlugin.registerCommands(dispatcher);
         }
     }
 
+    @Override
     public String getVersion() {
         return this.container.getMetadata().getVersion().getFriendlyString();
     }
 
+    @Override
     public Path getConfigDirectory() {
         if (this.configDirectory == null) {
             throw new IllegalStateException("Config directory not set");