aboutsummaryrefslogtreecommitdiffstats
path: root/NeoForge
diff options
context:
space:
mode:
Diffstat (limited to 'NeoForge')
-rw-r--r--NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java75
-rw-r--r--NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserProperties.java46
-rw-r--r--NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java18
-rw-r--r--NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java40
4 files changed, 147 insertions, 32 deletions
diff --git a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java
new file mode 100644
index 0000000..1b653ee
--- /dev/null
+++ b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java
@@ -0,0 +1,75 @@
+package com.aizistral.nochatrestrictions.core;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Executor;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.aizistral.nochatrestrictions.config.NCRConfig;
+import com.google.common.collect.ImmutableSet;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.minecraft.TelemetrySession;
+import com.mojang.authlib.minecraft.UserApiService;
+import com.mojang.authlib.minecraft.report.AbuseReportLimits;
+import com.mojang.authlib.yggdrasil.request.AbuseReportRequest;
+import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
+
+public class WrappedUserApiService implements UserApiService {
+ private final UserApiService service;
+ private @Nullable UserProperties properties = null;
+
+ public WrappedUserApiService(UserApiService service) {
+ this.service = service;
+ }
+
+ @Override
+ public UserProperties fetchProperties() throws AuthenticationException {
+ if (this.properties != null)
+ return this.properties;
+ else
+ return this.properties = WrappedUserProperties.of(this.service.fetchProperties());
+ }
+
+ @Override
+ public boolean isBlockedPlayer(UUID playerID) {
+ return this.service.isBlockedPlayer(playerID);
+ }
+
+ @Override
+ public void refreshBlockList() {
+ this.service.refreshBlockList();
+ }
+
+ @Override
+ public TelemetrySession newTelemetrySession(Executor executor) {
+ if (NCRConfig.getInstance().allowTelemetry())
+ return this.service.newTelemetrySession(executor);
+ else
+ return TelemetrySession.DISABLED;
+ }
+
+ // Methods below primarily concern chat reporting. Not doing anything with them
+ // here as that's out of scope for this mod, it's more of a No Chat Reports thing
+
+ @Override
+ public KeyPairResponse getKeyPair() {
+ return this.service.getKeyPair();
+ }
+
+ @Override
+ public void reportAbuse(AbuseReportRequest request) {
+ this.service.reportAbuse(request);
+ }
+
+ @Override
+ public boolean canSendReports() {
+ return this.service.canSendReports();
+ }
+
+ @Override
+ public AbuseReportLimits getAbuseReportLimits() {
+ return this.service.getAbuseReportLimits();
+ }
+
+}
diff --git a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserProperties.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserProperties.java
new file mode 100644
index 0000000..1d869b8
--- /dev/null
+++ b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserProperties.java
@@ -0,0 +1,46 @@
+package com.aizistral.nochatrestrictions.core;
+
+import java.util.Map;
+
+import com.aizistral.nochatrestrictions.config.NCRConfig;
+import com.google.common.collect.ImmutableSet;
+import com.mojang.authlib.minecraft.UserApiService.UserFlag;
+import com.mojang.authlib.minecraft.UserApiService.UserProperties;
+
+public final class WrappedUserProperties {
+
+ private WrappedUserProperties() {
+ throw new UnsupportedOperationException("Can't touch this");
+ }
+
+ public static UserProperties of(UserProperties properties) {
+ NCRConfig config = NCRConfig.getInstance();
+ ImmutableSet.Builder<UserFlag> flags = ImmutableSet.builder();
+
+ flags.add(UserFlag.CHAT_ALLOWED); // always let the player access chat
+ flags.add(UserFlag.SERVERS_ALLOWED); // always let the player open multiplayer menu
+ flags.add(UserFlag.REALMS_ALLOWED); // always let the player open Realms menu
+ flags.add(UserFlag.FRIENDS_ENABLED); // not sure if we need this, but let it be
+ // flags.add(UserFlag.CHAT_FRIENDS_ONLY); // not adding this for obvious reasons
+
+ addOptionalFlag(UserFlag.ACCEPT_FRIEND_INVITES, flags, properties); // I assume this is user-controller
+
+ if (config.allowTelemetry()) { // weird flex but ok
+ addOptionalFlag(UserFlag.TELEMETRY_ENABLED, flags, properties);
+ addOptionalFlag(UserFlag.OPTIONAL_TELEMETRY_AVAILABLE, flags, properties);
+ }
+
+ if (config.allowProfanityFilter()) { // never seen anyone actually want this, but sure
+ addOptionalFlag(UserFlag.PROFANITY_FILTER_ENABLED, flags, properties);
+ }
+
+ return new UserProperties(flags.build(), Map.of());
+ }
+
+ private static void addOptionalFlag(UserFlag flag, ImmutableSet.Builder<UserFlag> builder, UserProperties properties) {
+ if (properties.flag(flag)) {
+ builder.add(flag);
+ }
+ }
+
+}
diff --git a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java
index b5605df..c0fa4d0 100644
--- a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java
+++ b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java
@@ -5,14 +5,26 @@ 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.nochatrestrictions.core.NCRCore;
+import com.aizistral.nochatrestrictions.core.WrappedUserApiService;
+import com.mojang.authlib.minecraft.UserApiService;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+
import net.minecraft.client.Minecraft;
+import net.minecraft.client.main.GameConfig;
@Mixin(Minecraft.class)
public class MixinMinecraft {
- // Removal of multiplayer/chat/telemetry restrictions is handled in
- // MixinYggdrasilUserApiService, so that it keeps working after in-game
- // account switchers (e.g. IAS) replace the UserApiService instance.
+ @Inject(method = "createUserApiService", at = @At("RETURN"), cancellable = true)
+ private static void onCreateUserApi(YggdrasilAuthenticationService authService, GameConfig gameConfig,
+ CallbackInfoReturnable<UserApiService> info) {
+ UserApiService returnedService = info.getReturnValue();
+ assert returnedService != null;
+ info.setReturnValue(new WrappedUserApiService(returnedService));
+
+ NCRCore.LOGGER.info("Successfully supplanted UserApiService with a wrapped version.");
+ }
@Inject(method = "isNameBanned", at = @At("HEAD"), cancellable = true)
private void onCheckNameBan(CallbackInfoReturnable<Boolean> info) {
diff --git a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java
index 923d385..4ff648d 100644
--- a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java
+++ b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java
@@ -3,6 +3,7 @@ package com.aizistral.nochatrestrictions.mixins;
import java.util.Map;
import java.util.concurrent.Executor;
+import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
@@ -11,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.aizistral.nochatrestrictions.config.NCRConfig;
import com.aizistral.nochatrestrictions.core.NCRCore;
+import com.aizistral.nochatrestrictions.core.WrappedUserProperties;
import com.google.common.collect.ImmutableSet;
import com.mojang.authlib.minecraft.TelemetrySession;
import com.mojang.authlib.minecraft.UserApiService.UserFlag;
@@ -19,7 +21,7 @@ import com.mojang.authlib.yggdrasil.YggdrasilUserApiService;
/**
* Applies the chat/multiplayer restriction removal directly on the concrete
- * service class instead of wrapping it once at {@code Minecraft.createUserApiService}.
+ * service class instead of just wrapping it once at {@code Minecraft#createUserApiService}.
*
* In-game account switchers (e.g. IAS) build a brand new {@link YggdrasilUserApiService}
* and swap it onto the Minecraft instance without going through the original wrapping
@@ -34,34 +36,21 @@ public class MixinYggdrasilUserApiService {
NCRCore.LOGGER.info("MixinYggdrasilUserApiService initialized succesfully.");
}
+ private @Unique @Nullable UserProperties wrappedProperties;
+
@Inject(method = "fetchProperties", at = @At("RETURN"), cancellable = true)
private void onFetchProperties(CallbackInfoReturnable<UserProperties> info) {
UserProperties original = info.getReturnValue();
if (original == null)
return;
-
- NCRConfig config = NCRConfig.getInstance();
- ImmutableSet.Builder<UserFlag> flags = ImmutableSet.builder();
-
- flags.add(UserFlag.CHAT_ALLOWED); // always let the player access chat
- flags.add(UserFlag.SERVERS_ALLOWED); // always let the player open multiplayer menu
- flags.add(UserFlag.REALMS_ALLOWED); // always let the player open Realms menu
- flags.add(UserFlag.FRIENDS_ENABLED); // not sure if we need this, but let it be
- // flags.add(UserFlag.CHAT_FRIENDS_ONLY); // not adding this for obvious reasons
-
- this.addOptionalFlag(UserFlag.ACCEPT_FRIEND_INVITES, flags, original); // I assume this is user-controlled
-
- if (config.allowTelemetry()) { // weird flex but ok
- this.addOptionalFlag(UserFlag.TELEMETRY_ENABLED, flags, original);
- this.addOptionalFlag(UserFlag.OPTIONAL_TELEMETRY_AVAILABLE, flags, original);
- }
-
- if (config.allowProfanityFilter()) { // never seen anyone actually want this, but sure
- this.addOptionalFlag(UserFlag.PROFANITY_FILTER_ENABLED, flags, original);
+ else if (this.wrappedProperties != null) {
+ info.setReturnValue(this.wrappedProperties);
+ return;
+ } else {
+ info.setReturnValue(this.wrappedProperties = WrappedUserProperties.of(original));
+ return;
}
-
- info.setReturnValue(new UserProperties(flags.build(), Map.of()));
}
@Inject(method = "newTelemetrySession", at = @At("HEAD"), cancellable = true)
@@ -71,11 +60,4 @@ public class MixinYggdrasilUserApiService {
}
}
- @Unique
- private void addOptionalFlag(UserFlag flag, ImmutableSet.Builder<UserFlag> builder, UserProperties properties) {
- if (properties.flag(flag)) {
- builder.add(flag);
- }
- }
-
}