Backport #8322 to Forge 1.20.1: Use Forge face data instead of custom…

… unlit quad hooks (#8325)
AppliedEnergistics · Jan 14, 2025 · a114af5 · a114af5
1 parent b98ea1f
commit a114af5
Show file tree

Hide file tree

Showing 42 changed files with 616 additions and 892 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/BlockModelMixin.java b/src/main/java/appeng/mixins/unlitquad/BlockModelMixin.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
@@ -17,9 +17,6 @@
     "UnbreakingMixin"
   ],
   "client": [
-    "unlitquad.ModelManagerMixin",
-    "unlitquad.BlockModelMixin",
-    "unlitquad.BlockPartFaceDeserializerMixin",
     "AbstractContainerScreenMixin",
     "GuiGraphicsMixin",
     "WrappedGenericStackTooltipModIdMixin",

diff --git a/src/main/resources/assets/ae2/models/block/chest/lights_on.json b/src/main/resources/assets/ae2/models/block/chest/lights_on.json
@@ -12,7 +12,7 @@
         "up": {
           "texture": "#lights_bright",
           "tintindex": 3,
-          "unlit": true
+          "forge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -23,7 +23,7 @@
         "up": {
           "texture": "#lights_medium",
           "tintindex": 2,
-          "unlit": true
+          "forge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -34,7 +34,7 @@
         "up": {
           "texture": "#lights_dark",
           "tintindex": 1,
-          "unlit": true
+          "forge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }

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
@@ -9,32 +9,32 @@
         "down": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "forge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "forge_data": { "block_light": 15, "sky_light": 15 }
         },
         "north": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "forge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "forge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "forge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#lights",
           "uv": [0, 0, 16, 16],
-          "unlit": true
+          "forge_data": { "block_light": 15, "sky_light": 15 }
         }
       },
       "from": [0, 0, 0],