Remove ctrlQCraftingFix as the bug is fixed
In 24w33a (1.21.2) according to MC-135971
This commit is contained in:
1 parent
9f8e6f5168
commit
505280df73
3 files changed
-59
No files matched your search
@@ -156,9 +156,6 @@ public class CarpetSettings
|
|||||||
@Rule(desc = "Gbhs sgnf sadsgras fhskdpri!!!", category = EXPERIMENTAL)
|
@Rule(desc = "Gbhs sgnf sadsgras fhskdpri!!!", category = EXPERIMENTAL)
|
||||||
public static boolean superSecretSetting = false;
|
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})
|
@Rule(desc = "Parrots don't get of your shoulders until you receive proper damage", category = {SURVIVAL, FEATURE})
|
||||||
public static boolean persistentParrots = false;
|
public static boolean persistentParrots = false;
|
||||||
|
|
||||||
|
|||||||
@@ -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<Slot> 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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -96,7 +96,6 @@
|
|||||||
"Player_antiCheatDisabledMixin",
|
"Player_antiCheatDisabledMixin",
|
||||||
"ServerPlayerGameMode_antiCheatMixin",
|
"ServerPlayerGameMode_antiCheatMixin",
|
||||||
"HopperBlockEntity_counterMixin",
|
"HopperBlockEntity_counterMixin",
|
||||||
"AbstractContainerMenu_ctrlQCraftingMixin",
|
|
||||||
"Connection_packetCounterMixin",
|
"Connection_packetCounterMixin",
|
||||||
"ItemStack_stackableShulkerBoxesMixin",
|
"ItemStack_stackableShulkerBoxesMixin",
|
||||||
"ItemEntityMixin",
|
"ItemEntityMixin",
|
||||||
|
|||||||
Reference in new issue
Block a user