Port/1.21 (#92)

Port/1.21

Author: Nightenom

gradle.properties

@@ -6,21 +6,21 @@ modGroup=com.ldtteam
 modVersion=0.0.1-LOCAL
 modBaseName=blockui
 
-javaVersion=17
+javaVersion=21
 useJavaToolChains=true
 #The currently running forge.
-forgeVersion=20.4.223
+forgeVersion=21.0.75-beta
 #The minimal needed forge, as marked in metadata and curseforge.
-forgeMinVersion=20.4.127-beta
+forgeMinVersion=21.0.75-beta
 
-fml_range=[1,)
-forge_range=[20.4.127-beta,)
-minecraft_range=[1.20.4, 1.21)
+fml_range=[4,)
+forge_range=[21.0.75-beta,)
+minecraft_range=[1.21, 1.22)
 
 #The version for forge (dependency)
-exactMinecraftVersion=1.20.4
+exactMinecraftVersion=1.21
 #The main version on curseforge
-minecraftVersion=1.20.4
+minecraftVersion=1.21
 #Semicolon seperated list of mc versions, which are marked as compatible on curseforge
 additionalMinecraftVersions=
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

gradlew.bat

@@ -107,8 +107,8 @@ private class CustomGuiSpriteManager extends TextureAtlasHolder
         private CustomGuiSpriteManager(final TextureManager textureManager, final String modId)
         {
             super(textureManager,
-                new ResourceLocation(modId, "textures/atlas/" + modId + "_gui.png"),
-                new ResourceLocation(modId, modId + "_gui"),
+                ResourceLocation.fromNamespaceAndPath(modId, "textures/atlas/" + modId + "_gui.png"),
+                ResourceLocation.fromNamespaceAndPath(modId, modId + "_gui"),
                 GuiSpriteManager.METADATA_SECTIONS);
         }
 

src/main/java/com/ldtteam/blockui/AtlasManager.java

@@ -3,7 +3,6 @@
 import com.ldtteam.blockui.mod.item.BlockStateRenderingData;
 import com.ldtteam.blockui.util.SingleBlockGetter.SingleBlockNeighborhood;
 import com.ldtteam.blockui.util.cursor.Cursor;
-import com.mojang.blaze3d.platform.Lighting;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
@@ -25,7 +24,7 @@
 import net.neoforged.neoforge.client.ClientHooks;
 import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions;
 import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix4f;
+import org.joml.Matrix3f;
 
 public class BOGuiGraphics extends GuiGraphics
 {
@@ -113,43 +112,33 @@ public void renderBlockStateAsItem(final BlockStateRenderingData data, final Ite
         // prepare pose just like itemStack rendering would do
 
         pose().pushPose();
+        pose().last().normal().identity(); // reset normals cuz lighting
         pose().translate(8, 8, 150);
-        pose().mulPoseMatrix(new Matrix4f().scaling(1.0F, -1.0F, 1.0F));
-        pose().scale(16.0F, 16.0F, 16.0F);
+        pose().scale(16.0F, -16.0F, 16.0F);
         ClientHooks.handleCameraTransforms(pose(), itemModel, ItemDisplayContext.GUI, false);
 
         if (data.modelNeedsRotationFix())
         {
+            final Matrix3f oldNormal = pose().last().normal();
             pose().pushPose();
             pose().rotateAround(Axis.YP.rotationDegrees(45), 0.0f, 0.5f, 0.0f);
+            pose().last().normal().set(oldNormal.rotate(Axis.YP.rotationDegrees(-45)));
         }
 
         pose().translate(-0.5F, -0.5F, -0.5F);
 
-        pushMvApplyPose();
-
-        if (data.modelNeedsRotationFix())
-        {
-            Lighting.setupLevel(new Matrix4f().rotationAround(Axis.ZP.rotationDegrees(-180), 0.5f, 0.0f, 0.5f));
-        }
-        else
-        {
-            Lighting.setupLevel(new Matrix4f().rotationAround(Axis.YP.rotationDegrees(-45), 0.0f, 0.5f, 0.0f));
-        }
-
         // render block and BE
 
-        final PoseStack poseStack = new PoseStack();
-        final int light = LightTexture.pack(10, 10);
+        final int light = LightTexture.pack(15, 15);
         minecraft.getBlockRenderer()
-            .renderSingleBlock(data.blockState(), poseStack, bufferSource(), light, OverlayTexture.NO_OVERLAY, data.modelData(), null);
+            .renderSingleBlock(data.blockState(), pose(), bufferSource(), light, OverlayTexture.NO_OVERLAY, data.modelData(), null);
         if (data.blockEntity() != null)
         {
             try
             {
                 minecraft.getBlockEntityRenderDispatcher()
                     .getRenderer(data.blockEntity())
-                    .render(data.blockEntity(), 0, poseStack, bufferSource(), light, OverlayTexture.NO_OVERLAY);
+                    .render(data.blockEntity(), 0, pose(), bufferSource(), light, OverlayTexture.NO_OVERLAY);
             }
             catch (final Exception e)
             {
@@ -162,9 +151,6 @@ public void renderBlockStateAsItem(final BlockStateRenderingData data, final Ite
         {
             pose().popPose();
             pose().translate(-0.5F, -0.5F, -0.5F);
-
-            RenderSystem.getModelViewStack().popPose();
-            pushMvApplyPose();
         }
 
         // render fluid
@@ -173,26 +159,29 @@ public void renderBlockStateAsItem(final BlockStateRenderingData data, final Ite
         if (!fluidState.isEmpty())
         {
             final RenderType renderType = ItemBlockRenderTypes.getRenderLayer(fluidState);
+            pushMvApplyPose();
 
             NEIGHBORHOOD.blockState = data.blockState();
             minecraft.getBlockRenderer()
                 .renderLiquid(BlockPos.ZERO, NEIGHBORHOOD, bufferSource().getBuffer(renderType), data.blockState(), fluidState);
 
             bufferSource().endBatch(renderType);
+            popMvPose();
         }
 
-        Lighting.setupFor3DItems();
-
-        RenderSystem.getModelViewStack().popPose();
-        RenderSystem.applyModelViewMatrix();
-
         pose().popPose();
     }
 
     public void pushMvApplyPose()
     {
-        RenderSystem.getModelViewStack().pushPose();
-        RenderSystem.getModelViewStack().mulPoseMatrix(pose().last().pose());
+        RenderSystem.getModelViewStack().pushMatrix();
+        RenderSystem.getModelViewStack().mul(pose().last().pose());
+        RenderSystem.applyModelViewMatrix();
+    }
+
+    public void popMvPose()
+    {
+        RenderSystem.getModelViewStack().popMatrix();
         RenderSystem.applyModelViewMatrix();
     }
 }

src/main/java/com/ldtteam/blockui/BOGuiGraphics.java

@@ -6,6 +6,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexSorting;
 import org.joml.Matrix4f;
+import org.joml.Matrix4fStack;
 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.ReportedException;
@@ -80,14 +81,14 @@ public void render(final GuiGraphics ms, final int mx, final int my, final float
         y = Math.floor((guiHeight - height * renderScale) / 2.0d);
 
         // replace vanilla projection
-        final PoseStack shaderPs = RenderSystem.getModelViewStack();
+        final Matrix4fStack shaderPs = RenderSystem.getModelViewStack();
         final Matrix4f oldProjection = RenderSystem.getProjectionMatrix();
         RenderSystem.setProjectionMatrix(
             new Matrix4f().setOrtho(0.0F, framebufferWidth, framebufferHeight, 0.0F, 1000.0F, ClientHooks.getGuiFarPlane()),
             VertexSorting.ORTHOGRAPHIC_Z);
-        shaderPs.pushPose();
-        shaderPs.setIdentity();
-        shaderPs.translate(0.0D, 0.0D, 10000F - net.neoforged.neoforge.client.ClientHooks.getGuiFarPlane());
+        shaderPs.pushMatrix();
+        shaderPs.identity();
+        shaderPs.translate(0.0f, 0.0f, 10000f - net.neoforged.neoforge.client.ClientHooks.getGuiFarPlane());
         RenderSystem.applyModelViewMatrix();
 
         final PoseStack newMs = new PoseStack();
@@ -134,7 +135,7 @@ public void render(final GuiGraphics ms, final int mx, final int my, final float
         finally
         {
             // restore vanilla state
-            shaderPs.popPose();
+            shaderPs.popMatrix();
             RenderSystem.setProjectionMatrix(oldProjection, VertexSorting.ORTHOGRAPHIC_Z);
             RenderSystem.applyModelViewMatrix();
 

src/main/java/com/ldtteam/blockui/BOScreen.java

@@ -27,7 +27,7 @@ public final class Loader extends SimplePreparableReloadListener<Map<ResourceLoc
 {
     public static final Loader INSTANCE = new Loader();
 
-    private final Map<ResourceLocation, Function<PaneParams, ? extends Pane>> paneFactories = new HashMap<>();
+    private final Map<String, Function<PaneParams, ? extends Pane>> paneFactories = new HashMap<>();
 
     private Map<ResourceLocation, PaneParams> xmlCache = new HashMap<>();
 
@@ -42,7 +42,6 @@ private Loader()
         register("toggle", ToggleButton::new);
         register("input", TextFieldVanilla::new);
         register("image", Image::new);
-        register("imagerepeat", ImageRepeatable::new);
         register("box", Box::new);
         register("itemicon", Loader::itemIcon);
         register("entityicon", EntityIcon::new);
@@ -80,14 +79,12 @@ private static ItemIcon itemIcon(final PaneParams paneParams)
      */
     public void register(final String name, final Function<PaneParams, ? extends Pane> factoryMethod)
     {
-        final ResourceLocation key = new ResourceLocation(name);
-
-        if (paneFactories.containsKey(key))
+        if (paneFactories.containsKey(name))
         {
             throw new IllegalArgumentException("Duplicate pane type '" + name + "' when registering Pane class method.");
         }
 
-        paneFactories.put(key, factoryMethod);
+        paneFactories.put(name, factoryMethod);
     }
 
     /**
@@ -98,20 +95,13 @@ public void register(final String name, final Function<PaneParams, ? extends Pan
      */
     private Pane createFromPaneParams(final PaneParams params)
     {
-        final ResourceLocation paneType = new ResourceLocation(params.getType());
-
-        if (paneFactories.containsKey(paneType))
-        {
-            return paneFactories.get(paneType).apply(params);
-        }
-
-        if (paneFactories.containsKey(new ResourceLocation(paneType.getPath())))
+        final String name = params.getType();
+        if (paneFactories.containsKey(name))
         {
-            Log.getLogger().warn("Namespace override for " + paneType.getPath() + " not found. Using default.");
-            return paneFactories.get(new ResourceLocation(paneType.getPath())).apply(params);
+            return paneFactories.get(name).apply(params);
         }
 
-        Log.getLogger().error("There is no factory method for " + paneType.getPath());
+        Log.getLogger().error("There is no factory method for " + name);
         return null;
     }
 

src/main/java/com/ldtteam/blockui/Loader.java

@@ -204,19 +204,6 @@ public ResourceLocation getResource(final String name)
         return getResource(name, (ResourceLocation) null);
     }
 
-    /**
-     * Get the resource location from the name
-     * @param name the attribute name
-     * @param def the default value to fallback to
-     * @return the parsed resource location
-     * @deprecated use {@link PaneParams#getResource(String, ResourceLocation)} instead.
-     */
-    @Deprecated(forRemoval = true, since = "1.20.1")
-    public ResourceLocation getResource(final String name, final String def)
-    {
-        return getResource(name, new ResourceLocation(def));
-    }
-
     /**
      * Get the resource location from the name
      * @param name the attribute name

src/main/java/com/ldtteam/blockui/PaneParams.java

@@ -32,7 +32,7 @@ private Parsers()
     public static Function<String, Double> DOUBLE = Double::parseDouble;
 
     /** Parses a resource location, include shorthand tricks */
-    public static Function<String, ResourceLocation> RESOURCE = ResourceLocation::new;
+    public static Function<String, ResourceLocation> RESOURCE = ResourceLocation::tryParse;
 
     /** Parses a potentially translatable portion of text as a component */
     private static Function<String, String> RAW_TEXT = v -> {