Update to 23w13a_or_b

13 files changed, 22 insertions, 40 deletions

diff --git a/.github/workflows/curseforge.yml b/.github/workflows/curseforge.yml
index 18b67355a..d66182164 100644
--- a/.github/workflows/curseforge.yml
+++ b/.github/workflows/curseforge.yml
@@ -14,6 +14,7 @@ on:
       - 9.x-1.19
       - 10.x-1.19.3
       - 11.x-1.19.4
+      - 11.x-23w13a_or_b
 
 jobs:
   build:
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
index d1361c235..38c9b1696 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
@@ -265,7 +265,6 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin
         registry.registerRecipeFiller(BlastingRecipe.class, RecipeType.BLASTING, DefaultBlastingDisplay::new);
         registry.registerRecipeFiller(CampfireCookingRecipe.class, RecipeType.CAMPFIRE_COOKING, DefaultCampfireDisplay::new);
         registry.registerRecipeFiller(StonecutterRecipe.class, RecipeType.STONECUTTING, DefaultStoneCuttingDisplay::new);
-        registry.registerRecipeFiller(LegacyUpgradeRecipe.class, RecipeType.SMITHING, DefaultSmithingDisplay::new);
         registry.registerRecipeFiller(SmithingTransformRecipe.class, RecipeType.SMITHING, DefaultSmithingDisplay::new);
         registry.registerRecipeFiller(SmithingTrimRecipe.class, RecipeType.SMITHING, DefaultSmithingDisplay::new);
         registry.registerFiller(AnvilRecipe.class, DefaultAnvilDisplay::new);
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
index 67210568b..7a4b445f8 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
@@ -28,13 +28,7 @@ import me.shedaniel.rei.api.common.display.basic.BasicDisplay;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
 import me.shedaniel.rei.api.common.util.EntryIngredients;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
-import net.minecraft.core.Holder;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.armortrim.*;
-import net.minecraft.world.item.crafting.LegacyUpgradeRecipe;
 import net.minecraft.world.item.crafting.SmithingRecipe;
 import net.minecraft.world.item.crafting.SmithingTransformRecipe;
 import net.minecraft.world.item.crafting.SmithingTrimRecipe;
@@ -42,19 +36,8 @@ import org.jetbrains.annotations.ApiStatus;
 
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Supplier;
 
 public class DefaultSmithingDisplay extends BasicDisplay {
-    public DefaultSmithingDisplay(LegacyUpgradeRecipe recipe) {
-        this(
-                recipe,
-                List.of(
-                        EntryIngredients.ofIngredient(recipe.base),
-                        EntryIngredients.ofIngredient(recipe.addition)
-                )
-        );
-    }
-    
     @ApiStatus.Experimental
     public DefaultSmithingDisplay(SmithingTransformRecipe recipe) {
         this(
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 58d30a50f..edd2110cf 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -106,7 +106,7 @@ unifiedPublishing {
     project {
         displayName = "[Fabric $rootProject.supported_version] v$project.version"
         releaseType = "release"
-        gameVersions = ["1.19.4"]
+        gameVersions = []
         gameLoaders = ["fabric"]
         changelog = rootProject.releaseChangelog
 
@@ -131,7 +131,7 @@ unifiedPublishing {
             curseforge {
                 token = project.hasProperty("danielshe_curse_api_key") ? project.property("danielshe_curse_api_key") : System.getenv("danielshe_curse_api_key")
                 id = "310111"
-                gameVersions.addAll "Java 17", "1.19-Snapshot"
+                gameVersions.addAll "Java 17", "1.20-Snapshot"
             }
         }
 
@@ -140,6 +140,7 @@ unifiedPublishing {
                 token = project.hasProperty("modrinth_key") ? project.property("modrinth_key") : System.getenv("modrinth_key")
                 id = "nfn13YXA"
                 version = "$project.version+$project.name"
+                gameVersions.addAll project.minecraft_version
             }
         }
     }
diff --git a/fabric/src/main/resources/error_notifier.json b/fabric/src/main/resources/error_notifier.json
index 3e8d1c063..132e07187 100644
--- a/fabric/src/main/resources/error_notifier.json
+++ b/fabric/src/main/resources/error_notifier.json
@@ -12,14 +12,14 @@
             "type": "depends",
             "modId": "architectury",
             "modName": "Architectury API",
-            "versions": ">=8.0.0 <9.0.0",
+            "versions": ">=9.0.0 <10.0.0",
             "url": "https://www.curseforge.com/minecraft/mc-mods/architectury-api/files/all"
         },
         {
             "type": "depends",
             "modId": "cloth-config2",
             "modName": "Cloth Config",
-            "versions": ">=10.0.0 <11.0.0",
+            "versions": ">=11.0.0 <12.0.0",
             "url": "https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/all"
         }
     ]
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 70e6b0d83..e0c84f24a 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -119,6 +119,6 @@
     }
   },
   "depends": {
-    "minecraft": "~1.19-beta.1"
+    "minecraft": "~1.20-"
   }
 }
