diff options
Diffstat (limited to 'src/main/java/com')
5 files changed, 14 insertions, 7 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java index f950713..e931e21 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java @@ -30,7 +30,7 @@ public class NCRCore { setup(); - if (provider.getEnvironment() == EnvType.CLIENT) { + if (provider.isOnClient()) { clientSetup(); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java index 258b340..9c7c2e9 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java @@ -96,7 +96,7 @@ public abstract class JSONConfig { } }); - if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { + if (NCRCore.getProvider().isOnClient()) { builder.registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE); } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java index 01c33fa..3074ad8 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java @@ -50,7 +50,7 @@ public final class NCRConfig { public static void load() { common = JSONConfig.loadConfig(NCRConfigCommon.class, NCRConfigCommon::new, NCRConfigCommon.FILE_NAME); - if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { + if (NCRCore.getProvider().isOnClient()) { client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME); serverPreferences = JSONConfig.loadConfig(NCRServerPreferences.class, NCRServerPreferences::new, NCRServerPreferences.FILE_NAME); encryption = JSONConfig.loadConfig(NCRConfigEncryption.class, NCRConfigEncryption::new, NCRConfigEncryption.FILE_NAME); @@ -62,7 +62,7 @@ public final class NCRConfig { public static void save() { checkLoaded(() -> common).saveFile(); - if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { + if (NCRCore.getProvider().isOnClient()) { checkLoaded(() -> client).saveFile(); checkLoaded(() -> serverPreferences).saveFile(); checkLoaded(() -> encryption).saveFile(); diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java b/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java index 5dc064e..bdeee8d 100644 --- a/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java +++ b/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java @@ -7,7 +7,9 @@ import net.fabricmc.api.EnvType; public interface PlatformProvider { - public EnvType getEnvironment(); + public boolean isOnClient(); + + public boolean isOnDedicatedServer(); public Path getMinecraftDir(); diff --git a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java index 2092a78..4dcb517 100644 --- a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java @@ -18,8 +18,13 @@ public class NoChatReports implements ModInitializer, PlatformProvider { } @Override - public EnvType getEnvironment() { - return FabricLoader.getInstance().getEnvironmentType(); + public boolean isOnClient() { + return FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT; + } + + @Override + public boolean isOnDedicatedServer() { + return FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER; } @Override |
