From 05069aa62b09f02a8cd6e526ec58a30347a56500 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 27 Jul 2022 23:25:27 +0800 Subject: WIP Module --- .../me/shedaniel/rei/RoughlyEnoughItemsCore.java | 82 +-- .../rei/RoughlyEnoughItemsCoreClient.java | 86 ++- .../rei/impl/client/AbstractViewSearchBuilder.java | 50 ++ .../rei/impl/client/ClientHelperImpl.java | 250 +------- .../client/LegacyWrapperViewSearchBuilder.java | 145 +++++ .../shedaniel/rei/impl/client/REIRuntimeImpl.java | 13 +- .../rei/impl/client/ViewSearchBuilderImpl.java | 144 +++++ .../rei/impl/client/config/ConfigManagerImpl.java | 439 ------------- .../rei/impl/client/config/ConfigObjectImpl.java | 707 --------------------- .../config/addon/ConfigAddonRegistryImpl.java | 61 -- .../client/config/addon/ConfigAddonsScreen.java | 192 ------ .../client/config/entries/ConfigAddonsEntry.java | 96 --- .../config/entries/FilteringAddRuleScreen.java | 201 ------ .../impl/client/config/entries/FilteringEntry.java | 116 ---- .../config/entries/FilteringRuleOptionsScreen.java | 383 ----------- .../config/entries/FilteringRulesScreen.java | 253 -------- .../client/config/entries/FilteringScreen.java | 514 --------------- .../client/config/entries/NoFilteringEntry.java | 96 --- .../config/entries/RecipeScreenTypeEntry.java | 115 ---- .../client/config/entries/ReloadPluginsEntry.java | 6 +- .../SearchFilterSyntaxHighlightingEntry.java | 117 ---- .../impl/client/config/entries/TitleTextEntry.java | 87 --- .../entry/filtering/AbstractFilteringRule.java | 40 -- .../client/entry/filtering/FilteringCache.java | 31 - .../client/entry/filtering/FilteringCacheImpl.java | 44 -- .../client/entry/filtering/FilteringContext.java | 47 -- .../entry/filtering/FilteringContextImpl.java | 122 ---- .../entry/filtering/FilteringContextType.java | 34 - .../client/entry/filtering/FilteringResult.java | 93 --- .../entry/filtering/FilteringResultImpl.java | 55 -- .../impl/client/entry/filtering/FilteringRule.java | 86 --- .../entry/filtering/rules/ManualFilteringRule.java | 121 ---- .../entry/filtering/rules/SearchFilteringRule.java | 239 ------- .../entry/renderer/EntryRendererRegistryImpl.java | 66 -- .../entry/type/types/RenderingEntryDefinition.java | 91 --- .../DelegatingFavoriteEntryProviderImpl.java | 117 ---- .../favorites/FavoriteEntryTypeRegistryImpl.java | 160 ----- .../rei/impl/client/gui/hints/HintProvider.java | 55 -- .../gui/screen/UncertainDisplayViewingScreen.java | 6 +- .../client/gui/widget/CatchingExceptionUtils.java | 9 +- .../impl/client/gui/widget/ConfigButtonWidget.java | 23 +- .../gui/widget/CraftableFilterButtonWidget.java | 18 +- .../impl/client/gui/widget/InternalWidgets.java | 6 +- .../widget/entrylist/CollapsedEntriesTooltip.java | 1 - .../gui/widget/entrylist/CollapsedStack.java | 60 ++ .../entrylist/CollapsingEntryListWidget.java | 1 - .../widget/entrylist/EntryListSearchManager.java | 18 +- .../gui/widget/entrylist/EntryListStackEntry.java | 2 - .../gui/widget/entrylist/EntryListWidget.java | 20 +- .../widget/entrylist/PaginatedEntryListWidget.java | 1 - .../widget/entrylist/ScrolledEntryListWidget.java | 1 - .../widget/favorites/FavoritesEntriesManager.java | 149 ----- .../gui/widget/favorites/FavoritesListWidget.java | 103 +-- .../favorites/history/DisplayHistoryManager.java | 17 +- .../listeners/FavoritesRegionListener.java | 8 +- .../listeners/FavoritesSystemRegionListener.java | 56 -- .../gui/widget/search/OverlaySearchField.java | 21 +- .../OverlaySearchFieldSyntaxHighlighter.java | 45 +- .../registry/category/CategoryRegistryImpl.java | 201 ------ .../registry/display/DisplayRegistryImpl.java | 322 ---------- .../client/registry/screen/ExclusionZonesImpl.java | 158 ----- .../client/registry/screen/ScreenRegistryImpl.java | 332 ---------- .../rei/impl/client/search/AsyncSearchManager.java | 148 ----- .../shedaniel/rei/impl/client/search/IntRange.java | 61 -- .../rei/impl/client/search/SearchProviderImpl.java | 114 ---- .../search/argument/AlternativeArgument.java | 74 --- .../rei/impl/client/search/argument/Argument.java | 367 ----------- .../client/search/argument/CompoundArgument.java | 88 --- .../rei/impl/client/search/argument/IndexSet.java | 173 ----- .../client/search/argument/InputMethodMatcher.java | 129 ---- .../argument/type/AlwaysMatchingArgumentType.java | 60 -- .../client/search/argument/type/ArgumentType.java | 101 --- .../argument/type/ArgumentTypesRegistry.java | 52 -- .../argument/type/IdentifierArgumentType.java | 88 --- .../client/search/argument/type/MatchType.java | 41 -- .../search/argument/type/ModArgumentType.java | 103 --- .../search/argument/type/RegexArgumentType.java | 99 --- .../search/argument/type/TagArgumentType.java | 92 --- .../search/argument/type/TextArgumentType.java | 75 --- .../search/argument/type/TooltipArgumentType.java | 123 ---- .../client/search/method/DefaultInputMethod.java | 76 --- .../search/method/InputMethodRegistryImpl.java | 109 ---- .../search/result/ArgumentApplicableResult.java | 122 ---- .../impl/client/subsets/SubsetsRegistryImpl.java | 79 --- .../rei/impl/client/util/CrashReportUtils.java | 74 --- .../common/category/CategoryIdentifierImpl.java | 80 --- .../display/DisplaySerializerRegistryImpl.java | 77 --- .../rei/impl/common/entry/AbstractEntryStack.java | 281 -------- .../entry/DeferringEntryTypeProviderImpl.java | 108 ---- .../rei/impl/common/entry/EmptyEntryStack.java | 45 -- .../rei/impl/common/entry/EntryIngredientImpl.java | 476 -------------- .../impl/common/entry/EntryStackProviderImpl.java | 50 -- .../rei/impl/common/entry/TypedEntryStack.java | 53 -- .../comparison/EntryComparatorRegistryImpl.java | 92 --- .../comparison/FluidComparatorRegistryImpl.java | 56 -- .../comparison/ItemComparatorRegistryImpl.java | 56 -- .../entry/comparison/NbtHasherProviderImpl.java | 101 --- .../settings/EntrySettingsAdapterRegistryImpl.java | 71 --- .../impl/common/entry/type/EntryRegistryImpl.java | 291 --------- .../impl/common/entry/type/EntryRegistryList.java | 60 -- .../common/entry/type/EntryRegistryListener.java | 45 -- .../impl/common/entry/type/EntryTypeDeferred.java | 78 --- .../common/entry/type/EntryTypeRegistryImpl.java | 102 --- .../common/entry/type/NormalEntryRegistryList.java | 115 ---- .../common/entry/type/PreFilteredEntryList.java | 198 ------ .../entry/type/ReloadingEntryRegistryList.java | 107 ---- .../entry/type/collapsed/CollapsedStack.java | 59 -- .../collapsed/CollapsibleEntryRegistryImpl.java | 138 ---- .../entry/type/types/BuiltinEntryDefinition.java | 152 ----- .../entry/type/types/EmptyEntryDefinition.java | 50 -- .../common/fluid/FluidSupportProviderImpl.java | 89 --- .../rei/impl/common/logging/FileLogger.java | 78 --- .../rei/impl/common/logging/FilteringLogger.java | 56 -- .../rei/impl/common/logging/Log4JLogger.java | 50 -- .../rei/impl/common/logging/MultiLogger.java | 56 -- .../impl/common/logging/TransformingLogger.java | 54 -- .../rei/impl/common/plugins/PluginManagerImpl.java | 305 ++------- .../impl/common/plugins/PluginReloaderImpl.java | 289 +++++++++ .../common/registry/RecipeManagerContextImpl.java | 72 --- .../impl/common/util/HashedEntryStackWrapper.java | 74 --- .../impl/init/RoughlyEnoughItemsInitializer.java | 1 + .../rei/impl/init/ServiceBasedPluginDetector.java | 61 ++ .../plugin/client/entry/FluidEntryDefinition.java | 316 --------- .../plugin/client/entry/ItemEntryDefinition.java | 382 ----------- .../client/runtime/DefaultClientRuntimePlugin.java | 39 +- .../runtime/FilteredStacksVisibilityHandler.java | 116 ---- .../plugin/client/runtime/InputMethodWatcher.java | 13 +- .../runtime/PluginStageExecutionWatcher.java | 98 +-- .../client/runtime/SearchFilterPrepareWatcher.java | 91 --- .../common/runtime/DefaultRuntimePlugin.java | 58 -- .../shedaniel/rei/plugin/test/REITestPlugin.java | 105 --- ...daniel.rei.impl.ClientInternals$WidgetsProvider | 1 + ...hedaniel.rei.impl.client.gui.hints.HintProvider | 3 + .../me.shedaniel.rei.impl.init.PluginDetector | 1 + 134 files changed, 1051 insertions(+), 13878 deletions(-) create mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/AbstractViewSearchBuilder.java create mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/LegacyWrapperViewSearchBuilder.java create mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/ViewSearchBuilderImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonsScreen.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ConfigAddonsEntry.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringEntry.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRuleOptionsScreen.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringEntry.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/TitleTextEntry.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/AbstractFilteringRule.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringCache.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringCacheImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringContext.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringContextImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringContextType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringResult.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringResultImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringRule.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/rules/ManualFilteringRule.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/rules/SearchFilteringRule.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/renderer/EntryRendererRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/entry/type/types/RenderingEntryDefinition.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/DelegatingFavoriteEntryProviderImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/gui/hints/HintProvider.java create mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/CollapsedStack.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesEntriesManager.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/listeners/FavoritesSystemRegionListener.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/registry/category/CategoryRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ExclusionZonesImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/AsyncSearchManager.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/IntRange.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/AlternativeArgument.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/Argument.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/CompoundArgument.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/IndexSet.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/InputMethodMatcher.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/AlwaysMatchingArgumentType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ArgumentType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ArgumentTypesRegistry.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/IdentifierArgumentType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/MatchType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ModArgumentType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/RegexArgumentType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TagArgumentType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TextArgumentType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TooltipArgumentType.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/DefaultInputMethod.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/method/InputMethodRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/search/result/ArgumentApplicableResult.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/subsets/SubsetsRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/display/DisplaySerializerRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/DeferringEntryTypeProviderImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EmptyEntryStack.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryStackProviderImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/TypedEntryStack.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/EntryComparatorRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/FluidComparatorRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/ItemComparatorRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/NbtHasherProviderImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/settings/EntrySettingsAdapterRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryList.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryListener.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryTypeDeferred.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryTypeRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/NormalEntryRegistryList.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/PreFilteredEntryList.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/ReloadingEntryRegistryList.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsedStack.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/collapsed/CollapsibleEntryRegistryImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/BuiltinEntryDefinition.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/fluid/FluidSupportProviderImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FileLogger.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/logging/Log4JLogger.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/logging/MultiLogger.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/logging/TransformingLogger.java create mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/plugins/PluginReloaderImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/common/util/HashedEntryStackWrapper.java create mode 100644 runtime/src/main/java/me/shedaniel/rei/impl/init/ServiceBasedPluginDetector.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/FilteredStacksVisibilityHandler.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/SearchFilterPrepareWatcher.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/plugin/common/runtime/DefaultRuntimePlugin.java delete mode 100644 runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java create mode 100644 runtime/src/main/resources/META-INF/services/me.shedaniel.rei.impl.ClientInternals$WidgetsProvider create mode 100644 runtime/src/main/resources/META-INF/services/me.shedaniel.rei.impl.client.gui.hints.HintProvider create mode 100644 runtime/src/main/resources/META-INF/services/me.shedaniel.rei.impl.init.PluginDetector (limited to 'runtime/src') diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index f7bc42f5f..1cda29bf3 100644 --- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -23,60 +23,37 @@ package me.shedaniel.rei; -import com.google.common.collect.ImmutableList; import dev.architectury.platform.Platform; import dev.architectury.registry.ReloadListenerRegistry; import dev.architectury.utils.Env; import dev.architectury.utils.EnvExecutor; import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.annotation.Nullable; -import me.shedaniel.rei.api.common.entry.type.EntryType; +import me.shedaniel.rei.api.common.display.DisplaySerializerRegistry; +import me.shedaniel.rei.api.common.entry.comparison.FluidComparatorRegistry; +import me.shedaniel.rei.api.common.entry.comparison.ItemComparatorRegistry; +import me.shedaniel.rei.api.common.entry.settings.EntrySettingsAdapterRegistry; +import me.shedaniel.rei.api.common.entry.type.EntryTypeRegistry; +import me.shedaniel.rei.api.common.fluid.FluidSupportProvider; import me.shedaniel.rei.api.common.plugins.PluginManager; -import me.shedaniel.rei.api.common.plugins.PluginView; import me.shedaniel.rei.api.common.plugins.REIPlugin; -import me.shedaniel.rei.api.common.plugins.REIServerPlugin; +import me.shedaniel.rei.api.common.registry.RecipeManagerContext; import me.shedaniel.rei.api.common.registry.ReloadStage; +import me.shedaniel.rei.api.common.transfer.info.MenuInfoRegistry; import me.shedaniel.rei.impl.Internals; -import me.shedaniel.rei.impl.common.InternalLogger; -import me.shedaniel.rei.impl.common.category.CategoryIdentifierImpl; -import me.shedaniel.rei.impl.common.display.DisplaySerializerRegistryImpl; -import me.shedaniel.rei.impl.common.entry.DeferringEntryTypeProviderImpl; -import me.shedaniel.rei.impl.common.entry.EntryIngredientImpl; -import me.shedaniel.rei.impl.common.entry.EntryStackProviderImpl; -import me.shedaniel.rei.impl.common.entry.comparison.FluidComparatorRegistryImpl; -import me.shedaniel.rei.impl.common.entry.comparison.ItemComparatorRegistryImpl; -import me.shedaniel.rei.impl.common.entry.comparison.NbtHasherProviderImpl; -import me.shedaniel.rei.impl.common.entry.settings.EntrySettingsAdapterRegistryImpl; -import me.shedaniel.rei.impl.common.entry.type.EntryTypeRegistryImpl; -import me.shedaniel.rei.impl.common.fluid.FluidSupportProviderImpl; -import me.shedaniel.rei.impl.common.logging.*; import me.shedaniel.rei.impl.common.logging.performance.PerformanceLogger; import me.shedaniel.rei.impl.common.logging.performance.PerformanceLoggerImpl; -import me.shedaniel.rei.impl.common.plugins.PluginManagerImpl; -import me.shedaniel.rei.impl.common.registry.RecipeManagerContextImpl; -import me.shedaniel.rei.impl.common.transfer.MenuInfoRegistryImpl; import me.shedaniel.rei.impl.init.PluginDetector; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.PackType; import net.minecraft.util.Unit; import org.apache.commons.lang3.mutable.MutableLong; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; import org.jetbrains.annotations.ApiStatus; -import java.util.ServiceLoader; -import java.util.function.Function; -import java.util.function.UnaryOperator; +import java.util.List; @ApiStatus.Internal public class RoughlyEnoughItemsCore { - @ApiStatus.Internal - public static final InternalLogger LOGGER = new TransformingLogger(new MultiLogger(ImmutableList.of( - new FileLogger(Platform.getGameFolder().resolve("logs/rei.log")), - new FilteringLogger(new FileLogger(Platform.getGameFolder().resolve("logs/rei-issues.log")), Level.WARN), - new Log4JLogger(LogManager.getFormatterLogger("REI")) - )), message -> "[REI] " + message); public static final PerformanceLogger PERFORMANCE_LOGGER = new PerformanceLoggerImpl(); - private static final ServiceLoader PLUGIN_DETECTOR_LOADER = ServiceLoader.load(PluginDetector.class); + public static final List PLUGIN_DETECTORS = Internals.resolveServices(PluginDetector.class); static { attachCommonInternals(); @@ -86,26 +63,14 @@ public class RoughlyEnoughItemsCore { } public static void attachCommonInternals() { - Internals.attachInstanceSupplier(LOGGER, "logger"); - CategoryIdentifierImpl.attach(); - Internals.attachInstance((Function>) DeferringEntryTypeProviderImpl.INSTANCE, "entryTypeDeferred"); - Internals.attachInstance(EntryStackProviderImpl.INSTANCE, Internals.EntryStackProvider.class); - Internals.attachInstance(NbtHasherProviderImpl.INSTANCE, Internals.NbtHasherProvider.class); - Internals.attachInstance(EntryIngredientImpl.INSTANCE, Internals.EntryIngredientProvider.class); - Internals.attachInstanceSupplier(new PluginManagerImpl<>( - REIPlugin.class, - UnaryOperator.identity(), - new EntryTypeRegistryImpl(), - new EntrySettingsAdapterRegistryImpl(), - new RecipeManagerContextImpl<>(RecipeManagerContextImpl.supplier()), - new ItemComparatorRegistryImpl(), - new FluidComparatorRegistryImpl(), - new DisplaySerializerRegistryImpl(), - new FluidSupportProviderImpl()), "commonPluginManager"); - Internals.attachInstanceSupplier(new PluginManagerImpl<>( - REIServerPlugin.class, - view -> view.then(PluginView.getInstance()), - new MenuInfoRegistryImpl()), "serverPluginManager"); + PluginManager.getInstance().registerReloadable(EntryTypeRegistry.class); + PluginManager.getInstance().registerReloadable(EntrySettingsAdapterRegistry.class); + PluginManager.getInstance().registerReloadable(RecipeManagerContext.class); + PluginManager.getInstance().registerReloadable(ItemComparatorRegistry.class); + PluginManager.getInstance().registerReloadable(FluidComparatorRegistry.class); + PluginManager.getInstance().registerReloadable(DisplaySerializerRegistry.class); + PluginManager.getInstance().registerReloadable(FluidSupportProvider.class); + PluginManager.getServerInstance().registerReloadable(MenuInfoRegistry.class); } public static void _reloadPlugins(@Nullable ReloadStage stage) { @@ -131,9 +96,10 @@ public class RoughlyEnoughItemsCore { } public void onInitialize() { - PluginDetector detector = getPluginDetector(); - detector.detectCommonPlugins(); - detector.detectServerPlugins(); + for (PluginDetector detector : PLUGIN_DETECTORS) { + detector.detectCommonPlugins(); + detector.detectServerPlugins(); + } RoughlyEnoughItemsNetwork.onInitialize(); if (Platform.getEnvironment() == Env.SERVER) { @@ -146,8 +112,4 @@ public class RoughlyEnoughItemsCore { }); } } - - public static PluginDetector getPluginDetector() { - return PLUGIN_DETECTOR_LOADER.findFirst().orElseThrow(); - } } diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java index 0181a0267..e2dba5a38 100644 --- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java +++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java @@ -34,8 +34,10 @@ import dev.architectury.event.events.client.ClientScreenInputEvent; import dev.architectury.networking.NetworkManager; import me.shedaniel.math.Point; import me.shedaniel.rei.api.client.REIRuntime; +import me.shedaniel.rei.api.client.config.ConfigManager; import me.shedaniel.rei.api.client.config.ConfigObject; -import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer; +import me.shedaniel.rei.api.client.config.addon.ConfigAddonRegistry; +import me.shedaniel.rei.api.client.entry.renderer.EntryRendererRegistry; import me.shedaniel.rei.api.client.favorites.FavoriteEntry; import me.shedaniel.rei.api.client.favorites.FavoriteEntryType; import me.shedaniel.rei.api.client.gui.screen.DisplayScreen; @@ -44,44 +46,37 @@ import me.shedaniel.rei.api.client.gui.widgets.TooltipContext; import me.shedaniel.rei.api.client.overlay.ScreenOverlay; import me.shedaniel.rei.api.client.plugins.REIClientPlugin; import me.shedaniel.rei.api.client.registry.category.CategoryRegistry; +import me.shedaniel.rei.api.client.registry.display.DisplayRegistry; +import me.shedaniel.rei.api.client.registry.entry.CollapsibleEntryRegistry; +import me.shedaniel.rei.api.client.registry.entry.EntryRegistry; import me.shedaniel.rei.api.client.registry.screen.ClickArea; import me.shedaniel.rei.api.client.registry.screen.OverlayDecider; import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry; +import me.shedaniel.rei.api.client.registry.transfer.TransferHandlerRegistry; +import me.shedaniel.rei.api.client.search.SearchProvider; +import me.shedaniel.rei.api.client.search.method.InputMethodRegistry; +import me.shedaniel.rei.api.client.subsets.SubsetsRegistry; +import me.shedaniel.rei.api.client.view.Views; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.plugins.PluginManager; import me.shedaniel.rei.api.common.plugins.PluginView; import me.shedaniel.rei.api.common.plugins.REIPlugin; +import me.shedaniel.rei.api.common.plugins.REIPluginProvider; import me.shedaniel.rei.api.common.registry.ReloadStage; import me.shedaniel.rei.api.common.util.CollectionUtils; import me.shedaniel.rei.api.common.util.EntryStacks; import me.shedaniel.rei.api.common.util.ImmutableTextComponent; import me.shedaniel.rei.impl.ClientInternals; import me.shedaniel.rei.impl.client.REIRuntimeImpl; -import me.shedaniel.rei.impl.client.config.ConfigManagerImpl; -import me.shedaniel.rei.impl.client.config.addon.ConfigAddonRegistryImpl; -import me.shedaniel.rei.impl.client.entry.renderer.EntryRendererRegistryImpl; -import me.shedaniel.rei.impl.client.favorites.DelegatingFavoriteEntryProviderImpl; -import me.shedaniel.rei.impl.client.favorites.FavoriteEntryTypeRegistryImpl; import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl; -import me.shedaniel.rei.impl.client.gui.widget.InternalWidgets; +import me.shedaniel.rei.impl.client.gui.widget.CatchingExceptionUtils; import me.shedaniel.rei.impl.client.gui.widget.QueuedTooltip; import me.shedaniel.rei.impl.client.gui.widget.TooltipContextImpl; import me.shedaniel.rei.impl.client.gui.widget.search.OverlaySearchField; -import me.shedaniel.rei.impl.client.registry.category.CategoryRegistryImpl; -import me.shedaniel.rei.impl.client.registry.display.DisplayRegistryImpl; -import me.shedaniel.rei.impl.client.registry.screen.ScreenRegistryImpl; -import me.shedaniel.rei.impl.client.search.SearchProviderImpl; -import me.shedaniel.rei.impl.client.search.method.InputMethodRegistryImpl; -import me.shedaniel.rei.impl.client.subsets.SubsetsRegistryImpl; -import me.shedaniel.rei.impl.client.transfer.TransferHandlerRegistryImpl; -import me.shedaniel.rei.impl.client.view.ViewsImpl; import me.shedaniel.rei.impl.common.InternalLogger; -import me.shedaniel.rei.impl.common.entry.type.EntryRegistryImpl; -import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsibleEntryRegistryImpl; -import me.shedaniel.rei.impl.common.entry.type.types.EmptyEntryDefinition; import me.shedaniel.rei.impl.common.plugins.PluginManagerImpl; import me.shedaniel.rei.impl.common.util.IssuesDetector; -import me.shedaniel.rei.plugin.test.REITestPlugin; +import me.shedaniel.rei.impl.init.PluginDetector; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; @@ -110,6 +105,7 @@ import org.apache.commons.lang3.mutable.MutableLong; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; +import java.lang.reflect.InvocationTargetException; import java.util.Collection; import java.util.ConcurrentModificationException; import java.util.List; @@ -135,10 +131,7 @@ public class RoughlyEnoughItemsCoreClient { private static final List> RELOAD_TASKS = new CopyOnWriteArrayList<>(); public static void attachClientInternals() { - InternalWidgets.attach(); - EmptyEntryDefinition.EmptyRenderer emptyEntryRenderer = new EmptyEntryDefinition.EmptyRenderer(); - ClientInternals.attachInstance((Supplier>) () -> emptyEntryRenderer, "emptyEntryRenderer"); - ClientInternals.attachInstance((BiFunction>, Supplier, FavoriteEntry>) DelegatingFavoriteEntryProviderImpl::new, "delegateFavoriteEntry"); + CatchingExceptionUtils.attach(); ClientInternals.attachInstance((Function>) (object) -> { String type = object.getString(FavoriteEntry.TYPE_KEY); ResourceLocation id = new ResourceLocation(type); @@ -204,30 +197,29 @@ public class RoughlyEnoughItemsCoreClient { return categories.stream(); } }, "clickAreaHandlerResult"); - ClientInternals.attachInstanceSupplier(new PluginManagerImpl<>( - REIClientPlugin.class, - view -> view.then(PluginView.getInstance()), - new EntryRendererRegistryImpl(), - new ViewsImpl(), - new InputMethodRegistryImpl(), - new SearchProviderImpl(), - new ConfigManagerImpl(), - new EntryRegistryImpl(), - new CollapsibleEntryRegistryImpl(), - new CategoryRegistryImpl(), - new DisplayRegistryImpl(), - new ScreenRegistryImpl(), - new FavoriteEntryTypeRegistryImpl(), - new SubsetsRegistryImpl(), - new TransferHandlerRegistryImpl(), - new REIRuntimeImpl(), - new ConfigAddonRegistryImpl()), "clientPluginManager"); + ClientInternals.getPluginManager().registerReloadable(EntryRendererRegistry.class); + ClientInternals.getPluginManager().registerReloadable(Views.class); + ClientInternals.getPluginManager().registerReloadable(InputMethodRegistry.class); + ClientInternals.getPluginManager().registerReloadable(SearchProvider.class); + ClientInternals.getPluginManager().registerReloadable(ConfigManager.class); + ClientInternals.getPluginManager().registerReloadable(EntryRegistry.class); + ClientInternals.getPluginManager().registerReloadable(CollapsibleEntryRegistry.class); + ClientInternals.getPluginManager().registerReloadable(CategoryRegistry.class); + ClientInternals.getPluginManager().registerReloadable(DisplayRegistry.class); + ClientInternals.getPluginManager().registerReloadable(ScreenRegistry.class); + ClientInternals.getPluginManager().registerReloadable(FavoriteEntryType.Registry.class); + ClientInternals.getPluginManager().registerReloadable(SubsetsRegistry.class); + ClientInternals.getPluginManager().registerReloadable(TransferHandlerRegistry.class); + ClientInternals.getPluginManager().registerReloadable(REIRuntime.class); + ClientInternals.getPluginManager().registerReloadable(ConfigAddonRegistry.class); } public void onInitializeClient() { IssuesDetector.detect(); registerEvents(); - RoughlyEnoughItemsCore.getPluginDetector().detectClientPlugins().get().run(); + for (PluginDetector detector : RoughlyEnoughItemsCore.PLUGIN_DETECTORS) { + detector.detectClientPlugins().get().run(); + } loadTestPlugins(); Minecraft client = Minecraft.getInstance(); @@ -271,7 +263,13 @@ public class RoughlyEnoughItemsCoreClient { private void loadTestPlugins() { if (System.getProperty("rei.test", "false").equals("true")) { - PluginView.getClientInstance().registerPlugin(new REITestPlugin()); + try { + PluginView.getClientInstance().registerPlugin((REIPluginProvider) Class.forName("me.shedaniel.rei.plugin.test.REITestPlugin") + .getDeclaredConstructor() + .newInstance()); + } catch (InstantiationException | ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { + throw new RuntimeException(e); + } } } @@ -312,7 +310,7 @@ public class RoughlyEnoughItemsCoreClient { reloadPlugins(endReload, ReloadStage.END); }); ClientGuiEvent.INIT_PRE.register((screen, access) -> { - List stages = ((PluginManagerImpl>) PluginManager.getInstance()).getObservedStages(); + List stages = ((PluginManagerImpl>) PluginManager.getInstance()).getReloader().getObservedStages(); if (Minecraft.getInstance().level != null && Minecraft.getInstance().player != null && stages.contains(ReloadStage.START) && !stages.contains(ReloadStage.END) && !PluginManager.areAnyReloading() && screen instanceof AbstractContainerScreen) { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/AbstractViewSearchBuilder.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/AbstractViewSearchBuilder.java new file mode 100644 index 000000000..b0cc20251 --- /dev/null +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/AbstractViewSearchBuilder.java @@ -0,0 +1,50 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021, 2022 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.impl.client; + +import me.shedaniel.rei.api.client.gui.screen.DisplayScreen; +import me.shedaniel.rei.api.client.view.ViewSearchBuilder; +import me.shedaniel.rei.impl.display.DisplaySpec; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; + +import java.util.Collection; +import java.util.stream.Stream; + +abstract class AbstractViewSearchBuilder implements ViewSearchBuilder { + public ViewSearchBuilder fillPreferredOpenedCategory() { + if (getPreferredOpenedCategory() == null) { + Screen currentScreen = Minecraft.getInstance().screen; + if (currentScreen instanceof DisplayScreen displayScreen) { + setPreferredOpenedCategory(displayScreen.getCurrentCategoryId()); + } + } + return this; + } + + @Override + public Stream streamDisplays() { + return buildMapInternal().values().stream().flatMap(Collection::stream); + } +} diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java index 7a90619fc..b690e0932 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java @@ -49,7 +49,6 @@ import me.shedaniel.rei.api.common.util.FormattingUtils; import me.shedaniel.rei.impl.ClientInternals; import me.shedaniel.rei.impl.client.gui.screen.CompositeDisplayViewingScreen; import me.shedaniel.rei.impl.client.gui.screen.DefaultDisplayViewingScreen; -import me.shedaniel.rei.impl.client.view.ViewsImpl; import me.shedaniel.rei.impl.display.DisplaySpec; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -61,7 +60,6 @@ import net.minecraft.core.NonNullList; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.LazyLoadedValue; import net.minecraft.util.Mth; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.Slot; @@ -70,15 +68,16 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.time.LocalDateTime; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.function.Supplier; -import java.util.stream.Stream; @ApiStatus.Internal @Environment(EnvType.CLIENT) public class ClientHelperImpl implements ClientHelper { - @ApiStatus.Internal - public final LazyLoadedValue isAprilFools = new LazyLoadedValue<>(() -> { + public final Supplier isAprilFools = Suppliers.memoize(() -> { try { LocalDateTime now = LocalDateTime.now(); return now.getMonthValue() == 4 && now.getDayOfMonth() == 1; @@ -86,7 +85,7 @@ public class ClientHelperImpl implements ClientHelper { } return false; }); - private final Map modNameCache = new HashMap() {{ + private final Map modNameCache = new HashMap<>() {{ put("minecraft", "Minecraft"); put("c", "Global"); put("global", "Global"); @@ -358,241 +357,4 @@ public class ClientHelperImpl implements ClientHelper { ClientInternals.attachInstance(this, ClientHelper.class); ClientInternals.attachInstance((Supplier) ViewSearchBuilderImpl::new, "viewSearchBuilder"); } - - private static abstract class AbstractViewSearchBuilder implements ViewSearchBuilder { - public ViewSearchBuilder fillPreferredOpenedCategory() { - if (getPreferredOpenedCategory() == null) { - Screen currentScreen = Minecraft.getInstance().screen; - if (currentScreen instanceof DisplayScreen displayScreen) { - setPreferredOpenedCategory(displayScreen.getCurrentCategoryId()); - } - } - return this; - } - - @Override - public Stream streamDisplays() { - return buildMapInternal().values().stream().flatMap(Collection::stream); - } - } - - public static final class ViewSearchBuilderImpl extends AbstractViewSearchBuilder { - private final Set> filteringCategories = new HashSet<>(); - private final Set> categories = new HashSet<>(); - private final List> recipesFor = new ArrayList<>(); - private final List> usagesFor = new ArrayList<>(); - @Nullable - private CategoryIdentifier preferredOpenedCategory = null; - private boolean mergeDisplays = true; - private boolean processVisibilityHandlers = true; - private final Supplier, List>> map = Suppliers.memoize(() -> ViewsImpl.buildMapFor(this)); - - @Override - public ViewSearchBuilder addCategory(CategoryIdentifier category) { - this.categories.add(category); - return this; - } - - @Override - public ViewSearchBuilder addCategories(Collection> categories) { - this.categories.addAll(categories); - return this; - } - - @Override - public Set> getCategories() { - return categories; - } - - @Override - public ViewSearchBuilder addRecipesFor(EntryStack stack) { - this.recipesFor.add(stack); - return this; - } - - @Override - public List> getRecipesFor() { - return recipesFor; - } - - @Override - public ViewSearchBuilder addUsagesFor(EntryStack stack) { - this.usagesFor.add(stack); - return this; - } - - @Override - public List> getUsagesFor() { - return usagesFor; - } - - @Override - public ViewSearchBuilder setPreferredOpenedCategory(@Nullable CategoryIdentifier category) { - this.preferredOpenedCategory = category; - return this; - } - - @Override - @Nullable - public CategoryIdentifier getPreferredOpenedCategory() { - return this.preferredOpenedCategory; - } - - @Override - public ViewSearchBuilder filterCategory(CategoryIdentifier category) { - this.filteringCategories.add(category); - return this; - } - - @Override - public ViewSearchBuilder filterCategories(Collection> categories) { - this.filteringCategories.addAll(categories); - return this; - } - - @Override - public Set> getFilteringCategories() { - return filteringCategories; - } - - @Override - public Map, List> buildMapInternal() { - fillPreferredOpenedCategory(); - return this.map.get(); - } - - @Override - public boolean isMergingDisplays() { - return mergeDisplays; - } - - @Override - public ViewSearchBuilder mergingDisplays(boolean mergingDisplays) { - this.mergeDisplays = mergingDisplays; - return this; - } - - @Override - public boolean isProcessingVisibilityHandlers() { - return processVisibilityHandlers; - } - - @Override - public ViewSearchBuilder processingVisibilityHandlers(boolean processingVisibilityHandlers) { - this.processVisibilityHandlers = processingVisibilityHandlers; - return this; - } - } - - public static final class LegacyWrapperViewSearchBuilder extends AbstractViewSearchBuilder { - private final Map, List> map; - @Nullable - private EntryStack inputNotice; - @Nullable - private EntryStack outputNotice; - @Nullable - private CategoryIdentifier preferredOpenedCategory = null; - - public LegacyWrapperViewSearchBuilder(Map, List> map) { - this.map = map; - } - - @Override - public ViewSearchBuilder addCategory(CategoryIdentifier category) { - return this; - } - - @Override - public ViewSearchBuilder addCategories(Collection> categories) { - return this; - } - - @Override - public Set> getCategories() { - return Collections.emptySet(); - } - - @Override - public ViewSearchBuilder filterCategory(CategoryIdentifier category) { - return this; - } - - @Override - public ViewSearchBuilder filterCategories(Collection> categories) { - return this; - } - - @Override - public Set> getFilteringCategories() { - return Collections.emptySet(); - } - - @Override - public ViewSearchBuilder addRecipesFor(EntryStack stack) { - return this; - } - - @Override - public List> getRecipesFor() { - return inputNotice == null ? Collections.emptyList() : Collections.singletonList(outputNotice); - } - - @Override - public ViewSearchBuilder addUsagesFor(EntryStack stack) { - return this; - } - - @Override - public List> getUsagesFor() { - return inputNotice == null ? Collections.emptyList() : Collections.singletonList(inputNotice); - } - - @Override - public ViewSearchBuilder setPreferredOpenedCategory(@Nullable CategoryIdentifier category) { - this.preferredOpenedCategory = category; - return this; - } - - @Override - @Nullable - public CategoryIdentifier getPreferredOpenedCategory() { - return this.preferredOpenedCategory; - } - - public LegacyWrapperViewSearchBuilder addInputNotice(@Nullable EntryStack stack) { - this.inputNotice = stack; - return this; - } - - public LegacyWrapperViewSearchBuilder addOutputNotice(@Nullable EntryStack stack) { - this.outputNotice = stack; - return this; - } - - @Override - public Map, List> buildMapInternal() { - fillPreferredOpenedCategory(); - return this.map; - } - - @Override - public boolean isMergingDisplays() { - return true; - } - - @Override - public ViewSearchBuilder mergingDisplays(boolean mergingDisplays) { - return this; - } - - @Override - public boolean isProcessingVisibilityHandlers() { - return false; - } - - @Override - public ViewSearchBuilder processingVisibilityHandlers(boolean processingVisibilityHandlers) { - return this; - } - } } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/LegacyWrapperViewSearchBuilder.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/LegacyWrapperViewSearchBuilder.java new file mode 100644 index 000000000..c199f94e9 --- /dev/null +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/LegacyWrapperViewSearchBuilder.java @@ -0,0 +1,145 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021, 2022 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.impl.client; + +import me.shedaniel.rei.api.client.registry.display.DisplayCategory; +import me.shedaniel.rei.api.client.view.ViewSearchBuilder; +import me.shedaniel.rei.api.common.category.CategoryIdentifier; +import me.shedaniel.rei.api.common.entry.EntryStack; +import me.shedaniel.rei.impl.display.DisplaySpec; +import org.jetbrains.annotations.Nullable; + +import java.util.*; + +public final class LegacyWrapperViewSearchBuilder extends AbstractViewSearchBuilder { + private final Map, List> map; + @Nullable + private EntryStack inputNotice; + @Nullable + private EntryStack outputNotice; + @Nullable + private CategoryIdentifier preferredOpenedCategory = null; + + public LegacyWrapperViewSearchBuilder(Map, List> map) { + this.map = map; + } + + @Override + public ViewSearchBuilder addCategory(CategoryIdentifier category) { + return this; + } + + @Override + public ViewSearchBuilder addCategories(Collection> categories) { + return this; + } + + @Override + public Set> getCategories() { + return Collections.emptySet(); + } + + @Override + public ViewSearchBuilder filterCategory(CategoryIdentifier category) { + return this; + } + + @Override + public ViewSearchBuilder filterCategories(Collection> categories) { + return this; + } + + @Override + public Set> getFilteringCategories() { + return Collections.emptySet(); + } + + @Override + public ViewSearchBuilder addRecipesFor(EntryStack stack) { + return this; + } + + @Override + public List> getRecipesFor() { + return inputNotice == null ? Collections.emptyList() : Collections.singletonList(outputNotice); + } + + @Override + public ViewSearchBuilder addUsagesFor(EntryStack stack) { + return this; + } + + @Override + public List> getUsagesFor() { + return inputNotice == null ? Collections.emptyList() : Collections.singletonList(inputNotice); + } + + @Override + public ViewSearchBuilder setPreferredOpenedCategory(@Nullable CategoryIdentifier category) { + this.preferredOpenedCategory = category; + return this; + } + + @Override + @Nullable + public CategoryIdentifier getPreferredOpenedCategory() { + return this.preferredOpenedCategory; + } + + public LegacyWrapperViewSearchBuilder addInputNotice(@Nullable EntryStack stack) { + this.inputNotice = stack; + return this; + } + + public LegacyWrapperViewSearchBuilder addOutputNotice(@Nullable EntryStack stack) { + this.outputNotice = stack; + return this; + } + + @Override + public Map, List> buildMapInternal() { + fillPreferredOpenedCategory(); + return this.map; + } + + @Override + public boolean isMergingDisplays() { + return true; + } + + @Override + public ViewSearchBuilder mergingDisplays(boolean mergingDisplays) { + return this; + } + + @Override + public boolean isProcessingVisibilityHandlers() { + return false; + } + + @Override + public ViewSearchBuilder processingVisibilityHandlers(boolean processingVisibilityHandlers) { + return this; + } +} diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java index bff0573e8..a63ddc97d 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java @@ -42,12 +42,13 @@ import me.shedaniel.rei.api.client.gui.widgets.TextField; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.client.overlay.ScreenOverlay; import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry; +import me.shedaniel.rei.api.client.search.SearchProvider; import me.shedaniel.rei.api.common.registry.ReloadStage; +import me.shedaniel.rei.impl.Internals; import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl; import me.shedaniel.rei.impl.client.gui.hints.HintProvider; import me.shedaniel.rei.impl.client.gui.widget.CachedEntryListRender; import me.shedaniel.rei.impl.client.gui.widget.search.OverlaySearchField; -import me.shedaniel.rei.impl.client.search.argument.Argument; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; @@ -74,7 +75,7 @@ public class REIRuntimeImpl implements REIRuntime { private AbstractContainerScreen previousContainerScreen = null; private Screen previousScreen = null; private LinkedHashSet lastDisplayScreen = Sets.newLinkedHashSetWithExpectedSize(10); - private List hintProviders = new ArrayList<>(); + private List hintProviders = Internals.resolveServices(HintProvider.class); /** * @return the instance of screen helper @@ -85,10 +86,6 @@ public class REIRuntimeImpl implements REIRuntime { return (REIRuntimeImpl) REIRuntime.getInstance(); } - public void addHintProvider(HintProvider provider) { - this.hintProviders.add(provider); - } - public List getHintProviders() { return Collections.unmodifiableList(hintProviders); } @@ -255,7 +252,7 @@ public class REIRuntimeImpl implements REIRuntime { @Override public void startReload() { - Argument.SEARCH_CACHE.clear(); + SearchProvider.getInstance().clearCache(); getOverlay().ifPresent(ScreenOverlay::queueReloadOverlay); lastDisplayScreen.clear(); if (!RenderSystem.isOnRenderThread()) { @@ -272,7 +269,7 @@ public class REIRuntimeImpl implements REIRuntime { @Override public void endReload(ReloadStage stage) { - Argument.SEARCH_CACHE.clear(); + SearchProvider.getInstance().clearCache(); getOverlay().ifPresent(ScreenOverlay::queueReloadOverlay); } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/ViewSearchBuilderImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/ViewSearchBuilderImpl.java new file mode 100644 index 000000000..3db7d31a9 --- /dev/null +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/ViewSearchBuilderImpl.java @@ -0,0 +1,144 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021, 2022 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.impl.client; + +import com.google.common.base.Suppliers; +import me.shedaniel.rei.api.client.registry.display.DisplayCategory; +import me.shedaniel.rei.api.client.view.ViewSearchBuilder; +import me.shedaniel.rei.api.common.category.CategoryIdentifier; +import me.shedaniel.rei.api.common.entry.EntryStack; +import me.shedaniel.rei.impl.client.view.ViewsImpl; +import me.shedaniel.rei.impl.display.DisplaySpec; +import org.jetbrains.annotations.Nullable; + +import java.util.*; +import java.util.function.Supplier; + +public final class ViewSearchBuilderImpl extends AbstractViewSearchBuilder { + private final Set> filteringCategories = new HashSet<>(); + private final Set> categories = new HashSet<>(); + private final List> recipesFor = new ArrayList<>(); + private final List> usagesFor = new ArrayList<>(); + @Nullable + private CategoryIdentifier preferredOpenedCategory = null; + private boolean mergeDisplays = true; + private boolean processVisibilityHandlers = true; + private final Supplier, List>> map = Suppliers.memoize(() -> ViewsImpl.buildMapFor(this)); + + @Override + public ViewSearchBuilder addCategory(CategoryIdentifier category) { + this.categories.add(category); + return this; + } + + @Override + public ViewSearchBuilder addCategories(Collection> categories) { + this.categories.addAll(categories); + return this; + } + + @Override + public Set> getCategories() { + return categories; + } + + @Override + public ViewSearchBuilder addRecipesFor(EntryStack stack) { + this.recipesFor.add(stack); + return this; + } + + @Override + public List> getRecipesFor() { + return recipesFor; + } + + @Override + public ViewSearchBuilder addUsagesFor(EntryStack stack) { + this.usagesFor.add(stack); + return this; + } + + @Override + public List> getUsagesFor() { + return usagesFor; + } + + @Override + public ViewSearchBuilder setPreferredOpenedCategory(@Nullable CategoryIdentifier category) { + this.preferredOpenedCategory = category; + return this; + } + + @Override + @Nullable + public CategoryIdentifier getPreferredOpenedCategory() { + return this.preferredOpenedCategory; + } + + @Override + public ViewSearchBuilder filterCategory(CategoryIdentifier category) { + this.filteringCategories.add(category); + return this; + } + + @Override + public ViewSearchBuilder filterCategories(Collection> categories) { + this.filteringCategories.addAll(categories); + return this; + } + + @Override + public Set> getFilteringCategories() { + return filteringCategories; + } + + @Override + public Map, List> buildMapInternal() { + fillPreferredOpenedCategory(); + return this.map.get(); + } + + @Override + public boolean isMergingDisplays() { + return mergeDisplays; + } + + @Override + public ViewSearchBuilder mergingDisplays(boolean mergingDisplays) { + this.mergeDisplays = mergingDisplays; + return this; + } + + @Override + public boolean isProcessingVisibilityHandlers() { + return processVisibilityHandlers; + } + + @Override + public ViewSearchBuilder processingVisibilityHandlers(boolean processingVisibilityHandlers) { + this.processVisibilityHandlers = processingVisibilityHandlers; + return this; + } +} diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java deleted file mode 100644 index 2a1e99012..000000000 --- a/runtime/src/main/java/m