Fixed Fabric BUT MULTIPLAYER PACKETS ARE BROKEN

MeAlam1 · MeAlam1 · commit 2c1c373ea8ff · 2026-01-01T22:59:44.000+01:00
diff --git a/changelog.md b/changelog.md
@@ -2,4 +2,9 @@
 
 ## Changed
 
-* Massive cleanup in the way we register Codecs and Data ComponentTypes.
+* Massive cleanup in the way we register Codecs and Data ComponentTypes.
+
+## Bug Fixes
+
+* Fixed a critical issue where Fabric Server where enable to be started due to trying to load Client sided Code on the
+  Server.
diff --git a/common/src/main/java/software/bluelib/api/net/NetworkPacket.java b/common/src/main/java/software/bluelib/api/net/NetworkPacket.java
@@ -8,9 +8,11 @@
 package software.bluelib.api.net;
 
 import java.util.function.Predicate;
+
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
@@ -19,7 +21,7 @@
 import software.bluelib.api.utils.logging.BaseLogger;
 import software.bluelib.internal.BlueTranslation;
 
-@SuppressWarnings({ "unused" })
+@SuppressWarnings({"unused"})
 public interface NetworkPacket<T extends NetworkPacket<T>> extends CustomPacketPayload, Encodable {
 
 	@NotNull
@@ -35,22 +37,16 @@ default void sendToPlayers(@NotNull Iterable<ServerPlayer> pPlayers) {
 		}
 	}
 
