2 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java b/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java
index df1afc053..aff7a5e2b 100644
--- a/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java
+++ b/src/main/java/me/shedaniel/rei/api/AutoTransferHandler.java
@@ -48,7 +48,7 @@ public interface AutoTransferHandler {
             return new ResultImpl();
         }
 
-        static Result createSuccessfulReturnToScreen() {
+        static Result createSuccessfulReturningToScreen() {
             return new ResultImpl(true, true, true);
         }
 
@@ -80,7 +80,7 @@ public interface AutoTransferHandler {
          * Applicable if {@link #isSuccessful()} is true. Will return
          * to the previous screen rather than staying open.
          */
-        boolean isReturnToScreen();
+        boolean isReturningToScreen();
         
         boolean isApplicable();
         
@@ -121,7 +121,7 @@ public interface AutoTransferHandler {
     
     @ApiStatus.Internal
     final class ResultImpl implements Result {
-        private boolean successful, applicable, returnToScreen;
+        private boolean successful, applicable, returningToScreen;
         private String errorKey;
         private IntList integers = new IntArrayList();
         private int color;
@@ -134,10 +134,10 @@ public interface AutoTransferHandler {
             this(false, applicable, false);
         }
 
-        public ResultImpl(boolean successful, boolean applicable, boolean returnToScreen) {
+        public ResultImpl(boolean successful, boolean applicable, boolean returningToScreen) {
             this.successful = successful;
             this.applicable = applicable;
-            this.returnToScreen = returnToScreen;
+            this.returningToScreen = returningToScreen;
         }
 
         public ResultImpl(String errorKey, IntList integers, int color) {
@@ -165,8 +165,8 @@ public interface AutoTransferHandler {
         }
 
         @Override
-        public boolean isReturnToScreen() {
-            return returnToScreen;
+        public boolean isReturningToScreen() {
+            return returningToScreen;
         }
 
         @Override
diff --git a/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java b/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java
index 307b3cffc..497d67727 100644
--- a/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java
+++ b/src/main/java/me/shedaniel/rei/impl/InternalWidgets.java
@@ -35,6 +35,8 @@ import me.shedaniel.rei.gui.widget.LateRenderable;
 import me.shedaniel.rei.gui.widget.Widget;
 import me.shedaniel.rei.gui.widget.WidgetWithBounds;
 import me.shedaniel.rei.utils.CollectionUtils;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.screen.ingame.ContainerScreen;
@@ -51,6 +53,7 @@ import java.util.Objects;
 import java.util.function.Supplier;
 
 @ApiStatus.Internal
+@Environment(EnvType.CLIENT)
 public final class InternalWidgets {
     private InternalWidgets() {}
     
@@ -66,7 +69,7 @@ public final class InternalWidgets {
                         try {
                             AutoTransferHandler.Result result = autoTransferHandler.handle(context);
                             if (result.isSuccessful()) {
-                                if (result.isReturnToScreen()) {
+                                if (result.isReturningToScreen()) {
                                     break; // Same as failing, but doesn't ask other handlers
                                 }
                                 return;