Initial Port to 1.19.4-pre3

4 files changed, 24 insertions, 6 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/AbstractRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/AbstractRenderer.java
index 5adb1437c..45d9d293e 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/AbstractRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/AbstractRenderer.java
@@ -29,13 +29,15 @@ import net.minecraft.client.gui.GuiComponent;
 
 @Environment(EnvType.CLIENT)
 public abstract class AbstractRenderer extends GuiComponent implements Renderer {
+    private int z;
+    
     @Override
     public int getZ() {
-        return getBlitOffset();
+        return z;
     }
     
     @Override
     public void setZ(int z) {
-        setBlitOffset(z);
+        this.z = z;
     }
 }
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 0efb360b6..a631ddded 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
@@ -59,6 +59,7 @@ public abstract class Widget extends AbstractContainerEventHandler implements Re
      */
     protected final Font font = minecraft.font;
     private static final Stack<Point> mouseStack = new Stack<>();
+    private int z;
     
     public static Point mouse() {
         return mouseStack.empty() ? PointHelper.ofMouse() : mouseStack.peek();
@@ -87,12 +88,14 @@ public abstract class Widget extends AbstractContainerEventHandler implements Re
         return pushMouse(new Point(mouseVec.x(), mouseVec.y()));
     }
     
+    @Override
     public int getZ() {
-        return this.getBlitOffset();
+        return this.z;
     }
     
+    @Override
     public void setZ(int z) {
-        this.setBlitOffset(z);
+        this.z = z;
     }
     
     public boolean containsMouse(double mouseX, double mouseY) {
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/search/method/InputMethod.java b/api/src/main/java/me/shedaniel/rei/api/client/search/method/InputMethod.java
index 24372ed05..ef7ab26f1 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/search/method/InputMethod.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/search/method/InputMethod.java
@@ -58,8 +58,8 @@ public interface InputMethod<T> {
      * @return the list of all Minecraft supported locales
      */
     static List<Locale> getAllLocales() {
-        return CollectionUtils.map(Minecraft.getInstance().getLanguageManager().getLanguages(), info ->
-                new Locale(info.getCode(), Component.literal(info.getName())));
+        return CollectionUtils.map(Minecraft.getInstance().getLanguageManager().getLanguages().entrySet(), entry ->
+                new Locale(entry.getKey(), entry.getValue().toComponent()));
     }
     
     /**
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java b/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
index 9c259a1ba..09f913832 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
@@ -23,23 +23,31 @@
 
 package me.shedaniel.rei.api.common.display.basic;
 
+import dev.architectury.utils.EnvExecutor;
+import dev.architectury.utils.GameInstance;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.display.SimpleDisplaySerializer;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
 import me.shedaniel.rei.api.common.util.EntryIngredients;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 /**
  * A basic implementation of a display, consisting of a list of inputs, a list of outputs
  * and a possible display location.
  */
 public abstract class BasicDisplay implements Display {
+    protected static final Supplier<RegistryAccess> REGISTRY_ACCESS =
+            EnvExecutor.getEnvSpecific(() -> () -> () -> GameInstance.getClient().player.level.registryAccess(),
+                    () -> () -> () -> GameInstance.getServer().registryAccess());
     protected List<EntryIngredient> inputs;
     protected List<EntryIngredient> outputs;
     protected Optional<ResourceLocation> location;
@@ -54,6 +62,11 @@ public abstract class BasicDisplay implements Display {
         this.location = location;
     }
     
+    @ApiStatus.Experimental
+    public static RegistryAccess registryAccess() {
+        return REGISTRY_ACCESS.get();
+    }
+    
     /**
      * {@inheritDoc}
      */