aboutsummaryrefslogtreecommitdiff
path: root/RoughlyEnoughItems-api/src/main/java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-11-05 17:27:31 +0800
committershedaniel <daniel@shedaniel.me>2020-11-05 17:27:31 +0800
commitecf3079ca2622e538cc325fa6063401139881e12 (patch)
tree00a90fcf5af63b36f4951a598270d6d81ad6b2ed /RoughlyEnoughItems-api/src/main/java
parent19d5cc098a812d08b235dbb128746380919a4de6 (diff)
downloadRoughlyEnoughItems-ecf3079ca2622e538cc325fa6063401139881e12.tar.gz
RoughlyEnoughItems-ecf3079ca2622e538cc325fa6063401139881e12.tar.bz2
RoughlyEnoughItems-ecf3079ca2622e538cc325fa6063401139881e12.zip
v5.8.0 Update
- Config screen animations - Require dragging the favorites further before initializing the dragging phase - Require specific fabric modules to run instead of the whole API - Mark getPreviousContainerScreen as nullable - New config settings for setting entry list boundaries - Update fabric loader, auto config and cloth config versions Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'RoughlyEnoughItems-api/src/main/java')
-rw-r--r--RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java13
-rw-r--r--RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/ConfigObject.java6
-rw-r--r--RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/REIHelper.java2
3 files changed, 17 insertions, 4 deletions
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java
index 34d6cc66d..f6b9232e7 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java
@@ -32,6 +32,7 @@ import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.world.inventory.AbstractContainerMenu;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import java.util.function.Supplier;
@@ -182,8 +183,10 @@ public interface AutoTransferHandler {
boolean isActuallyCrafting();
+ @Nullable
AbstractContainerScreen<?> getContainerScreen();
-
+
+ @Nullable
@Deprecated
@ApiStatus.ScheduledForRemoval
default AbstractContainerScreen<?> getHandledScreen() {
@@ -191,15 +194,17 @@ public interface AutoTransferHandler {
}
RecipeDisplay getRecipe();
-
+
+ @Nullable
@Deprecated
@ApiStatus.ScheduledForRemoval
default AbstractContainerMenu getScreenHandler() {
return getContainer();
}
-
+
+ @Nullable
default AbstractContainerMenu getContainer() {
- return getHandledScreen().getMenu();
+ return getContainerScreen() == null ? null : getContainerScreen().getMenu();
}
}
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/ConfigObject.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/ConfigObject.java
index 62482d09b..da43f244f 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/ConfigObject.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/ConfigObject.java
@@ -182,4 +182,10 @@ public interface ConfigObject {
boolean isInventoryHighlightingAllowed();
boolean shouldResizeDynamically();
+
+ @ApiStatus.Experimental
+ double getHorizontalEntriesBoundaries();
+
+ @ApiStatus.Experimental
+ double getVerticalEntriesBoundaries();
}
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/REIHelper.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/REIHelper.java
index 6a42c90dd..787c83e19 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/REIHelper.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/REIHelper.java
@@ -51,8 +51,10 @@ public interface REIHelper {
@ApiStatus.Experimental
Optional<REIOverlay> getOverlay();
+ @Nullable
AbstractContainerScreen<?> getPreviousContainerScreen();
+ @Nullable
@Deprecated
default AbstractContainerScreen<?> getPreviousHandledScreen() {
return getPreviousContainerScreen();