remove injection.mixin.features.v1_6_1.MixinAbstractContainerScreen and add new mixins recreating shift click behavior in specific containers in certain version ranges

src/main/java/com/viaversion/viafabricplus/features/FeaturesLoading.java

@@ -35,6 +35,7 @@
 import com.viaversion.viafabricplus.features.global.ResourcePackHeaderDiff;
 import com.viaversion.viafabricplus.features.v1_11_1.Recipes1_11_2;
 import com.viaversion.viafabricplus.features.v1_12_2.FootStepParticle1_12_2;
+import com.viaversion.viafabricplus.features.v26_2.PotionBrewing26_2;
 import com.viaversion.viafabricplus.util.network.SyncTasks;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.Minecraft;
@@ -81,6 +82,7 @@ public static void onPostGameLoading() {
         Recipes1_11_2.init();
         ArmorHudEmulation1_8.init();
         CPEAdditions.postInit();
+        PotionBrewing26_2.init();
     }
 
 }

src/main/java/com/viaversion/viafabricplus/features/v1_11/FurnaceFuels.java

@@ -0,0 +1,205 @@
+/*
+ * This file is part of ViaFabricPlus - https://github.com/ViaVersion/ViaFabricPlus
+ * Copyright (C) 2021-2026 the original authors
+ *                         - Florian Reuth <git@florianreuth.de>
+ *                         - RK_01/RaphiMC
+ * Copyright (C) 2023-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.viaversion.viafabricplus.features.v1_11;
+
+import net.minecraft.core.Holder;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.Blocks;
+import java.util.ArrayList;
+
+public final class FurnaceFuels {
+
+    private static FurnaceFuels FUELS_1_11 = null;
+    private static FurnaceFuels FUELS_1_3_1 = null;
+    private static FurnaceFuels FUELS_1_2_5 = null;
+
+    private final ArrayList<Item> values;
+
+    private FurnaceFuels(final ArrayList<Item> values) {
+        this.values = values;
+    }
+
+    public boolean isFuel(final ItemStack itemStack) {
+        return this.values.contains(itemStack.getItem());
+    }
+
+    public static FurnaceFuels getFuels_1_11() {
+        if (FUELS_1_11 == null)
+            FUELS_1_11 = new FurnaceFuels.Builder()
+                .add(Items.LAVA_BUCKET)
+                .add(Blocks.COAL_BLOCK)
+                .add(Items.BLAZE_ROD)
+                .add(Items.COAL)
+                .add(Items.CHARCOAL)
+                .add(ItemTags.PLANKS)
+                .add(ItemTags.WOODEN_STAIRS)
+                .add(ItemTags.WOODEN_TRAPDOORS)
+                .add(ItemTags.WOODEN_PRESSURE_PLATES)
+                .add(ItemTags.WOODEN_FENCES)
+                .add(ItemTags.FENCE_GATES)
+                .add(Blocks.NOTE_BLOCK)
+                .add(Blocks.BOOKSHELF)
+                .add(Blocks.JUKEBOX)
+                .add(Blocks.CHEST)
+                .add(Blocks.TRAPPED_CHEST)
+                .add(Blocks.CRAFTING_TABLE)
+                .add(Blocks.DAYLIGHT_DETECTOR)
+                .add(ItemTags.BANNERS)
+                .add(Items.BOW)
+                .add(Items.FISHING_ROD)
+                .add(Blocks.LADDER)
+                .add(ItemTags.SIGNS)
+                .add(Items.WOODEN_SHOVEL)
+                .add(Items.WOODEN_SWORD)
+                .add(Items.WOODEN_SPEAR)
+                .add(Items.WOODEN_HOE)
+                .add(Items.WOODEN_AXE)
+                .add(Items.WOODEN_PICKAXE)
+                .add(ItemTags.WOODEN_DOORS)
+                .add(ItemTags.BOATS)
+                .add(ItemTags.WOOL)
+                .add(ItemTags.WOODEN_BUTTONS)
+                .add(Items.STICK)
+                .add(ItemTags.SAPLINGS)
+                .add(Items.BOWL)
+                .add(ItemTags.WOOL_CARPETS)
+                .remove(ItemTags.NON_FLAMMABLE_WOOD)
+                .build();
+
+        return FUELS_1_11;
+    }
+
+    public static FurnaceFuels getFuels_1_3_1() {
+        if (FUELS_1_3_1 == null)
+            FUELS_1_3_1 = new FurnaceFuels.Builder()
+                .add(Items.LAVA_BUCKET)
+                .add(Blocks.COAL_BLOCK)
+                .add(Items.BLAZE_ROD)
+                .add(Items.COAL)
+                .add(Items.CHARCOAL)
+                .add(ItemTags.PLANKS)
+                .add(ItemTags.WOODEN_STAIRS)
+                .add(ItemTags.WOODEN_TRAPDOORS)
+                .add(ItemTags.WOODEN_PRESSURE_PLATES)
+                .add(ItemTags.WOODEN_FENCES)
+                .add(ItemTags.FENCE_GATES)
+                .add(Blocks.NOTE_BLOCK)
+                .add(Blocks.BOOKSHELF)
+                .add(Blocks.JUKEBOX)
+                .add(Blocks.CHEST)
+                .add(Blocks.TRAPPED_CHEST)
+                .add(Blocks.CRAFTING_TABLE)
+                .add(Blocks.DAYLIGHT_DETECTOR)
+                .add(ItemTags.BANNERS)
+                .add(Items.BOW)
+                .add(Items.FISHING_ROD)
+                .add(Blocks.LADDER)
+                .add(Items.WOODEN_SHOVEL)
+                .add(Items.WOODEN_SWORD)
+                .add(Items.WOODEN_SPEAR)
+                .add(Items.WOODEN_HOE)
+                .add(Items.WOODEN_AXE)
+                .add(Items.WOODEN_PICKAXE)
+                .add(Items.STICK)
+                .add(ItemTags.SAPLINGS)
+                .add(Items.BOWL)
+                .remove(ItemTags.NON_FLAMMABLE_WOOD)
+                .build();
+
+        return FUELS_1_3_1;
+    }
+
+    public static FurnaceFuels getFuels_1_2_5() {
+        if (FUELS_1_2_5 == null)
+            FUELS_1_2_5 = new FurnaceFuels.Builder()
+                .add(Items.LAVA_BUCKET)
+                .add(Blocks.COAL_BLOCK)
+                .add(Items.BLAZE_ROD)
+                .add(Items.COAL)
+                .add(Items.CHARCOAL)
+                .add(ItemTags.PLANKS)
+                .add(ItemTags.WOODEN_STAIRS)
+                .add(ItemTags.WOODEN_TRAPDOORS)
+                .add(ItemTags.WOODEN_PRESSURE_PLATES)
+                .add(ItemTags.WOODEN_FENCES)
+                .add(ItemTags.FENCE_GATES)
+                .add(Blocks.NOTE_BLOCK)
+                .add(Blocks.BOOKSHELF)
+                .add(Blocks.JUKEBOX)
+                .add(Blocks.CHEST)
+                .add(Blocks.TRAPPED_CHEST)
+                .add(Blocks.CRAFTING_TABLE)
+                .add(Blocks.DAYLIGHT_DETECTOR)
+                .add(ItemTags.BANNERS)
+                .add(Items.BOW)
+                .add(Items.FISHING_ROD)
+                .add(Blocks.LADDER)
+                .add(Items.STICK)
+                .add(ItemTags.SAPLINGS)
+                .add(Items.BOWL)
+                .remove(ItemTags.NON_FLAMMABLE_WOOD)
+                .build();
+
+        return FUELS_1_2_5;
+    }
+
+    public static class Builder {
+
+        private final ArrayList<Item> values = new ArrayList<>();
+
+        public FurnaceFuels build() {
+            return new FurnaceFuels(this.values);
+        }
+
+        public FurnaceFuels.Builder remove(final TagKey<Item> tag) {
+            BuiltInRegistries.ITEM.get(tag).ifPresent(items -> {
+                for (Holder<Item> item : items) {
+                    this.values.remove(item.value());
+                }
+            });
+            return this;
+        }
+
+        public FurnaceFuels.Builder add(final TagKey<Item> tag) {
+            BuiltInRegistries.ITEM.get(tag).ifPresent(items -> {
+                for (Holder<Item> item : items) {
+                    this.values.add(item.value());
+                }
+            });
+            return this;
+        }
+
+        public FurnaceFuels.Builder add(final ItemLike itemLike) {
+            Item item = itemLike.asItem();
+            this.values.add(item);
+            return this;
+        }
+
+    }
+
+}

src/main/java/com/viaversion/viafabricplus/features/v26_2/PotionBrewing26_2.java

@@ -0,0 +1,160 @@
+/*
+ * This file is part of ViaFabricPlus - https://github.com/ViaVersion/ViaFabricPlus
+ * Copyright (C) 2021-2026 the original authors
+ *                         - Florian Reuth <git@florianreuth.de>
+ *                         - RK_01/RaphiMC
+ * Copyright (C) 2023-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.viaversion.viafabricplus.features.v26_2;
+
+import net.minecraft.core.Holder;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.alchemy.Potion;
+import net.minecraft.world.item.alchemy.Potions;
+import net.minecraft.world.item.crafting.Ingredient;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PotionBrewing26_2 {
+    public static PotionBrewing26_2 INSTANCE = null;
+    private final List<PotionBrewing26_2.Mix<Potion>> potionMixes;
+    private final List<PotionBrewing26_2.Mix<Item>> containerMixes;
+
+    private PotionBrewing26_2(
+        final List<PotionBrewing26_2.Mix<Potion>> potionMixes, final List<PotionBrewing26_2.Mix<Item>> containerMixes
+    ) {
+        this.potionMixes = potionMixes;
+        this.containerMixes = containerMixes;
+    }
+
+    public boolean isIngredient(final ItemStack ingredient) {
+        return this.isContainerIngredient(ingredient) || this.isPotionIngredient(ingredient);
+    }
+
+    public boolean isContainerIngredient(final ItemStack ingredient) {
+        for (PotionBrewing26_2.Mix<Item> containerMix : this.containerMixes) {
+            if (containerMix.ingredient.test(ingredient)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public boolean isPotionIngredient(final ItemStack ingredient) {
+        for (PotionBrewing26_2.Mix<Potion> potionMix : this.potionMixes) {
+            if (potionMix.ingredient.test(ingredient)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static void init() {
+        if (INSTANCE != null) {
+            throw new IllegalStateException("PotionBrewing26_2 is already initialized");
+        }
+
+        PotionBrewing26_2.Builder builder = new PotionBrewing26_2.Builder();
+
+        builder.addContainerRecipe(Items.POTION, Items.GUNPOWDER, Items.SPLASH_POTION);
+        builder.addContainerRecipe(Items.SPLASH_POTION, Items.DRAGON_BREATH, Items.LINGERING_POTION);
+        builder.addMix(Potions.WATER, Items.GLOWSTONE_DUST, Potions.THICK);
+        builder.addMix(Potions.WATER, Items.REDSTONE, Potions.MUNDANE);
+        builder.addMix(Potions.WATER, Items.NETHER_WART, Potions.AWKWARD);
+        builder.addStartMix(Items.BREEZE_ROD, Potions.WIND_CHARGED);
+        builder.addStartMix(Items.SLIME_BLOCK, Potions.OOZING);
+        builder.addStartMix(Items.STONE, Potions.INFESTED);
+        builder.addStartMix(Items.COBWEB, Potions.WEAVING);
+        builder.addMix(Potions.AWKWARD, Items.GOLDEN_CARROT, Potions.NIGHT_VISION);
+        builder.addMix(Potions.NIGHT_VISION, Items.REDSTONE, Potions.LONG_NIGHT_VISION);
+        builder.addMix(Potions.NIGHT_VISION, Items.FERMENTED_SPIDER_EYE, Potions.INVISIBILITY);
+        builder.addMix(Potions.LONG_NIGHT_VISION, Items.FERMENTED_SPIDER_EYE, Potions.LONG_INVISIBILITY);
+        builder.addMix(Potions.INVISIBILITY, Items.REDSTONE, Potions.LONG_INVISIBILITY);
+        builder.addStartMix(Items.MAGMA_CREAM, Potions.FIRE_RESISTANCE);
+        builder.addMix(Potions.FIRE_RESISTANCE, Items.REDSTONE, Potions.LONG_FIRE_RESISTANCE);
+        builder.addStartMix(Items.RABBIT_FOOT, Potions.LEAPING);
+        builder.addMix(Potions.LEAPING, Items.REDSTONE, Potions.LONG_LEAPING);
+        builder.addMix(Potions.LEAPING, Items.GLOWSTONE_DUST, Potions.STRONG_LEAPING);
+        builder.addMix(Potions.LEAPING, Items.FERMENTED_SPIDER_EYE, Potions.SLOWNESS);
+        builder.addMix(Potions.LONG_LEAPING, Items.FERMENTED_SPIDER_EYE, Potions.LONG_SLOWNESS);
+        builder.addMix(Potions.SLOWNESS, Items.REDSTONE, Potions.LONG_SLOWNESS);
+        builder.addMix(Potions.SLOWNESS, Items.GLOWSTONE_DUST, Potions.STRONG_SLOWNESS);
+        builder.addMix(Potions.AWKWARD, Items.TURTLE_HELMET, Potions.TURTLE_MASTER);
+        builder.addMix(Potions.TURTLE_MASTER, Items.REDSTONE, Potions.LONG_TURTLE_MASTER);
+        builder.addMix(Potions.TURTLE_MASTER, Items.GLOWSTONE_DUST, Potions.STRONG_TURTLE_MASTER);
+        builder.addMix(Potions.SWIFTNESS, Items.FERMENTED_SPIDER_EYE, Potions.SLOWNESS);
+        builder.addMix(Potions.LONG_SWIFTNESS, Items.FERMENTED_SPIDER_EYE, Potions.LONG_SLOWNESS);
+        builder.addStartMix(Items.SUGAR, Potions.SWIFTNESS);
+        builder.addMix(Potions.SWIFTNESS, Items.REDSTONE, Potions.LONG_SWIFTNESS);
+        builder.addMix(Potions.SWIFTNESS, Items.GLOWSTONE_DUST, Potions.STRONG_SWIFTNESS);
+        builder.addMix(Potions.AWKWARD, Items.PUFFERFISH, Potions.WATER_BREATHING);
+        builder.addMix(Potions.WATER_BREATHING, Items.REDSTONE, Potions.LONG_WATER_BREATHING);
+        builder.addStartMix(Items.GLISTERING_MELON_SLICE, Potions.HEALING);
+        builder.addMix(Potions.HEALING, Items.GLOWSTONE_DUST, Potions.STRONG_HEALING);
+        builder.addMix(Potions.HEALING, Items.FERMENTED_SPIDER_EYE, Potions.HARMING);
+        builder.addMix(Potions.STRONG_HEALING, Items.FERMENTED_SPIDER_EYE, Potions.STRONG_HARMING);
+        builder.addMix(Potions.HARMING, Items.GLOWSTONE_DUST, Potions.STRONG_HARMING);
+        builder.addMix(Potions.POISON, Items.FERMENTED_SPIDER_EYE, Potions.HARMING);
+        builder.addMix(Potions.LONG_POISON, Items.FERMENTED_SPIDER_EYE, Potions.HARMING);
+        builder.addMix(Potions.STRONG_POISON, Items.FERMENTED_SPIDER_EYE, Potions.STRONG_HARMING);
+        builder.addStartMix(Items.SPIDER_EYE, Potions.POISON);
+        builder.addMix(Potions.POISON, Items.REDSTONE, Potions.LONG_POISON);
+        builder.addMix(Potions.POISON, Items.GLOWSTONE_DUST, Potions.STRONG_POISON);
+        builder.addStartMix(Items.GHAST_TEAR, Potions.REGENERATION);
+        builder.addMix(Potions.REGENERATION, Items.REDSTONE, Potions.LONG_REGENERATION);
+        builder.addMix(Potions.REGENERATION, Items.GLOWSTONE_DUST, Potions.STRONG_REGENERATION);
+        builder.addStartMix(Items.BLAZE_POWDER, Potions.STRENGTH);
+        builder.addMix(Potions.STRENGTH, Items.REDSTONE, Potions.LONG_STRENGTH);
+        builder.addMix(Potions.STRENGTH, Items.GLOWSTONE_DUST, Potions.STRONG_STRENGTH);
+        builder.addMix(Potions.WATER, Items.FERMENTED_SPIDER_EYE, Potions.WEAKNESS);
+        builder.addMix(Potions.WEAKNESS, Items.REDSTONE, Potions.LONG_WEAKNESS);
+        builder.addMix(Potions.AWKWARD, Items.PHANTOM_MEMBRANE, Potions.SLOW_FALLING);
+        builder.addMix(Potions.SLOW_FALLING, Items.REDSTONE, Potions.LONG_SLOW_FALLING);
+
+        INSTANCE = builder.build();
+    }
+
+    public static class Builder {
+        private final List<PotionBrewing26_2.Mix<Potion>> potionMixes = new ArrayList<>();
+        private final List<PotionBrewing26_2.Mix<Item>> containerMixes = new ArrayList<>();
+
+        public void addContainerRecipe(final Item from, final Item ingredient, final Item to) {
+                this.containerMixes.add(new PotionBrewing26_2.Mix<>(BuiltInRegistries.ITEM.wrapAsHolder(from), Ingredient.of(ingredient), BuiltInRegistries.ITEM.wrapAsHolder(to)));
+        }
+
+        public void addMix(final Holder<Potion> from, final Item ingredient, final Holder<Potion> to) {
+                this.potionMixes.add(new PotionBrewing26_2.Mix<>(from, Ingredient.of(ingredient), to));
+        }
+
+        public void addStartMix(final Item ingredient, final Holder<Potion> potion) {
+                this.addMix(Potions.WATER, ingredient, Potions.MUNDANE);
+                this.addMix(Potions.AWKWARD, ingredient, potion);
+        }
+
+        public PotionBrewing26_2 build() {
+            return new PotionBrewing26_2(List.copyOf(this.potionMixes), List.copyOf(this.containerMixes));
+        }
+    }
+
+    private record Mix<T>(Holder<T> from, Ingredient ingredient, Holder<T> to) {
+    }
+}