brig/authlib mixins don't work on neo

mod-shared/src/mixin/java/net/kyori/adventure/platform/modcommon/impl/mixin/authlib/GameProfileMixin.java → fabric/src/mixin/java/net/kyori/adventure/platform/fabric/impl/mixin/authlib/GameProfileMixin.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package net.kyori.adventure.platform.modcommon.impl.mixin.authlib;
+package net.kyori.adventure.platform.fabric.impl.mixin.authlib;
 
 import com.mojang.authlib.GameProfile;
 import java.util.UUID;

mod-shared/src/mixin/java/net/kyori/adventure/platform/modcommon/impl/mixin/brigadier/exceptions/CommandSyntaxExceptionMixin.java → fabric/src/mixin/java/net/kyori/adventure/platform/fabric/impl/mixin/brigadier/exceptions/CommandSyntaxExceptionMixin.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package net.kyori.adventure.platform.modcommon.impl.mixin.brigadier.exceptions;
+package net.kyori.adventure.platform.fabric.impl.mixin.brigadier.exceptions;
 
 import com.mojang.brigadier.Message;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;

fabric/src/mixin/resources/adventure-platform-fabric.mixins.json

@@ -4,6 +4,8 @@
   "mixins": [
     "api.KeyMixin",
     "api.SignedMessageMixin",
+    "authlib.GameProfileMixin",
+    "brigadier.exceptions.CommandSyntaxExceptionMixin",
     "minecraft.commands.CommandsMixin",
     "minecraft.commands.synchronization.ArgumentTypeInfosMixin",
     "minecraft.commands.synchronization.ArgumentUtilsMixin",

mod-shared/src/main/java/net/kyori/adventure/platform/modcommon/MinecraftAudiences.java

@@ -33,6 +33,7 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.key.Keyed;
 import net.kyori.adventure.platform.modcommon.impl.AdventureCommon;
+import net.kyori.adventure.platform.modcommon.impl.CommandSyntaxExceptionWrapper;
 import net.kyori.adventure.platform.modcommon.impl.MinecraftAudiencesInternal;
 import net.kyori.adventure.platform.modcommon.impl.NonWrappingComponentSerializer;
 import net.kyori.adventure.platform.modcommon.impl.PlayerChatMessageBridge;
@@ -161,8 +162,11 @@ static Sound.Emitter asEmitter(final Entity entity) {
    * @since 6.0.0
    */
   @Contract("null -> null; !null -> !null")
-  static ComponentMessageThrowable asComponentThrowable(final CommandSyntaxException ex) {
-    return (ComponentMessageThrowable) ex;
+  default ComponentMessageThrowable asComponentThrowable(final CommandSyntaxException ex) {
+    if (ex == null) {
+      return null;
+    }
+    return new CommandSyntaxExceptionWrapper(ex, this);
   }
 
   /**
@@ -198,7 +202,13 @@ static Identified identified(final Player player) {
    */
   @Contract("null -> null; !null -> !null")
   static Identity identity(final GameProfile profile) {
-    return (Identity) profile;
+    if (profile == null) {
+      return null;
+    }
+    if (profile instanceof Identity identity) {
+      return identity;
+    }
+    return Identity.identity(profile.getId());
   }
 
   /**

mod-shared/src/main/java/net/kyori/adventure/platform/modcommon/impl/CommandSyntaxExceptionWrapper.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of adventure-platform-mod, licensed under the MIT License.
+ *
+ * Copyright (c) 2024 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package net.kyori.adventure.platform.modcommon.impl;
+
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.kyori.adventure.platform.modcommon.MinecraftAudiences;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.util.ComponentMessageThrowable;
+import net.minecraft.network.chat.ComponentUtils;
+import org.jetbrains.annotations.Nullable;
+
+public final class CommandSyntaxExceptionWrapper extends CommandSyntaxException implements ComponentMessageThrowable {
+  private final @Nullable Component componentMessage;
+
+  public CommandSyntaxExceptionWrapper(final CommandSyntaxException wrapped, final MinecraftAudiences audiences) {
+    super(wrapped.getType(), wrapped.getRawMessage(), wrapped.getInput(), wrapped.getCursor());
+    this.componentMessage = wrapped.getRawMessage() == null ? null : audiences.asAdventure(ComponentUtils.fromMessage(wrapped.getRawMessage()));
+  }
+
+  @Override
+  public @Nullable Component componentMessage() {
+    return this.componentMessage;
+  }
+}

mod-shared/src/mixin/java/net/kyori/adventure/platform/modcommon/impl/mixin/minecraft/world/entity/player/PlayerMixin.java

@@ -26,6 +26,7 @@
 import com.mojang.authlib.GameProfile;
 import net.kyori.adventure.identity.Identity;
 import net.kyori.adventure.platform.modcommon.IdentifiedAtRuntime;
+import net.kyori.adventure.platform.modcommon.MinecraftAudiences;
 import net.kyori.adventure.platform.modcommon.impl.AdventureCommon;
 import net.kyori.adventure.platform.modcommon.impl.NonWrappingComponentSerializer;
 import net.kyori.adventure.platform.modcommon.impl.PointerProviderBridge;
@@ -56,7 +57,7 @@ protected PlayerMixin(final EntityType<? extends LivingEntity> entityType, final
 
   @Override
   public @NotNull Identity identity() {
-    return (Identity) this.gameProfile;
+    return MinecraftAudiences.identity(this.gameProfile);
   }
 
   @Override

mod-shared/src/mixin/resources/adventure-platform-mod-shared.mixins.json

@@ -2,8 +2,6 @@
   "package": "net.kyori.adventure.platform.modcommon.impl.mixin",
   "parent": "adventure-platform-mod-shared.parent.mixins.json",
   "mixins": [
-    "authlib.GameProfileMixin",
-    "brigadier.exceptions.CommandSyntaxExceptionMixin",
     "minecraft.commands.CommandSourceStackMixin",
     "minecraft.network.FriendlyByteBufMixin",
     "minecraft.network.chat.ClickEvent_ActionMixin",