diff options
Diffstat (limited to 'NeoForge/src/main')
| -rw-r--r-- | NeoForge/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java | 29 | ||||
| -rw-r--r-- | NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedUserApiService.java | 6 | ||||
| -rw-r--r-- | NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java | 6 | ||||
| -rw-r--r-- | NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraftServicesUserApiService.java (renamed from NeoForge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinYggdrasilUserApiService.java) | 13 | ||||
| -rw-r--r-- | NeoForge/src/main/resources/META-INF/neoforge.mods.toml | 2 | ||||
| -rw-r--r-- | NeoForge/src/main/resources/nochatrestrictions.mixins.json | 3 |
6 files changed, 13 insertions, 46 deletions
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 |