-	default void sendToAllPlayers() {
-		NetworkRegistry.sendToAllPlayers(this);
+	default void sendToAllPlayers(@NotNull MinecraftServer pServer) {
+		NetworkRegistry.sendToAllPlayers(pServer, this);
 	}
 
 	default void sendToServer() {
 		NetworkRegistry.sendToServer(this);
 	}
 
-	default void sendToPlayersAround(@NotNull Double pX, @NotNull Double pY, @NotNull Double pZ, @NotNull Double pDistance, @NotNull ResourceKey<Level> pWorldKey, @NotNull Predicate<ServerPlayer> pExclusionCondition) {
-		var server = BlueLibConstants.PlatformHelper.PLATFORM.getServer();
-		if (server == null) {
-			BaseLogger.log(true, BaseLogLevel.ERROR, BlueTranslation.translate("server.null"));
-			return;
-		}
-
-		for (ServerPlayer player : server.getPlayerList().getPlayers()) {
+	default void sendToPlayersAround(@NotNull MinecraftServer pServer, @NotNull Double pX, @NotNull Double pY, @NotNull Double pZ, @NotNull Double pDistance, @NotNull ResourceKey<Level> pWorldKey, @NotNull Predicate<ServerPlayer> pExclusionCondition) {
+		for (ServerPlayer player : pServer.getPlayerList().getPlayers()) {
 			if (pExclusionCondition.test(player)) continue;
 			if (!player.level().dimension().equals(pWorldKey)) continue;
 
@@ -63,8 +59,8 @@ default void sendToPlayersAround(@NotNull Double pX, @NotNull Double pY, @NotNul
 		}
 	}
 
-	default void sendToPlayersAround(@NotNull Double pX, @NotNull Double pY, @NotNull Double pZ, @NotNull Double pDistance, @NotNull ResourceKey<Level> pWorldKey) {
-		sendToPlayersAround(pX, pY, pZ, pDistance, pWorldKey, player -> false);
+	default void sendToPlayersAround(@NotNull MinecraftServer pServer, @NotNull Double pX, @NotNull Double pY, @NotNull Double pZ, @NotNull Double pDistance, @NotNull ResourceKey<Level> pWorldKey) {
+		sendToPlayersAround(pServer, pX, pY, pZ, pDistance, pWorldKey, player -> false);
 	}
 
 	@Override
diff --git a/common/src/main/java/software/bluelib/api/net/NetworkRegistry.java b/common/src/main/java/software/bluelib/api/net/NetworkRegistry.java
@@ -9,6 +9,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
+import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
@@ -22,7 +24,7 @@
 import software.bluelib.internal.BlueTranslation;
 import software.bluelib.net.PacketRegisterInfo;
 
-@SuppressWarnings({ "unused" })
+@SuppressWarnings({"unused"})
 public class NetworkRegistry {
 
 	public static void sendPacket(@NotNull ServerPlayer pPlayer, @NotNull NetworkPacket<?> pPacket) {
@@ -37,13 +39,8 @@ public static void sendPacketToPlayer(@NotNull ServerPlayer pPlayer, @NotNull Ne
 		BlueLibConstants.PlatformHelper.REGISTRY.getNetwork().sendPacketToPlayer(pPlayer, pPacket);
 	}
 
-	public static void sendToAllPlayers(@NotNull NetworkPacket<?> pPacket) {
-		MinecraftServer server = BlueLibConstants.PlatformHelper.PLATFORM.getServer();
-		if (server == null) {
-			BaseLogger.log(true, BaseLogLevel.ERROR, BlueTranslation.translate("server.null"));
-			return;
-		}
-		sendPacketToPlayers(server.getPlayerList().getPlayers(), pPacket);
+	public static void sendToAllPlayers(@NotNull MinecraftServer pServer, @NotNull NetworkPacket<?> pPacket) {
+		sendPacketToPlayers(pServer.getPlayerList().getPlayers(), pPacket);
 	}
 
 	public static void sendPacketToPlayers(@NotNull Iterable<ServerPlayer> pPlayers, @NotNull NetworkPacket<?> pPacket) {
diff --git a/common/src/main/java/software/bluelib/commands/OpenLoggerScreenCommand.java b/common/src/main/java/software/bluelib/commands/OpenLoggerScreenCommand.java
@@ -31,6 +31,7 @@ private static int openLogScreen(@NotNull CommandContext<CommandSourceStack> pCo
 			pContext.getSource().sendFailure(BlueTranslation.translate("command.logger.no_player"));
 			return 0;
 		}
+		NetworkRegistry.sendPacketToPlayer(player, new OpenLoggerPacket());
 		if (player.hasPermissions(3)) {
 			NetworkRegistry.sendPacketToPlayer(player, new OpenLoggerPacket());
 		} else {
diff --git a/common/src/main/java/software/bluelib/config/LoggerConfig.java b/common/src/main/java/software/bluelib/config/LoggerConfig.java
@@ -15,5 +15,5 @@ public class LoggerConfig {
 	public static boolean isBlueLibLoggingEnabled = false;
 	public static boolean isLoggingEnabled = false;
 	@ApiStatus.Internal
-	public static final boolean isExampleEnabled = false;
+	public static final boolean isExampleEnabled = true;
 }
diff --git a/common/src/main/java/software/bluelib/platform/IPlatformHelper.java b/common/src/main/java/software/bluelib/platform/IPlatformHelper.java
@@ -48,7 +48,4 @@ default String getEnvironmentName() {
 
 	@NotNull
 	ModAPI getAPI();
-
-	@Nullable
-	MinecraftServer getServer();
 }
diff --git a/fabric/src/main/java/software/bluelib/platform/FabricPlatformClientHelper.java b/fabric/src/main/java/software/bluelib/platform/FabricPlatformClientHelper.java
@@ -9,7 +9,9 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
diff --git a/fabric/src/main/java/software/bluelib/platform/FabricPlatformHelper.java b/fabric/src/main/java/software/bluelib/platform/FabricPlatformHelper.java
@@ -13,6 +13,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
@@ -27,6 +28,9 @@
 
 public class FabricPlatformHelper implements IPlatformHelper {
 
+	public FabricPlatformHelper() {
+	}
+
 	@Override
 	public @NotNull String getPlatformName() {
 		return "Fabric";
@@ -85,9 +89,4 @@ public boolean isPhysicalClient() {
 	public @NotNull ModAPI getAPI() {
 		return ModAPI.FABRIC;
 	}
-
-	@Override
-	public @Nullable MinecraftServer getServer() {
-		return this.getEnvironment() == Environment.CLIENT ? Minecraft.getInstance().getSingleplayerServer() : BlueLibConstants.server;
-	}
 }
diff --git a/fabric/src/main/resources/bluelib.fabric.mixins.json b/fabric/src/main/resources/bluelib.fabric.mixins.json
@@ -3,9 +3,21 @@
   "minVersion": "0.8",
   "package": "software.bluelib.mixin",
   "refmap": "${mod_id}.refmap.json",
-  "mixins": [],
+  "mixins": [
+    "common.brewing.BrewingStandBlockEntityMixin",
+    "common.brewing.BrewingStandMenuMixin",
+    "common.brewing.IngredientSlotMixin",
+    "common.brewing.PotionSlotMixin",
+    "common.loader.AbstractContainerMenuMixin",
+    "common.loader.ItemStackMixin",
+    "common.variant.LivingEntityMixin"
+  ],
   "client": [
-    "client.HumanoidArmorLayerMixin"
+    "client.HumanoidArmorLayerMixin",
+    "client.BlockEntityWithoutLevelRendererMixin",
+    "client.LevelRendererMixin",
+    "client.TextureManagerMixin",
+    "client.VersionWarningMixin"
   ],
   "server": [],
   "injectors": {
diff --git a/neoforge/src/main/java/software/bluelib/BlueLib.java b/neoforge/src/main/java/software/bluelib/BlueLib.java
@@ -28,15 +28,18 @@
 public class BlueLib {
 
 	public BlueLib(@NotNull IEventBus pModEventBus, @NotNull ModContainer pModContainer) {
+		pModEventBus.addListener(EventPriority.HIGHEST, NeoForgeNetworkManager::registerMessages);
+
 		NeoForgeRegistryHelper.register(pModEventBus);
 
+		setupEventListeners(pModEventBus);
+
 		BlueLibCommon.doRegistration();
 
 		if (FMLEnvironment.dist == Dist.CLIENT)
 			BlueLibClient.init(pModContainer);
 
 		registerConfigs(pModContainer);
-		setupEventListeners(pModEventBus);
 
 		NeoForgeReloadHandler.registerProvider(new VariantProvider());
 	}
@@ -48,7 +51,6 @@ private void registerConfigs(@NotNull ModContainer pModContainer) {
 
 	private void setupEventListeners(@NotNull IEventBus pModEventBus) {
 		pModEventBus.register(this);
-		pModEventBus.addListener(NeoForgeNetworkManager::registerMessages);
 	}
 
 	@SubscribeEvent(priority = EventPriority.LOWEST)
diff --git a/neoforge/src/main/java/software/bluelib/net/NeoForgeNetworkManager.java b/neoforge/src/main/java/software/bluelib/net/NeoForgeNetworkManager.java
@@ -9,6 +9,7 @@
 
 import java.util.HashSet;
 import java.util.Objects;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
@@ -31,27 +32,25 @@ public class NeoForgeNetworkManager implements NetworkManager {
 	@NotNull
 	public static final String PROTOCOL_VERSION = "1.0.0";
 
+	static {
+	}
+
 	public static void registerMessages(@NotNull RegisterPayloadHandlersEvent pEvent) {
-		var registrar = pEvent.registrar(BlueLibConstants.MOD_ID).versioned(PROTOCOL_VERSION);
+		var registrar = pEvent.registrar(BlueLibConstants.MOD_ID)
+				.versioned(PROTOCOL_VERSION);
 
-		var netRegistrar = pEvent.registrar(BlueLibConstants.MOD_ID)
+		var optionalRegistrar = pEvent.registrar(BlueLibConstants.MOD_ID)
+				.versioned(PROTOCOL_VERSION);
+
+		var optionalNetRegistrar = pEvent.registrar(BlueLibConstants.MOD_ID)
 				.versioned(PROTOCOL_VERSION)
 				.executesOn(HandlerThread.NETWORK);
 
-		var syncPackets = new HashSet<ResourceLocation>();
-		var asyncPackets = new HashSet<ResourceLocation>();
-
 		NetworkRegistry.getS2CPayloads().stream()
 				.map(NeoForgePacketInfo::new)
 				.forEach(it -> {
 					boolean handleAsync = it.info().getHandler() instanceof DataRegistrySyncPacketHandler<?, ?>;
-					if (handleAsync) {
-						asyncPackets.add(it.info().getId());
-					} else {
-						syncPackets.add(it.info().getId());
-					}
-
-					it.registerToClient(handleAsync ? netRegistrar : registrar);
+					it.registerToClient(handleAsync ? optionalNetRegistrar : optionalRegistrar);
 				});
 
 		NetworkRegistry.getC2SPayloads().stream()
diff --git a/neoforge/src/main/java/software/bluelib/net/NeoForgePacketInfo.java b/neoforge/src/main/java/software/bluelib/net/NeoForgePacketInfo.java
@@ -9,6 +9,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
@@ -35,7 +36,12 @@ public void registerToClient(@NotNull PayloadRegistrar pRegistrar) {
 			clientHandler.handle(arg, Minecraft.getInstance());
 		};
 
-		pRegistrar.playToClient(info.getPayloadId(), info.getCodec(), handler);
+		pRegistrar.playToClient(
+				info.getPayloadId(),
+				info.getCodec(),
+				handler);
+				//.optional();
+
 	}
 
 	public void registerToServer(@NotNull PayloadRegistrar pRegistrar) {
diff --git a/neoforge/src/main/java/software/bluelib/platform/NeoForgePlatformHelper.java b/neoforge/src/main/java/software/bluelib/platform/NeoForgePlatformHelper.java
@@ -13,6 +13,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+
 import net.minecraft.server.MinecraftServer;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.loading.FMLEnvironment;
@@ -83,9 +84,4 @@ public boolean isPhysicalClient() {
 	public @NotNull ModAPI getAPI() {
 		return ModAPI.NEOFORGE;
 	}
-
-	@Override
-	public @Nullable MinecraftServer getServer() {
-		return ServerLifecycleHooks.getCurrentServer();
-	}
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ private static int openLogScreen(@NotNull CommandContext<CommandSourceStack> pCo`
`31`	`31`	`pContext.getSource().sendFailure(BlueTranslation.translate("command.logger.no_player"));`
`32`	`32`	`return 0;`
`33`	`33`	`}`
	`34`	`+ NetworkRegistry.sendPacketToPlayer(player, new OpenLoggerPacket());`
`34`	`35`	`if (player.hasPermissions(3)) {`
`35`	`36`	`NetworkRegistry.sendPacketToPlayer(player, new OpenLoggerPacket());`
`36`	`37`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ public class LoggerConfig {`
`15`	`15`	`public static boolean isBlueLibLoggingEnabled = false;`
`16`	`16`	`public static boolean isLoggingEnabled = false;`
`17`	`17`	`@ApiStatus.Internal`
`18`		`- public static final boolean isExampleEnabled = false;`
	`18`	`+ public static final boolean isExampleEnabled = true;`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,4 @@ default String getEnvironmentName() {`
`48`	`48`
`49`	`49`	`@NotNull`
`50`	`50`	`ModAPI getAPI();`
`51`		`-`
`52`		`- @Nullable`
`53`		`- MinecraftServer getServer();`
`54`	`51`	`}`