summaryrefslogtreecommitdiffstats
path: root/src/main/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReports.java5
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java2
5 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
index 3e2e527..9cdc7b3 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
@@ -36,11 +36,10 @@ public final class NoChatReports implements ModInitializer {
}
private void onPlayReady(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server) {
- if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT)
- if (!NCRConfig.getClient().enableMod())
+ server.execute(() -> {
+ if (server.isSingleplayerOwner(handler.player.getGameProfile()))
return;
- server.execute(() -> {
if (NCRConfig.getCommon().demandOnClient() && !ServerPlayNetworking.canSend(handler, CHANNEL)) {
handler.disconnect(Component.literal(NCRConfig.getCommon().demandOnClientMessage()));
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
index 0d99199..963e9a3 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
@@ -18,12 +18,12 @@ import net.minecraft.util.StringUtil;
public final class NCRConfigClient extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Client.json";
- protected volatile boolean demandOnServer = false, showServerSafety = true, hideRedChatIndicators = true,
+ protected boolean demandOnServer = false, showServerSafety = true, hideRedChatIndicators = true,
hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true,
alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true,
whitelistAllServers = false, verifiedIconEnabled = true, showNCRButton = true,
enableMod = true, skipRealmsWarning = false;
- protected volatile int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0, reconnectAwaitSeconds = 4,
+ protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0, reconnectAwaitSeconds = 4,
postDisconnectAwaitSeconds = 10;
protected NCRConfigClient() {
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
index e00669d..7aa0322 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
@@ -8,9 +8,9 @@ import com.google.common.base.Preconditions;
public final class NCRConfigCommon extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Common.json";
- protected volatile String demandOnClientMessage = "You do not have No Chat Reports, and this server is"
+ protected String demandOnClientMessage = "You do not have No Chat Reports, and this server is"
+ " configured to require it on client!";
- protected volatile boolean demandOnClient = true, enableDebugLog = false, convertToGameMessage = false,
+ protected boolean demandOnClient = true, enableDebugLog = false, convertToGameMessage = false,
addQueryData = true;
protected NCRConfigCommon() {
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java
index f7470b7..71ca2f6 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java
@@ -17,11 +17,11 @@ import net.minecraft.util.StringUtil;
public class NCRConfigEncryption extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-Encryption.json";
- protected volatile boolean skipWarning = false, enableEncryption = false, encryptPublic = true,
+ protected boolean skipWarning = false, enableEncryption = false, encryptPublic = true,
showEncryptionButton = true;
- protected volatile String encryptionKey = Encryption.AES_CFB8.getDefaultKey(), encryptionPassphrase = "",
+ protected String encryptionKey = Encryption.AES_CFB8.getDefaultKey(), encryptionPassphrase = "",
algorithmName = Encryption.AES_CFB8.getName();
- protected volatile List<String> encryptableCommands = List.of("msg:1", "w:1", "whisper:1", "tell:1", "r:0", "dm:1",
+ protected List<String> encryptableCommands = List.of("msg:1", "w:1", "whisper:1", "tell:1", "r:0", "dm:1",
"me:0", "m:1", "t:1", "pm:1", "emsg:1", "epm:1", "etell:1", "ewhisper:1");
private transient Encryption algorithm;
private transient boolean isValid = false;
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java b/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java
index 15f343e..48658e7 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java
@@ -10,7 +10,7 @@ import net.minecraft.client.multiplayer.resolver.ServerAddress;
public class NCRServerWhitelist extends JSONConfig {
protected static final String FILE_NAME = "NoChatReports/NCR-ServerWhitelist.json";
protected static final List<String> DEFAULT_WHITELISTED_SERVERS = new ArrayList<>();
- protected volatile List<String> whitelistedServers = DEFAULT_WHITELISTED_SERVERS;
+ protected List<String> whitelistedServers = DEFAULT_WHITELISTED_SERVERS;
protected NCRServerWhitelist() {
super(FILE_NAME);