From dc92d0a4d262b633e9f322def3e89ab1a05417ab Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 5 Feb 2021 21:55:26 +0800 Subject: More Signed-off-by: shedaniel --- .../main/java/me/shedaniel/rei/plugin/DefaultPlugin.java | 4 +++- .../plugin/autocrafting/DefaultRecipeBookHandler.java | 4 ++-- .../plugin/beacon/base/DefaultBeaconBaseCategory.java | 16 ++++++++-------- .../rei/plugin/beacon/base/DefaultBeaconBaseDisplay.java | 2 +- .../beacon/payment/DefaultBeaconPaymentCategory.java | 16 ++++++++-------- .../beacon/payment/DefaultBeaconPaymentDisplay.java | 2 +- .../rei/plugin/brewing/DefaultBrewingCategory.java | 8 ++++---- .../rei/plugin/brewing/DefaultBrewingDisplay.java | 2 +- .../rei/plugin/campfire/DefaultCampfireCategory.java | 8 ++++---- .../rei/plugin/campfire/DefaultCampfireDisplay.java | 2 +- .../rei/plugin/composting/DefaultCompostingCategory.java | 10 +++++----- .../rei/plugin/composting/DefaultCompostingDisplay.java | 2 +- .../rei/plugin/cooking/DefaultCookingCategory.java | 11 +++++------ .../rei/plugin/cooking/DefaultCookingDisplay.java | 2 +- .../rei/plugin/crafting/DefaultCraftingCategory.java | 10 +++++----- .../rei/plugin/crafting/DefaultCraftingDisplay.java | 2 +- .../rei/plugin/crafting/DefaultCustomDisplay.java | 2 +- .../rei/plugin/favorites/GameModeFavoriteEntry.java | 6 +++--- .../rei/plugin/favorites/WeatherFavoriteEntry.java | 6 +++--- .../shedaniel/rei/plugin/fuel/DefaultFuelCategory.java | 14 +++++++------- .../me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java | 2 +- .../plugin/information/DefaultInformationCategory.java | 12 ++++++------ .../plugin/information/DefaultInformationDisplay.java | 2 +- .../rei/plugin/pathing/DefaultPathingCategory.java | 8 ++++---- .../rei/plugin/pathing/DefaultPathingDisplay.java | 2 +- .../rei/plugin/smithing/DefaultSmithingCategory.java | 8 ++++---- .../rei/plugin/smithing/DefaultSmithingDisplay.java | 2 +- .../plugin/stonecutting/DefaultStoneCuttingCategory.java | 8 ++++---- .../plugin/stonecutting/DefaultStoneCuttingDisplay.java | 2 +- .../rei/plugin/stripping/DefaultStrippingCategory.java | 8 ++++---- .../rei/plugin/stripping/DefaultStrippingDisplay.java | 2 +- .../rei/plugin/tilling/DefaultTillingCategory.java | 8 ++++---- .../rei/plugin/tilling/DefaultTillingDisplay.java | 2 +- 33 files changed, 98 insertions(+), 97 deletions(-) (limited to 'default-plugin/src/main') diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index bf0adfc33..59ca85570 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -38,8 +38,10 @@ import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.api.favorites.FavoriteEntry; import me.shedaniel.rei.api.favorites.FavoriteEntryType; import me.shedaniel.rei.api.fluid.FluidSupportProvider; +import me.shedaniel.rei.api.plugins.BuiltinPlugin; import me.shedaniel.rei.api.plugins.REIPluginV0; import me.shedaniel.rei.api.registry.CategoryRegistry; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.plugin.autocrafting.DefaultRecipeBookHandler; import me.shedaniel.rei.plugin.beacon.base.DefaultBeaconBaseCategory; import me.shedaniel.rei.plugin.beacon.base.DefaultBeaconBaseDisplay; @@ -79,7 +81,7 @@ 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.utils.CollectionUtils; +import me.shedaniel.rei.api.util.CollectionUtils; 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/autocrafting/DefaultRecipeBookHandler.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java index a609270d2..3d420d638 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 @@ -25,8 +25,8 @@ package me.shedaniel.rei.plugin.autocrafting; import me.shedaniel.rei.api.AutoTransferHandler; import me.shedaniel.rei.api.ClientHelper; -import me.shedaniel.rei.api.Display; -import me.shedaniel.rei.api.TransferDisplay; +import me.shedaniel.rei.api.registry.display.Display; +import me.shedaniel.rei.api.registry.display.TransferDisplay; import me.shedaniel.rei.plugin.cooking.DefaultCookingDisplay; import me.shedaniel.rei.plugin.crafting.DefaultCraftingDisplay; import net.fabricmc.api.EnvType; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseCategory.java index 2ee7a8db6..4172e150d 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseCategory.java @@ -31,16 +31,16 @@ import me.shedaniel.clothconfig2.api.ScrollingContainer; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.REIHelper; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Slot; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.entries.DisplayRenderer; -import me.shedaniel.rei.gui.widget.Widget; -import me.shedaniel.rei.gui.widget.WidgetWithBounds; +import me.shedaniel.rei.api.gui.widgets.Slot; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.DisplayRenderer; +import me.shedaniel.rei.api.gui.widgets.Widget; +import me.shedaniel.rei.api.gui.widgets.WidgetWithBounds; import me.shedaniel.rei.plugin.DefaultPlugin; -import me.shedaniel.rei.utils.CollectionUtils; +import me.shedaniel.rei.api.util.CollectionUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.resources.language.I18n; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseDisplay.java index 89e850a03..f83216ed6 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseDisplay.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.plugin.beacon.base; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentCategory.java index 55b546067..13500d069 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentCategory.java @@ -31,16 +31,16 @@ import me.shedaniel.clothconfig2.api.ScrollingContainer; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.REIHelper; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Slot; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.entries.DisplayRenderer; -import me.shedaniel.rei.gui.widget.Widget; -import me.shedaniel.rei.gui.widget.WidgetWithBounds; +import me.shedaniel.rei.api.gui.widgets.Slot; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.DisplayRenderer; +import me.shedaniel.rei.api.gui.widgets.Widget; +import me.shedaniel.rei.api.gui.widgets.WidgetWithBounds; import me.shedaniel.rei.plugin.DefaultPlugin; -import me.shedaniel.rei.utils.CollectionUtils; +import me.shedaniel.rei.api.util.CollectionUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.resources.language.I18n; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentDisplay.java index 058e035b1..0176a0085 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentDisplay.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.plugin.beacon.payment; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; 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/brewing/DefaultBrewingCategory.java index 09c0a96de..5aa9ea816 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java @@ -27,11 +27,11 @@ import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.REIHelper; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java index 116c6aa27..1a3cf1e59 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.plugin.brewing; import com.google.common.collect.Lists; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java index 94e0f140a..955f5c7a3 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java @@ -26,11 +26,11 @@ package me.shedaniel.rei.plugin.campfire; import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.TranslatableComponent; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java index 164e792b3..cbb1222ee 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.plugin.campfire; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java index 360dae21a..b3f2d4054 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java @@ -28,12 +28,12 @@ import com.mojang.blaze3d.vertex.PoseStack; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.entries.DisplayRenderer; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.DisplayRenderer; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingDisplay.java index 583d6db9d..8ee9d303a 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingDisplay.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.plugin.composting; import it.unimi.dsi.fastutil.objects.Object2FloatMap; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java index c48083c72..a83f60784 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java @@ -28,13 +28,12 @@ import com.mojang.blaze3d.vertex.PoseStack; import it.unimi.dsi.fastutil.ints.IntList; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.ingredient.EntryIngredient; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.TransferDisplayCategory; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.entries.DisplayRenderer; -import me.shedaniel.rei.gui.entries.SimpleDisplayRenderer; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.registry.display.TransferDisplayCategory; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.DisplayRenderer; +import me.shedaniel.rei.api.gui.SimpleDisplayRenderer; +import me.shedaniel.rei.api.gui.widgets.Widget; import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.TranslatableComponent; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java index 67d442b45..1a778c925 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java @@ -23,7 +23,7 @@ package me.shedaniel.rei.plugin.cooking; -import me.shedaniel.rei.api.TransferDisplay; +import me.shedaniel.rei.api.registry.display.TransferDisplay; import me.shedaniel.rei.api.ingredient.EntryIngredient; import me.shedaniel.rei.api.ingredient.util.EntryIngredients; import me.shedaniel.rei.api.ingredient.util.EntryStacks; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java index 52202a76d..9e0f6a6f9 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java @@ -30,12 +30,12 @@ import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.ingredient.EntryStack; import me.shedaniel.rei.api.REIHelper; -import me.shedaniel.rei.api.util.Renderer; -import me.shedaniel.rei.api.TransferDisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; +import me.shedaniel.rei.api.registry.display.TransferDisplayCategory; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Slot; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Slot; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import me.shedaniel.rei.api.server.ContainerInfo; import me.shedaniel.rei.api.server.ContainerInfoHandler; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java index e7bb4914f..0d62f186d 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java @@ -23,7 +23,7 @@ package me.shedaniel.rei.plugin.crafting; -import me.shedaniel.rei.api.TransferDisplay; +import me.shedaniel.rei.api.registry.display.TransferDisplay; import me.shedaniel.rei.api.ingredient.EntryIngredient; import me.shedaniel.rei.api.server.ContainerInfo; import me.shedaniel.rei.plugin.DefaultPlugin; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java index e5bbdb0f4..7d277bc6c 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java @@ -27,7 +27,7 @@ import com.google.common.collect.ImmutableList; import me.shedaniel.rei.api.ingredient.EntryIngredient; import me.shedaniel.rei.api.ingredient.EntryStack; import me.shedaniel.rei.api.ingredient.util.EntryIngredients; -import me.shedaniel.rei.utils.CollectionUtils; +import me.shedaniel.rei.api.util.CollectionUtils; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.resources.ResourceLocation; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java index 7ff978803..e016e6693 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java @@ -30,13 +30,13 @@ import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.ConfigObject; import me.shedaniel.rei.api.REIHelper; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.entry.AbstractRenderer; import me.shedaniel.rei.api.favorites.FavoriteEntry; import me.shedaniel.rei.api.favorites.FavoriteEntryType; import me.shedaniel.rei.api.favorites.FavoriteMenuEntry; -import me.shedaniel.rei.api.widgets.Tooltip; -import me.shedaniel.rei.utils.CollectionUtils; +import me.shedaniel.rei.api.gui.widgets.Tooltip; +import me.shedaniel.rei.api.util.CollectionUtils; import net.minecraft.ChatFormatting; import net.minecraft.Util; import net.minecraft.client.Minecraft; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/WeatherFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/WeatherFavoriteEntry.java index cdbdd2c0f..81b420054 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/WeatherFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/WeatherFavoriteEntry.java @@ -31,13 +31,13 @@ import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.ConfigObject; import me.shedaniel.rei.api.REIHelper; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.entry.AbstractRenderer; import me.shedaniel.rei.api.favorites.FavoriteEntry; import me.shedaniel.rei.api.favorites.FavoriteEntryType; import me.shedaniel.rei.api.favorites.FavoriteMenuEntry; -import me.shedaniel.rei.api.widgets.Tooltip; -import me.shedaniel.rei.utils.CollectionUtils; +import me.shedaniel.rei.api.gui.widgets.Tooltip; +import me.shedaniel.rei.api.util.CollectionUtils; import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.events.GuiEventListener; 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/fuel/DefaultFuelCategory.java index d7aadd037..627000368 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java @@ -27,14 +27,14 @@ import com.google.common.collect.Lists; import com.mojang.blaze3d.vertex.PoseStack; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Slot; -import me.shedaniel.rei.api.widgets.Tooltip; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.entries.DisplayRenderer; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Slot; +import me.shedaniel.rei.api.gui.widgets.Tooltip; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.DisplayRenderer; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java index 4bf29e856..480b2080f 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.plugin.fuel; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; 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/information/DefaultInformationCategory.java index 1f5fa9c96..a937e652f 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java @@ -33,13 +33,13 @@ import me.shedaniel.clothconfig2.api.ScrollingContainer; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.REIHelper; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.entry.AbstractRenderer; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.entries.DisplayRenderer; -import me.shedaniel.rei.gui.widget.Widget; -import me.shedaniel.rei.gui.widget.WidgetWithBounds; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.DisplayRenderer; +import me.shedaniel.rei.api.gui.widgets.Widget; +import me.shedaniel.rei.api.gui.widgets.WidgetWithBounds; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java index 206e10dda..5b6fafef5 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.plugin.information; import com.google.common.collect.Lists; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; 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/pathing/DefaultPathingCategory.java index 0074cd887..51eaa513d 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java @@ -26,11 +26,11 @@ package me.shedaniel.rei.plugin.pathing; import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java index 26b09bc6a..3b958e47a 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.plugin.pathing; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingCategory.java index 9b8c176d3..7432b3958 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingCategory.java @@ -26,11 +26,11 @@ package me.shedaniel.rei.plugin.smithing; import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java index 7cc2dc999..f1f0d2cc7 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.plugin.smithing; import com.google.common.collect.Lists; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java index 771e12537..2f1615168 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java @@ -26,11 +26,11 @@ package me.shedaniel.rei.plugin.stonecutting; import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java index da2d0d2fb..50ca977df 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.plugin.stonecutting; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java index 4b2788c15..1e2ea3adf 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java @@ -26,11 +26,11 @@ package me.shedaniel.rei.plugin.stripping; import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java index adc0df8a9..28d944dba 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.plugin.stripping; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java index 47e6e63e3..288404815 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java @@ -26,11 +26,11 @@ package me.shedaniel.rei.plugin.tilling; import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.registry.category.DisplayCategory; -import me.shedaniel.rei.api.util.Renderer; +import me.shedaniel.rei.api.registry.display.DisplayCategory; +import me.shedaniel.rei.api.gui.Renderer; import me.shedaniel.rei.api.ingredient.util.EntryStacks; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.widget.Widget; +import me.shedaniel.rei.api.gui.widgets.Widgets; +import me.shedaniel.rei.api.gui.widgets.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java index 1a36cc07a..35a01c59b 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java @@ -24,7 +24,7 @@ package me.shedaniel.rei.plugin.tilling; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.Display; +import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.plugin.DefaultPlugin; import net.fabricmc.api.EnvType; -- cgit