diff options
| author | Aizistral | 2026-09-30 00:28:00 +0200 |
|---|---|---|
| committer | Aizistral | 2026-09-30 11:36:53 +0200 |
| commit | c648e2495327f7fe6ecfdda91d8075a9141dd5a7 (patch) | |
| tree | 9e840fde3a48e12c4ce5fb2a278391de26265a91 /Forge/src/main/java/com | |
| parent | 0ce2600cc9523997605d069aff1ebc32948b027a (diff) | |
Initial 26.3 port
Diffstat (limited to 'Forge/src/main/java/com')
| -rw-r--r-- | Forge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java | 6 | ||||
| -rw-r--r-- | Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java | 4 | ||||
| -rw-r--r-- | Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraftServicesUserApiService.java (renamed from Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java) | 13 |
3 files changed, 9 insertions, 14 deletions
diff --git a/Forge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java b/Forge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java index 1b653ee..248d102 100644 --- a/Forge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java +++ b/Forge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java @@ -1,19 +1,17 @@ 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; +import com.mojang.authlib.services.request.AbuseReportRequest; +import com.mojang.authlib.services.response.KeyPairResponse; public class WrappedUserApiService implements UserApiService { private final UserApiService service; diff --git a/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java b/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java index 4dc6080..2a8f935 100644 --- a/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java +++ b/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java @@ -8,7 +8,7 @@ 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 com.mojang.authlib.services.MinecraftServicesDiscoveryService; import net.minecraft.client.Minecraft; import net.minecraft.client.main.GameConfig; @@ -17,7 +17,7 @@ import net.minecraft.client.main.GameConfig; public class MixinMinecraft { @Inject(method = "createUserApiService", at = @At("RETURN"), cancellable = true) - private static void onCreateUserApi(YggdrasilAuthenticationService authService, GameConfig gameConfig, + private static void onCreateUserApi(MinecraftServicesDiscoveryService discoveryService, GameConfig gameConfig, CallbackInfoReturnable<UserApiService> info) { UserApiService returnedService = info.getReturnValue(); assert returnedService != null; diff --git a/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java b/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraftServicesUserApiService.java index 4ff648d..f38140b 100644 --- a/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java +++ b/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraftServicesUserApiService.java @@ -1,6 +1,5 @@ package com.aizistral.nochatrestrictions.mixins; -import java.util.Map; import java.util.concurrent.Executor; import org.jetbrains.annotations.Nullable; @@ -13,27 +12,25 @@ 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; import com.mojang.authlib.minecraft.UserApiService.UserProperties; -import com.mojang.authlib.yggdrasil.YggdrasilUserApiService; +import com.mojang.authlib.services.MinecraftServicesUserApiService; /** * Applies the chat/multiplayer restriction removal directly on the concrete * 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} + * In-game account switchers (e.g. IAS) build a brand new {@link MinecraftServicesUserApiService} * and swap it onto the Minecraft instance without going through the original wrapping * path, which is why restrictions used to come back after switching accounts. By hooking * the service class itself, every instance the game ever uses returns permissive * properties, regardless of who created it or when. */ -@Mixin(value = YggdrasilUserApiService.class, remap = false) -public class MixinYggdrasilUserApiService { +@Mixin(value = MinecraftServicesUserApiService.class, remap = false) +public class MixinMinecraftServicesUserApiService { static { - NCRCore.LOGGER.info("MixinYggdrasilUserApiService initialized succesfully."); + NCRCore.LOGGER.info("MixinMinecraftServicesUserApiService initialized successfully."); } private @Unique @Nullable UserProperties wrappedProperties; |
