From bde7dc42c9137b28231815d284cbc72247242609 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 2 Apr 2023 03:14:46 +0800 Subject: Update to 23w13a_or_b --- .../java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java | 3 ++- .../shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java | 3 ++- .../me/shedaniel/rei/impl/init/RoughlyEnoughItemsInitializer.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'runtime/src') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java index 3465598ab..0f60966a2 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java @@ -30,6 +30,7 @@ import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexSorting; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.impl.client.gui.toast.ExportRecipeIdentifierToast; @@ -84,7 +85,7 @@ public final class RecipeDisplayExporter { renderTarget.bindWrite(true); RenderSystem.clear(256, Minecraft.ON_OSX); Matrix4f matrix4f = new Matrix4f().setOrtho(0.0F, (float) ((double) window.getWidth() / window.getGuiScale()), 0.0F, (float) ((double) window.getHeight() / window.getGuiScale()), 1000.0F, 3000.0F); - RenderSystem.setProjectionMatrix(matrix4f); + RenderSystem.setProjectionMatrix(matrix4f, VertexSorting.ORTHOGRAPHIC_Z); PoseStack poseStack = RenderSystem.getModelViewStack(); poseStack.pushPose(); poseStack.setIdentity(); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java index 3140e2c22..c82393899 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java @@ -30,6 +30,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexFormat; +import com.mojang.blaze3d.vertex.VertexSorting; import dev.architectury.registry.ReloadListenerRegistry; import it.unimi.dsi.fastutil.longs.Long2LongMap; import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap; @@ -146,7 +147,7 @@ public class CachedEntryListRender { TextureTarget target = new TextureTarget(width, height, true, false); target.bindWrite(true); Matrix4f projectionMatrix = new Matrix4f().setOrtho(0.0F, width, 0.0F, height, 1000.0F, 3000.0F); - RenderSystem.setProjectionMatrix(projectionMatrix); + RenderSystem.setProjectionMatrix(projectionMatrix, VertexSorting.ORTHOGRAPHIC_Z); PoseStack modelViewStack = RenderSystem.getModelViewStack(); modelViewStack.pushPose(); modelViewStack.setIdentity(); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/init/RoughlyEnoughItemsInitializer.java b/runtime/src/main/java/me/shedaniel/rei/impl/init/RoughlyEnoughItemsInitializer.java index ec3b91044..95697b81c 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/init/RoughlyEnoughItemsInitializer.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/init/RoughlyEnoughItemsInitializer.java @@ -29,8 +29,8 @@ import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; public class RoughlyEnoughItemsInitializer { - public static final String COMPATIBLE_MC_VERSION_LOW = "1.19"; - public static final String COMPATIBLE_MC_VERSION_HIGH = "1.20"; + public static final String COMPATIBLE_MC_VERSION_LOW = "1.20"; + public static final String COMPATIBLE_MC_VERSION_HIGH = "1.21"; public static void onInitialize() { PrimitivePlatformAdapter adapter = PrimitivePlatformAdapter.get(); -- cgit