From 7374ae49a8624418d48757d32431570cf25ef9e9 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 22 Jul 2018 17:11:58 +0200 Subject: [PATCH] Add docs and update changelog. --- CHANGELOG.md | 1 + .../refinedstorage/api/autocrafting/ICraftingPattern.java | 6 ++++++ .../api/autocrafting/ICraftingPatternContainer.java | 3 +++ .../raoulvdberge/refinedstorage/api/network/INetwork.java | 7 +++++++ 4 files changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b727dc80f..ea109819c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### 1.6.1 - Added fluid autocrafting (raoulvdberge) +- Updated Russian translation (kellixon) ### 1.6 NOTE: Worlds that used Refined Storage 1.5.x are fully compatible with Refined Storage 1.6.x and are getting converted upon loading the world. It is however not possible to revert back to Refined Storage 1.5.x when a world has already been converted to Refined Storage 1.6.x. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java index 366b661cc..ede71ccfa 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPattern.java @@ -62,8 +62,14 @@ public interface ICraftingPattern { */ NonNullList getByproducts(NonNullList took); + /** + * @return the fluid inputs + */ NonNullList getFluidInputs(); + /** + * @return the fluid outputs + */ NonNullList getFluidOutputs(); /** diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java index bc8ff374a..e54bab1d4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingPatternContainer.java @@ -26,6 +26,9 @@ public interface ICraftingPatternContainer { @Nullable IItemHandler getConnectedInventory(); + /** + * @return the fluid inventory that this container is connected to, or null if no fluid inventory is present + */ @Nullable IFluidHandler getConnectedFluidInventory(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java index c57ccd468..4700cdb9b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetwork.java @@ -167,6 +167,13 @@ public interface INetwork { @Nullable FluidStack insertFluid(@Nonnull FluidStack stack, int size, Action action); + /** + * Inserts a fluid and notifies the crafting manager of the incoming fluid. + * + * @param stack the stack prototype to insert, do NOT modify + * @param size the amount of that prototype that has to be inserted + * @return null if the insert was successful, or a stack with the remainder + */ default FluidStack insertFluidTracked(@Nonnull FluidStack stack, int size) { FluidStack remainder = insertFluid(stack, size, Action.PERFORM);