aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-01-02 14:31:16 +0800
committershedaniel <daniel@shedaniel.me>2020-01-02 14:31:16 +0800
commit5e2eccadbd91171c01cdb209d1338bcfb7786b1c (patch)
tree6c7387de5baea8b335e8abe58651018f77ad2d41 /src
parente8714fe8fc1dcaec7ad299c63e2b657870c8fb40 (diff)
downloadRoughlyEnoughItems-5e2eccadbd91171c01cdb209d1338bcfb7786b1c.tar.gz
RoughlyEnoughItems-5e2eccadbd91171c01cdb209d1338bcfb7786b1c.tar.bz2
RoughlyEnoughItems-5e2eccadbd91171c01cdb209d1338bcfb7786b1c.zip
3.3
Fix #58 Close #134 Close #158 Fix #227
Diffstat (limited to 'src')
-rw-r--r--src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java6
-rw-r--r--src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java61
-rw-r--r--src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java6
-rw-r--r--src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java78
-rw-r--r--src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java12
-rw-r--r--src/main/java/me/shedaniel/rei/api/ButtonAreaSupplier.java6
-rw-r--r--src/main/java/me/shedaniel/rei/api/ClientHelper.java69
-rw-r--r--src/main/java/me/shedaniel/rei/api/ConfigManager.java18
-rw-r--r--src/main/java/me/shedaniel/rei/api/ConfigObject.java133
-rw-r--r--src/main/java/me/shedaniel/rei/api/DisplayHelper.java41
-rw-r--r--src/main/java/me/shedaniel/rei/api/DisplayVisibilityHandler.java6
-rw-r--r--src/main/java/me/shedaniel/rei/api/EntryRegistry.java28
-rw-r--r--src/main/java/me/shedaniel/rei/api/EntryStack.java93
-rw-r--r--src/main/java/me/shedaniel/rei/api/LiveRecipeGenerator.java8
-rw-r--r--src/main/java/me/shedaniel/rei/api/ObjectHolder.java14
-rw-r--r--src/main/java/me/shedaniel/rei/api/REIPluginEntry.java8
-rw-r--r--src/main/java/me/shedaniel/rei/api/RecipeCategory.java24
-rw-r--r--src/main/java/me/shedaniel/rei/api/RecipeDisplay.java12
-rw-r--r--src/main/java/me/shedaniel/rei/api/RecipeHelper.java74
-rw-r--r--src/main/java/me/shedaniel/rei/api/TransferRecipeDisplay.java8
-rw-r--r--src/main/java/me/shedaniel/rei/api/annotations/Experimental.java3
-rw-r--r--src/main/java/me/shedaniel/rei/api/annotations/Internal.java3
-rw-r--r--src/main/java/me/shedaniel/rei/api/annotations/ToBeRemoved.java3
-rw-r--r--src/main/java/me/shedaniel/rei/api/plugins/REIPluginV0.java16
-rw-r--r--src/main/java/me/shedaniel/rei/gui/ConfigReloadingScreen.java10
-rw-r--r--src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java124
-rw-r--r--src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java26
-rw-r--r--src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java24
-rw-r--r--src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java85
-rw-r--r--src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java62
-rw-r--r--src/main/java/me/shedaniel/rei/gui/config/ItemCheatingMode.java2
-rw-r--r--src/main/java/me/shedaniel/rei/gui/config/ItemListOrdering.java10
-rw-r--r--src/main/java/me/shedaniel/rei/gui/config/ItemListOrderingConfig.java12
-rw-r--r--src/main/java/me/shedaniel/rei/gui/config/RecipeScreenType.java2
-rw-r--r--src/main/java/me/shedaniel/rei/gui/config/SearchFieldLocation.java2
-rw-r--r--src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java14
-rw-r--r--src/main/java/me/shedaniel/rei/gui/entries/RecipeEntry.java42
-rw-r--r--src/main/java/me/shedaniel/rei/gui/entries/SimpleRecipeEntry.java22
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java22
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java44
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/CategoryBaseWidget.java8
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java34
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java16
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/DraggableWidget.java26
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java278
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java63
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java145
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/LabelWidget.java42
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/PanelWidget.java32
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/QueuedTooltip.java26
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java10
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java6
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java40
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java10
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java24
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java188
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/Widget.java8
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/WidgetWithBounds.java14
-rw-r--r--src/main/java/me/shedaniel/rei/impl/AbstractEntryStack.java18
-rw-r--r--src/main/java/me/shedaniel/rei/impl/BaseBoundsHandlerImpl.java30
-rw-r--r--src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java135
-rw-r--r--src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java99
-rw-r--r--src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java260
-rw-r--r--src/main/java/me/shedaniel/rei/impl/DisplayHelperImpl.java32
-rw-r--r--src/main/java/me/shedaniel/rei/impl/EmptyEntryStack.java55
-rw-r--r--src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java32
-rw-r--r--src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java44
-rw-r--r--src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java146
-rw-r--r--src/main/java/me/shedaniel/rei/impl/ObjectHolderImpl.java4
-rw-r--r--src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java119
-rw-r--r--src/main/java/me/shedaniel/rei/impl/ScreenHelper.java43
-rw-r--r--src/main/java/me/shedaniel/rei/impl/SearchArgument.java39
-rw-r--r--src/main/java/me/shedaniel/rei/impl/Weather.java14
-rw-r--r--src/main/java/me/shedaniel/rei/listeners/RecipeBookGuiHooks.java8
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java28
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinItemRenderer.java2
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinItemStack.java6
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java8
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java56
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultRecipeBookExclusionZones.java4
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/blasting/DefaultBlastingDisplay.java4
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingCategory.java10
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/brewing/DefaultBrewingDisplay.java14
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java20
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/composting/DefaultCompostingCategory.java18
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/containers/CraftingContainerInfoWrapper.java16
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingDisplay.java22
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java14
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java14
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java26
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java20
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java20
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/smelting/DefaultSmeltingDisplay.java4
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/smoking/DefaultSmokingDisplay.java4
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/stonecutting/DefaultStoneCuttingCategory.java12
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/stripping/DefaultStrippingDisplay.java16
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/stripping/DummyAxeItem.java2
-rw-r--r--src/main/java/me/shedaniel/rei/server/ContainerInfo.java10
-rw-r--r--src/main/java/me/shedaniel/rei/server/ContainerInfoHandler.java6
-rw-r--r--src/main/java/me/shedaniel/rei/server/InputSlotCrafter.java65
-rw-r--r--src/main/java/me/shedaniel/rei/server/RecipeFinder.java128
-rw-r--r--src/main/java/me/shedaniel/rei/server/RecipeGridAligner.java16
-rw-r--r--src/main/java/me/shedaniel/rei/tests/plugin/REITestPlugin.java12
-rw-r--r--src/main/java/me/shedaniel/rei/utils/CollectionUtils.java78
-rw-r--r--src/main/java/me/shedaniel/rei/utils/ExecutorUtil.java18
-rwxr-xr-xsrc/main/resources/assets/roughlyenoughitems/lang/en_us.json17
106 files changed, 1976 insertions, 1995 deletions
diff --git a/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java b/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java
index ef7e9b160..5c04233d2 100644
--- a/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java
+++ b/src/main/java/me/shedaniel/rei/REIModMenuEntryPoint.java
@@ -12,15 +12,15 @@ import net.minecraft.client.gui.screen.Screen;
import java.util.function.Function;
public class REIModMenuEntryPoint implements ModMenuApi {
-
+
@Override
public String getModId() {
return "roughlyenoughitems";
}
-
+
@Override
public Function<Screen, ? extends Screen> getConfigScreenFactory() {
return parent -> ConfigManager.getInstance().getConfigScreen(parent);
}
-
+
}
diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index dad49fefc..100cd75bb 100644
--- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -56,48 +56,43 @@ import java.util.concurrent.atomic.AtomicLong;
@Internal
public class RoughlyEnoughItemsCore implements ClientModInitializer {
-
- @Internal
- public static final Logger LOGGER;
- @SuppressWarnings("deprecation")
- private static final RecipeHelper RECIPE_HELPER = new RecipeHelperImpl();
- @SuppressWarnings("deprecation")
- private static final EntryRegistry ENTRY_REGISTRY = new EntryRegistryImpl();
- @SuppressWarnings("deprecation")
- private static final DisplayHelper DISPLAY_HELPER = new DisplayHelperImpl();
+
+ @Internal public static final Logger LOGGER;
+ @SuppressWarnings("deprecation") private static final RecipeHelper RECIPE_HELPER = new RecipeHelperImpl();
+ @SuppressWarnings("deprecation") private static final EntryRegistry ENTRY_REGISTRY = new EntryRegistryImpl();
+ @SuppressWarnings("deprecation") private static final DisplayHelper DISPLAY_HELPER = new DisplayHelperImpl();<