Merge remote-tracking branch 'origin/1.19.2' into 1.20

Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	fabric/src/main/java/dev/architectury/event/fabric/EventHandlerImpl.java
#	forge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java
#	gradle.properties

fabric/src/main/java/dev/architectury/event/fabric/EventHandlerImpl.java

@@ -19,14 +19,13 @@
 
 package dev.architectury.event.fabric;
 
-import dev.architectury.event.events.client.ClientGuiEvent;
-import dev.architectury.event.events.client.ClientLifecycleEvent;
-import dev.architectury.event.events.client.ClientTickEvent;
-import dev.architectury.event.events.client.ClientTooltipEvent;
+import com.mojang.brigadier.CommandDispatcher;
+import dev.architectury.event.events.client.*;
 import dev.architectury.event.events.common.*;
 import dev.architectury.impl.fabric.ChatComponentImpl;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
@@ -58,6 +57,11 @@ public class EventHandlerImpl {
         
         ItemTooltipCallback.EVENT.register((itemStack, tooltipFlag, list) -> ClientTooltipEvent.ITEM.invoker().append(itemStack, list, tooltipFlag));
         HudRenderCallback.EVENT.register((graphics, tickDelta) -> ClientGuiEvent.RENDER_HUD.invoker().renderHud(graphics, tickDelta));
+        
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, access) -> {
+            ClientCommandRegistrationEvent.EVENT.invoker().register((CommandDispatcher<ClientCommandRegistrationEvent.ClientCommandSourceStack>)
+                    (CommandDispatcher<?>) dispatcher, access);
+        });
     }
     
     public static void registerCommon() {

fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinFabricClientCommandSource.java

@@ -0,0 +1,64 @@
+/*
+ * This file is part of architectury.
+ * Copyright (C) 2020, 2021, 2022 architectury
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package dev.architectury.mixin.fabric.client;
+
+import dev.architectury.event.events.client.ClientCommandRegistrationEvent;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+import org.spongepowered.asm.mixin.Mixin;
+
+import java.util.function.Supplier;
+
+@Mixin(FabricClientCommandSource.class)
+public interface MixinFabricClientCommandSource extends ClientCommandRegistrationEvent.ClientCommandSourceStack {
+    @Override
+    default void arch$sendSuccess(Supplier<Component> message, boolean broadcastToAdmins) {
+        ((FabricClientCommandSource) this).sendFeedback(message.get());
+    }
+    
+    @Override
+    default void arch$sendFailure(Component message) {
+        ((FabricClientCommandSource) this).sendError(message);
+    }
+    
+    @Override
+    default LocalPlayer arch$getPlayer() {
+        return ((FabricClientCommandSource) this).getPlayer();
+    }
+    
+    @Override
+    default Vec3 arch$getPosition() {
+        return ((FabricClientCommandSource) this).getPosition();
+    }
+    
+    @Override
+    default Vec2 arch$getRotation() {
+        return ((FabricClientCommandSource) this).getRotation();
+    }
+    
+    @Override
+    default ClientLevel arch$getLevel() {
+        return ((FabricClientCommandSource) this).getWorld();
+    }
+}

fabric/src/main/resources/architectury.mixins.json

@@ -12,6 +12,7 @@
     "client.MixinClientPacketListener",
     "client.MixinDebugScreenOverlay",
     "client.MixinEffectInstance",
+    "client.MixinFabricClientCommandSource",
     "client.MixinGameRenderer",
     "client.MixinGuiGraphics",
     "client.MixinIntegratedServer",