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 | |
| parent | 0ce2600cc9523997605d069aff1ebc32948b027a (diff) | |
Initial 26.3 port
24 files changed, 60 insertions, 100 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e6cf44..8eaf4b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +#### **\[Build MC26.3-v1.3.0\]:** + +- Initial release for Minecraft 26.3. + #### **\[Build MC26.2-v1.2.2\]:** - Fixed Forge and NeoForge version of the mod not working; diff --git a/Fabric/gradle.properties b/Fabric/gradle.properties index 653afe0..2511b71 100644 --- a/Fabric/gradle.properties +++ b/Fabric/gradle.properties @@ -7,14 +7,14 @@ org.gradle.configuration-cache=false # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=26.2 -loader_version=0.19.3 -loom_version=1.17-SNAPSHOT +minecraft_version=26.3 +loader_version=0.19.5 +loom_version=1.17.21 # Mod Properties -mod_version=Fabric-MC26.2-v1.2.2 +mod_version=Fabric-MC26.3-v1.3.0 maven_group=com.aizistral.nochatrestrictions archives_base_name=NoChatRestrictions # Dependencies -fabric_api_version=0.152.2+26.2
\ No newline at end of file +fabric_api_version=0.161.0+26.3
\ No newline at end of file diff --git a/Fabric/gradle/wrapper/gradle-wrapper.properties b/Fabric/gradle/wrapper/gradle-wrapper.properties index 1a70468..c42672d 100644 --- a/Fabric/gradle/wrapper/gradle-wrapper.properties +++ b/Fabric/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java b/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java index 1b653ee..248d102 100644 --- a/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java +++ b/Fabric/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/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java b/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java index c0fa4d0..2a8f935 100644 --- a/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java +++ b/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java @@ -8,16 +8,16 @@ 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; -@Mixin(Minecraft.class) +@Mixin(value = Minecraft.class, remap = false) 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/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java b/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraftServicesUserApiService.java index 4ff648d..f38140b 100644 --- a/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java +++ b/Fabric/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; diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index 1317c07..3bf02a1 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ ], "depends": { "fabricloader": ">=0.16", - "minecraft": ">=26.1", + "minecraft": ">=26.3", "java": ">=25", "fabric-api": "*" } diff --git a/Fabric/src/main/resources/nochatrestrictions.mixins.json b/Fabric/src/main/resources/nochatrestrictions.mixins.json index 3f5e294..8700b64 100644 --- a/Fabric/src/main/resources/nochatrestrictions.mixins.json +++ b/Fabric/src/main/resources/nochatrestrictions.mixins.json @@ -5,7 +5,7 @@ "mixins": [], "client": [ "MixinMinecraft", - "MixinYggdrasilUserApiService" + "MixinMinecraftServicesUserApiService" ], "injectors": { "defaultRequire": 1 diff --git a/Forge/gradle.properties b/Forge/gradle.properties index 37d3ff7..475c5b7 100644 --- a/Forge/gradle.properties +++ b/Forge/gradle.properties @@ -4,11 +4,11 @@ org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false org.gradle.configuration-cache=false -minecraft_version=26.2 -forge_version=65.0.0 +minecraft_version=26.3 +forge_version=66.0.8 archivesBaseName=NoChatRestrictions -modVersion=Forge-MC26.2-v1.2.2 -manifestVersion=26.2-v1.2.2 +modVersion=Forge-MC26.3-v1.3.0 +manifestVersion=26.3-v1.3.0 net.minecraftforge.gradle.merge-source-sets=true
\ No newline at end of file diff --git a/Forge/gradle/wrapper/gradle-wrapper.properties b/Forge/gradle/wrapper/gradle-wrapper.properties index 1a70468..c42672d 100644 --- a/Forge/gradle/wrapper/gradle-wrapper.properties +++ b/Forge/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME 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; diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index c7df76f..1101d9b 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -21,6 +21,6 @@ description="A mod dedicated to removing restrictions around the use of multipla [[dependencies.nochatrestrictions]] modId="minecraft" mandatory=true - versionRange="[26.1,)" + versionRange="[26.3)" ordering="NONE" side="BOTH" diff --git a/Forge/src/main/resources/nochatrestrictions.mixins.json b/Forge/src/main/resources/nochatrestrictions.mixins.json index c74587e..d50b07b 100644 --- a/Forge/src/main/resources/nochatrestrictions.mixins.json +++ b/Forge/src/main/resources/nochatrestrictions.mixins.json @@ -2,11 +2,10 @@ "required": true, "package": "com.aizistral.nochatrestrictions.mixins", "minVersion": "0.8", - "refmap": "nochatrestrictions.refmap.json", "mixins": [], "client": [ "MixinMinecraft", - "MixinYggdrasilUserApiService" + "MixinMinecraftServicesUserApiService" ], "injectors": { "defaultRequire": 1 diff --git a/Forge/src/main/resources/pack.mcmeta b/Forge/src/main/resources/pack.mcmeta index 8f48285..b3a3bae 100644 --- a/Forge/src/main/resources/pack.mcmeta +++ b/Forge/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { - "pack": { - "description": "NoChatRestrictions Resources", - "pack_format": 6 - } + "pack": { + "description": "NoChatRestrictions Resources", + "pack_format": 6 + } } diff --git a/NeoForge/gradle.properties b/NeoForge/gradle.properties index 13cfcfa..c23b501 100644 --- a/NeoForge/gradle.properties +++ b/NeoForge/gradle.properties @@ -4,7 +4,7 @@ org.gradle.daemon=false org.gradle.configuration-cache=false ## Environment Properties -minecraft_version=26.2 -neo_version=26.2.0.6-beta -mod_version=NeoForge-MC26.2-v1.2.2 -manifest_version=26.2-v1.2.2 +minecraft_version=26.3 +neo_version=26.3.0.36-beta +mod_version=NeoForge-MC26.3-v1.3.0 +manifest_version=26.3-v1.3.0 diff --git a/NeoForge/gradle/wrapper/gradle-wrapper.properties b/NeoForge/gradle/wrapper/gradle-wrapper.properties index 1a70468..c42672d 100644 --- a/NeoForge/gradle/wrapper/gradle-wrapper.properties +++ b/NeoForge/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java index 687444f..8bd80ce 100644 --- a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java +++ b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java @@ -1,35 +1,8 @@ package com.aizistral.nochatrestrictions; import com.aizistral.nochatrestrictions.core.NCRCore; -import com.mojang.logging.LogUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.world.food.FoodProperties; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.CreativeModeTabs; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.MapColor; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.ModLoadingContext; + import net.neoforged.fml.common.Mod; -import net.neoforged.fml.config.ModConfig; -import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; -import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; -import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; -import net.neoforged.neoforge.event.server.ServerStartingEvent; -import net.neoforged.neoforge.registries.DeferredBlock; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredItem; -import net.neoforged.neoforge.registries.DeferredRegister; -import org.slf4j.Logger; @Mod("nochatrestrictions") public class NoChatRestrictions { diff --git a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java index 1b653ee..248d102 100644 --- a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java +++ b/NeoForge/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/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java index c0fa4d0..2a8f935 100644 --- a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java +++ b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java @@ -8,16 +8,16 @@ 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; -@Mixin(Minecraft.class) +@Mixin(value = Minecraft.class, remap = false) 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/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraftServicesUserApiService.java index 4ff648d..f38140b 100644 --- a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java +++ b/NeoForge/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; diff --git a/NeoForge/src/main/resources/META-INF/neoforge.mods.toml b/NeoForge/src/main/resources/META-INF/neoforge.mods.toml index 1550235..4e78394 100644 --- a/NeoForge/src/main/resources/META-INF/neoforge.mods.toml +++ b/NeoForge/src/main/resources/META-INF/neoforge.mods.toml @@ -21,7 +21,7 @@ description="A mod dedicated to removing restrictions around the use of multipla [[dependencies.nochatrestrictions]] modId="minecraft" mandatory=true - versionRange="[26.1,)" + versionRange="[26.3)" ordering="NONE" side="BOTH" diff --git a/NeoForge/src/main/resources/nochatrestrictions.mixins.json b/NeoForge/src/main/resources/nochatrestrictions.mixins.json index c74587e..d50b07b 100644 --- a/NeoForge/src/main/resources/nochatrestrictions.mixins.json +++ b/NeoForge/src/main/resources/nochatrestrictions.mixins.json @@ -2,11 +2,10 @@ "required": true, "package": "com.aizistral.nochatrestrictions.mixins", "minVersion": "0.8", - "refmap": "nochatrestrictions.refmap.json", "mixins": [], "client": [ "MixinMinecraft", - "MixinYggdrasilUserApiService" + "MixinMinecraftServicesUserApiService" ], "injectors": { "defaultRequire": 1 |
