From 4627064699a0211f23f659ff6a814e717ef6f53c Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:29:07 -0400
Subject: [PATCH] feat: Add screen type matching to Custom Screen Layouts
 (#177)

---
 .../features/texturepack/CustomScreenLayouts.kt          | 9 +++++++--
 web/src/pages/docs/_texture-pack-format.md               | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomScreenLayouts.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomScreenLayouts.kt
index a68fb2a..4785e90 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomScreenLayouts.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomScreenLayouts.kt
@@ -8,6 +8,7 @@ import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.client.gui.screen.ingame.HandledScreen
 import net.minecraft.client.render.RenderLayer
+import net.minecraft.registry.Registries
 import net.minecraft.resource.ResourceManager
 import net.minecraft.resource.SinglePreparationResourceReloader
 import net.minecraft.screen.slot.Slot
@@ -49,11 +50,16 @@ object CustomScreenLayouts : SinglePreparationResourceReloader<List<CustomScreen
 	@Serializable
 	data class Preds(
 		val label: StringMatcher,
+		@Serializable(with = IdentifierSerializer::class)
+		val screenType: Identifier? = null,
 	) {
 		fun matches(screen: Screen): Boolean {
 			// TODO: does this deserve the restriction to handled screen
 			val s = screen as? HandledScreen<*>? ?: return false
-			return label.matches(s.title)
+			val typeMatches = screenType == null || s.screenHandler.type.equals(Registries.SCREEN_HANDLER
+				.get(screenType));
+
+			return label.matches(s.title) && typeMatches
 		}
 	}
 
@@ -215,5 +221,4 @@ object CustomScreenLayouts : SinglePreparationResourceReloader<List<CustomScreen
 			}
 		}
 	}
-
 }
diff --git a/web/src/pages/docs/_texture-pack-format.md b/web/src/pages/docs/_texture-pack-format.md
index 8d0e2ca..2f84777 100644
--- a/web/src/pages/docs/_texture-pack-format.md
+++ b/web/src/pages/docs/_texture-pack-format.md
@@ -577,7 +577,7 @@ not screens from other mods. You can also target specific texts via a [string ma
 
 ## Screen Layout Replacement
 
-You can change the layout of an entire screen by using screen layout overrides. These get placed in `firmskyblock:overrides/screen_layout/*.json`, with one file per screen. You can match on the title of a screen, replace the background texture (including extending the background canvas further than vanilla allows you) and move slots around.
+You can change the layout of an entire screen by using screen layout overrides. These get placed in `firmskyblock:overrides/screen_layout/*.json`, with one file per screen. You can match on the title of a screen, the type of screen, replace the background texture (including extending the background canvas further than vanilla allows you) and move slots around.
 
 ### Selecting a screen
 
@@ -586,13 +586,16 @@ You can change the layout of an entire screen by using screen layout overrides.
 	"predicates": {
 		"label": {
 			"regex": "Hyper Furnace"
-		}
+		},
+		"screenType": "minecraft:furnace"
 	}
 }
 ```
 
 The `label` property is a regular [string matcher](#string-matcher) and matches against the screens title (typically the chest title, or "Crafting" for the players inventory).
 
+The `screenType` property is an optional namespaced identifier that allows matching to a [screen type](https://minecraft.wiki/w/Java_Edition_protocol/Inventory#Types).
+
 ### Changing the background
 
 ```json