Refactor Default Plugin packages, fix favorites

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

47 files changed, 252 insertions, 522 deletions

diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java
index 797073814..07884806d 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java
@@ -27,8 +27,8 @@ import me.shedaniel.rei.api.client.ClientHelper;
 import me.shedaniel.rei.api.client.registry.transfer.TransferHandler;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.display.SimpleMenuDisplay;
-import me.shedaniel.rei.plugin.common.cooking.DefaultCookingDisplay;
-import me.shedaniel.rei.plugin.common.crafting.DefaultCraftingDisplay;
+import me.shedaniel.rei.plugin.common.displays.cooking.DefaultCookingDisplay;
+import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screens.Screen;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
index b05868492..2088d523b 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
@@ -42,51 +42,31 @@ import me.shedaniel.rei.api.client.registry.screen.ExclusionZones;
 import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry;
 import me.shedaniel.rei.api.client.registry.transfer.TransferHandlerRegistry;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
+import me.shedaniel.rei.api.common.util.CollectionUtils;
 import me.shedaniel.rei.api.common.util.EntryIngredients;
 import me.shedaniel.rei.api.common.util.EntryStacks;
-import me.shedaniel.rei.api.common.util.CollectionUtils;
 import me.shedaniel.rei.impl.ClientInternals;
 import me.shedaniel.rei.plugin.autocrafting.DefaultRecipeBookHandler;
-import me.shedaniel.rei.plugin.beacon.base.DefaultBeaconBaseCategory;
-import me.shedaniel.rei.plugin.beacon.base.DefaultBeaconBaseDisplay;
-import me.shedaniel.rei.plugin.beacon.payment.DefaultBeaconPaymentCategory;
-import me.shedaniel.rei.plugin.beacon.payment.DefaultBeaconPaymentDisplay;
-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.brewing.RegisteredBrewingRecipe;
+import me.shedaniel.rei.plugin.client.categories.*;
+import me.shedaniel.rei.plugin.client.categories.beacon.DefaultBeaconBaseCategory;
+import me.shedaniel.rei.plugin.client.categories.beacon.DefaultBeaconPaymentCategory;
+import me.shedaniel.rei.plugin.client.categories.cooking.DefaultCookingCategory;
+import me.shedaniel.rei.plugin.client.categories.crafting.DefaultCraftingCategory;
 import me.shedaniel.rei.plugin.client.exclusionzones.DefaultPotionEffectExclusionZones;
 import me.shedaniel.rei.plugin.client.exclusionzones.DefaultRecipeBookExclusionZones;
-import me.shedaniel.rei.plugin.common.campfire.DefaultCampfireCategory;
-import me.shedaniel.rei.plugin.common.campfire.DefaultCampfireDisplay;
-import me.shedaniel.rei.plugin.common.composting.DefaultCompostingCategory;
-import me.shedaniel.rei.plugin.common.composting.DefaultCompostingDisplay;
-import me.shedaniel.rei.plugin.common.cooking.DefaultCookingCategory;
-import me.shedaniel.rei.plugin.common.crafting.DefaultCraftingCategory;
-import me.shedaniel.rei.plugin.common.crafting.DefaultCustomDisplay;
-import me.shedaniel.rei.plugin.common.crafting.DefaultShapedDisplay;
-import me.shedaniel.rei.plugin.common.crafting.DefaultShapelessDisplay;
-import me.shedaniel.rei.plugin.common.stonecutting.DefaultStoneCuttingCategory;
-import me.shedaniel.rei.plugin.common.stonecutting.DefaultStoneCuttingDisplay;
-import me.shedaniel.rei.plugin.favorites.GameModeFavoriteEntry;
-import me.shedaniel.rei.plugin.favorites.WeatherFavoriteEntry;
-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.pathing.DefaultPathingCategory;
-import me.shedaniel.rei.plugin.pathing.DefaultPathingDisplay;
-import me.shedaniel.rei.plugin.pathing.DummyShovelItem;
-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.stripping.DefaultStrippingCategory;
-import me.shedaniel.rei.plugin.stripping.DefaultStrippingDisplay;
-import me.shedaniel.rei.plugin.stripping.DummyAxeItem;
-import me.shedaniel.rei.plugin.tilling.DefaultTillingCategory;
-import me.shedaniel.rei.plugin.tilling.DefaultTillingDisplay;
-import me.shedaniel.rei.plugin.tilling.DummyHoeItem;
+import me.shedaniel.rei.plugin.client.favorites.GameModeFavoriteEntry;
+import me.shedaniel.rei.plugin.client.favorites.WeatherFavoriteEntry;
+import me.shedaniel.rei.plugin.common.displays.*;
+import me.shedaniel.rei.plugin.common.displays.beacon.DefaultBeaconBaseDisplay;
+import me.shedaniel.rei.plugin.common.displays.beacon.DefaultBeaconPaymentDisplay;
+import me.shedaniel.rei.plugin.common.displays.brewing.BrewingRecipe;
+import me.shedaniel.rei.plugin.common.displays.brewing.DefaultBrewingDisplay;
+import me.shedaniel.rei.plugin.common.displays.cooking.DefaultBlastingDisplay;
+import me.shedaniel.rei.plugin.common.displays.cooking.DefaultSmeltingDisplay;
+import me.shedaniel.rei.plugin.common.displays.cooking.DefaultSmokingDisplay;
+import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCustomDisplay;
+import me.shedaniel.rei.plugin.common.displays.crafting.DefaultShapedDisplay;
+import me.shedaniel.rei.plugin.common.displays.crafting.DefaultShapelessDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
@@ -108,8 +88,10 @@ import net.minecraft.world.item.alchemy.PotionUtils;
 import net.minecraft.world.item.crafting.*;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.ComposterBlock;
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
 import org.jetbrains.annotations.ApiStatus;
