From 05069aa62b09f02a8cd6e526ec58a30347a56500 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 27 Jul 2022 23:25:27 +0800 Subject: WIP Module --- api/build.gradle | 53 -- .../api/client/entry/renderer/EntryRenderer.java | 4 +- .../api/client/favorites/FavoriteEntryType.java | 2 +- .../rei/api/client/overlay/OverlayListWidget.java | 2 + .../client/registry/entry/CollapsibleEntry.java | 42 ++ .../registry/entry/CollapsibleEntryRegistry.java | 2 +- .../api/client/registry/entry/EntryRegistry.java | 8 +- .../registry/entry/PreFilteredEntryList.java | 51 ++ .../rei/api/client/search/SearchFilter.java | 20 + .../rei/api/client/search/SearchProvider.java | 14 + .../rei/api/common/registry/ParentReloadable.java | 5 + .../me/shedaniel/rei/impl/ClientInternals.java | 60 +- .../main/java/me/shedaniel/rei/impl/Internals.java | 78 ++- build.gradle | 102 ++- default-plugin/build.gradle | 55 -- fabric/build.gradle | 2 - forge/build.gradle | 2 - .../me/shedaniel/rei/forge/PluginDetectorImpl.java | 23 +- runtime-engine/build.gradle | 7 + .../categories/.gradle/loom-cache/launch.cfg | 14 + .../categories/.gradle/loom-cache/log4j.xml | 63 ++ .../.gradle/loom-cache/remapClasspath.txt | 1 + .../CategoryRegistryImpl$Configuration.class | Bin 0 -> 7035 bytes .../registry/category/CategoryRegistryImpl.class | Bin 0 -> 10847 bytes .../CategoryIdentifierConstructorImpl.class | Bin 0 -> 1958 bytes .../common/category/CategoryIdentifierImpl.class | Bin 0 -> 2182 bytes .../libs/categories-transformProductionFabric.jar | Bin 0 -> 166 bytes .../libs/categories-transformProductionForge.jar | Bin 0 -> 166 bytes ...i.api.client.registry.category.CategoryRegistry | 1 + ...ei.impl.Internals.CategoryIdentifierConstructor | 1 + .../CategoryIdentifierConstructorImpl.java | 22 + .../registry/category/CategoryRegistryImpl.java | 201 ++++++ .../CategoryIdentifierConstructorImpl.java | 45 ++ .../common/category/CategoryIdentifierImpl.java | 67 ++ ...i.api.client.registry.category.CategoryRegistry | 1 + ...ei.impl.Internals.CategoryIdentifierConstructor | 1 + .../configs/.gradle/loom-cache/launch.cfg | 14 + .../configs/.gradle/loom-cache/log4j.xml | 63 ++ .../configs/.gradle/loom-cache/remapClasspath.txt | 1 + .../libs/configs-transformProductionFabric.jar | Bin 0 -> 166 bytes .../libs/configs-transformProductionForge.jar | Bin 0 -> 166 bytes .../rei/impl/client/config/ConfigManagerImpl.java | 494 ++++++++++++++ .../rei/impl/client/config/ConfigObjectImpl.java | 658 +++++++++++++++++++ .../config/addon/ConfigAddonRegistryImpl.java | 61 ++ .../client/config/addon/ConfigAddonsScreen.java | 192 ++++++ .../client/config/entries/ConfigAddonsEntry.java | 96 +++ .../config/entries/RecipeScreenTypeEntry.java | 115 ++++ .../SearchFilterSyntaxHighlightingEntry.java | 117 ++++ .../impl/client/config/entries/TitleTextEntry.java | 87 +++ ...e.shedaniel.rei.api.client.config.ConfigManager | 1 + ...me.shedaniel.rei.api.client.config.ConfigObject | 1 + ...rei.api.client.config.addon.ConfigAddonRegistry | 1 + .../.gradle/loom-cache/launch.cfg | 14 + .../.gradle/loom-cache/log4j.xml | 63 ++ .../.gradle/loom-cache/remapClasspath.txt | 1 + ...lt-runtime-plugin-transformProductionFabric.jar | Bin 0 -> 166 bytes ...ult-runtime-plugin-transformProductionForge.jar | Bin 0 -> 166 bytes .../plugin/client/entry/FluidEntryDefinition.java | 316 +++++++++ .../plugin/client/entry/ItemEntryDefinition.java | 382 +++++++++++ .../common/runtime/DefaultRuntimePlugin.java | 56 ++ .../shedaniel/rei/plugin/test/REITestPlugin.java | 105 +++ .../displays/.gradle/loom-cache/launch.cfg | 14 + .../displays/.gradle/loom-cache/log4j.xml | 63 ++ .../displays/.gradle/loom-cache/remapClasspath.txt | 1 + .../libs/displays-transformProductionFabric.jar | Bin 0 -> 166 bytes .../libs/displays-transformProductionForge.jar | Bin 0 -> 166 bytes .../registry/display/DisplayRegistryImpl.java | 322 ++++++++++ .../common/registry/RecipeManagerContextImpl.java | 76 +++ .../display/DisplaySerializerRegistryImpl.java | 77 +++ ...rei.api.client.registry.display.DisplayRegistry | 1 + ...ei.api.common.display.DisplaySerializerRegistry | 1 + ...el.rei.api.common.registry.RecipeManagerContext | 1 + .../entries/.gradle/loom-cache/launch.cfg | 14 + .../entries/.gradle/loom-cache/log4j.xml | 63 ++ .../entries/.gradle/loom-cache/remapClasspath.txt | 1 + .../libs/entries-transformProductionFabric.jar | Bin 0 -> 166 bytes .../libs/entries-transformProductionForge.jar | Bin 0 -> 166 bytes .../impl/client/entry/type/EntryRegistryImpl.java | 276 ++++++++ .../impl/client/entry/type/EntryRegistryList.java | 62 ++ .../client/entry/type/EntryRegistryListener.java | 47 ++ .../client/entry/type/EntryTypeRegistryImpl.java | 102 +++ .../client/entry/type/NormalEntryRegistryList.java | 117 ++++ .../entry/type/ReloadingEntryRegistryList.java | 109 ++++ .../collapsed/CollapsibleEntryRegistryImpl.java | 149 +++++ ...iel.rei.api.client.registry.entry.EntryRegistry | 1 + .../entry-stacks/.gradle/loom-cache/launch.cfg | 14 + .../entry-stacks/.gradle/loom-cache/log4j.xml | 63 ++ .../.gradle/loom-cache/remapClasspath.txt | 1 + ...y-stacks-8.3.9999-transformProductionFabric.jar | Bin 0 -> 166 bytes ...ry-stacks-8.3.9999-transformProductionForge.jar | Bin 0 -> 166 bytes .../entry-stacks-transformProductionFabric.jar | Bin 0 -> 166 bytes .../libs/entry-stacks-transformProductionForge.jar | Bin 0 -> 166 bytes .../rei/impl/common/entry/EntryIngredientImpl.java | 476 ++++++++++++++ .../settings/EntrySettingsAdapterRegistryImpl.java | 71 +++ .../common/entry/stack/AbstractEntryStack.java | 281 ++++++++ .../impl/common/entry/stack/EmptyEntryStack.java | 45 ++ .../common/entry/stack/EntryStackProviderImpl.java | 50 ++ .../impl/common/entry/stack/TypedEntryStack.java | 53 ++ ...mon.entry.settings.EntrySettingsAdapterRegistry | 1 + ...niel.rei.impl.Internals$EntryIngredientProvider | 1 + ...shedaniel.rei.impl.Internals$EntryStackProvider | 1 + .../entry-types/.gradle/loom-cache/launch.cfg | 14 + .../entry-types/.gradle/loom-cache/log4j.xml | 63 ++ .../.gradle/loom-cache/remapClasspath.txt | 1 + ...ry-types-8.3.9999-transformProductionFabric.jar | Bin 0 -> 166 bytes ...try-types-8.3.9999-transformProductionForge.jar | Bin 0 -> 166 bytes .../libs/entry-types-transformProductionFabric.jar | Bin 0 -> 166 bytes .../libs/entry-types-transformProductionForge.jar | Bin 0 -> 166 bytes .../entry/renderer/EntryRendererRegistryImpl.java | 66 ++ .../comparison/EntryComparatorRegistryImpl.java | 92 +++ .../comparison/FluidComparatorRegistryImpl.java | 56 ++ .../comparison/ItemComparatorRegistryImpl.java | 56 ++ .../entry/comparison/NbtHasherProviderImpl.java | 100 +++ .../entry/type/types/BuiltinEntryDefinition.java | 152 +++++ .../entry/type/types/DeferredEntryTypeImpl.java | 78 +++ .../type/types/DeferringEntryTypeProviderImpl.java | 108 ++++ .../entry/type/types/EmptyEntryDefinition.java | 49 ++ .../entry/type/types/RenderingEntryDefinition.java | 90 +++ .../common/fluid/FluidSupportProviderImpl.java | 89 +++ ...common.entry.comparison.FluidComparatorRegistry | 1 + ....common.entry.comparison.ItemComparatorRegistry | 1 + ...aniel.rei.api.common.fluid.FluidSupportProvider | 1 + ...l.rei.impl.Internals$DeferringEntryTypeProvider | 1 + ....shedaniel.rei.impl.Internals$NbtHasherProvider | 1 + .../favorites/.gradle/loom-cache/launch.cfg | 14 + .../favorites/.gradle/loom-cache/log4j.xml | 63 ++ .../.gradle/loom-cache/remapClasspath.txt | 1 + .../libs/favorites-transformProductionFabric.jar | Bin 0 -> 166 bytes .../libs/favorites-transformProductionForge.jar | Bin 0 -> 166 bytes .../DelegatingFavoriteEntryProviderImpl.java | 125 ++++ .../favorites/FavoriteEntryTypeRegistryImpl.java | 150 +++++ .../widget/favorites/FavoritesEntriesManager.java | 154 +++++ ...api.client.favorites.FavoriteEntryType$Registry | 1 + ...ClientInternals$DelegatingFavoriteEntryProvider | 1 + .../.gradle/loom-cache/launch.cfg | 14 + .../filtering-entries/.gradle/loom-cache/log4j.xml | 63 ++ .../.gradle/loom-cache/remapClasspath.txt | 1 + runtime-engine/filtering-entries/build.gradle | 3 + ...filtering-entries-transformProductionFabric.jar | Bin 0 -> 166 bytes .../filtering-entries-transformProductionForge.jar | Bin 0 -> 166 bytes .../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 +++ .../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 | 240 +++++++ .../entry/type/PreFilteredEntryListImpl.java | 208 ++++++ .../runtime/FilteredStacksVisibilityHandler.java | 135 ++++ ...hedaniel.rei.api.client.plugins.REIClientPlugin | 1 + ...ei.impl.client.entry.type.EntryRegistryListener | 1 + .../screens/.gradle/loom-cache/launch.cfg | 14 + .../screens/.gradle/loom-cache/log4j.xml | 63 ++ .../screens/.gradle/loom-cache/remapClasspath.txt | 1 + .../registry/screen/ExclusionZonesImpl.class | Bin 0 -> 9115 bytes .../registry/screen/ScreenRegistryImpl$1.class | Bin 0 -> 2749 bytes .../registry/screen/ScreenRegistryImpl$2.class | Bin 0 -> 2322 bytes .../registry/screen/ScreenRegistryImpl$3.class | Bin 0 -> 2325 bytes .../registry/screen/ScreenRegistryImpl.class | Bin 0 -> 20609 bytes .../libs/screens-transformProductionFabric.jar | Bin 0 -> 166 bytes .../libs/screens-transformProductionForge.jar | Bin 0 -> 166 bytes .../tmp/compileJava/previous-compilation-data.bin | Bin 0 -> 112600 bytes .../client/registry/screen/ExclusionZonesImpl.java | 158 +++++ .../client/registry/screen/ScreenRegistryImpl.java | 332 ++++++++++ ...l.rei.api.client.registry.screen.ScreenRegistry | 1 + .../search/.gradle/loom-cache/launch.cfg | 14 + runtime-engine/search/.gradle/loom-cache/log4j.xml | 63 ++ .../search/.gradle/loom-cache/remapClasspath.txt | 1 + .../libs/search-transformProductionFabric.jar | Bin 0 -> 166 bytes .../build/libs/search-transformProductionForge.jar | Bin 0 -> 166 bytes .../shedaniel/rei/impl/client/search/IntRange.java | 27 + .../rei/impl/client/search/SearchProviderImpl.java | 129 ++++ .../search/argument/AlternativeArgument.java | 74 +++ .../rei/impl/client/search/argument/Argument.java | 360 +++++++++++ .../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 | 110 ++++ .../search/result/ArgumentApplicableResult.java | 122 ++++ .../client/runtime/SearchFilterPrepareWatcher.java | 91 +++ ....shedaniel.rei.api.client.search.SearchProvider | 1 + ...hedaniel.rei.impl.client.gui.hints.HintProvider | 1 + .../rei/impl/common/logging/FileLogger.java | 80 +++ .../rei/impl/common/logging/FilteringLogger.java | 58 ++ .../rei/impl/common/logging/Log4JLogger.java | 52 ++ .../rei/impl/common/logging/MultiLogger.java | 58 ++ .../impl/common/logging/TransformingLogger.java | 56 ++ .../rei/impl/init/RoughlyEnoughItemsEngine.java | 46 ++ .../subsets/.gradle/loom-cache/launch.cfg | 14 + .../subsets/.gradle/loom-cache/log4j.xml | 63 ++ .../subsets/.gradle/loom-cache/remapClasspath.txt | 1 + .../libs/subsets-transformProductionFabric.jar | Bin 0 -> 166 bytes .../libs/subsets-transformProductionForge.jar | Bin 0 -> 166 bytes .../impl/client/subsets/SubsetsRegistryImpl.java | 79 +++ ...hedaniel.rei.api.client.subsets.SubsetsRegistry | 1 + .../.gradle/loom-cache/launch.cfg | 14 + .../transfer-handlers/.gradle/loom-cache/log4j.xml | 63 ++ .../.gradle/loom-cache/remapClasspath.txt | 1 + ...transfer-handlers-transformProductionFabric.jar | Bin 0 -> 166 bytes .../transfer-handlers-transformProductionForge.jar | Bin 0 -> 166 bytes runtime/build.gradle | 45 -- .../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 + settings.gradle | 15 + .../impl/client/config/ConfigManagerInternal.java | 41 ++ .../client/favorites/MutableFavoritesList.java | 9 + .../rei/impl/client/gui/hints/HintProvider.java | 55 ++ .../rei/impl/client/search/AsyncSearchManager.java | 148 +++++ .../rei/impl/client/search/SearchManager.java | 48 ++ .../rei/impl/client/util/CrashReportUtils.java | 74 +++ .../impl/common/util/HashedEntryStackWrapper.java | 71 +++ 364 files changed, 15554 insertions(+), 14100 deletions(-) delete mode 100644 api/build.gradle create mode 100644 api/src/main/java/me/shedaniel/rei/api/client/registry/entry/CollapsibleEntry.java create mode 100644 api/src/main/java/me/shedaniel/rei/api/client/registry/entry/PreFilteredEntryList.java delete mode 100644 default-plugin/build.gradle create mode 100644 runtime-engine/build.gradle create mode 100644 runtime-engine/categories/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/categories/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/categories/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/categories/build/classes/java/main/me/shedaniel/rei/impl/client/registry/category/CategoryRegistryImpl$Configuration.class create mode 100644 runtime-engine/categories/build/classes/java/main/me/shedaniel/rei/impl/client/registry/category/CategoryRegistryImpl.class create mode 100644 runtime-engine/categories/build/classes/java/main/me/shedaniel/rei/impl/common/category/CategoryIdentifierConstructorImpl.class create mode 100644 runtime-engine/categories/build/classes/java/main/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.class create mode 100644 runtime-engine/categories/build/libs/categories-transformProductionFabric.jar create mode 100644 runtime-engine/categories/build/libs/categories-transformProductionForge.jar create mode 100644 runtime-engine/categories/build/resources/main/META-INF/services/me.shedaniel.rei.api.client.registry.category.CategoryRegistry create mode 100644 runtime-engine/categories/build/resources/main/META-INF/services/me.shedaniel.rei.impl.Internals.CategoryIdentifierConstructor create mode 100644 runtime-engine/categories/build/tmp/updateLicenseMain/original/me/shedaniel/rei/impl/common/category/CategoryIdentifierConstructorImpl.java create mode 100644 runtime-engine/categories/src/main/java/me/shedaniel/rei/impl/client/registry/category/CategoryRegistryImpl.java create mode 100644 runtime-engine/categories/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierConstructorImpl.java create mode 100644 runtime-engine/categories/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java create mode 100644 runtime-engine/categories/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.registry.category.CategoryRegistry create mode 100644 runtime-engine/categories/src/main/resources/META-INF/services/me.shedaniel.rei.impl.Internals.CategoryIdentifierConstructor create mode 100644 runtime-engine/configs/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/configs/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/configs/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/configs/build/libs/configs-transformProductionFabric.jar create mode 100644 runtime-engine/configs/build/libs/configs-transformProductionForge.jar create mode 100644 runtime-engine/configs/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java create mode 100644 runtime-engine/configs/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java create mode 100644 runtime-engine/configs/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonRegistryImpl.java create mode 100644 runtime-engine/configs/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonsScreen.java create mode 100644 runtime-engine/configs/src/main/java/me/shedaniel/rei/impl/client/config/entries/ConfigAddonsEntry.java create mode 100644 runtime-engine/configs/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java create mode 100644 runtime-engine/configs/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java create mode 100644 runtime-engine/configs/src/main/java/me/shedaniel/rei/impl/client/config/entries/TitleTextEntry.java create mode 100644 runtime-engine/configs/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.config.ConfigManager create mode 100644 runtime-engine/configs/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.config.ConfigObject create mode 100644 runtime-engine/configs/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.config.addon.ConfigAddonRegistry create mode 100644 runtime-engine/default-runtime-plugin/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/default-runtime-plugin/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/default-runtime-plugin/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/default-runtime-plugin/build/libs/default-runtime-plugin-transformProductionFabric.jar create mode 100644 runtime-engine/default-runtime-plugin/build/libs/default-runtime-plugin-transformProductionForge.jar create mode 100644 runtime-engine/default-runtime-plugin/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java create mode 100644 runtime-engine/default-runtime-plugin/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java create mode 100644 runtime-engine/default-runtime-plugin/src/main/java/me/shedaniel/rei/plugin/common/runtime/DefaultRuntimePlugin.java create mode 100644 runtime-engine/default-runtime-plugin/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java create mode 100644 runtime-engine/displays/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/displays/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/displays/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/displays/build/libs/displays-transformProductionFabric.jar create mode 100644 runtime-engine/displays/build/libs/displays-transformProductionForge.jar create mode 100644 runtime-engine/displays/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java create mode 100644 runtime-engine/displays/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java create mode 100644 runtime-engine/displays/src/main/java/me/shedaniel/rei/impl/common/registry/display/DisplaySerializerRegistryImpl.java create mode 100644 runtime-engine/displays/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.registry.display.DisplayRegistry create mode 100644 runtime-engine/displays/src/main/resources/META-INF/services/me.shedaniel.rei.api.common.display.DisplaySerializerRegistry create mode 100644 runtime-engine/displays/src/main/resources/META-INF/services/me.shedaniel.rei.api.common.registry.RecipeManagerContext create mode 100644 runtime-engine/entries/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/entries/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/entries/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/entries/build/libs/entries-transformProductionFabric.jar create mode 100644 runtime-engine/entries/build/libs/entries-transformProductionForge.jar create mode 100644 runtime-engine/entries/src/main/java/me/shedaniel/rei/impl/client/entry/type/EntryRegistryImpl.java create mode 100644 runtime-engine/entries/src/main/java/me/shedaniel/rei/impl/client/entry/type/EntryRegistryList.java create mode 100644 runtime-engine/entries/src/main/java/me/shedaniel/rei/impl/client/entry/type/EntryRegistryListener.java create mode 100644 runtime-engine/entries/src/main/java/me/shedaniel/rei/impl/client/entry/type/EntryTypeRegistryImpl.java create mode 100644 runtime-engine/entries/src/main/java/me/shedaniel/rei/impl/client/entry/type/NormalEntryRegistryList.java create mode 100644 runtime-engine/entries/src/main/java/me/shedaniel/rei/impl/client/entry/type/ReloadingEntryRegistryList.java create mode 100644 runtime-engine/entries/src/main/java/me/shedaniel/rei/impl/client/entry/type/collapsed/CollapsibleEntryRegistryImpl.java create mode 100644 runtime-engine/entries/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.registry.entry.EntryRegistry create mode 100644 runtime-engine/entry-stacks/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/entry-stacks/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/entry-stacks/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/entry-stacks/build/libs/RoughlyEnoughItems-entry-stacks-8.3.9999-transformProductionFabric.jar create mode 100644 runtime-engine/entry-stacks/build/libs/RoughlyEnoughItems-entry-stacks-8.3.9999-transformProductionForge.jar create mode 100644 runtime-engine/entry-stacks/build/libs/entry-stacks-transformProductionFabric.jar create mode 100644 runtime-engine/entry-stacks/build/libs/entry-stacks-transformProductionForge.jar create mode 100644 runtime-engine/entry-stacks/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java create mode 100644 runtime-engine/entry-stacks/src/main/java/me/shedaniel/rei/impl/common/entry/settings/EntrySettingsAdapterRegistryImpl.java create mode 100644 runtime-engine/entry-stacks/src/main/java/me/shedaniel/rei/impl/common/entry/stack/AbstractEntryStack.java create mode 100644 runtime-engine/entry-stacks/src/main/java/me/shedaniel/rei/impl/common/entry/stack/EmptyEntryStack.java create mode 100644 runtime-engine/entry-stacks/src/main/java/me/shedaniel/rei/impl/common/entry/stack/EntryStackProviderImpl.java create mode 100644 runtime-engine/entry-stacks/src/main/java/me/shedaniel/rei/impl/common/entry/stack/TypedEntryStack.java create mode 100644 runtime-engine/entry-stacks/src/main/resources/META-INF/services/me.shedaniel.rei.api.common.entry.settings.EntrySettingsAdapterRegistry create mode 100644 runtime-engine/entry-stacks/src/main/resources/META-INF/services/me.shedaniel.rei.impl.Internals$EntryIngredientProvider create mode 100644 runtime-engine/entry-stacks/src/main/resources/META-INF/services/me.shedaniel.rei.impl.Internals$EntryStackProvider create mode 100644 runtime-engine/entry-types/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/entry-types/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/entry-types/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/entry-types/build/libs/RoughlyEnoughItems-entry-types-8.3.9999-transformProductionFabric.jar create mode 100644 runtime-engine/entry-types/build/libs/RoughlyEnoughItems-entry-types-8.3.9999-transformProductionForge.jar create mode 100644 runtime-engine/entry-types/build/libs/entry-types-transformProductionFabric.jar create mode 100644 runtime-engine/entry-types/build/libs/entry-types-transformProductionForge.jar create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/client/entry/renderer/EntryRendererRegistryImpl.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/EntryComparatorRegistryImpl.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/FluidComparatorRegistryImpl.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/ItemComparatorRegistryImpl.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/NbtHasherProviderImpl.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/BuiltinEntryDefinition.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/DeferredEntryTypeImpl.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/DeferringEntryTypeProviderImpl.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/EmptyEntryDefinition.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/entry/type/types/RenderingEntryDefinition.java create mode 100644 runtime-engine/entry-types/src/main/java/me/shedaniel/rei/impl/common/fluid/FluidSupportProviderImpl.java create mode 100644 runtime-engine/entry-types/src/main/resources/META-INF/services/me.shedaniel.rei.api.common.entry.comparison.FluidComparatorRegistry create mode 100644 runtime-engine/entry-types/src/main/resources/META-INF/services/me.shedaniel.rei.api.common.entry.comparison.ItemComparatorRegistry create mode 100644 runtime-engine/entry-types/src/main/resources/META-INF/services/me.shedaniel.rei.api.common.fluid.FluidSupportProvider create mode 100644 runtime-engine/entry-types/src/main/resources/META-INF/services/me.shedaniel.rei.impl.Internals$DeferringEntryTypeProvider create mode 100644 runtime-engine/entry-types/src/main/resources/META-INF/services/me.shedaniel.rei.impl.Internals$NbtHasherProvider create mode 100644 runtime-engine/favorites/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/favorites/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/favorites/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/favorites/build/libs/favorites-transformProductionFabric.jar create mode 100644 runtime-engine/favorites/build/libs/favorites-transformProductionForge.jar create mode 100644 runtime-engine/favorites/src/main/java/me/shedaniel/rei/impl/client/favorites/DelegatingFavoriteEntryProviderImpl.java create mode 100644 runtime-engine/favorites/src/main/java/me/shedaniel/rei/impl/client/favorites/FavoriteEntryTypeRegistryImpl.java create mode 100644 runtime-engine/favorites/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/FavoritesEntriesManager.java create mode 100644 runtime-engine/favorites/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.favorites.FavoriteEntryType$Registry create mode 100644 runtime-engine/favorites/src/main/resources/META-INF/services/me.shedaniel.rei.impl.ClientInternals$DelegatingFavoriteEntryProvider create mode 100644 runtime-engine/filtering-entries/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/filtering-entries/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/filtering-entries/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/filtering-entries/build.gradle create mode 100644 runtime-engine/filtering-entries/build/libs/filtering-entries-transformProductionFabric.jar create mode 100644 runtime-engine/filtering-entries/build/libs/filtering-entries-transformProductionForge.jar create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringEntry.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRuleOptionsScreen.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringEntry.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/AbstractFilteringRule.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringCache.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringCacheImpl.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringContext.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringContextImpl.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringContextType.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringResult.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringResultImpl.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/FilteringRule.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/rules/ManualFilteringRule.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/filtering/rules/SearchFilteringRule.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/impl/client/entry/type/PreFilteredEntryListImpl.java create mode 100644 runtime-engine/filtering-entries/src/main/java/me/shedaniel/rei/plugin/client/runtime/FilteredStacksVisibilityHandler.java create mode 100644 runtime-engine/filtering-entries/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.plugins.REIClientPlugin create mode 100644 runtime-engine/filtering-entries/src/main/resources/META-INF/services/me.shedaniel.rei.impl.client.entry.type.EntryRegistryListener create mode 100644 runtime-engine/screens/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/screens/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/screens/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/screens/build/classes/java/main/me/shedaniel/rei/impl/client/registry/screen/ExclusionZonesImpl.class create mode 100644 runtime-engine/screens/build/classes/java/main/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl$1.class create mode 100644 runtime-engine/screens/build/classes/java/main/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl$2.class create mode 100644 runtime-engine/screens/build/classes/java/main/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl$3.class create mode 100644 runtime-engine/screens/build/classes/java/main/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.class create mode 100644 runtime-engine/screens/build/libs/screens-transformProductionFabric.jar create mode 100644 runtime-engine/screens/build/libs/screens-transformProductionForge.jar create mode 100644 runtime-engine/screens/build/tmp/compileJava/previous-compilation-data.bin create mode 100644 runtime-engine/screens/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ExclusionZonesImpl.java create mode 100644 runtime-engine/screens/src/main/java/me/shedaniel/rei/impl/client/registry/screen/ScreenRegistryImpl.java create mode 100644 runtime-engine/screens/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.registry.screen.ScreenRegistry create mode 100644 runtime-engine/search/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/search/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/search/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/search/build/libs/search-transformProductionFabric.jar create mode 100644 runtime-engine/search/build/libs/search-transformProductionForge.jar create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/IntRange.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/AlternativeArgument.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/Argument.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/CompoundArgument.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/IndexSet.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/InputMethodMatcher.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/AlwaysMatchingArgumentType.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ArgumentType.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ArgumentTypesRegistry.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/IdentifierArgumentType.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/MatchType.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ModArgumentType.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/RegexArgumentType.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TagArgumentType.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TextArgumentType.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TooltipArgumentType.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/method/DefaultInputMethod.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/method/InputMethodRegistryImpl.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/impl/client/search/result/ArgumentApplicableResult.java create mode 100644 runtime-engine/search/src/main/java/me/shedaniel/rei/plugin/client/runtime/SearchFilterPrepareWatcher.java create mode 100644 runtime-engine/search/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.search.SearchProvider create mode 100644 runtime-engine/search/src/main/resources/META-INF/services/me.shedaniel.rei.impl.client.gui.hints.HintProvider create mode 100644 runtime-engine/src/main/java/me/shedaniel/rei/impl/common/logging/FileLogger.java create mode 100644 runtime-engine/src/main/java/me/shedaniel/rei/impl/common/logging/FilteringLogger.java create mode 100644 runtime-engine/src/main/java/me/shedaniel/rei/impl/common/logging/Log4JLogger.java create mode 100644 runtime-engine/src/main/java/me/shedaniel/rei/impl/common/logging/MultiLogger.java create mode 100644 runtime-engine/src/main/java/me/shedaniel/rei/impl/common/logging/TransformingLogger.java create mode 100644 runtime-engine/src/main/java/me/shedaniel/rei/impl/init/RoughlyEnoughItemsEngine.java create mode 100644 runtime-engine/subsets/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/subsets/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/subsets/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/subsets/build/libs/subsets-transformProductionFabric.jar create mode 100644 runtime-engine/subsets/build/libs/subsets-transformProductionForge.jar create mode 100644 runtime-engine/subsets/src/main/java/me/shedaniel/rei/impl/client/subsets/SubsetsRegistryImpl.java create mode 100644 runtime-engine/subsets/src/main/resources/META-INF/services/me.shedaniel.rei.api.client.subsets.SubsetsRegistry create mode 100644 runtime-engine/transfer-handlers/.gradle/loom-cache/launch.cfg create mode 100644 runtime-engine/transfer-handlers/.gradle/loom-cache/log4j.xml create mode 100644 runtime-engine/transfer-handlers/.gradle/loom-cache/remapClasspath.txt create mode 100644 runtime-engine/transfer-handlers/build/libs/transfer-handlers-transformProductionFabric.jar create mode 100644 runtime-engine/transfer-handlers/build/libs/transfer-handlers-transformProductionForge.jar 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 create mode 100644 shared-internals/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerInternal.java create mode 100644 shared-internals/src/main/java/me/shedaniel/rei/impl/client/favorites/MutableFavoritesList.java create mode 100644 shared-internals/src/main/java/me/shedaniel/rei/impl/client/gui/hints/HintProvider.java create mode 100644 shared-internals/src/main/java/me/shedaniel/rei/impl/client/search/AsyncSearchManager.java create mode 100644 shared-internals/src/main/java/me/shedaniel/rei/impl/client/search/SearchManager.java create mode 100644 shared-internals/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java create mode 100644 shared-internals/src/main/java/me/shedaniel/rei/impl/common/util/HashedEntryStackWrapper.java diff --git a/api/build.gradle b/api/build.gradle deleted file mode 100644 index 9cbc69fa1..000000000 --- a/api/build.gradle +++ /dev/null @@ -1,53 +0,0 @@ -archivesBaseName = rootProject.name + "-" + project.name - -dependencies { - modCompileOnly("net.fabricmc:fabric-loader:${project.fabricloader_version}") - modApi("me.shedaniel.cloth:cloth-config:${cloth_config_version}") - modApi("dev.architectury:architectury:${architectury_version}") -} - -architectury { - common(forgeEnabled.toBoolean()) -} - -remapJar { - classifier "raw" -} - -task fakeJar(type: Jar, dependsOn: remapJar) { - from remapJar.archiveFile.map { zipTree(it) } - from(rootProject.file("fake/fabric.mod.json")) { - into "" - } - classifier null -} - -task fakeForgeJar(type: Jar, dependsOn: remapJar) { - from remapJar.archiveFile.map { zipTree(it) } - from(rootProject.file("fake/fabric.mod.json")) { - into "" - } - from(rootProject.file("fake/REIPlugin.class")) { - into "me/shedaniel/rei/forge" - } - classifier "fake-forge" -} - -artifacts { - apiElements(fakeJar) - runtimeElements(fakeJar) -} - -afterEvaluate { - configurations.apiElements.artifacts.removeIf { it.buildDependencies.getDependencies(null).contains(tasks.remapJar) } - configurations.runtimeElements.artifacts.removeIf { it.buildDependencies.getDependencies(null).contains(tasks.remapJar) } -} - -publishing { - publications { - mavenCommon(MavenPublication) { - artifactId = rootProject.name + "-" + project.name - from components.java - } - } -} diff --git a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java index c51309603..2aa203aa9 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java @@ -29,7 +29,7 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.client.gui.widgets.TooltipContext; import me.shedaniel.rei.api.common.entry.EntryStack; -import me.shedaniel.rei.impl.ClientInternals; +import me.shedaniel.rei.api.common.entry.type.BuiltinEntryTypes; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.jetbrains.annotations.ApiStatus; @@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public interface EntryRenderer extends EntryRendererProvider { static EntryRenderer empty() { - return ClientInternals.getEmptyEntryRenderer(); + return (EntryRenderer) BuiltinEntryTypes.EMPTY.getDefinition().getRenderer(); } @Environment(EnvType.CLIENT) diff --git a/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntryType.java b/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntryType.java index 35a5e8f96..d80c567b0 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntryType.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntryType.java @@ -80,7 +80,7 @@ public interface FavoriteEntryType { default void add(FavoriteEntry... entries) { add(false, entries); } - + @ApiStatus.Experimental void add(boolean defaultFavorited, FavoriteEntry... entries); diff --git a/api/src/main/java/me/shedaniel/rei/api/client/overlay/OverlayListWidget.java b/api/src/main/java/me/shedaniel/rei/api/client/overlay/OverlayListWidget.java index 1fa784806..57e7e8999 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/overlay/OverlayListWidget.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/overlay/OverlayListWidget.java @@ -54,4 +54,6 @@ public interface OverlayListWidget { * @return whether the mouse is within the overlay list widget */ boolean containsMouse(Point point); + + void queueReloadSearch(); } diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/CollapsibleEntry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/CollapsibleEntry.java new file mode 100644 index 000000000..a3623970a --- /dev/null +++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/CollapsibleEntry.java @@ -0,0 +1,42 @@ +/* + * 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, EXPRES