aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/ClientHelper.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/AbstractEntryRenderer.java (renamed from api/src/main/java/me/shedaniel/rei/api/client/ingredient/entry/renderer/AbstractEntryRenderer.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/BatchEntryRenderer.java (renamed from api/src/main/java/me/shedaniel/rei/api/client/ingredient/entry/renderer/BatchEntryRenderer.java)4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java (renamed from api/src/main/java/me/shedaniel/rei/api/client/ingredient/entry/renderer/EntryRenderer.java)4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/entry/type/BuiltinClientEntryTypes.java (renamed from api/src/main/java/me/shedaniel/rei/api/client/ingredient/entry/type/BuiltinClientEntryTypes.java)4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntryType.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java6
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStack.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Slot.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/plugins/REIClientPlugin.java5
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/registry/category/CategoryRegistry.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayCategory.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/registry/display/LiveDisplayGenerator.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/registry/entry/EntryRegistry.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/registry/screen/FocusedStackProvider.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/registry/screen/ScreenRegistry.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java9
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/search/SearchFilter.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/subsets/SubsetsRegistry.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryIngredients.java (renamed from api/src/main/java/me/shedaniel/rei/api/client/ingredient/util/ClientEntryIngredients.java)4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryStacks.java (renamed from api/src/main/java/me/shedaniel/rei/api/client/ingredient/util/ClientEntryStacks.java)6
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/view/ViewSearchBuilder.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/view/Views.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/display/Display.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/display/SimpleDisplaySerializer.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/EntryIngredient.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/EntryIngredient.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/EntrySerializer.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/EntrySerializer.java)3
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/EntryStack.java)13
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/ComparisonContext.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/comparison/ComparisonContext.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/ItemComparator.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/comparison/ItemComparator.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/ItemComparatorRegistry.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/comparison/ItemComparatorRegistry.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/type/BuiltinEntryTypes.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/type/BuiltinEntryTypes.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/type/EntryDefinition.java)10
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryType.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/type/EntryType.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeBridge.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/type/EntryTypeBridge.java)4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeRegistry.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/type/EntryTypeRegistry.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/type/VanillaEntryTypes.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/entry/type/VanillaEntryTypes.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/fluid/FluidSupportProvider.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/plugins/REIPlugin.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/plugins/REIPluginProvider.java3
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/plugins/REIServerPlugin.java5
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/util/CollectionUtils.java3
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/util/EntryIngredients.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/util/EntryIngredients.java)10
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java (renamed from api/src/main/java/me/shedaniel/rei/api/common/ingredient/util/EntryStacks.java)14
-rw-r--r--api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java8
-rw-r--r--api/src/main/java/me/shedaniel/rei/impl/Internals.java14
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java6
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/client/BuiltinClientPlugin.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java6
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java6
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/campfire/DefaultCampfireCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/campfire/DefaultCampfireDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/composting/DefaultCompostingCategory.java6
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/composting/DefaultCompostingDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/cooking/DefaultCookingCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/cooking/DefaultCookingDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/crafting/DefaultCraftingCategory.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/crafting/DefaultCraftingDisplay.java6
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/crafting/DefaultCustomDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/crafting/DefaultShapedDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/crafting/DefaultShapelessDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/stonecutting/DefaultStoneCuttingCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/stonecutting/DefaultStoneCuttingDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java11
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java4
-rw-r--r--fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java57
-rw-r--r--fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsFabric.java2
-rw-r--r--fabric/src/main/resources/fabric.mod.json3
-rw-r--r--forge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java182
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsInitializer.java34
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java6
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java (renamed from runtime/src/main/java/me/shedaniel/rei/impl/registry/ClientHelperImpl.java)51
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/ErrorDisplayer.java (renamed from runtime/src/main/java/me/shedaniel/rei/impl/ErrorDisplayer.java)4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/REIHelperImpl.java (renamed from runtime/src/main/java/me/shedaniel/rei/impl/REIHelperImpl.java)8
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java (renamed from runtime/src/main/java/me/shedaniel/rei/impl/config/ConfigManagerImpl.java)20
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java (renamed from runtime/src/main/java/me/shedaniel/rei/impl/config/ConfigObjectImpl.java)6
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java (renamed from runtime/src/main/java/me/shedaniel/rei/api/client/gui/config/entry/FilteringAddRuleScreen.java)6
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringEntry.java (renamed from runtime/src/main/java/me/shedaniel/rei/api/client/gui/config/entry/FilteringEntry.java)8
-rw-r--r--