fix

Author: Coloryr

client

@@ -1,6 +1,7 @@
 package com.coloryr.allmusic.server.mixin;
 
 import com.coloryr.allmusic.server.core.AllMusic;
+import com.coloryr.allmusic.server.core.music.PlayMusic;
 import net.minecraft.network.Connection;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.PlayerList;
@@ -13,7 +14,7 @@
 public class ServerPlayerMixin {
     @Inject(at = @At("HEAD"), method = "remove")
     private void remove(ServerPlayer entity, CallbackInfo info) {
-        AllMusic.removeNowPlayPlayer(entity.getName().getString());
+        PlayMusic.removeNowPlayPlayer(entity.getName().getString());
     }
 
     @Inject(at = @At("TAIL"), method = "placeNewPlayer")

fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java

@@ -1,6 +1,7 @@
 package com.coloryr.allmusic.server.mixin;
 
 import com.coloryr.allmusic.server.core.AllMusic;
+import com.coloryr.allmusic.server.core.music.PlayMusic;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -13,7 +14,7 @@
 public class ServerPlayerMixin {
     @Inject(at = @At("HEAD"), method = "remove")
     private void remove(ServerPlayerEntity entity, CallbackInfo info) {
-        AllMusic.removeNowPlayPlayer(entity.getName().getString());
+        PlayMusic.removeNowPlayPlayer(entity.getName().getString());
     }
 
     @Inject(at = @At("TAIL"), method = "onPlayerConnect")

fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java

@@ -1,6 +1,7 @@
 package com.coloryr.allmusic.server.mixin;
 
 import com.coloryr.allmusic.server.core.AllMusic;
+import com.coloryr.allmusic.server.core.music.PlayMusic;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ConnectedClientData;
@@ -14,7 +15,7 @@
 public class ServerPlayerMixin {
     @Inject(at = @At("HEAD"), method = "remove")
     private void remove(ServerPlayerEntity entity, CallbackInfo info) {
-        AllMusic.removeNowPlayPlayer(entity.getName().getString());
+        PlayMusic.removeNowPlayPlayer(entity.getName().getString());
     }
 
     @Inject(at = @At("TAIL"), method = "onPlayerConnect")

fabric_1_21/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java

@@ -1,6 +1,7 @@
 package com.coloryr.allmusic.server.mixin;
 
 import com.coloryr.allmusic.server.core.AllMusic;
+import com.coloryr.allmusic.server.core.music.PlayMusic;
 import net.minecraft.network.Connection;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.CommonListenerCookie;
@@ -14,7 +15,7 @@
 public class ServerPlayerMixin {
     @Inject(at = @At("HEAD"), method = "remove")
     private void remove(ServerPlayer entity, CallbackInfo info) {
-        AllMusic.removeNowPlayPlayer(entity.getName().getString());
+        PlayMusic.removeNowPlayPlayer(entity.getName().getString());
     }
 
     @Inject(at = @At("TAIL"), method = "placeNewPlayer")

fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java

@@ -1,6 +1,7 @@
 package com.coloryr.allmusic.server.mixin;
 
 import com.coloryr.allmusic.server.core.AllMusic;
+import com.coloryr.allmusic.server.core.music.PlayMusic;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ConnectedClientData;
@@ -14,7 +15,7 @@
 public class ServerPlayerMixin {
     @Inject(at = @At("HEAD"), method = "remove")
     private void remove(ServerPlayerEntity entity, CallbackInfo info) {
-        AllMusic.removeNowPlayPlayer(entity.getName().getString());
+        PlayMusic.removeNowPlayPlayer(entity.getName().getString());
     }
 
     @Inject(at = @At("TAIL"), method = "onPlayerConnect")

fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java

@@ -35,10 +35,14 @@ dependencies {
 	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-	include implementation('com.squareup.okio:okio-jvm:3.16.4')
-	include implementation('com.squareup.okhttp3:okhttp:5.3.2')
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+
+	include implementation('net.kyori:adventure-text-minimessage:4.26.1')
+	include implementation('net.kyori:adventure-api:4.26.1')
+	include implementation('net.kyori:adventure-key:4.26.1')
+	include implementation('org.apache.httpcomponents.client5:httpclient5:5.6')
+	include implementation('org.apache.httpcomponents.core5:httpcore5:5.4')
+	include implementation('org.apache.httpcomponents.core5:httpcore5-h2:5.4')
 	include implementation('org.xerial:sqlite-jdbc:3.51.1.0')
 }
 

fabric_26_1/build.gradle

@@ -4,13 +4,13 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=26.1-snapshot-1
-loader_version=0.18.3
-loom_version=1.14-SNAPSHOT
+minecraft_version=26.1
+loader_version=0.18.5
+loom_version=1.15-SNAPSHOT
 
 # Mod Properties
 maven_group = com.coloryr.allmusic.server
 archives_base_name =[fabric-26.1]AllMusic_Server
 
 # Dependencies
-fabric_version=0.140.2+26.1
+fabric_api_version=0.144.3+26.1

fabric_26_1/gradle.properties

@@ -1,41 +1,29 @@
 package com.coloryr.allmusic.server;
 
 import com.coloryr.allmusic.server.core.AllMusic;
-import net.fabricmc.api.ModInitializer;
+import net.fabricmc.api.DedicatedServerModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
-public class AllMusicFabric implements ModInitializer {
-    public static MinecraftServer server;
-    public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server");
-
-    public static final Identifier ID = Identifier.fromNamespaceAndPath("allmusic", "channel");
-
+public class AllMusicServer implements DedicatedServerModInitializer {
     public static final String dir = "allmusic_server/";
+    public static MinecraftServer server;
 
     @Override
-    public void onInitialize() {
+    public void onInitializeServer() {
         AllMusic.log = new LogFabric();
         AllMusic.side = new SideFabric();
 
-        new AllMusic().init(new File(dir));
-
         CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment)
                 -> CommandFabric.instance.register(dispatcher));
 
-        PayloadTypeRegistry.playS2C().register(PackPayload.ID, PackPayload.CODEC);
         ServerLifecycleEvents.SERVER_STARTED.register((a) -> {
             server = a;
-
+            AllMusic.init(new File(dir));
             AllMusic.start();
-
             Tasks.init();
         });