summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/aizistral/nochatreports
diff options
context:
space:
mode:
authorMadis2022-07-13 20:30:40 +0300
committerMadis2022-07-13 20:30:40 +0300
commit773ec8c6d0c268125bfb184741f5932355623367 (patch)
treeb7352676718159a625f9acc114edeef7dd950868 /src/main/java/com/aizistral/nochatreports
parent48ba64a7e3bffa26d3cdc88a181a9e33fd3c1b48 (diff)
More config options
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java33
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java13
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java2
5 files changed, 44 insertions, 10 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
index 384ab08..92e2148 100644
--- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
@@ -39,7 +39,8 @@ public class NoReportsConfig {
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
private static NoReportsConfig INSTANCE;
private boolean demandOnClient, demandOnServer, enableDebugLog, convertToGameMessage = true,
- showServerSafety = true, suppressMessageTrustIndicators = true, alwaysHideReportButton = false;
+ showServerSafety = true, suppressMessageTrustIndicators = true, alwaysHideReportButton = false,
+ versionEasterEgg = true, disableTelemetry = true, showReloadButton = true;
private List<String> whitelistedServers;
private static NoReportsConfig getInstance() {
@@ -207,4 +208,34 @@ public class NoReportsConfig {
return getInstance().alwaysHideReportButton;
}
+ /**
+ * @return True if "1.19.1" should be changed to "1.19.84" on titlebar and title screen.
+ *
+ * This is true by default.
+ */
+
+ public static boolean versionEasterEgg() {
+ return getInstance().versionEasterEgg;
+ }
+
+ /**
+ * @return True if sending telemetry to Mojang should be disabled.
+ *
+ * This is true by default.
+ */
+
+ public static boolean disableTelemetry() {
+ return getInstance().disableTelemetry;
+ }
+
+ /**
+ * @return True if the configuration reload button should be displayed in multiplayer screen.
+ *
+ * This is true by default.
+ */
+
+ public static boolean showReloadButton() {
+ return getInstance().showReloadButton;
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
index 36e1986..7a5aaf9 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
@@ -1,14 +1,11 @@
package com.aizistral.nochatreports.mixins.client;
-import com.mojang.authlib.minecraft.TelemetrySession;
-import com.mojang.authlib.minecraft.UserApiService;
+import com.aizistral.nochatreports.core.NoReportsConfig;
import net.minecraft.client.ClientTelemetryManager;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
-import java.util.concurrent.Executor;
-
@Mixin(ClientTelemetryManager.class)
public class MixinClientTelemetryManager {
@@ -17,11 +14,9 @@ public class MixinClientTelemetryManager {
* @author Aizistral
*/
- @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/UserApiService;"
- + "newTelemetrySession(Ljava/util/concurrent/Executor;)Lcom/mojang/authlib/minecraft/TelemetrySession;",
- remap = false))
- private TelemetrySession onCreateTelemetrySession(UserApiService service, Executor executor) {
- return TelemetrySession.DISABLED;
+ @Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/SharedConstants;IS_RUNNING_IN_IDE:Z"))
+ private boolean disableTelemetrySession() {
+ return NoReportsConfig.disableTelemetry();
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
index b6c8b71..e9f6395 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
@@ -45,6 +45,9 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
@Inject(method = "init", at = @At("HEAD"))
private void onInit(CallbackInfo info) {
+ if (!NoReportsConfig.showReloadButton())
+ return;
+
var button = new ImageButton(this.width/2 + 158, this.height - 52, 20, 20, 0, 0, 20, RELOAD_TEXTURE,
64, 64, btn -> NoReportsConfig.loadConfig(), (btn, poseStack, i, j) ->
this.renderTooltipNoGap(poseStack, this.minecraft.font.split(RELOAD_TOOLTIP, 250), i, j),
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
index 0d9c796..1e7b920 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
@@ -28,6 +28,9 @@ public class MixinMinecraft {
@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/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
index 11def95..513c28c 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
@@ -1,5 +1,6 @@
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;
@@ -21,6 +22,7 @@ public class MixinTitleScreen {
"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;
}