Move all usage of Fabric API to the respective package

imm_ptl_core/src/main/java/qouteall/imm_ptl/core/IPModMain.java

@@ -2,7 +2,6 @@
 
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.minecraft.world.InteractionResult;
 import qouteall.imm_ptl.core.chunk_loading.ChunkDataSyncManager;
 import qouteall.imm_ptl.core.chunk_loading.EntitySync;
@@ -11,7 +10,6 @@
 import qouteall.imm_ptl.core.chunk_loading.ServerPerformanceMonitor;
 import qouteall.imm_ptl.core.chunk_loading.WorldInfoSender;
 import qouteall.imm_ptl.core.commands.AxisArgumentType;
-import qouteall.imm_ptl.core.commands.PortalCommand;
 import qouteall.imm_ptl.core.commands.SubCommandArgumentType;
 import qouteall.imm_ptl.core.commands.TimingFunctionArgumentType;
 import qouteall.imm_ptl.core.compat.IPPortingLibCompat;
@@ -72,10 +70,7 @@ public static void init() {
         MyLoadingTicket.init();
 
         IPPortingLibCompat.init();
-
-        CommandRegistrationCallback.EVENT.register(
-            (dispatcher, registryAccess, environment) -> PortalCommand.register(dispatcher)
-        );
+
         SubCommandArgumentType.init();
         TimingFunctionArgumentType.init();
         AxisArgumentType.init();
@@ -84,7 +79,7 @@ public static void init() {
         RotationAnimation.init();
         NormalAnimation.init();
     }
-    
+
     private static void loadConfig() {
         // upgrade old config
         Path gameDir = O_O.getGameDir();

imm_ptl_core/src/main/java/qouteall/imm_ptl/core/commands/ClientDebugCommand.java

@@ -9,6 +9,8 @@
 import com.mojang.datafixers.util.Pair;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+// FIXME Usage of Fabric Api Outside of Fabric package. I'm still thinking about an approach to fix this,
+//  as I don't want to move it to the platform specific package in the long term.
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.Minecraft;

imm_ptl_core/src/main/java/qouteall/imm_ptl/core/commands/SubCommandArgumentType.java

@@ -15,6 +15,7 @@
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
+// FIXME Usage of Fabric Api Outside of Fabric package.
 import net.fabricmc.fabric.api.command.v2.ArgumentTypeRegistry;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.synchronization.ArgumentTypeInfo;

imm_ptl_core/src/main/java/qouteall/imm_ptl/core/compat/IPFlywheelCompat.java

@@ -2,8 +2,8 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.loader.api.FabricLoader;
 import qouteall.q_misc_util.Helper;
+import qouteall.q_misc_util.platform_specific.PlatformHelper;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -14,7 +14,7 @@ public class IPFlywheelCompat {
     public static boolean isFlywheelPresent = false;
 
     public static void init(){
-        if (FabricLoader.getInstance().isModLoaded("flywheel")) {
+        if (PlatformHelper.isModLoaded("flywheel")) {
             Helper.log("Flywheel is present");
         }
 

imm_ptl_core/src/main/java/qouteall/imm_ptl/core/compat/IPModInfoChecking.java

@@ -2,6 +2,8 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+// FIXME Usage of Fabric Api Outside of Fabric package. I'm still thinking about an approach to fix this,
+//  as I don't want to move it to the platform specific package in the long term. Maybe a wrapper class?
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.ChatFormatting;
@@ -24,6 +26,7 @@
 import qouteall.imm_ptl.core.platform_specific.O_O;
 import qouteall.q_misc_util.Helper;
 import qouteall.q_misc_util.my_util.MyTaskList;
+import qouteall.q_misc_util.platform_specific.PlatformHelper;
 
 import javax.annotation.Nullable;
 import java.util.List;

imm_ptl_core/src/main/java/qouteall/imm_ptl/core/compat/IPPortingLibCompat.java

@@ -3,10 +3,10 @@
 import com.mojang.blaze3d.pipeline.RenderTarget;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Minecraft;
 import qouteall.imm_ptl.core.ducks.IEFrameBuffer;
 import qouteall.q_misc_util.Helper;
+import qouteall.q_misc_util.platform_specific.PlatformHelper;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -18,11 +18,11 @@ public class IPPortingLibCompat {
     private static Field f_port_lib$stencilEnabled;
 
     public static void init() {
-        if (FabricLoader.getInstance().isModLoaded("porting_lib")) {
+        if (PlatformHelper.isModLoaded("porting_lib")) {
             Helper.log("Porting Lib is present");
             isPortingLibPresent = true;
 
-            if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+            if (PlatformHelper.getEnvironmentType() == qouteall.q_misc_util.platform_specific.EnvType.CLIENT) {
                 f_port_lib$stencilEnabled = Helper.noError(
                     () -> RenderTarget.class.getDeclaredField("port_lib$stencilEnabled")
                 );

imm_ptl_core/src/main/java/qouteall/imm_ptl/core/compat/mixin/MixinIrisIris.java

@@ -2,7 +2,6 @@
 
 import net.coderbot.iris.Iris;
 import net.coderbot.iris.shaderpack.DimensionId;
-import net.fabricmc.loader.api.FabricLoader;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

imm_ptl_core/src/main/java/qouteall/imm_ptl/core/platform_specific/IPModEntry.java

@@ -3,19 +3,30 @@
 import com.fusionflux.gravity_api.util.GravityChannel;
 import com.fusionflux.gravity_api.util.packet.DefaultGravityPacket;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.command.v2.ArgumentTypeRegistry;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import qouteall.imm_ptl.core.IPModMain;
+import qouteall.imm_ptl.core.commands.PortalCommand;
+import qouteall.imm_ptl.core.commands.SubCommandArgumentType;
 import qouteall.imm_ptl.core.compat.GravityChangerInterface;
 import qouteall.q_misc_util.Helper;
 
 public class IPModEntry implements ModInitializer {
 
     @Override
     public void onInitialize() {
+        CommandRegistrationCallback.EVENT.register(
+                (dispatcher, registryAccess, environment) -> PortalCommand.register(dispatcher)
+        );
+
         IPModMain.init();
+
+
+
         RequiemCompat.init();
 
         IPRegistry.registerEntitiesFabric();
@@ -51,5 +62,5 @@ public void onInitialize() {
         }
 
     }
-    
+
 }

imm_ptl_core/src/main/java/qouteall/imm_ptl/core/platform_specific/IPModEntryClient.java

@@ -1,6 +1,7 @@
 package qouteall.imm_ptl.core.platform_specific;
 
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
@@ -11,6 +12,7 @@
 import qouteall.imm_ptl.core.IPGlobal;
 import qouteall.imm_ptl.core.IPMcHelper;
 import qouteall.imm_ptl.core.IPModMainClient;
+import qouteall.imm_ptl.core.commands.ClientDebugCommand;
 import qouteall.imm_ptl.core.compat.IPModInfoChecking;
 import qouteall.imm_ptl.core.compat.iris_compatibility.ExperimentalIrisPortalRenderer;
 import qouteall.imm_ptl.core.compat.iris_compatibility.IrisInterface;
@@ -65,6 +67,10 @@ public static void initPortalRenderers() {
     @Override
     public void onInitializeClient() {
         IPModMainClient.init();
+
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
+            ClientDebugCommand.register(dispatcher);
+        });
 
         initPortalRenderers();
 

q_misc_util/src/main/java/qouteall/q_misc_util/ImplRemoteProcedureCall.java

@@ -31,6 +31,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 import org.apache.commons.lang3.Validate;
+import qouteall.q_misc_util.platform_specific.MiscNetworking;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

q_misc_util/src/main/java/qouteall/q_misc_util/MiscGlobals.java

@@ -1,7 +1,5 @@
 package qouteall.q_misc_util;
 
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.server.MinecraftServer;
 import qouteall.q_misc_util.my_util.MyTaskList;
 import qouteall.q_misc_util.my_util.Signal;

q_misc_util/src/main/java/qouteall/q_misc_util/MiscHelper.java

@@ -2,7 +2,6 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.MappedRegistry;
 import net.minecraft.resources.ResourceKey;
@@ -12,6 +11,7 @@
 import org.apache.logging.log4j.Logger;
 import qouteall.q_misc_util.ducks.IEMinecraftServer_Misc;
 import qouteall.q_misc_util.mixin.IELevelStorageAccess_Misc;
+import qouteall.q_misc_util.platform_specific.PlatformHelper;
 
 import java.nio.file.Path;
 import java.util.Map;
@@ -84,7 +84,7 @@ public static void executeOnServerThread(Runnable runnable) {
     }
 
     public static boolean isDedicatedServer() {
-        return FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER;
+        return PlatformHelper.getEnvironmentType() == qouteall.q_misc_util.platform_specific.EnvType.SERVER;
     }
 
 

q_misc_util/src/main/java/qouteall/q_misc_util/api/DimensionAPI.java

@@ -1,6 +1,8 @@
 package qouteall.q_misc_util.api;
 
 import com.mojang.serialization.Lifecycle;
+// FIXME Usage of Fabric Api Outside of Fabric package. I'm still thinking about an approach to fix this,
+//  as I don't want to move it to the platform specific package in the long term.
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.core.DefaultedMappedRegistry;

q_misc_util/src/main/java/qouteall/q_misc_util/dimension/DynamicDimensionsImpl.java

@@ -1,7 +1,6 @@
 package qouteall.q_misc_util.dimension;
 
 import com.google.common.collect.ImmutableList;
-import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
@@ -27,7 +26,7 @@
 import qouteall.q_misc_util.Helper;
 import qouteall.q_misc_util.MiscGlobals;
 import qouteall.q_misc_util.MiscHelper;
-import qouteall.q_misc_util.MiscNetworking;
+import qouteall.q_misc_util.platform_specific.MiscNetworking;
 import qouteall.q_misc_util.api.DimensionAPI;
 import qouteall.q_misc_util.ducks.IEMinecraftServer_Misc;
 import qouteall.q_misc_util.mixin.dimension.IEWorldBorder;

q_misc_util/src/main/java/qouteall/q_misc_util/mixin/MixinServerGamePacketListenerImpl_Misc.java

@@ -8,7 +8,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import qouteall.q_misc_util.MiscNetworking;
+import qouteall.q_misc_util.platform_specific.MiscNetworking;
 
 @Mixin(ServerGamePacketListenerImpl.class)
 public class MixinServerGamePacketListenerImpl_Misc {

q_misc_util/src/main/java/qouteall/q_misc_util/mixin/client/MixinClientboundCustomPayloadPacket_Misc.java

@@ -10,7 +10,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import qouteall.q_misc_util.MiscNetworking;
+import qouteall.q_misc_util.platform_specific.MiscNetworking;
 
 @Mixin(ClientboundCustomPayloadPacket.class)
 public class MixinClientboundCustomPayloadPacket_Misc {

q_misc_util/src/main/java/qouteall/q_misc_util/mixin/dimension/MixinPlayerList_Misc.java

@@ -7,7 +7,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import qouteall.q_misc_util.MiscNetworking;
+import qouteall.q_misc_util.platform_specific.MiscNetworking;
 
 @Mixin(PlayerList.class)
 public class MixinPlayerList_Misc {

q_misc_util/src/main/java/qouteall/q_misc_util/platform_specific/EnvType.java

@@ -0,0 +1,11 @@
+package qouteall.q_misc_util.platform_specific;
+
+/**
+ * An alternative would be to directly implement isClient() and isServer into {@link PlatformHelper}.
+ * @see net.fabricmc.api.EnvType
+ */
+public enum EnvType {
+    CLIENT,
+    SERVER,
+    UNIMPLEMENTED
+}

q_misc_util/src/main/java/qouteall/q_misc_util/MiscNetworking.java → q_misc_util/src/main/java/qouteall/q_misc_util/platform_specific/MiscNetworking.java

@@ -1,4 +1,4 @@
-package qouteall.q_misc_util;
+package qouteall.q_misc_util.platform_specific;
 
 import io.netty.buffer.Unpooled;
 import net.fabricmc.api.EnvType;
@@ -13,6 +13,9 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.Level;
 import org.apache.commons.lang3.Validate;
+import qouteall.q_misc_util.Helper;
+import qouteall.q_misc_util.ImplRemoteProcedureCall;
+import qouteall.q_misc_util.MiscHelper;
 import qouteall.q_misc_util.api.DimensionAPI;
 import qouteall.q_misc_util.dimension.DimensionIdRecord;
 import qouteall.q_misc_util.dimension.DimensionTypeSync;

q_misc_util/src/main/java/qouteall/q_misc_util/MiscUtilModEntry.java → q_misc_util/src/main/java/qouteall/q_misc_util/platform_specific/MiscUtilModEntry.java

@@ -1,9 +1,9 @@
-package qouteall.q_misc_util;
+package qouteall.q_misc_util.platform_specific;
 
 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.fabric.api.event.lifecycle.v1.ServerTickEvents;
+import qouteall.q_misc_util.MiscGlobals;
 import qouteall.q_misc_util.dimension.DimensionMisc;
 import qouteall.q_misc_util.dimension.DimsCommand;
 import qouteall.q_misc_util.dimension.DynamicDimensionsImpl;

q_misc_util/src/main/java/qouteall/q_misc_util/MiscUtilModEntryClient.java → q_misc_util/src/main/java/qouteall/q_misc_util/platform_specific/MiscUtilModEntryClient.java

@@ -1,4 +1,4 @@
-package qouteall.q_misc_util;
+package qouteall.q_misc_util.platform_specific;
 
 import net.fabricmc.api.ClientModInitializer;
 

q_misc_util/src/main/java/qouteall/q_misc_util/platform_specific/PlatformHelper.java

@@ -0,0 +1,26 @@
+package qouteall.q_misc_util.platform_specific;
+
+import net.fabricmc.loader.api.FabricLoader;
+
+public final class PlatformHelper {
+
+    public static boolean isModLoaded(String id) {
+        return FabricLoader.getInstance().isModLoaded(id);
+    }
+
+    public static boolean isDevelopmentEnvironment() {
+        return FabricLoader.getInstance().isDevelopmentEnvironment();
+    }
+
+    public static EnvType getEnvironmentType() {
+        switch (FabricLoader.getInstance().getEnvironmentType()) {
+            case CLIENT -> {return EnvType.CLIENT;}
+            case SERVER -> {return EnvType.SERVER;}
+            default -> {return EnvType.UNIMPLEMENTED;}
+        }
+    }
+
+    private PlatformHelper() {
+        throw new UnsupportedOperationException("This is a static only class.");
+    }
+}

q_misc_util/src/main/resources/fabric.mod.json

@@ -14,10 +14,10 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "qouteall.q_misc_util.MiscUtilModEntry"
+      "qouteall.q_misc_util.platform_specific.MiscUtilModEntry"
     ],
     "client": [
-      "qouteall.q_misc_util.MiscUtilModEntryClient"
+      "qouteall.q_misc_util.platform_specific.MiscUtilModEntryClient"
     ],
     "server": [