diff options
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/impl')
12 files changed, 23 insertions, 24 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java index 1f327fb7b..450248dbe 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java @@ -26,12 +26,11 @@ package me.shedaniel.rei.impl; import io.netty.buffer.Unpooled; import me.shedaniel.architectury.networking.NetworkManager; import me.shedaniel.architectury.platform.Platform; -import me.shedaniel.architectury.utils.Fraction; import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.RoughlyEnoughItemsNetwork; import me.shedaniel.rei.api.ClientHelper; -import me.shedaniel.rei.api.ConfigManager; -import me.shedaniel.rei.api.ConfigObject; +import me.shedaniel.rei.api.config.ConfigManager; +import me.shedaniel.rei.api.config.ConfigObject; import me.shedaniel.rei.api.REIHelper; import me.shedaniel.rei.api.gui.config.RecipeScreenType; import me.shedaniel.rei.api.ingredient.EntryStack; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java index c2930d4e6..c99795f5e 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java @@ -49,7 +49,7 @@ import me.shedaniel.clothconfig2.api.ModifierKeyCode; import me.shedaniel.clothconfig2.gui.entries.KeyCodeEntry; import me.shedaniel.clothconfig2.impl.EasingMethod; import me.shedaniel.rei.RoughlyEnoughItemsCore; -import me.shedaniel.rei.api.ConfigManager; +import me.shedaniel.rei.api.config.ConfigManager; import me.shedaniel.rei.api.REIHelper; import me.shedaniel.rei.api.favorites.FavoriteEntry; import me.shedaniel.rei.api.gui.config.RecipeScreenType; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java index 85c9ebe12..0445416a3 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java @@ -30,7 +30,7 @@ import me.shedaniel.autoconfig.annotation.ConfigEntry; import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Comment; import me.shedaniel.clothconfig2.api.Modifier; import me.shedaniel.clothconfig2.api.ModifierKeyCode; -import me.shedaniel.rei.api.ConfigObject; +import me.shedaniel.rei.api.config.ConfigObject; import me.shedaniel.rei.api.favorites.FavoriteEntry; import me.shedaniel.rei.api.gui.config.*; import me.shedaniel.rei.api.ingredient.EntryStack; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java index faf38e282..7af51086e 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java @@ -26,7 +26,7 @@ package me.shedaniel.rei.impl; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import me.shedaniel.rei.RoughlyEnoughItemsCore; -import me.shedaniel.rei.api.ConfigObject; +import me.shedaniel.rei.api.config.ConfigObject; import me.shedaniel.rei.api.ingredient.EntryStack; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.api.plugins.REIPlugin; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java b/runtime/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java index c9c9968cc..dea02b9c2 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java @@ -28,7 +28,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import it.unimi.dsi.fastutil.ints.IntList; import me.shedaniel.math.Rectangle; import me.shedaniel.math.impl.PointHelper; -import me.shedaniel.rei.api.ConfigObject; +import me.shedaniel.rei.api.config.ConfigObject; import me.shedaniel.rei.api.REIHelper; import me.shedaniel.rei.api.gui.widgets.*; import me.shedaniel.rei.api.registry.display.Display; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/REIHelperImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/REIHelperImpl.java index 5f36fd2cd..cef610c4a 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/REIHelperImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/REIHelperImpl.java @@ -29,8 +29,8 @@ import com.mojang.blaze3d.platform.Window; import me.shedaniel.architectury.event.events.GuiEvent; import me.shedaniel.architectury.event.events.client.ClientTickEvent; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.ConfigManager; -import me.shedaniel.rei.api.ConfigObject; +import me.shedaniel.rei.api.config.ConfigManager; +import me.shedaniel.rei.api.config.ConfigObject; import me.shedaniel.rei.api.REIHelper; import me.shedaniel.rei.api.REIOverlay; import me.shedaniel.rei.api.gui.config.SearchFieldLocation; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java index 2c76b3876..bc21380b8 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java @@ -27,8 +27,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.mojang.blaze3d.platform.Window; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.FocusedStackProvider; -import me.shedaniel.rei.api.ScreenClickAreaProvider; +import me.shedaniel.rei.api.registry.screen.FocusedStackProvider; +import me.shedaniel.rei.api.registry.screen.SimpleClickArea; import me.shedaniel.rei.api.gui.config.DisplayPanelLocation; import me.shedaniel.rei.api.ingredient.EntryStack; import me.shedaniel.rei.api.ingredient.util.EntryStacks; @@ -149,9 +149,9 @@ public class ScreenRegistryImpl implements ScreenRegistry { } @Override - public <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(ScreenClickAreaProvider<T> provider, Class<? extends T> screenClass, ResourceLocation... categories) { + public <C extends AbstractContainerMenu, T extends AbstractContainerScreen<C>> void registerContainerClickArea(SimpleClickArea<T> area, Class<? extends T> screenClass, ResourceLocation... categories) { registerClickArea(screen -> { - Rectangle rectangle = provider.provide(screen).clone(); + Rectangle rectangle = area.provide(screen).clone(); rectangle.translate(screen.leftPos, screen.topPos); return rectangle; }, screenClass, categories); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/filtering/rules/ManualFilteringRule.java b/runtime/src/main/java/me/shedaniel/rei/impl/filtering/rules/ManualFilteringRule.java index 4970f45d5..89477641b 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/filtering/rules/ManualFilteringRule.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/filtering/rules/ManualFilteringRule.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.impl.filtering.rules; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSet; -import me.shedaniel.rei.api.ConfigObject; +import me.shedaniel.rei.api.config.ConfigObject; import me.shedaniel.rei.api.ingredient.EntryStack; import me.shedaniel.rei.api.ingredient.entry.ComparisonContext; import me.shedaniel.rei.api.ingredient.util.EntryStacks; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java index 9dd07f1eb..6283451b9 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java @@ -23,7 +23,7 @@ package me.shedaniel.rei.impl.registry; -import me.shedaniel.rei.api.ButtonAreaSupplier; +import me.shedaniel.rei.api.registry.category.ButtonArea; import me.shedaniel.rei.api.ingredient.EntryIngredient; import me.shedaniel.rei.api.plugins.REIPlugin; import me.shedaniel.rei.api.registry.Reloadable; @@ -97,7 +97,7 @@ public class CategoryRegistryImpl implements CategoryRegistry, Reloadable { private final DisplayCategory<T> category; private final List<EntryIngredient> workstations = Collections.synchronizedList(new ArrayList<>()); - private Optional<ButtonAreaSupplier> plusButtonArea = Optional.of(ButtonAreaSupplier.defaultArea()); + private Optional<ButtonArea> plusButtonArea = Optional.of(ButtonArea.defaultArea()); public Configuration(DisplayCategory<T> category) { this.category = category; @@ -109,12 +109,12 @@ public class CategoryRegistryImpl implements CategoryRegistry, Reloadable { } @Override - public void setPlusButtonArea(ButtonAreaSupplier supplier) { - this.plusButtonArea = Optional.ofNullable(supplier); + public void setPlusButtonArea(ButtonArea area) { + this.plusButtonArea = Optional.ofNullable(area); } @Override - public Optional<ButtonAreaSupplier> getPlusButtonArea() { + public Optional<ButtonArea> getPlusButtonArea() { return plusButtonArea; } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/registry/DisplayRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/registry/DisplayRegistryImpl.java index 5246d38f2..b92791137 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/registry/DisplayRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/registry/DisplayRegistryImpl.java @@ -24,8 +24,8 @@ package me.shedaniel.rei.impl.registry; import me.shedaniel.rei.RoughlyEnoughItemsCore; -import me.shedaniel.rei.api.DisplayVisibilityPredicate; -import me.shedaniel.rei.api.LiveDisplayGenerator; +import me.shedaniel.rei.api.registry.display.visibility.DisplayVisibilityPredicate; +import me.shedaniel.rei.api.registry.display.LiveDisplayGenerator; import me.shedaniel.rei.api.plugins.REIPlugin; import me.shedaniel.rei.api.registry.category.CategoryRegistry; import me.shedaniel.rei.api.registry.display.Display; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/view/ViewsImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/view/ViewsImpl.java index 55319da56..6f75f80e6 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/view/ViewsImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/view/ViewsImpl.java @@ -27,8 +27,8 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import me.shedaniel.rei.RoughlyEnoughItemsCore; -import me.shedaniel.rei.api.ConfigObject; -import me.shedaniel.rei.api.LiveDisplayGenerator; +import me.shedaniel.rei.api.config.ConfigObject; +import me.shedaniel.rei.api.registry.display.LiveDisplayGenerator; import me.shedaniel.rei.api.ingredient.EntryIngredient; import me.shedaniel.rei.api.ingredient.EntryStack; import me.shedaniel.rei.api.ingredient.util.EntryIngredients; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java index a0d7d2a98..d34db75a4 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/widgets/PanelWidget.java @@ -28,7 +28,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.ConfigObject; +import me.shedaniel.rei.api.config.ConfigObject; import me.shedaniel.rei.api.REIHelper; import me.shedaniel.rei.api.gui.config.RecipeBorderType; import me.shedaniel.rei.api.gui.config.RecipeScreenType; |