summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMODKILLER1OO12022-08-07 11:26:37 -0400
committerGitHub2022-08-07 11:26:37 -0400
commit2d51ce6394a91ba4c214530c174ba0d0ddb2e306 (patch)
tree47707fa3e1c4975fb498c852b5f0ca14e40e0c8a
parent26f9abc93b22d563fac521564d56b773853f6c79 (diff)
parente7ed3e014f0df81353c32429caf95686ed0dad00 (diff)
Merge branch 'Aizistral-Studios:1.19.1-Fabric' into 1.19.2-ModMenu-Cloth
-rw-r--r--build.gradle4
-rw-r--r--docs/README.md4
-rw-r--r--docs/changelog.html11
-rw-r--r--gradle.properties10
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java14
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java39
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java29
-rw-r--r--src/main/resources/fabric.mod.json2
-rw-r--r--src/main/resources/nochatreports.mixins.json2
10 files changed, 27 insertions, 98 deletions
diff --git a/build.gradle b/build.gradle
index 68b8f2c..4d2e26e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -85,7 +85,7 @@ curseforge {
changelog = file('docs/changelog.html')
mainArtifact(remapJar)
- addGameVersion '1.19.1'
+ addGameVersion '1.19.2'
addGameVersion 'Fabric'
addGameVersion 'Quilt'
addGameVersion 'Java 17'
@@ -116,7 +116,7 @@ modrinth {
versionType = "release"
changelog = rootProject.file("docs/changelog.html").text
uploadFile = remapJar
- gameVersions = ["1.19.1"]
+ gameVersions = ["1.19.2"]
loaders = ['fabric', 'quilt']
dependencies {
diff --git a/docs/README.md b/docs/README.md
index 1c402ac..e732a19 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,8 +1,8 @@
# No Chat Reports
-**Current Version:** 1.19.1-v1.8.4
+**Current Version:** 1.19.2-v1.9.0
-**Minecraft Version:** 1.19.1
+**Minecraft Version:** 1.19.2
Strips cryptographic signatures from player messages, making it impossible to track and associate them with your Mojang/Microsoft account, as well as use Player Chat Reporting feature.
diff --git a/docs/changelog.html b/docs/changelog.html
index 95d9614..09e26fb 100644
--- a/docs/changelog.html
+++ b/docs/changelog.html
@@ -1,5 +1,16 @@
<h3><b>The Changelog:</b></h3><br/>
+<h5><b>[Release 1.19.2-v1.9.0]:</b></h5>
+<p>
+&nbsp;- First release for 1.19.2 (<a href="https://github.com/Aizistral-Studios/No-Chat-Reports/pull/144">thanks CraftingDragon007, #144</a>);<br/>
+&nbsp;- Added config option to always skip "Unsafe Server" warning screen (<a href="https://github.com/Aizistral-Studios/No-Chat-Reports/pull/124">thanks Madis0, #124</a>);<br/>
+&nbsp;- Compressed some of the GUI textures (<a href="https://github.com/Aizistral-Studios/No-Chat-Reports/pull/136">thanks Madis0, #136</a>);<br/>
+&nbsp;- Removed version easter egg (<a href="https://github.com/Aizistral-Studios/No-Chat-Reports/pull/145">thanks Madis0, #145</a>);<br/>
+&nbsp;- Updated Italian translation (<a href="https://github.com/Aizistral-Studios/No-Chat-Reports/pull/126">thanks WVam, #126</a>);<br/>
+&nbsp;- Updated Polish translation (<a href="https://github.com/Aizistral-Studios/No-Chat-Reports/pull/133">thanks GerbilPL, #133</a>);<br/>
+&nbsp;- Added Finnish translation (<a href="https://github.com/Aizistral-Studios/No-Chat-Reports/pull/137">thanks Joquliina, #137</a>).<br/>
+<p/><br/><br/>
+
<h5><b>[Release 1.19.1-v1.8.4]:</b></h5>
<p>
&nbsp;- Ensured change from previous release works properly.<br/>
diff --git a/gradle.properties b/gradle.properties
index de782b4..434f563 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,17 +4,17 @@ org.gradle.daemon=false
# Fabric Properties
# check these on https://fabricmc.net/develop
-minecraft_version=1.19.1
-yarn_mappings=1.19.1+build.1
-loader_version=0.14.8
+minecraft_version=1.19.2
+yarn_mappings=1.19.2+build.1
+loader_version=0.14.9
# Mod Properties
-mod_version=1.19.1-v1.8.4
+mod_version=1.19.2-v1.9.0
maven_group=com.aizistral.nochatreports
archives_base_name=NoChatReports-FABRIC
# Dependencies
-fabric_version=0.58.4+1.19.1
+fabric_version=0.59.0+1.19.2
# Publishing
curse_id=634062
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
index d7de215..60993ec 100644
--- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
@@ -43,8 +43,8 @@ public class NoReportsConfig {
public boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false,
convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true,
hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true,
- alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true,
- showReloadButton = true, whitelistAllServers = false;
+ alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true,
+ whitelistAllServers = false;
private List<String> whitelistedServers;
public static NoReportsConfig getInstance() {
@@ -249,16 +249,6 @@ public class NoReportsConfig {
}
/**
- * @return True if "1.19.1" should be changed to "1.19.84" on titlebar and title screen.<br><br>
- *
- * This is true by default.
- */
-
- public static boolean versionEasterEgg() {
- return getInstance().versionEasterEgg;
- }
-
- /**
* @return True if sending telemetry to Mojang should be disabled.<br><br>
*
* This is true by default.
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
deleted file mode 100644
index 1e7b920..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-import java.time.Instant;
-import java.util.UUID;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import com.aizistral.nochatreports.core.NoReportsConfig;
-import com.mojang.authlib.minecraft.BanDetails;
-import com.mojang.authlib.minecraft.UserApiService;
-
-import net.fabricmc.fabric.mixin.client.rendering.MixinInGameHud;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.Minecraft.ChatStatus;
-import net.minecraft.world.entity.player.ChatVisiblity;
-
-@Mixin(Minecraft.class)
-public class MixinMinecraft {
-
- /**
- * @reason Replace "1.19.1" with "1.19.84" in game window title. No functional purpose.
- * @author Aizistral
- */
-
- @Inject(method = "createTitle", at = @At("RETURN"), cancellable = true, require = 0)
- private void onCreateTitle(CallbackInfoReturnable<String> info) {
- if (!NoReportsConfig.versionEasterEgg())
- return;
-
- if (info.getReturnValue().contains("1.19.1")) {
- info.setReturnValue(info.getReturnValue().replace("1.19.1", "1.19.84"));
- }
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
index e1dc8f2..70fa9fa 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
@@ -1,5 +1,6 @@
package com.aizistral.nochatreports.mixins.client;
+import com.aizistral.nochatreports.core.ServerSafetyState;
import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
import net.minecraft.client.multiplayer.ProfileKeyPairManager;
import net.minecraft.util.Signer;
@@ -9,9 +10,6 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import com.aizistral.nochatreports.NoChatReports;
-import com.aizistral.nochatreports.core.ServerSafetyState;
-
import java.util.Optional;
@Mixin(ProfileKeyPairManager.class)
@@ -36,10 +34,10 @@ public class MixinProfileKeyPairManager {
* @author Aizistral
*/
- @Inject(method = "profilePublicKeyData", at = @At("HEAD"), cancellable = true)
- private void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) {
+ @Inject(method = "parsePublicKey", at = @At("HEAD"), cancellable = true)
+ private static void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) {
if (!ServerSafetyState.allowsUnsafeServer()) {
- info.setReturnValue(Optional.empty());
+ info.setReturnValue(null);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
deleted file mode 100644
index 513c28c..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-import com.aizistral.nochatreports.core.NoReportsConfig;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import com.mojang.bridge.game.GameVersion;
-
-import net.minecraft.WorldVersion;
-import net.minecraft.client.gui.screens.TitleScreen;
-
-@Mixin(TitleScreen.class)
-public class MixinTitleScreen {
-
- /**
- * @reason Replace "1.19.1" with "1.19.84" in title screen. No functional purpose.
- * @author Aizistral
- */
-
- @Redirect(method = "render", at = @At(value = "INVOKE", remap = true, target =
- "Lnet/minecraft/WorldVersion;getName()Ljava/lang/String;"), require = 0)
- private String onGetVersionName(WorldVersion version) {
- String original = version.getName();
- if (!NoReportsConfig.versionEasterEgg()) return original;
- return original.contains("1.19.1") ? original.replace("1.19.1", "1.19.84") : original;
- }
-
-}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index a78c3cd..11e3947 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -36,7 +36,7 @@
"depends": {
"fabricloader": ">=0.14.6",
"fabric": "*",
- "minecraft": "=1.19.1",
+ "minecraft": "=1.19.2",
"java": ">=17"
},
"suggests": {},
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index 4e0f080..10f0fd2 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -18,8 +18,6 @@
"client.MixinChatOptionsScreen",
"client.MixinProfileKeyPairManager",
"client.MixinClientTelemetryManager",
- "client.MixinTitleScreen",
- "client.MixinMinecraft",
"client.MixinPlayerEntry",
"client.MixinChatScreen",
"client.AccessorDisconnectedScreen",