diff --git a/fabric/src/main/resources/roughlyenoughitems.accessWidener b/fabric/src/main/resources/roughlyenoughitems.accessWidener
index 22dc526c1..f38aa63a4 100644
--- a/fabric/src/main/resources/roughlyenoughitems.accessWidener
+++ b/fabric/src/main/resources/roughlyenoughitems.accessWidener
@@ -35,8 +35,6 @@ accessible    method net/minecraft/client/gui/screens/Screen
 accessible method net/minecraft/client/renderer/RenderType create (Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;ILnet/minecraft/client/renderer/RenderType$CompositeState;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;
 accessible field net/minecraft/tags/TagEntry tag Z
 accessible field net/minecraft/tags/TagEntry id Lnet/minecraft/resources/ResourceLocation;
-accessible field net/minecraft/world/item/crafting/LegacyUpgradeRecipe base Lnet/minecraft/world/item/crafting/Ingredient;
-accessible field net/minecraft/world/item/crafting/LegacyUpgradeRecipe addition Lnet/minecraft/world/item/crafting/Ingredient;
 accessible field net/minecraft/world/item/crafting/SmithingTransformRecipe template Lnet/minecraft/world/item/crafting/Ingredient;
 accessible field net/minecraft/world/item/crafting/SmithingTransformRecipe base Lnet/minecraft/world/item/crafting/Ingredient;
 accessible field net/minecraft/world/item/crafting/SmithingTransformRecipe addition Lnet/minecraft/world/item/crafting/Ingredient;
diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg
index cd8fd6891..0b9eaa001 100644
--- a/forge/src/main/resources/META-INF/accesstransformer.cfg
+++ b/forge/src/main/resources/META-INF/accesstransformer.cfg
@@ -36,8 +36,6 @@ public net.minecraft.client.renderer.RenderType$OutlineProperty
 public net.minecraft.client.renderer.RenderType$CompositeState
 public net.minecraft.tags.TagEntry f_215914_ # tag
 public net.minecraft.tags.TagEntry f_215913_ # id
-public net.minecraft.world.item.crafting.LegacyUpgradeRecipe f_265911_ # base
-public net.minecraft.world.item.crafting.LegacyUpgradeRecipe f_265910_ # addition
 public net.minecraft.world.item.crafting.SmithingTransformRecipe f_265949_ # template
 public net.minecraft.world.item.crafting.SmithingTransformRecipe f_265888_ # base
 public net.minecraft.world.item.crafting.SmithingTransformRecipe f_265907_ # addition
diff --git a/gradle.properties b/gradle.properties
index 4f19c62d9..59b318511 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx6G
 base_version=11.0
 unstable=false
-supported_version=1.19.4
-minecraft_version=1.19.4
-forgeEnabled=true
+supported_version=23w13a_or_b
+minecraft_version=23w13a_or_b
+forgeEnabled=false
 forge_version=45.0.6
-fabricloader_version=0.14.17
-cloth_config_version=10.0.96
-modmenu_version=5.0.1
-fabric_api=0.76.0+1.19.4
-architectury_version=8.1.73
+fabricloader_version=0.14.19
+cloth_config_version=11.0.97
+modmenu_version=6.1.0-rc.4
+fabric_api=0.76.3+23w13a_or_b
+architectury_version=9.0.2
 api_exculde=
 #api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric
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();
diff --git a/settings.gradle b/settings.gradle
index 937a949bf..857bbede0 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,4 +13,4 @@ include "api"
 include "default-plugin"
 include "runtime"
 include "fabric"
-include "forge"
+//include "forge"