aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-02-21 22:33:45 +0800
committershedaniel <daniel@shedaniel.me>2021-02-21 22:33:45 +0800
commita56baa875630ffac06e421a7389854b5301ed7f0 (patch)
tree9469ff3f61f2aca622d6f86dbe8044769198e639
parent5eae235995583e378a884a14118095c1fda08fab (diff)
downloadRoughlyEnoughItems-a56baa875630ffac06e421a7389854b5301ed7f0.tar.gz
RoughlyEnoughItems-a56baa875630ffac06e421a7389854b5301ed7f0.tar.bz2
RoughlyEnoughItems-a56baa875630ffac06e421a7389854b5301ed7f0.zip
More
Signed-off-by: shedaniel <daniel@shedaniel.me>
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/ClientHelper.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/DisplayRegistry.java92
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/LiveDisplayGenerator.java (renamed from api/src/main/java/me/shedaniel/rei/api/LiveRecipeGenerator.java)9
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/REIPluginEntry.java (renamed from api/src/main/java/me/shedaniel/rei/api/REIPlugin.java)6
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/RecipeRegistry.java266
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/gui/AbstractRenderer.java (renamed from api/src/main/java/me/shedaniel/rei/api/ingredient/entry/AbstractRenderer.java)2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/gui/DisplayRenderer.java1
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widget.java9
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widgets.java54
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/plugins/REIPlugin.java (renamed from api/src/main/java/me/shedaniel/rei/api/plugins/REIPluginV0.java)41
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/CategoryRegistry.java92
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/DisplayerQuery.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/EntryRegistry.java (renamed from api/src/main/java/me/shedaniel/rei/api/EntryRegistry.java)84
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/PluginHandler.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/RecipeManagerContext.java20
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/display/Display.java10
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/display/DisplayCategory.java52
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/screens/DisplayBoundsProvider.java23
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/screens/ExclusionZones.java (renamed from api/src/main/java/me/shedaniel/rei/api/ExclusionZones.java)7
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/screens/OverlayDecider.java (renamed from api/src/main/java/me/shedaniel/rei/api/OverlayDecider.java)10
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/registry/screens/ScreenRegistry.java (renamed from api/src/main/java/me/shedaniel/rei/api/DisplayBoundsRegistry.java)40
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/server/ContainerInfo.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/util/CollectionUtils.java39
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/util/Identifiable.java5
-rw-r--r--api/src/main/java/me/shedaniel/rei/impl/Internals.java33
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java64
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseCategory.java23
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/base/DefaultBeaconBaseDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentCategory.java12
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/beacon/payment/DefaultBeaconPaymentDisplay.java2
-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.java5
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java5
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java6
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java1
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java36
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java5
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/WeatherFavoriteEntry.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/fuel/DefaultFuelCategory.java5
-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/DefaultInformationCategory.java8
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingCategory.java5
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/pathing/DefaultPathingDisplay.java2
-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.java5
-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/stonecutting/DefaultStoneCuttingCategory.java20
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingCategory.java5
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java2
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingCategory.java5
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/tilling/DefaultTillingDisplay.java2
-rw-r--r--gradle.properties4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java39
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsInitializer.java123
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java149
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsState.java24
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/FilteringScreen.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/api/gui/config/entry/ReloadPluginsEntry.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/compat/LBASupportPlugin.java8
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java26
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java12
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java6
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/WarningAndErrorScreen.java6
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/modules/Menu.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/modules/entries/EntryStackSubsetsMenuEntry.java1
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/modules/entries/SubSubsetsMenuEntry.java1
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/plugin/DefaultRuntimePlugin.java25
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java13
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java9
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/DynamicErrorFreeEntryListWidget.java588
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java31
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/ErrorDisplayer.java58
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/ExclusionZonesImpl.java6
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java18
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/PluginManager.java (renamed from runtime/src/main/java/me/shedaniel/rei/impl/RecipeRegistryImpl.java)89
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java33
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/ScreenRegistryImpl.java (renamed from runtime/src/main/java/me/shedaniel/rei/impl/DisplayBoundsRegistryImpl.java)33
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/registry/CategoryRegistryImpl.java68
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/registry/DisplayRegistryImpl.java54
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/registry/RecipeManagerContextImpl.java35
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/tests/plugin/REITestPlugin.java6
-rw-r--r--runtime/src/main/resources/fabric.mod.json10
-rwxr-xr-xsrc/main/resources/fabric.mod.json7
103 files changed, 1782 insertions, 903 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java b/api/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java
index 64e4b27e8..65116400e 100644
--- a/api/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java
+++ b/api/src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java
@@ -28,7 +28,11 @@ import me.shedaniel.math.Rectangle;
/**
* The supplier for the + button area.
*/
+@FunctionalInterface
public interface ButtonAreaSupplier {
+ static ButtonAreaSupplier defaultArea() {
+ return bounds -> new Rectangle(bounds.getMaxX() - 16, bounds.getMaxY() - 16, 10, 10);
+ }
/**
* Declares the button bounds
diff --git a/api/src/main/java/me/shedaniel/rei/api/ClientHelper.java b/api/src/main/java/me/shedaniel/rei/api/ClientHelper.java
index c1ff48e21..00cbb338b 100644
--- a/api/src/main/java/me/shedaniel/rei/api/ClientHelper.java
+++ b/api/src/mai