summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.gradle6
-rw-r--r--docs/CHANGELOG.md42
-rw-r--r--docs/README.md2
-rw-r--r--gradle.properties6
-rw-r--r--src/main/java/com/aizistral/nochatreports/NCRMixinPlugin.java45
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReports.java7
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java36
-rw-r--r--src/main/resources/NCR_logo.pngbin12770 -> 716 bytes
-rw-r--r--src/main/resources/nochatreports.mixins.json1
10 files changed, 130 insertions, 18 deletions
diff --git a/build.gradle b/build.gradle
index f715cf6..b46e666 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,8 +55,8 @@ curseforge {
id = "${curse_id}"
releaseType = "${curse_release}"
- changelogType = 'html'
- changelog = file('docs/changelog.html')
+ changelogType = 'markdown'
+ changelog = file('docs/CHANGELOG.md')
mainArtifact(remapJar)
addGameVersion '1.19'
@@ -88,7 +88,7 @@ modrinth {
versionNumber = "Fabric-" + project.mod_version
versionName = "No Chat Reports Fabric-" + project.mod_version
versionType = "release"
- changelog = rootProject.file("docs/changelog.html").text
+ changelog = rootProject.file("docs/CHANGELOG.md").text
uploadFile = remapJar
gameVersions = ["1.19"]
loaders = ['fabric', 'quilt']
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
new file mode 100644
index 0000000..bf639a5
--- /dev/null
+++ b/docs/CHANGELOG.md
@@ -0,0 +1,42 @@
+#### **\[Build MC1.19-v1.2.4\]:**
+
+- Added `enableMod` option to the config file, allowing users to disable the mod without removing it;
+- Redesigned some GUI textures.
+
+
+#### **\[Build 1.19-v1.2.3\]:**
+
+- Added Polish translation ([thanks GerbilPL, #24](https://github.com/Aizistral-Studios/No-Chat-Reports/pull/24));
+- Added Russian translation ([thanks sst4nk0, #25](https://github.com/Aizistral-Studios/No-Chat-Reports/pull/25));
+- Added German translation ([thanks Doenerstyle, #34](https://github.com/Aizistral-Studios/No-Chat-Reports/pull/34));
+- Added French translation ([thanks Mrredstone5230, #29](https://github.com/Aizistral-Studios/No-Chat-Reports/pull/29)).
+
+
+#### **\[Build 1.19-v1.2.2\]:**
+
+- Added Simplified Chinese translation ([thanks CJYKK, #21](https://github.com/Aizistral-Studios/No-Chat-Reports/pull/21));
+- This and all further releases for Fabric will be marked Quilt-compatible.
+
+
+#### **\[Build 1.19-v1.2.1\]:**
+
+- Replaced all overwrites with injects, which should hopefully increase compatibility with other mods ([thanks ToxicAven, #7](https://github.com/Aizistral-Studios/No-Chat-Reports/pull/7));
+- Remade implementation of player to system message convertion, in a way that should resolve conflict with Styled Chat.
+
+
+#### **\[Build 1.19-v1.2.0\]:**
+
+- Implemented optional server-sided bypass for signature verification, by converting player messages to system messages ([thanks JFronny, #1](https://github.com/Aizistral-Studios/No-Chat-Reports/pull/1));
+- Minor optimizations (once again thanks JFronny).
+
+
+#### **\[Build 1.19-v1.1.0\]:**
+
+- Public keys are now prevented from being sent to server;
+- Client no longer requires mod to be present on server by default;
+- Implemented suppression of built-in telemetry.
+
+
+#### **\[Build 1.19-v1.0.0\]:**
+
+- Initial release.
diff --git a/docs/README.md b/docs/README.md
index 105e281..0bd1e00 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
# No Chat Reports
-**Current Version:** 1.19-v1.2.3
+**Current Version:** MC1.19-v1.2.4
**Minecraft Version:** 1.19.x
diff --git a/gradle.properties b/gradle.properties
index d53fa10..f6328a6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,15 +6,15 @@ org.gradle.daemon=false
# check these on https://fabricmc.net/develop
minecraft_version=1.19
yarn_mappings=1.19+build.4
-loader_version=0.14.8
+loader_version=0.20.1
# Mod Properties
-mod_version=1.19-v1.2.3
+mod_version=MC1.19-v1.2.4
maven_group=com.aizistral.nochatreports
archives_base_name=NoChatReports-FABRIC
# Dependencies
-fabric_version=0.56.0+1.19
+fabric_version=0.58.0+1.19
# Publishing
curse_id=634062
diff --git a/src/main/java/com/aizistral/nochatreports/NCRMixinPlugin.java b/src/main/java/com/aizistral/nochatreports/NCRMixinPlugin.java
new file mode 100644
index 0000000..3883b50
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/NCRMixinPlugin.java
@@ -0,0 +1,45 @@
+package com.aizistral.nochatreports;
+
+import java.util.List;
+import java.util.Set;
+
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import com.aizistral.nochatreports.handlers.NoReportsConfig;
+
+public class NCRMixinPlugin implements IMixinConfigPlugin {
+
+ @Override
+ public void onLoad(String mixinPackage) {
+ }
+
+ @Override
+ public String getRefMapperConfig() {
+ return null;
+ }
+
+ @Override
+ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+ return NoReportsConfig.isModRunning();
+ }
+
+ @Override
+ public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+ }
+
+ @Override
+ public List<String> getMixins() {
+ return null;
+ }
+
+ @Override
+ public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+ }
+
+ @Override
+ public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
index 0bf43bf..7219e45 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
@@ -26,11 +26,16 @@ public class NoChatReports implements ModInitializer {
@Override
public void onInitialize() {
+ if (!NoReportsConfig.isModRunning()) {
+ LOGGER.info("No Chat Reports is disabled in its config and will not initialize.");
+ return;
+ }
+
LOGGER.info("KONNICHIWA ZA WARUDO!");
ServerPlayNetworking.registerGlobalReceiver(CHANNEL, ServerChannelHandler.INSTANCE);
ServerPlayConnectionEvents.JOIN.register(this::onPlayReady);
- NoReportsConfig.loadConfig();
+ NoReportsConfig.saveConfig();
}
private void onPlayReady(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server) {
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 075b460..3ecec28 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -20,6 +20,9 @@ public class NoChatReportsClient implements ClientModInitializer {
@Override
public void onInitializeClient() {
+ if (!NoReportsConfig.isModRunning())
+ return;
+
NoChatReports.LOGGER.info("Client initialization...");
ClientPlayNetworking.registerGlobalReceiver(NoChatReports.CHANNEL, ClientChannelHandler.INSTANCE);
ClientPlayConnectionEvents.JOIN.register(this::onPlayReady);
diff --git a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java
index 0a9734e..ef4736f 100644
--- a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java
@@ -8,26 +8,38 @@ import java.nio.file.Path;
import javax.annotation.Nullable;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import net.fabricmc.loader.api.FabricLoader;
public class NoReportsConfig {
+ private static final Logger LOGGER = LogManager.getLogger("NoChatReports");
private static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json");
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
private static NoReportsConfig INSTANCE;
- private boolean demandOnClient, demandOnServer, convertToGameMessage;
-
- public static void loadConfig() {
- INSTANCE = readFile();
+ private boolean enableMod = true, demandOnClient, demandOnServer, convertToGameMessage;
+ private static synchronized NoReportsConfig getInstance() {
if (INSTANCE == null) {
- INSTANCE = new NoReportsConfig();
- //INSTANCE.demandOnServer = true;
+ INSTANCE = readFile();
+
+ if (INSTANCE == null) {
+ INSTANCE = new NoReportsConfig();
+ //INSTANCE.demandOnServer = true;
+ }
+
+ LOGGER.info("Mod Enabled: {}", INSTANCE.enableMod);
}
- writeFile(INSTANCE);
+ return INSTANCE;
+ }
+
+ public static void saveConfig() {
+ writeFile(getInstance());
}
@Nullable
@@ -50,16 +62,20 @@ public class NoReportsConfig {
}
}
+ public static boolean isModRunning() {
+ return getInstance().enableMod;
+ }
+
public static boolean demandsOnClient() {
- return INSTANCE.demandOnClient;
+ return getInstance().demandOnClient;
}
public static boolean demandsOnServer() {
- return INSTANCE.demandOnServer;
+ return getInstance().demandOnServer;
}
public static boolean convertsToGameMessage() {
- return INSTANCE.convertToGameMessage;
+ return getInstance().convertToGameMessage;
}
}
diff --git a/src/main/resources/NCR_logo.png b/src/main/resources/NCR_logo.png
index 433dc42..dedbb06 100644
--- a/src/main/resources/NCR_logo.png
+++ b/src/main/resources/NCR_logo.png
Binary files differ
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index c81b80e..259fd0e 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -2,6 +2,7 @@
"required": true,
"minVersion": "0.8",
"package": "com.aizistral.nochatreports.mixins",
+ "plugin": "com.aizistral.nochatreports.NCRMixinPlugin",
"compatibilityLevel": "JAVA_17",
"verbose": true,
"mixins": [