Update to simplified gui texture and equipment dsl

xenondevs · Nov 23, 2024 · 3d6f918 · 3d6f918
1 parent b92c550
commit 3d6f918
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/registry/Equipment.kt b/machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/registry/Equipment.kt
@@ -9,18 +9,16 @@ import xyz.xenondevs.nova.initialize.InitStage
 object Equipment : EquipmentRegistry by Machines.registry {
 
     val STAR = equipment("star") {
-        texture {
-            humanoid {
-                layer {
-                    texture("star")
-                    emissivityMap("star_emissivity_map")
-                }
+        humanoid {
+            layer {
+                texture("star")
+                emissivityMap("star_emissivity_map")
             }
-            humanoidLeggings {
-                layer {
-                    texture("star")
-                    emissivityMap("star_emissivity_map")
-                }
+        }
+        humanoidLeggings {
+            layer {
+                texture("star")
+                emissivityMap("star_emissivity_map")
             }
         }
     }

diff --git a/machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/registry/GuiTextures.kt b/machines/src/main/kotlin/xyz/xenondevs/nova/addon/machines/registry/GuiTextures.kt
@@ -8,16 +8,16 @@ import xyz.xenondevs.nova.initialize.InitStage
 @Init(stage = InitStage.PRE_PACK)
 object GuiTextures : GuiTextureRegistry by Machines.registry {
 
-    val CONFIGURE_POTION = guiTexture("configure_potion") { texture { path("gui/configure_potion") } }
-    val ELECTRIC_BREWING_STAND = guiTexture("electric_brewing_stand") { texture { path("gui/electric_brewing_stand") } }
-    val AUTO_CRAFTER_RECIPE = guiTexture("auto_crafter") { texture { path("gui/auto_crafter/recipe") } }
-    val AUTO_CRAFTER_INVENTORY = guiTexture("auto_crafter_internal_inventory") { texture { path("gui/auto_crafter/inventory") } }
-    val RECIPE_PULVERIZER = guiTexture("recipe_pulverizer") { texture { path("gui/recipe/pulverizer") } }
-    val RECIPE_PRESS = guiTexture("recipe_press") { texture { path("gui/recipe/press") } }
-    val RECIPE_FLUID_INFUSER = guiTexture("recipe_fluid_infuser") { texture { path("gui/recipe/fluid_infuser") } }
-    val RECIPE_FREEZER = guiTexture("recipe_freezer") { texture { path("gui/recipe/freezer") } }
-    val RECIPE_STAR_COLLECTOR = guiTexture("recipe_star_collector") { texture { path("gui/recipe/star_collector") } }
-    val RECIPE_COBBLESTONE_GENERATOR = guiTexture("recipe_cobblestone_generator") { texture { path("gui/recipe/cobblestone_generator") } }
-    val RECIPE_ELECTRIC_BREWING_STAND = guiTexture("recipe_electric_brewing_stand") { texture { path("gui/recipe/electric_brewing_stand") } }
+    val CONFIGURE_POTION = guiTexture("configure_potion") { path("gui/configure_potion") }
+    val ELECTRIC_BREWING_STAND = guiTexture("electric_brewing_stand") { path("gui/electric_brewing_stand") }
+    val AUTO_CRAFTER_RECIPE = guiTexture("auto_crafter") { path("gui/auto_crafter/recipe") }
+    val AUTO_CRAFTER_INVENTORY = guiTexture("auto_crafter_internal_inventory") { path("gui/auto_crafter/inventory") }
+    val RECIPE_PULVERIZER = guiTexture("recipe_pulverizer") { path("gui/recipe/pulverizer") }
+    val RECIPE_PRESS = guiTexture("recipe_press") { path("gui/recipe/press") }
+    val RECIPE_FLUID_INFUSER = guiTexture("recipe_fluid_infuser") { path("gui/recipe/fluid_infuser") }
+    val RECIPE_FREEZER = guiTexture("recipe_freezer") { path("gui/recipe/freezer") }
+    val RECIPE_STAR_COLLECTOR = guiTexture("recipe_star_collector") { path("gui/recipe/star_collector") }
+    val RECIPE_COBBLESTONE_GENERATOR = guiTexture("recipe_cobblestone_generator") { path("gui/recipe/cobblestone_generator") }
+    val RECIPE_ELECTRIC_BREWING_STAND = guiTexture("recipe_electric_brewing_stand") { path("gui/recipe/electric_brewing_stand") }
 
 }