1.3.1 patch

johnpgr · Nov 5, 2024 · a1a357f · a1a357f
1 parent ff2980d
commit a1a357f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/changelogs/1.3.1-1.20.5.md b/changelogs/1.3.1-1.20.5.md
@@ -0,0 +1,3 @@
+### Patch [1.3.1]
+
+- Fixed a crash when opening the CraftingTableII screen
diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ yarn_mappings=1.20.5+build.1
 loader_version=0.15.6
 
 # Mod Properties
-mod_version=1.3-1.20.5
+mod_version=1.3.1-1.20.5
 maven_group=net.johnpgr.craftingtableiifabric
 archives_base_name=craftingtable-ii-refabricated
 

diff --git a/src/main/kotlin/net/johnpgr/craftingtableiifabric/inventory/CraftingTableIISlot.kt b/src/main/kotlin/net/johnpgr/craftingtableiifabric/inventory/CraftingTableIISlot.kt
@@ -17,6 +17,6 @@ class CraftingTableIISlot(
     }
 
     val recipe
-        get(): RecipeEntry<*> =
-            (inventory as CraftingTableIIInventory).recipes[index]
+        get(): RecipeEntry<*>? =
+            (inventory as CraftingTableIIInventory).recipes.getOrNull(index)
 }
diff --git a/src/main/kotlin/net/johnpgr/craftingtableiifabric/screen/CraftingTableIIScreen.kt b/src/main/kotlin/net/johnpgr/craftingtableiifabric/screen/CraftingTableIIScreen.kt
@@ -202,7 +202,7 @@ class CraftingTableIIScreen(
                 //draw description overlay
                 ctx.drawTexture(descriptionTexture, x - 124, y, 0, 0, 121, 162)
 
-                val recipe = slot.recipe
+                val recipe = slot.recipe ?: continue
                 val ingredientStacks = arrayListOf<ItemStack>()
 
                 //TODO: Find a way to draw all matching stacks. Maybe a timer that loops through the list of matching stacks

diff --git a/src/main/kotlin/net/johnpgr/craftingtableiifabric/screen/CraftingTableIIScreenHandler.kt b/src/main/kotlin/net/johnpgr/craftingtableiifabric/screen/CraftingTableIIScreenHandler.kt
@@ -148,7 +148,7 @@ class CraftingTableIIScreenHandler(
 
         val quickCraft = actionType == SlotActionType.QUICK_MOVE
         val itemStack = slot.stack
-        val recipe = slot.recipe
+        val recipe = slot.recipe ?: return
 
         ClientPlayNetworking.send(CraftingTableIIPacket(recipe.id, syncId, quickCraft))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Patch [1.3.1]

		- Fixed a crash when opening the CraftingTableII screen