@@ -123,10 +105,10 @@ import java.util.stream.Stream;
 @ApiStatus.Internal
 public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin {
     public DefaultClientPlugin() {
-        ClientInternals.attachInstance((Supplier<Object>) () ->this, "builtinClientPlugin");
+        ClientInternals.attachInstance((Supplier<Object>) () -> this, "builtinClientPlugin");
     }
     
-    public static void registerBrewingRecipe(RegisteredBrewingRecipe recipe) {
+    public static void registerBrewingRecipe(BrewingRecipe recipe) {
         DisplayRegistry.getInstance().registerDisplay(new DefaultBrewingDisplay(recipe.input, recipe.ingredient, recipe.output));
     }
     
@@ -136,7 +118,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin
     
     @Override
     public void registerBrewingRecipe(Ingredient input, Ingredient ingredient, ItemStack output) {
-        registerBrewingRecipe(new RegisteredBrewingRecipe(input, ingredient, output));
+        registerBrewingRecipe(new BrewingRecipe(input, ingredient, output));
     }
     
     @Override
@@ -148,7 +130,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin
     public void registerEntries(EntryRegistry registry) {
         for (Item item : Registry.ITEM) {
             try {
-                registry.registerEntries(EntryStacks.ofItemStacks(registry.appendStacksForItem(item)));
+                registry.registerEntries(EntryIngredients.ofItemStacks(registry.appendStacksForItem(item)));
             } catch (Exception ignored) {
                 registry.registerEntry(EntryStacks.of(item));
             }
@@ -359,7 +341,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin
         registry.getOrCrateSection(new TranslatableComponent(GameModeFavoriteEntry.TRANSLATION_KEY))
                 .add(Stream.concat(
                         Arrays.stream(GameType.values())
-                                .filter(type -> type != GameType.NOT_SET),
+                                .filter(type -> type.getId() >= 0),
                         Stream.of((GameType) null)
                 ).<FavoriteEntry>map(GameModeFavoriteEntry.Type.INSTANCE::fromArgs).toArray(FavoriteEntry[]::new));
         registry.register(WeatherFavoriteEntry.ID, WeatherFavoriteEntry.Type.INSTANCE);
@@ -374,4 +356,35 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin
     public int getPriority() {
         return -100;
     }
+    
+    public static class DummyShovelItem extends ShovelItem {
+        public DummyShovelItem(Tier tier, float f, float g, Properties properties) {
+            super(tier, f, g, properties);
+        }
+        
+        public static Map<Block, BlockState> getPathBlocksMap() {
+            return FLATTENABLES;
+        }
+    }
+    
+    public static class DummyAxeItem extends AxeItem {
+        public DummyAxeItem(Tier tier, float f, float g, Properties properties) {
+            super(tier, f, g, properties);
+        }
+        
+        public static Map<Block, Block> getStrippedBlocksMap() {
+            return STRIPABLES;
+        }
+    }
+    
+    public static class DummyHoeItem extends HoeItem {
+        public DummyHoeItem(Tier tier, int i, float f, Properties properties) {
+            super(tier, i, f, properties);
+        }
+        
+        public static Map<Block, BlockState> getTilledBlocksMap() {
+            return TILLABLES;
+        }
+    }
+    
 }
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java
index 6358c0f2b..42434df3a 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultBrewingCategory.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.plugin.brewing;
+package me.shedaniel.rei.plugin.client.categories;
 
 import com.google.common.collect.Lists;
 import me.shedaniel.math.Point;
@@ -34,6 +34,7 @@ import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
+import me.shedaniel.rei.plugin.common.displays.brewing.DefaultBrewingDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/campfire/DefaultCampfireCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCampfireCategory.java
index 6c50b261c..87c630e98 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/campfire/DefaultCampfireCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCampfireCategory.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.plugin.common.campfire;
+package me.shedaniel.rei.plugin.client.categories;
 
 import com.google.common.collect.Lists;
 import me.shedaniel.math.Point;
@@ -33,6 +33,7 @@ import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
+import me.shedaniel.rei.plugin.common.displays.DefaultCampfireDisplay;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.level.block.Blocks;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/composting/DefaultCompostingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java
index 880afe6df..c152eed69 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/composting/DefaultCompostingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.plugin.common.composting;
+package me.shedaniel.rei.plugin.client.categories;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -37,6 +37,7 @@ import me.shedaniel.rei.api.common.entry.EntryIngredient;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
+import me.shedaniel.rei.plugin.common.displays.DefaultCompostingDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.ChatFormatting;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java
index 0c642f3e0..ad396ed18 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultFuelCategory.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.plugin.fuel;
+package me.shedaniel.rei.plugin.client.categories;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -37,6 +37,7 @@ import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
+import me.shedaniel.rei.plugin.common.displays.DefaultFuelDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
@@ -50,7 +51,6 @@ import java.util.List;
 
 @Environment(EnvType.CLIENT)
 public class DefaultFuelCategory implements DisplayCategory<DefaultFuelDisplay> {
-    
     private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##");
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
index bdac76f0e..6dfc4e1b3 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.plugin.information;
+package me.shedaniel.rei.plugin.client.categories;
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -42,6 +42,7 @@ import me.shedaniel.rei.api.client.gui.widgets.Widgets;
 import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
+import me.shedaniel.rei.plugin.common.displays.DefaultInformationDisplay;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultPathingCategory.java
index d939a3e0e..866c233b6 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java
+++ b/