1.21.6

Author: matthewperiut

build.gradle

@@ -63,11 +63,11 @@ subprojects {
         }
 
         if (project.name == "neoforge") {
-            modImplementation("maven.modrinth:cryonicconfig:neoforge-1.21.4-1.0.0")
+            modImplementation("maven.modrinth:cryonicconfig:neoforge-1.21.6-1.0.0")
         } else if (project.name == "fabric") {
-            modImplementation("maven.modrinth:cryonicconfig:fabric-1.21.4-1.0.0")
+            modImplementation("maven.modrinth:cryonicconfig:fabric-1.21.6-1.0.0")
         } else {
-            modImplementation("maven.modrinth:cryonicconfig:fabric-1.21.4-1.0.0")
+            modImplementation("maven.modrinth:cryonicconfig:fabric-1.21.6-1.0.0")
         }
     }
 

common/src/main/java/com/periut/chisel/gui/ChiselScreen.java

@@ -129,33 +129,17 @@ protected void drawSlot(DrawContext context, Slot slot) {
 
             // Handle big slots differently
             if (isBigSlot && !itemStack.isEmpty()) {
-                // Save state for big item rendering
-                context.getMatrices().push();
-
-                // Center at slot position
-                float centerX = i + 8;
-                float centerY = j + 8;
-
-                // Move to center, scale up, then move back
-                context.getMatrices().translate(centerX, centerY, 0);
-                context.getMatrices().scale(2.0f, 2.0f, 1.0f);  // 2x size
-                context.getMatrices().translate(-8, -8, 0);
-
-                // Draw the item at 2x size
+                // Draw the item at 2x size (without matrix transformations)
                 if (slot.disablesDynamicDisplay()) {
-                    context.drawItemWithoutEntity(itemStack, 0, 0, k);
+                    context.drawItemWithoutEntity(itemStack, i, j, k);
                 } else {
-                    context.drawItem(itemStack, 0, 0, k);
+                    context.drawItem(itemStack, i, j, k);
                 }
 
                 // Hide stack overlay for slots 1-60 (only draw for slots outside this range)
                 if (slot.id < 1 || slot.id > 60) {
-                    // Adjust stack overlay position for larger items
-                    context.drawStackOverlay(this.textRenderer, itemStack, 0, 0, string);
+                    context.drawStackOverlay(this.textRenderer, itemStack, i, j, string);
                 }
-
-                // Restore state
-                context.getMatrices().pop();
             } else {
                 // Normal item rendering (unchanged)
                 if (slot.disablesDynamicDisplay()) {

fabric/src/main/java/com/periut/chisel/fabric/ClientRegister.java

@@ -1,8 +1,9 @@
 package com.periut.chisel.fabric;
 
 import com.periut.chisel.Chisel;
-import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
 import net.minecraft.block.Block;
+import net.minecraft.client.render.BlockRenderLayer;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
@@ -13,11 +14,11 @@ public static void Register()
     {
         for (String name : Chisel.translucentBlocks) {
             Block block = Registries.BLOCK.get(Identifier.of(Chisel.MOD_ID, name));
-            BlockRenderLayerMap.INSTANCE.putBlock(block, RenderLayer.getTranslucent());
+            BlockRenderLayerMap.putBlock(block, BlockRenderLayer.TRANSLUCENT);
         }
         for (String name : Chisel.transparentBlocks) {
             Block block = Registries.BLOCK.get(Identifier.of(Chisel.MOD_ID, name));
-            BlockRenderLayerMap.INSTANCE.putBlock(block, RenderLayer.getCutout());
+            BlockRenderLayerMap.putBlock(block, BlockRenderLayer.CUTOUT);
         }
     }
 }

fabric/src/main/resources/fabric.mod.json

@@ -41,7 +41,7 @@
     "fabricloader": ">=0.14.19",
     "architectury": "*",
     "fabric": "*",
-    "minecraft": [ "1.21.5" ],
+    "minecraft": [ "1.21.6" ],
     "java": ">=21",
     "cryonicconfig": "*"
   }

gradle.properties

@@ -13,7 +13,7 @@ architectury_version=17.0.6
 minecraft_version=1.21.6
 yarn_mappings=1.21.6+build.1
 fabric_loader_version=0.16.14
-fabric_api_version=0.127.1+1.21.6
+fabric_api_version=0.128.2+1.21.6
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 #---
 

neoforge/src/main/java/com/periut/chisel/neoforge/ChiselClientNeoForge.java

@@ -0,0 +1,38 @@
+package com.periut.chisel.neoforge;
+
+import com.periut.chisel.Chisel;
+import net.minecraft.block.Block;
+import net.minecraft.client.render.BlockRenderLayer;
+import net.minecraft.client.render.RenderLayers;
+import net.minecraft.registry.Registries;
+import net.minecraft.util.Identifier;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
+import net.neoforged.neoforge.client.gui.ConfigurationScreen;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
+
+// This class will not load on dedicated servers. Accessing client side code from here is safe.
+@Mod(value = Chisel.MOD_ID, dist = Dist.CLIENT)
+// You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
+@EventBusSubscriber(modid = Chisel.MOD_ID, value = Dist.CLIENT)
+public class ChiselClientNeoForge {
+    public ChiselClientNeoForge(ModContainer container) {
+
+    }
+
+    @SubscribeEvent
+    static void onClientSetup(FMLClientSetupEvent event) {
+        for (String name : Chisel.translucentBlocks) {
+            Block block = Registries.BLOCK.get(Identifier.of(Chisel.MOD_ID, name));
+            RenderLayers.setRenderLayer(block, BlockRenderLayer.TRANSLUCENT);
+        }
+        for (String name : Chisel.transparentBlocks) {
+            Block block = Registries.BLOCK.get(Identifier.of(Chisel.MOD_ID, name));
+            RenderLayers.setRenderLayer(block, BlockRenderLayer.CUTOUT);
+        }
+    }
+}

neoforge/src/main/java/com/periut/chisel/neoforge/ChiselNeoforge.java

@@ -3,6 +3,7 @@
 import com.periut.chisel.Chisel;
 import com.periut.chisel.gui.ChiselScreen;
 import net.minecraft.block.Block;
+import net.minecraft.client.render.BlockRenderLayer;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.RenderLayers;
 import net.minecraft.registry.Registries;
@@ -38,21 +39,4 @@ private void commonSetup(final FMLCommonSetupEvent event)
     private void registerScreens(RegisterMenuScreensEvent event) {
         event.register(CHISEL_SCREEN_HANDLER.get(), ChiselScreen::new);
     }
-
-    @EventBusSubscriber(modid = Chisel.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
-    public static class ClientModEvents
-    {
-        @SubscribeEvent
-        public static void onClientSetup(FMLClientSetupEvent event)
-        {
-            for (String name : Chisel.translucentBlocks) {
-                Block block = Registries.BLOCK.get(Identifier.of(Chisel.MOD_ID, name));
-                RenderLayers.setRenderLayer(block, RenderLayer.getTranslucent());
-            }
-            for (String name : Chisel.transparentBlocks) {
-                Block block = Registries.BLOCK.get(Identifier.of(Chisel.MOD_ID, name));
-                RenderLayers.setRenderLayer(block, RenderLayer.getCutout());
-            }
-        }
-    }
 }

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -19,7 +19,7 @@ config = "chisel.mixins.json"
 [[dependencies.chisel]]
 modId="minecraft"
 type="required"
-versionRange="[1.21.5]"
+versionRange="[1.21.6]"
 
 [[dependencies.chisel]]
 modId="neoforge"