Refactor and add modular service implementations.

Renamed interfaces to remove "I" prefix for consistency in naming. Added `GameHelper` and `ModLoaderHelper` implementations for both Fabric and NeoForge platforms. Updated service loading to include the newly added helpers.

Author: ThePandaOliver

common/src/main/java/me/pandamods/pandalib/platform/Services.java

@@ -13,17 +13,21 @@
 package me.pandamods.pandalib.platform;
 
 import com.mojang.logging.LogUtils;
-import me.pandamods.pandalib.platform.services.INetworkHelper;
-import me.pandamods.pandalib.platform.services.IRegistrationHelper;
+import me.pandamods.pandalib.platform.services.GameHelper;
+import me.pandamods.pandalib.platform.services.ModLoaderHelper;
+import me.pandamods.pandalib.platform.services.NetworkHelper;
+import me.pandamods.pandalib.platform.services.RegistrationHelper;
 import org.slf4j.Logger;
 
 import java.util.ServiceLoader;
 
 public class Services {
 	private static final Logger LOGGER = LogUtils.getLogger();
 
-	public static final INetworkHelper NETWORK = load(INetworkHelper.class);
-	public static final IRegistrationHelper REGISTRATION = load(IRegistrationHelper.class);
+	public static final NetworkHelper NETWORK = load(NetworkHelper.class);
+	public static final RegistrationHelper REGISTRATION = load(RegistrationHelper.class);
+	public static final GameHelper GAME = load(GameHelper.class);
+	public static final ModLoaderHelper MOD_LOADER = load(ModLoaderHelper.class);
 
 	private static <T> T load(Class<T> serviceClass) {
 		final T loadedService = ServiceLoader.load(serviceClass).findFirst().orElseThrow(() ->

common/src/main/java/me/pandamods/pandalib/platform/services/GameHelper.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2024 Oliver Froberg (The Panda Oliver)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.pandamods.pandalib.platform.services;
+
+import java.nio.file.Path;
+
+public interface GameHelper {
+	boolean isDevelopmentEnvironment();
+	boolean isProductionEnvironment();
+	
+	boolean isClient();
+	boolean isServer();
+	
+	Path getGameDir();
+	Path getConfigDir();
+	Path getModDir();
+}

common/src/main/java/me/pandamods/pandalib/platform/services/ModLoaderHelper.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2024 Oliver Froberg (The Panda Oliver)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.pandamods.pandalib.platform.services;
+
+import java.util.List;
+
+public interface ModLoaderHelper {
+	boolean isModLoaded(String modId);
+	Mod getMod(String modId);
+	List<Mod> getMods();
+	List<String> getModIds();
+	
+	interface Mod {
+		String getId();
+		String getDisplayName();
+		String getDescription();
+		List<String> getAuthors();
+		String getVersion();
+	}
+}

common/src/main/java/me/pandamods/pandalib/platform/services/INetworkHelper.java renamed to common/src/main/java/me/pandamods/pandalib/platform/services/NetworkHelper.java

@@ -16,7 +16,7 @@
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.level.ServerPlayer;
 
-public interface INetworkHelper extends NetworkRegistry {
+public interface NetworkHelper extends NetworkRegistry {
 	<T extends CustomPacketPayload> void sendToServer(T payload);
 
 	<T extends CustomPacketPayload> void sendToPlayer(ServerPlayer player, T payload);

common/src/main/java/me/pandamods/pandalib/platform/services/IRegistrationHelper.java renamed to common/src/main/java/me/pandamods/pandalib/platform/services/RegistrationHelper.java

@@ -16,6 +16,6 @@
 
 import java.util.function.Supplier;
 
-public interface IRegistrationHelper {
+public interface RegistrationHelper {
 	<T> void register(DeferredObject<? extends T> deferredObject, Supplier<? extends T> supplier);
 }

fabric/src/main/java/me/pandamods/pandalib/fabric/platform/GameHelperImpl.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024 Oliver Froberg (The Panda Oliver)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.pandamods.pandalib.fabric.platform;
+
+import me.pandamods.pandalib.platform.services.GameHelper;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.loader.api.FabricLoader;
+
+import java.nio.file.Path;
+
+public class GameHelperImpl implements GameHelper {
+	@Override
+	public boolean isDevelopmentEnvironment() {
+		return FabricLoader.getInstance().isDevelopmentEnvironment();
+	}
+
+	@Override
+	public boolean isProductionEnvironment() {
+		return !FabricLoader.getInstance().isDevelopmentEnvironment();
+	}
+
+	@Override
+	public boolean isClient() {
+		return FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT;
+	}
+
+	@Override
+	public boolean isServer() {
+		return FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER;
+	}
+
+	@Override
+	public Path getGameDir() {
+		return FabricLoader.getInstance().getGameDir().toAbsolutePath().normalize();
+	}
+
+	@Override
+	public Path getConfigDir() {
+		return FabricLoader.getInstance().getConfigDir().toAbsolutePath().normalize();
+	}
+
+	@Override
+	public Path getModDir() {
+		return getGameDir().resolve("mods");
+	}
+}

fabric/src/main/java/me/pandamods/pandalib/fabric/platform/ModLoaderHelperImpl.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2024 Oliver Froberg (The Panda Oliver)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.pandamods.pandalib.fabric.platform;
+
+import dev.architectury.event.events.client.ClientLifecycleEvent;
+import me.pandamods.pandalib.platform.services.ModLoaderHelper;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.fabricmc.loader.api.metadata.ModMetadata;
+import net.fabricmc.loader.api.metadata.Person;
+import net.fabricmc.loader.impl.FabricLoaderImpl;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ModLoaderHelperImpl implements ModLoaderHelper {
+	private final Map<String, Mod> mods = new HashMap<>();
+
+	@Override
+	public boolean isModLoaded(String modId) {
+		return FabricLoader.getInstance().isModLoaded(modId);
+	}
+
+	@Override
+	public Mod getMod(String modId) {
+		return mods.computeIfAbsent(modId, ModImpl::new);
+	}
+
+	@Override
+	public List<Mod> getMods() {
+		for (ModContainer mod : FabricLoader.getInstance().getAllMods()) {
+			getMod(mod.getMetadata().getId());
+		}
+		
+		return List.copyOf(mods.values());
+	}
+
+	@Override
+	public List<String> getModIds() {
+		return FabricLoader.getInstance().getAllMods().stream().map(ModContainer::getMetadata).map(ModMetadata::getId).toList();
+	}
+
+	private static class ModImpl implements Mod {
+		private final ModContainer container;
+		private final ModMetadata metadata;
+		
+		public ModImpl(String modId) {
+			this.container = FabricLoader.getInstance().getModContainer(modId).orElseThrow();
+			this.metadata = this.container.getMetadata();
+		}
+
+		@Override
+		public String getId() {
+			return metadata.getId();
+		}
+
+		@Override
+		public String getDisplayName() {
+			return metadata.getName();
+		}
+
+		@Override
+		public String getDescription() {
+			return metadata.getDescription();
+		}
+
+		@Override
+		public List<String> getAuthors() {
+			return metadata.getAuthors().stream().map(Person::getName).toList();
+		}
+
+		@Override
+		public String getVersion() {
+			return metadata.getVersion().getFriendlyString();
+		}
+	}
+}

fabric/src/main/java/me/pandamods/pandalib/fabric/platform/NetworkHelperImpl.java

@@ -17,7 +17,7 @@
 import me.pandamods.pandalib.fabric.PandaLibFabric;
 import me.pandamods.pandalib.networking.NetworkContext;
 import me.pandamods.pandalib.networking.NetworkReceiver;
-import me.pandamods.pandalib.platform.services.INetworkHelper;
+import me.pandamods.pandalib.platform.services.NetworkHelper;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
@@ -28,7 +28,7 @@
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.level.ServerPlayer;
 
-public class NetworkHelperImpl implements INetworkHelper {
+public class NetworkHelperImpl implements NetworkHelper {
 	@Override
 	@Environment(EnvType.CLIENT)
 	public <T extends CustomPacketPayload> void registerClientReceiver(CustomPacketPayload.Type<T> type,

fabric/src/main/java/me/pandamods/pandalib/fabric/platform/RegistrationHelperImpl.java

@@ -12,13 +12,13 @@
 
 package me.pandamods.pandalib.fabric.platform;
 
-import me.pandamods.pandalib.platform.services.IRegistrationHelper;
+import me.pandamods.pandalib.platform.services.RegistrationHelper;
 import me.pandamods.pandalib.registry.DeferredObject;
 import net.minecraft.core.Registry;
 
 import java.util.function.Supplier;
 
-public class RegistrationHelperImpl implements IRegistrationHelper {
+public class RegistrationHelperImpl implements RegistrationHelper {
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> void register(DeferredObject<? extends T> deferredObject, Supplier<? extends T> supplier) {

fabric/src/main/resources/META-INF/services/me.pandamods.pandalib.platform.services.GameHelper

@@ -0,0 +1 @@
+me.pandamods.pandalib.fabric.platform.GameHelperImpl