chore(events): preprocess MixinGuiContainer

Skytils · Aug 9, 2024 · 64bc387 · 64bc387
1 parent 18ba4b0
commit 64bc387
Showing 1 changed file with 65 additions and 2 deletions.
diff --git a/events/src/main/java/gg/skytils/event/mixins/gui/MixinGuiContainer.java b/events/src/main/java/gg/skytils/event/mixins/gui/MixinGuiContainer.java
@@ -30,43 +30,106 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+//#if MC >= 12000
+//$$ import net.minecraft.client.gui.DrawContext;
+//$$ import net.minecraft.screen.slot.SlotActionType;
+//$$ import net.minecraft.text.Text;
+//$$
+//$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+//#endif
+
 @Mixin(GuiContainer.class)
 public abstract class MixinGuiContainer extends GuiScreen {
 
     @Shadow public Container inventorySlots;
 
-    @Inject(method = "keyTyped", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/EntityPlayerSP;closeScreen()V", shift = At.Shift.BEFORE), cancellable = true)
+    //#if MC>=12000
+    //$$ protected MixinGuiContainer(Text title) {
+    //$$    super(title);
+    //$$ }
+    //#endif
+
+    @Inject(
+            //#if MC>=12000
+            //$$ method = "keyPressed",
+            //#else
+            method = "keyTyped",
+            //#endif
+            at = @At(
+                    value = "INVOKE",
+                    target =
+                        //#if MC>=12000
+                        //$$ "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;close()V",
+                        //#else
+                        "Lnet/minecraft/client/entity/EntityPlayerSP;closeScreen()V",
+                        //#endif
+                    shift = At.Shift.BEFORE
+            ), cancellable = true)
+    //#if MC>=12000
+    //$$ private void closeWindowPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
+    //#else
     private void closeWindowPressed(CallbackInfo ci) {
+    //#endif
         if (EventsKt.postCancellableSync(new GuiContainerCloseWindowEvent((GuiContainer) (Object) this, this.inventorySlots))) {
+            //#if MC>=12000
+            //$$ cir.setReturnValue(true);
+            //#else
             ci.cancel();
+            //#endif
         }
     }
 
+    //#if MC>=12000
+    //$$ @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;render(Lnet/minecraft/client/gui/DrawContext;IIF)V", shift = At.Shift.AFTER))
+    //$$ private void backgroundDrawn(DrawContext context, int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
+    //#else
     @Inject(method = "drawScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlStateManager;color(FFFF)V", ordinal = 1, shift = At.Shift.AFTER))
     private void backgroundDrawn(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
+    //#endif
         EventsKt.postSync(new GuiContainerBackgroundDrawnEvent((GuiContainer) (Object) this, this.inventorySlots, mouseX, mouseY, partialTicks));
     }
 
+    //#if MC>=12000
+    //$$ @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawForeground(Lnet/minecraft/client/gui/DrawContext;II)V", shift = At.Shift.AFTER))
+    //$$ private void onForegroundDraw(DrawContext context, int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
+    //#else
     @Inject(method = "drawScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/inventory/GuiContainer;drawGuiContainerForegroundLayer(II)V", shift = At.Shift.AFTER))
     private void onForegroundDraw(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
+    //#endif
         EventsKt.postSync(new GuiContainerForegroundDrawnEvent((GuiContainer) (Object) this, this.inventorySlots, mouseX, mouseY, partialTicks));
     }
 
     @Inject(method = "drawSlot", at = @At("HEAD"), cancellable = true)
+    //#if MC>=12000
+    //$$ private void onDrawSlot(DrawContext context, Slot slot, CallbackInfo ci) {
+    //#else
     private void onDrawSlot(Slot slot, CallbackInfo ci) {
+    //#endif
         if (EventsKt.postCancellableSync(new GuiContainerPreDrawSlotEvent((GuiContainer) (Object) this, this.inventorySlots, slot))) {
             ci.cancel();
         }
     }
 
     @Inject(method = "drawSlot", at = @At("RETURN"))
+    //#if MC>=12000
+    //$$ private void onDrawSlotPost(DrawContext context, Slot slot, CallbackInfo ci) {
+    //#else
     private void onDrawSlotPost(Slot slot, CallbackInfo ci) {
+    //#endif
         EventsKt.postSync(new GuiContainerPostDrawSlotEvent((GuiContainer) (Object) this, this.inventorySlots, slot));
     }
 
+    //#if MC>=12000
+    //$$ @Inject(method = "onMouseClick(Lnet/minecraft/screen/slot/Slot;IILnet/minecraft/screen/slot/SlotActionType;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;clickSlot(IIILnet/minecraft/screen/slot/SlotActionType;Lnet/minecraft/entity/player/PlayerEntity;)V"), cancellable = true)
+    //$$ private void onMouseClickEvent(Slot slot, int slotId, int button, SlotActionType actionType, CallbackInfo ci) {
+    //$$    this.onMouseClickEvent(slot, slotId, button, actionType.ordinal(), ci);
+    //$$ }
+    //#endif
 
+    //#if MC<12000
     @Inject(method = "handleMouseClick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/PlayerControllerMP;windowClick(IIIILnet/minecraft/entity/player/EntityPlayer;)Lnet/minecraft/item/ItemStack;"), cancellable = true)
-    private void onMouseClick(Slot slot, int slotId, int clickedButton, int clickType, CallbackInfo ci) {
+    //#endif
+    private void onMouseClickEvent(Slot slot, int slotId, int clickedButton, int clickType, CallbackInfo ci) {
         if (EventsKt.postCancellableSync(new GuiContainerSlotClickEvent((GuiContainer) (Object) this, this.inventorySlots, slot, slotId, clickedButton, clickType))) {
             ci.cancel();
         }