From 505280df73446345b2fde889a85ad57e45f5ba49 Mon Sep 17 00:00:00 2001 From: altrisi Date: Wed, 26 Nov 2025 23:28:09 +0100 Subject: [PATCH] Remove ctrlQCraftingFix as the bug is fixed In 24w33a (1.21.2) according to MC-135971 --- src/main/java/carpet/CarpetSettings.java | 3 - ...tractContainerMenu_ctrlQCraftingMixin.java | 55 ------------------- src/main/resources/carpet.mixins.json | 1 - 3 files changed, 59 deletions(-) delete mode 100644 src/main/java/carpet/mixins/AbstractContainerMenu_ctrlQCraftingMixin.java diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 8df84e0d..177a29c9 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -156,9 +156,6 @@ public class CarpetSettings @Rule(desc = "Gbhs sgnf sadsgras fhskdpri!!!", category = EXPERIMENTAL) public static boolean superSecretSetting = false; - @Rule(desc = "Dropping entire stacks works also from on the crafting UI result slot", category = {RuleCategory.BUGFIX, SURVIVAL}) - public static boolean ctrlQCraftingFix = false; - @Rule(desc = "Parrots don't get of your shoulders until you receive proper damage", category = {SURVIVAL, FEATURE}) public static boolean persistentParrots = false; diff --git a/src/main/java/carpet/mixins/AbstractContainerMenu_ctrlQCraftingMixin.java b/src/main/java/carpet/mixins/AbstractContainerMenu_ctrlQCraftingMixin.java deleted file mode 100644 index 49620f21..00000000 --- a/src/main/java/carpet/mixins/AbstractContainerMenu_ctrlQCraftingMixin.java +++ /dev/null @@ -1,55 +0,0 @@ -package carpet.mixins; - -import carpet.CarpetSettings; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.core.NonNullList; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.ClickType; -import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -@Mixin(AbstractContainerMenu.class) -public abstract class AbstractContainerMenu_ctrlQCraftingMixin -{ - - @Shadow public abstract void clicked(int int_1, int int_2, ClickType slotActionType_1, Player playerEntity_1); - - @Shadow public abstract void broadcastChanges(); - - @Shadow @Final public NonNullList slots; - - @Shadow protected abstract void resetQuickCraft(); - - @Shadow public abstract ItemStack getCarried(); - - @Inject( method = "doClick", at = @At(value = "HEAD"), cancellable = true) - private void onThrowClick(int slotId, int clickData, ClickType actionType, Player playerEntity, CallbackInfo ci) - { - if (actionType == ClickType.THROW && CarpetSettings.ctrlQCraftingFix && this.getCarried().isEmpty() && slotId >= 0) - { - Slot slot_4 = slots.get(slotId); - if (/*slot_4 != null && */slot_4.hasItem() && slot_4.mayPickup(playerEntity)) - { - if(slotId == 0 && clickData == 1) - { - Item craftedItem = slot_4.getItem().getItem(); - while(slot_4.hasItem() && slot_4.getItem().getItem() == craftedItem) - { - this.clicked(slotId, 0, ClickType.THROW, playerEntity); - } - this.broadcastChanges(); - this.resetQuickCraft(); - ci.cancel(); - } - } - } - } -} diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index c2bd87ed..0eed301f 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -96,7 +96,6 @@ "Player_antiCheatDisabledMixin", "ServerPlayerGameMode_antiCheatMixin", "HopperBlockEntity_counterMixin", - "AbstractContainerMenu_ctrlQCraftingMixin", "Connection_packetCounterMixin", "ItemStack_stackableShulkerBoxesMixin", "ItemEntityMixin",