From 927a4af76ec3c74dc83c38b5b46d105a933bb48a Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Tue, 22 Jun 2021 01:47:32 +0800
Subject: Fix #558

---
 api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java      | 2 ++
 .../main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java    | 3 +++
 api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java  | 5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'api/src/main')

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java
index 207bd118b..d00720ac9 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/Renderer.java
@@ -44,8 +44,10 @@ public interface Renderer {
         return null;
     }
     
+    @Environment(EnvType.CLIENT)
     int getZ();
     
+    @Environment(EnvType.CLIENT)
     void setZ(int z);
     
     default void fillCrashReport(CrashReport report, CrashReportCategory category) {
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java
index bf3a64dee..960573cf3 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java
@@ -28,6 +28,8 @@ import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.gui.AbstractContainerEventHandler;
 import me.shedaniel.rei.api.client.gui.Renderer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 
@@ -36,6 +38,7 @@ import net.minecraft.client.gui.Font;
  *
  * @see WidgetWithBounds for a widget with bounds
  */
+@Environment(EnvType.CLIENT)
 public abstract class Widget extends AbstractContainerEventHandler implements net.minecraft.client.gui.components.Widget, Renderer {
     
     /**
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
index 1789ccbae..9ac571bdb 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
@@ -65,8 +65,9 @@ public interface EntryStack<T> extends TextRepresentable, Renderer {
     }
     
     static EntryStack<?> read(CompoundTag tag) {
-        EntryDefinition<?> definition = EntryTypeRegistry.getInstance().get(new ResourceLocation(tag.getString("type")));
-        if (definition == null) throw new NullPointerException("Read missing entry type: " + definition);
+        ResourceLocation type = new ResourceLocation(tag.getString("type"));
+        EntryDefinition<?> definition = EntryTypeRegistry.getInstance().get(type);
+        if (definition == null) throw new NullPointerException("Read missing entry type: " + type);
         EntrySerializer<?> serializer = definition.getSerializer();
         if (serializer != null && serializer.supportReading()) {
             return EntryStack.of((EntryDefinition<Object>) definition, serializer.read(tag));
-- 
cgit