Use NeoForge face data instead of custom unlit quad hooks (#8322)

This fixes compatibility issues with mods that need to implement model loading themselves (e.g. ModernFix when dynamic resources is enabled). For reference, models were updated using: `find src/main/resources/assets/ae2/models -name \*.json | xargs sed -i 's/"unlit": true/"neoforge_data": {"block_light": 15, "sky_light": 15}/g'`
AppliedEnergistics · Jan 14, 2025 · 6d1dbc6 · 6d1dbc6
1 parent 681c528
commit 6d1dbc6
Show file tree

Hide file tree

Showing 38 changed files with 175 additions and 338 deletions.
diff --git a/src/main/java/appeng/hooks/UnlitQuadHooks.java b/src/main/java/appeng/hooks/UnlitQuadHooks.java
diff --git a/src/main/java/appeng/mixins/unlitquad/BlockPartFaceDeserializerMixin.java b/src/main/java/appeng/mixins/unlitquad/BlockPartFaceDeserializerMixin.java
diff --git a/src/main/java/appeng/mixins/unlitquad/ModelManagerMixin.java b/src/main/java/appeng/mixins/unlitquad/ModelManagerMixin.java
diff --git a/src/main/resources/ae2.mixins.json b/src/main/resources/ae2.mixins.json
@@ -15,8 +15,6 @@
     "StructureTemplateMixin"
   ],
   "client": [
-    "unlitquad.ModelManagerMixin",
-    "unlitquad.BlockPartFaceDeserializerMixin",
     "AbstractContainerScreenMixin",
     "GuiGraphicsMixin",
     "WrappedGenericStackTooltipModIdMixin",

diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_block_lights.json b/src/main/resources/assets/ae2/models/block/controller/controller_block_lights.json
@@ -10,32 +10,32 @@
         "down": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "north": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       },
       "from": [0, 0, 0],

diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_conflicted.json
@@ -12,32 +12,32 @@
         "down": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "north": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       },
       "from": [0, 0, 0],

diff --git a/src/main/resources/assets/ae2/models/block/controller/controller_column_online.json b/src/main/resources/assets/ae2/models/block/controller/controller_column_online.json
@@ -12,32 +12,32 @@
         "down": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "north": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       },
       "from": [0, 0, 0],

diff --git a/src/main/resources/assets/ae2/models/block/molecular_assembler_lights.json b/src/main/resources/assets/ae2/models/block/molecular_assembler_lights.json
@@ -13,37 +13,37 @@
           "texture": "#all",
           "uv": [2.6, 2.6, 13.4, 13.4],
           "cullface": "down",
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#all",
           "uv": [2.6, 2.6, 13.4, 13.4],
           "cullface": "up",
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "north": {
           "texture": "#all",
           "uv": [2.6, 2.6, 13.4, 13.4],
           "cullface": "north",
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "texture": "#all",
           "uv": [2.6, 2.6, 13.4, 13.4],
           "cullface": "south",
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#all",
           "uv": [2.6, 2.6, 13.4, 13.4],
           "cullface": "west",
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#all",
           "uv": [2.6, 2.6, 13.4, 13.4],
           "cullface": "east",
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }