5.x - 20w30a

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

38 files changed, 0 insertions, 3592 deletions

diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java
deleted file mode 100644
index d7cc11ddf..000000000
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is licensed under the MIT License, part of Roughly Enough Items.
- * Copyright (c) 2018, 2019, 2020 shedaniel
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package me.shedaniel.rei.plugin;
-
-import me.shedaniel.rei.api.ConfigObject;
-import me.shedaniel.rei.api.RecipeHelper;
-import me.shedaniel.rei.api.plugins.REIPluginV0;
-import me.shedaniel.rei.plugin.autocrafting.DefaultCategoryHandler;
-import me.shedaniel.rei.plugin.autocrafting.DefaultRecipeBookHandler;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.util.Identifier;
-
-@Environment(EnvType.CLIENT)
-public class DefaultAutoCraftingPlugin implements REIPluginV0 {
-    
-    public static final Identifier PLUGIN = new Identifier("roughlyenoughitems", "default_auto_crafting_plugin");
-    
-    @Override
-    public Identifier getPluginIdentifier() {
-        return PLUGIN;
-    }
-    
-    @Override
-    public void registerOthers(RecipeHelper recipeHelper) {
-        if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) {
-            return;
-        }
-        recipeHelper.registerAutoCraftingHandler(new DefaultCategoryHandler());
-        recipeHelper.registerAutoCraftingHandler(new DefaultRecipeBookHandler());
-    }
-}
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
deleted file mode 100644
index 460a5d119..000000000
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * This file is licensed under the MIT License, part of Roughly Enough Items.
- * Copyright (c) 2018, 2019, 2020 shedaniel
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package me.shedaniel.rei.plugin;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import it.unimi.dsi.fastutil.objects.Object2FloatMap;
-import me.shedaniel.math.Point;
-import me.shedaniel.math.Rectangle;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
-import me.shedaniel.rei.api.*;
-import me.shedaniel.rei.api.fluid.FluidSupportProvider;
-import me.shedaniel.rei.api.plugins.REIPluginV0;
-import me.shedaniel.rei.api.widgets.Panel;
-import me.shedaniel.rei.api.widgets.Tooltip;
-import me.shedaniel.rei.gui.RecipeViewingScreen;
-import me.shedaniel.rei.gui.VillagerRecipeViewingScreen;
-import me.shedaniel.rei.impl.ClientHelperImpl;
-import me.shedaniel.rei.impl.RenderingEntry;
-import me.shedaniel.rei.plugin.beacon.DefaultBeaconBaseCategory;
-import me.shedaniel.rei.plugin.beacon.DefaultBeaconBaseDisplay;
-import me.shedaniel.rei.plugin.blasting.DefaultBlastingDisplay;
-import me.shedaniel.rei.plugin.brewing.DefaultBrewingCategory;
-import me.shedaniel.rei.plugin.brewing.DefaultBrewingDisplay;
-import me.shedaniel.rei.plugin.campfire.DefaultCampfireCategory;
-import me.shedaniel.rei.plugin.campfire.DefaultCampfireDisplay;
-import me.shedaniel.rei.plugin.composting.DefaultCompostingCategory;
-import me.shedaniel.rei.plugin.composting.DefaultCompostingDisplay;
-import me.shedaniel.rei.plugin.cooking.DefaultCookingCategory;
-import me.shedaniel.rei.plugin.crafting.DefaultCraftingCategory;
-import me.shedaniel.rei.plugin.crafting.DefaultCustomDisplay;
-import me.shedaniel.rei.plugin.crafting.DefaultShapedDisplay;
-import me.shedaniel.rei.plugin.crafting.DefaultShapelessDisplay;
-import me.shedaniel.rei.plugin.fuel.DefaultFuelCategory;
-import me.shedaniel.rei.plugin.fuel.DefaultFuelDisplay;
-import me.shedaniel.rei.plugin.information.DefaultInformationCategory;
-import me.shedaniel.rei.plugin.information.DefaultInformationDisplay;
-import me.shedaniel.rei.plugin.smelting.DefaultSmeltingDisplay;
-import me.shedaniel.rei.plugin.smithing.DefaultSmithingCategory;
-import me.shedaniel.rei.plugin.smithing.DefaultSmithingDisplay;
-import me.shedaniel.rei.plugin.smoking.DefaultSmokingDisplay;
-import me.shedaniel.rei.plugin.stonecutting.DefaultStoneCuttingCategory;
-import me.shedaniel.rei.plugin.stonecutting.DefaultStoneCuttingDisplay;
-import me.shedaniel.rei.plugin.stripping.DefaultStrippingCategory;
-import me.shedaniel.rei.plugin.stripping.DefaultStrippingDisplay;
-import me.shedaniel.rei.plugin.stripping.DummyAxeItem;
-import me.shedaniel.rei.utils.CollectionUtils;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.block.ComposterBlock;
-import net.minecraft.block.entity.AbstractFurnaceBlockEntity;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.ingame.*;
-import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.fluid.Fluid;
-import net.minecraft.item.*;
-import net.minecraft.potion.PotionUtil;
-import net.minecraft.recipe.*;
-import net.minecraft.tag.BlockTags;
-import net.minecraft.tag.Tag;
-import net.minecraft.text.LiteralText;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.registry.Registry;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-
-@Environment(EnvType.CLIENT)
-public class DefaultPlugin implements REIPluginV0 {
-    
-    public static final Identifier CRAFTING = new Identifier("minecraft", "plugins/crafting");
-    public static final Identifier SMELTING = new Identifier("minecraft", "plugins/smelting");
-    public static final Identifier SMOKING = new Identifier("minecraft", "plugins/smoking");
-    public static final Identifier BLASTING = new Identifier("minecraft", "plugins/blasting");
-    public static final Identifier CAMPFIRE = new Identifier("minecraft", "plugins/campfire");
-    public static final Identifier STONE_CUTTING = new Identifier("minecraft", "plugins/stone_cutting");
-    public static final Identifier STRIPPING = new Identifier("minecraft", "plugins/stripping");
-    public static final Identifier BREWING = new Identifier("minecraft", "plugins/brewing");
-    public static final Identifier PLUGIN = new Identifier("roughlyenoughitems", "default_plugin");
-    public static final Identifier COMPOSTING = new Identifier("minecraft", "plugins/composting");
-    public static final Identifier FUEL = new Identifier("minecraft", "plugins/fuel");
-    public static final Identifier SMITHING = new Identifier("minecraft", "plugins/smithing");
-    public static final Identifier BEACON = new Identifier("minecraft", "plugins/beacon");
-    public static final Identifier INFO = new Identifier("roughlyenoughitems", "plugins/information");
-    private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png");
-    private static final Identifier DISPLAY_TEXTURE_DARK = new Identifier("roughlyenoughitems", "textures/gui/display_dark.png");
-    private static final List<DefaultBrewingDisplay> BREWING_DISPLAYS = Lists.newArrayList();
-    private static final List<DefaultInformationDisplay> INFO_DISPLAYS = Lists.newArrayList();
-    
-    public static Identifier getDisplayTexture() {
-        return REIHelper.getInstance().isDarkThemeEnabled() ? DISPLAY_TEXTURE_DARK : DISPLAY_TEXTURE;
-    }
-    
-    public static void registerBrewingDisplay(DefaultBrewingDisplay display) {
-        BREWING_DISPLAYS.add(display);
-    }
-    
-    public static void registerInfoDisplay(DefaultInformationDisplay display) {
-        INFO_DISPLAYS.add(display);
-    }
-    
-    @Override
-    public Identifier getPluginIdentifier() {
-        return PLUGIN;
-    }
-    
-    @Override
-    public void preRegister() {
-        INFO_DISPLAYS.clear();
-    }
-    
-    @Override
-    public void registerEntries(EntryRegistry entryRegistry) {
-        if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) {
-            return;
-        }
-        for (Item item : Registry.ITEM) {
-            List<ItemStack> stacks = null;
-            try {
-                stacks = entryRegistry.appendStacksForItem(item);
-            } catch (Exception ignored) {
-            }
-            if (stacks != null) {
-                for (ItemStack stack : entryRegistry.appendStacksForItem(item)) {
-                    entryRegistry.registerEntry(EntryStack.create(stack));
-                }
-            } else
-                entryRegistry.registerEntry(EntryStack.create(item));
-        }
-        EntryStack stack = EntryStack.create(Items.ENCHANTED_BOOK);
-        List<EntryStack> enchantments = new ArrayList<>();
-        for (Enchantment enchantment : Registry.ENCHANTMENT) {
-            for (int i = enchantment.getMinimumLevel(); i <= enchantment.getMaximumLevel(); i++) {
-                Map<Enchantment, Integer> map = new HashMap<>();
-                map.put(enchantment, i);
-                ItemStack itemStack = new ItemStack(Items.ENCHANTED_BOOK);
-                EnchantmentHelper.set(map, itemStack);
-                enchantments.add(EntryStack.create(itemStack).setting(EntryStack.Settings.CHECK_TAGS, EntryStack.Settings.TRUE));
-            }
-        }
-        entryRegistry.registerEntriesAfter(stack, enchantments);
-        for (Fluid fluid : Registry.FLUID) {
-            if (!fluid.getDefaultState().isEmpty() && fluid.getDefaultState().isStill())
-                entryRegistry.registerEntry(EntryStack.create(fluid));
-        }
-        entryRegistry.registerEntry(new RenderingEntry() {
-            private Identifier id = new Identifier("roughlyenoughitems", "textures/gui/kirb.png");
-            
-            @Override
-            public void render(MatrixStack matrices, Rectangle bounds, int mouseX, int mouseY, float delta) {
-                MinecraftClient.getInstance().getTextureManager().bindTexture(id);
-                drawTexturedQuad(matrices.peek().getModel(), bounds.x, bounds.getMaxX(), bounds.y, bounds.getMaxY(), getZOffset(), 0, 1, 0, 1);
-            }
-            
-            @Override
-            public boolean isEmpty() {
-                return !((ClientHelperImpl) ClientHelper.getInstance()).isAprilFools.get();
-            }
-            
-            @Override
-            public @Nullable Tooltip getTooltip(Point point) {
-                return Tooltip.create(new LiteralText("Kibby"));
-            }
-        });
-    }
-    
-    @Override
-    public void registerPluginCategories(RecipeHelper recipeHelper) {
-        if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) {
-            return;
-        }
-        recipeHelper.registerCategories(
-                new DefaultCraftingCategory(),
-                new DefaultCookingCategory(SMELTING, EntryStack.create(Items.FURNACE), "category.rei.smelting"),
-                new DefaultCookingCategory(SMOKING, EntryStack.create(Items.SMOKER), "category.rei.smoking"),
-                new DefaultCookingCategory(BLASTING, EntryStack.create(Items.BLAST_FURNACE), "category.rei.blasting"), new DefaultCampfireCategory(),
-                new DefaultStoneCuttingCategory(),
-                new DefaultFuelCategory(),
-                new DefaultBrewingCategory(),
-                new DefaultCompostingCategory(),
-                new DefaultStrippingCategory(),
-                new DefaultSmithingCategory(),
-                new DefaultBeaconBaseCategory(),
-                new DefaultInformationCategory()
-        );
-    }
-    
-    @Override
-    public void registerRecipeDisplays(RecipeHelper recipeHelper) {
-        if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) {
-            return;
-        }
-        recipeHelper.registerRecipes(CRAFTING, ShapelessRecipe.class, DefaultShapelessDisplay::new);
-        recipeHelper.registerRecipes(CRAFTING, ShapedRecipe.class, DefaultShapedDisplay::new);
-        recipeHelper.registerRecipes(SMELTING, SmeltingRecipe.class, DefaultSmeltingDisplay::new);
-        recipeHelper.registerRecipes(SMOKING, SmokingRecipe.class, DefaultSmokingDisplay::new);
-        recipeHelper.registerRecipes(BLASTING, BlastingRecipe.class, DefaultBlastingDisplay::new);
-        recipeHelper.registerRecipes(CAMPFIRE, CampfireCookingRecipe.class, DefaultCampfireDisplay::new);
-        recipeHelper.registerRecipes(STONE_CUTTING, StonecuttingRecipe.class, DefaultStoneCuttingDisplay::new);
-        recipeHelper.registerRecipes(SMITHING, SmithingRecipe.class, DefaultSmithingDisplay::new);
-        for (DefaultBrewingDisplay display : BREWING_DISPLAYS) {
-            recipeHelper.registerDisplay(display);
-        }
-        for (Map.Entry<Item, Integer> entry : AbstractFurnaceBlockEntity.createFuelTimeMap().entrySet()) {
-            recipeHelper.registerDisplay(new DefaultFuelDisplay(EntryStack.create(entry.getKey()), entry.getValue()));
-        }
-        List<EntryStack> arrowStack = Collections.singletonList(EntryStack.create(Items.ARROW));
-        EntryRegistry.getInstance().getEntryStacks().filter(entry -> entry.getItem() == Items.LINGERING_POTION).forEach(entry -> {
-            List<List<EntryStack>> input = new ArrayList<>();
-            for (int i = 0; i < 4; i++)
-                input.add(arrowStack);
-            input.add(Collections.singletonList(EntryStack.create(entry.getItemStack())));
-            for (int i = 0; i < 4; i++)
-                input.add(arrowStack);
-            ItemStack outputStack = new ItemStack(Items.TIPPED_ARROW, 8);
-            PotionUtil.setPotion(outputStack, PotionUtil.getPotion(entry.getItemStack()));
-            PotionUtil.setCustomPotionEffects(outputStack, PotionUtil.getCustomPotionEffects(entry.getItemStack()));
-            List<EntryStack> output = Collections.singletonList(EntryStack.create(outputStack).addSetting(EntryStack.Settings.CHECK_TAGS, EntryStack.Settings.TRUE));
-            recipeHelper.registerDisplay(new DefaultCustomDisplay(null, input, output));
-        });
-        Map<ItemConvertible, Float> map = Maps.newLinkedHashMap();
-        if (ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.isEmpty())
-            ComposterBlock.registerDefaultCompostableItems();
-        for (Object2FloatMap.Entry<ItemConvertible> entry : ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.object2FloatEntrySet()) {
-            if (entry.getFloatValue() > 0)
-                map.put(entry.getKey(), entry.getFloatValue());
-        }
-        List<ItemConvertible> stacks = Lists.newArrayList(map.keySet());
-        stacks.sort(Comparator.comparing(map::get));
-        for (int i = 0; i < stacks.size(); i += MathHelper.clamp(48, 1, stacks.size() - i)) {
-            List<ItemConvertible> thisStacks = Lists.newArrayList();
-            for (int j = i; j < i + 48; j++)
-                if (j < stacks.size())
-                    thisStacks.add(stacks.get(j));
-            recipeHelper.registerDisplay(new DefaultCompostingDisplay(MathHelper.floor(i / 48f), thisStacks, map, new ItemStack(Items.BONE_MEAL)));
-        }
-        DummyAxeItem.getStrippedBlocksMap().entrySet().stream().sorted(Comparator.comparing(b -> Registry.BLOCK.getId(b.getKey()))).forEach(set -> {
-            recipeHelper.registerDisplay(new DefaultStrippingDisplay(EntryStack.create(set.getKey()), EntryStack.create(set.getValue())));
-        });
-        recipeHelper.registerDisplay(new DefaultBeaconBaseDisplay(CollectionUtils.map(Lists.newArrayList(BlockTags.BEACON_BASE_BLOCKS.values()), ItemStack::new)));
-    }
-    
-    @Override
-    public void postRegister() {
-        for (DefaultInformationDisplay display : INFO_DISPLAYS)
-            RecipeHelper.getInstance().registerDisplay(display);
-        // TODO Turn this into an API
-        // Sit tight! This will be a fast journey!
-        long time = System.currentTimeMillis();
-        EntryRegistry.getInstance().getEntryStacks().forEach(this::applyPotionTransformer);
-        for (List<RecipeDisplay> displays : RecipeHelper.getInstance().getAllRecipesNoHandlers().values()) {
-            for (RecipeDisplay display : displays) {
-                for (List<EntryStack> entries : display.getInputEntries())
-                    for (EntryStack stack : entries)
-                        applyPotionTransformer(stack);
-                for (EntryStack stack : display.getOutputEntries())
-                    applyPotionTransformer(stack);
-            }
-        }
-        time = System.currentTimeMillis() - time;
-        RoughlyEnoughItemsCore.LOGGER.info("Applied Check Tags for potion in %dms.", time);
-    }
-    
-    private void applyPotionTransformer(EntryStack stack) {
-        if (stack.getItem() instanceof PotionItem)
-            stack.addSetting(EntryStack.Settings.CHECK_TAGS, EntryStack.Settings.TRUE);
-    }
-    
-    @Override
-    public void registerBounds(DisplayHelper displayHelper) {
-        if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) {
-            return;
-        }
-        BaseBoundsHandler baseBoundsHandler = BaseBoundsHandler.getInstance();
-        baseBoundsHandler.registerExclusionZones(AbstractInventoryScreen.class, new DefaultPotionEffectExclusionZones());
-        baseBoundsHandler.registerExclusionZones(RecipeBookProvider.class, new DefaultRecipeBookExclusionZones());
-        baseBoundsHandler.registerExclusionZones(RecipeViewingScreen.class, () -> {
-            Panel widget = ((RecipeViewingScreen) MinecraftClient.getInstance().currentScreen).getWorkingStationsBaseWidget();
-            if (widget == null)
-                return Collections.emptyList();
-            return Collections.singletonList(widget.getBounds().clone());
-        });
-        displayHelper.registerProvider(new DisplayHelper.DisplayBoundsProvider<ContainerScreen<?>>() {
-            @Override
-            public Rectangle getScreenBounds(ContainerScreen<?> screen) {
-                return new Rectangle(screen.x, screen.y, screen.containerWidth, screen.containerHeight);
-            }
-            
-            @Override
-            public Class<?> getBaseSupportedClass() {
-                return ContainerScreen.class;
-            }
-        });
-        displayHelper.registerProvider(new DisplayHelper.DisplayBoundsProvider<RecipeViewingScreen>() {
-            @Override
-            public Rectangle getScreenBounds(RecipeViewingScreen screen) {
-                return screen.getBounds();
-            }
-            
-            @Override
-            public Class<?> getBaseSupportedClass() {
-                return RecipeViewingScreen.class;
-            }
-        });
-        displayHelper.registerProvider(new DisplayHelper.DisplayBoundsProvider<VillagerRecipeViewingScreen>() {
-            @Override
-            public Rectangle getScreenBounds(VillagerRecipeViewingScreen screen) {
-                return screen.bounds;
-            }
-            
-            @Override
-            public Class<?> getBaseSupportedClass() {
-                return VillagerRecipeViewingScreen.class;
-            }
-        });
-    }
-    
-    @Override
-    public void registerOthers(RecipeHelper recipeHelper) {
-        if (!ConfigObject.getInstance().isLoadingDefaultPlugin()) {
-            return;
-        }
-        recipeHelper.registerWorkingStations(CRAFTING, EntryStack.create(Items.CRAFTING_TABLE));
-        recipeHelper.registerWorkingStations(SMELTING, EntryStack.create(Items.FURNACE));
-        recipeHelper.registerWorkingStations(SMOKING, EntryStack.create(Items.SMOKER));
-        recipeHelper.registerWorkingStations(BLASTING, EntryStack.create(Items.BLAST_FURNACE));
-        recipeHelper.registerWorkingStations(CAMPFIRE, EntryStack.create(Items.CAMPFIRE));
-        recipeHelper.registerWorkingStations(FUEL, EntryStack.create(Items.FURNACE), EntryStack.create(Items.SMOKER), EntryStack.create(Items.BLAST_FURNACE));
-        recipeHelper.registerWorkingStations(BREWING, EntryStack.create(Items.BREWING_STAND));
-        recipeHelper.registerWorkingStations(STONE_CUTTING, EntryStack.create(Items.STONECUTTER));
-        recipeHelper.registerWorkingStations(COMPOSTING, EntryStack.create(Items.COMPOSTER));
-        recipeHelper.registerWorkingStations(SMITHING, EntryStack.create(Items.SMITHING_TABLE));
-        recipeHelper.registerWorkingStations(BEACON, EntryStack.create(Items.BEACON));
-        Tag<Item> axes = MinecraftClient.getInstance().getNetworkHandler().getTagManager().items().get(new Identifier("fabric", "axes"));
-        if (axes != null) {
-            for (Item item : axes.values()) {
-                recipeHelper.registerWorkingStations(STRIPPING, EntryStack.create(item));
-            }
-        }
-        recipeHelper.removeAutoCraftButton(FUEL);
-        recipeHelper.removeAutoCraftButton(COMPOSTING);
-        recipeHelper.removeAutoCraftButton(BEACON);
-        recipeHelper.removeAutoCraftButton(INFO);
-        recipeHelper.registerScreenClickArea(new Rectangle(88, 32, 28, 23), CraftingTableScreen.class, CRAFTING);
-        recipeHelper.registerScreenClickArea(new Rectangle(137, 29, 10, 13), InventoryScreen.class, CRAFTING);
-        recipeHelper.registerScreenClickArea(new Rectangle(97, 16, 14, 30), BrewingStandScreen.class, BREWING);
-        recipeHelper.registerScreenClickArea(new Rectangle(78, 32, 28, 23), FurnaceScreen.class, SMELTING);
-        recipeHelper.registerScreenClickArea(new Rectangle(78, 32, 28, 23), SmokerScreen.class, SMOKING);
-        recipeHelper.registerScreenClickArea(new Rectangle(78, 32, 28, 23), BlastFurnaceScreen.class, BLASTING);
-        FluidSupportProvider.INSTANCE.registerFluidProvider(new FluidSupportProvider.FluidProvider() {
-            @Override
-            public @NotNull EntryStack itemToFluid(@NotNull EntryStack itemStack) {
-                Item item = itemStack.getItem();
-                if (item instanceof BucketItem)
-                    return EntryStack.create(((BucketItem) item).fluid, 1000);
-                return EntryStack.empty();
-            }
-        });
-//        SubsetsRegistry subsetsRegistry = SubsetsRegistry.INSTANCE;
-//        subsetsRegistry.registerPathEntry("roughlyenoughitems:food", EntryStack.create(Items.MILK_BUCKET));
-//        subsetsRegistry.registerPathEntry("roughlyenoughitems:food/roughlyenoughitems:cookies", EntryStack.create(Items.COOKIE));
-    }
-    
-    @Override
-    public int getPriority() {
-        return -1;
-    }
-    
-}
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffectExclusionZones.java
deleted file mode 100644
index 79116da14..000000000
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultPotionEffect