diff --git a/src/main/java/appeng/hooks/UnlitQuadHooks.java b/src/main/java/appeng/hooks/UnlitQuadHooks.java
deleted file mode 100644
index 3235e4ee14a..00000000000
--- a/src/main/java/appeng/hooks/UnlitQuadHooks.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2021, TeamAppliedEnergistics, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.hooks;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
-import net.minecraft.client.renderer.block.model.BlockElementFace;
-import net.minecraft.client.resources.model.ModelBakery;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.GsonHelper;
-import net.neoforged.neoforge.client.model.ExtraFaceData;
-
-import appeng.core.AppEng;
-
-/**
- * Implementation details of allowing quads to be defined as "unlit" in JSON models by specifying an "unlit" boolean
- * property on the face.
- */
-public class UnlitQuadHooks {
-
-    /**
-     * Thread-Local flag to indicate that an enhanced Applied Energistics model is currently being deserialized.
-     */
-    private static final ThreadLocal<Boolean> ENABLE_UNLIT_EXTENSIONS = new ThreadLocal<>();
-
-    /**
-     * Notify the unlit model system that a specific model is about to be deserialized by {@link ModelBakery}.
-     */
-    public static void beginDeserializingModel(ResourceLocation location) {
-        String namespace = location.getNamespace();
-        if (namespace.equals(AppEng.MOD_ID)) {
-            ENABLE_UNLIT_EXTENSIONS.set(true);
-        }
-    }
-
-    /**
-     * Notify the unlit model system that deserialization of a model has ended.
-     */
-    public static void endDeserializingModel() {
-        ENABLE_UNLIT_EXTENSIONS.set(false);
-    }
-
-    public static boolean isUnlitExtensionEnabled() {
-        Boolean b = ENABLE_UNLIT_EXTENSIONS.get();
-        return b != null && b;
-    }
-
-    public static BlockElementFace enhanceModelElementFace(BlockElementFace modelElement, JsonElement jsonElement) {
-        JsonObject jsonObject = jsonElement.getAsJsonObject();
-        if (GsonHelper.getAsBoolean(jsonObject, "unlit", false)) {
-            return new BlockElementFace(modelElement.cullForDirection(), modelElement.tintIndex(),
-                    modelElement.texture(), modelElement.uv(),
-                    new ExtraFaceData(0xFFFFFFFF, 15, 15, true),
-                    new org.apache.commons.lang3.mutable.MutableObject<>());
-        }
-        return modelElement;
-    }
-
-}
diff --git a/src/main/java/appeng/mixins/unlitquad/BlockPartFaceDeserializerMixin.java b/src/main/java/appeng/mixins/unlitquad/BlockPartFaceDeserializerMixin.java
deleted file mode 100644
index c84c094be3b..00000000000
--- a/src/main/java/appeng/mixins/unlitquad/BlockPartFaceDeserializerMixin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2021, TeamAppliedEnergistics, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.mixins.unlitquad;
-
-import java.lang.reflect.Type;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonElement;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.client.renderer.block.model.BlockElementFace;
-import net.minecraft.client.renderer.block.model.BlockElementFace.Deserializer;
-
-import appeng.hooks.UnlitQuadHooks;
-
-/**
- * This mixin will call the hook to deserialize the unlit property, but only if we are currently deserializing an AE2
- * model.
- */
-@Mixin(Deserializer.class)
-public class BlockPartFaceDeserializerMixin {
-
-    @Inject(method = "deserialize", at = @At("RETURN"), cancellable = true, allow = 1, remap = false)
-    public void onDeserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext,
-            CallbackInfoReturnable<BlockElementFace> cri) {
-        if (!UnlitQuadHooks.isUnlitExtensionEnabled()) {
-            return; // Not in a model that activated the deserializer
-        }
-
-        BlockElementFace modelElement = cri.getReturnValue();
-        cri.setReturnValue(UnlitQuadHooks.enhanceModelElementFace(modelElement, jsonElement));
-    }
-
-}
diff --git a/src/main/java/appeng/mixins/unlitquad/ModelManagerMixin.java b/src/main/java/appeng/mixins/unlitquad/ModelManagerMixin.java
deleted file mode 100644
index 24f41c0b506..00000000000
--- a/src/main/java/appeng/mixins/unlitquad/ModelManagerMixin.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2021, TeamAppliedEnergistics, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.mixins.unlitquad;
-
-import java.util.Map;
-
-import com.mojang.datafixers.util.Pair;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.client.resources.model.ModelManager;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.Resource;
-
-import appeng.hooks.UnlitQuadHooks;
-
-/**
- * The only job of this mixin is to only enable the unlit extensions if the model is whitelisted for it, which is
- * decided in {@link UnlitQuadHooks}.
- */
-@Mixin(ModelManager.class)
-public class ModelManagerMixin {
-
-    @Inject(method = { "lambda$loadBlockModels$8", "m_246478_" }, at = @At("HEAD"), allow = 1)
-    private static void onBeginLoadModel(Map.Entry<ResourceLocation, Resource> entry,
-            CallbackInfoReturnable<Pair<?, ?>> cri) {
-        UnlitQuadHooks.beginDeserializingModel(entry.getKey());
-    }
-
-    @Inject(method = { "lambda$loadBlockModels$8", "m_246478_" }, at = @At("RETURN"))
-    private static void onEndLoadModel(Map.Entry<ResourceLocation, Resource> entry,
-            CallbackInfoReturnable<Pair<?, ?>> cri) {
-        UnlitQuadHooks.endDeserializingModel();
-    }
-
-}
diff --git a/src/main/resources/ae2.mixins.json b/src/main/resources/ae2.mixins.json
index 740db0916cd..e0ff763a0b0 100644
--- 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
index f700af39f6a..e0122821796 100644
--- 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
index 9126ebebaa3..1bdfab52859 100644
--- 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
index a3c66c7fd32..5ac9acebadb 100644
--- 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
index 3c142d44299..c851d03059d 100644
--- 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 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/block/mysterious_cube.json b/src/main/resources/assets/ae2/models/block/mysterious_cube.json
index 31573168b89..63b3ed9849e 100644
--- a/src/main/resources/assets/ae2/models/block/mysterious_cube.json
+++ b/src/main/resources/assets/ae2/models/block/mysterious_cube.json
@@ -25,12 +25,36 @@
       "from": [0, 0, 0],
       "to": [16, 16, 16],
       "faces": {
-        "north": { "uv": [0, 0, 16, 16], "texture": "#side", "unlit": true },
-        "east": { "uv": [0, 0, 16, 16], "texture": "#side", "unlit": true },
-        "south": { "uv": [0, 0, 16, 16], "texture": "#side", "unlit": true },
-        "west": { "uv": [0, 0, 16, 16], "texture": "#side", "unlit": true },
-        "up": { "uv": [16, 0, 0, 16], "texture": "#top", "unlit": true },
-        "down": { "uv": [16, 0, 0, 16], "texture": "#bottom", "unlit": true }
+        "north": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#side",
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
+        },
+        "east": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#side",
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
+        },
+        "south": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#side",
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
+        },
+        "west": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#side",
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
+        },
+        "up": {
+          "uv": [16, 0, 0, 16],
+          "texture": "#top",
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
+        },
+        "down": {
+          "uv": [16, 0, 0, 16],
+          "texture": "#bottom",
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
+        }
       }
     }
   ],
diff --git a/src/main/resources/assets/ae2/models/part/conversion_monitor_locked_on.json b/src/main/resources/assets/ae2/models/part/conversion_monitor_locked_on.json
index 304bb8eeee7..3a5876d561b 100644
--- a/src/main/resources/assets/ae2/models/part/conversion_monitor_locked_on.json
+++ b/src/main/resources/assets/ae2/models/part/conversion_monitor_locked_on.json
@@ -12,7 +12,7 @@
         "north": {
           "texture": "#lightsBright",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -23,7 +23,7 @@
         "north": {
           "texture": "#lightsMedium",
           "tintindex": 2,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -34,7 +34,7 @@
         "north": {
           "texture": "#lightsDark",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/conversion_monitor_on.json b/src/main/resources/assets/ae2/models/part/conversion_monitor_on.json
index a43086b34f7..56c7f4e33b4 100644
--- a/src/main/resources/assets/ae2/models/part/conversion_monitor_on.json
+++ b/src/main/resources/assets/ae2/models/part/conversion_monitor_on.json
@@ -11,7 +11,7 @@
         "north": {
           "texture": "#lightsBright",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -22,7 +22,7 @@
         "north": {
           "texture": "#lightsMedium",
           "tintindex": 2,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/crafting_terminal_on.json b/src/main/resources/assets/ae2/models/part/crafting_terminal_on.json
index 605d973bf34..d9eaf1c697a 100644
--- a/src/main/resources/assets/ae2/models/part/crafting_terminal_on.json
+++ b/src/main/resources/assets/ae2/models/part/crafting_terminal_on.json
@@ -12,7 +12,7 @@
         "north": {
           "texture": "#lightsBright",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -23,7 +23,7 @@
         "north": {
           "texture": "#lightsMedium",
           "tintindex": 2,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -34,7 +34,7 @@
         "north": {
           "texture": "#lightsDark",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/display_status_has_channel.json b/src/main/resources/assets/ae2/models/part/display_status_has_channel.json
index b7e286e8047..b46ac22abd4 100644
--- a/src/main/resources/assets/ae2/models/part/display_status_has_channel.json
+++ b/src/main/resources/assets/ae2/models/part/display_status_has_channel.json
@@ -12,13 +12,13 @@
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -30,13 +30,13 @@
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "down": {
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -48,13 +48,13 @@
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -66,13 +66,13 @@
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/display_status_on.json b/src/main/resources/assets/ae2/models/part/display_status_on.json
index 80b5a4dbf7a..9a04e7ed08e 100644
--- a/src/main/resources/assets/ae2/models/part/display_status_on.json
+++ b/src/main/resources/assets/ae2/models/part/display_status_on.json
@@ -12,13 +12,13 @@
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -30,13 +30,13 @@
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "down": {
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -48,13 +48,13 @@
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -66,13 +66,13 @@
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/export_bus_has_channel.json b/src/main/resources/assets/ae2/models/part/export_bus_has_channel.json
index aa1baee006f..1a37d2f107a 100644
--- a/src/main/resources/assets/ae2/models/part/export_bus_has_channel.json
+++ b/src/main/resources/assets/ae2/models/part/export_bus_has_channel.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/export_bus_on.json b/src/main/resources/assets/ae2/models/part/export_bus_on.json
index 29efc0b62e4..939c134ebd9 100644
--- a/src/main/resources/assets/ae2/models/part/export_bus_on.json
+++ b/src/main/resources/assets/ae2/models/part/export_bus_on.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/import_bus_has_channel.json b/src/main/resources/assets/ae2/models/part/import_bus_has_channel.json
index aa1baee006f..1a37d2f107a 100644
--- a/src/main/resources/assets/ae2/models/part/import_bus_has_channel.json
+++ b/src/main/resources/assets/ae2/models/part/import_bus_has_channel.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/import_bus_on.json b/src/main/resources/assets/ae2/models/part/import_bus_on.json
index 29efc0b62e4..939c134ebd9 100644
--- a/src/main/resources/assets/ae2/models/part/import_bus_on.json
+++ b/src/main/resources/assets/ae2/models/part/import_bus_on.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/interface_has_channel.json b/src/main/resources/assets/ae2/models/part/interface_has_channel.json
index 93f99fed5dd..cce402cefc6 100644
--- a/src/main/resources/assets/ae2/models/part/interface_has_channel.json
+++ b/src/main/resources/assets/ae2/models/part/interface_has_channel.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/interface_on.json b/src/main/resources/assets/ae2/models/part/interface_on.json
index 48227535b4c..c552df4ec78 100644
--- a/src/main/resources/assets/ae2/models/part/interface_on.json
+++ b/src/main/resources/assets/ae2/models/part/interface_on.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/level_emitter_status_has_channel.json b/src/main/resources/assets/ae2/models/part/level_emitter_status_has_channel.json
index 86d3f5e9dd7..897306a415e 100644
--- a/src/main/resources/assets/ae2/models/part/level_emitter_status_has_channel.json
+++ b/src/main/resources/assets/ae2/models/part/level_emitter_status_has_channel.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/level_emitter_status_on.json b/src/main/resources/assets/ae2/models/part/level_emitter_status_on.json
index 40625b5ffe4..8a8ad424d99 100644
--- a/src/main/resources/assets/ae2/models/part/level_emitter_status_on.json
+++ b/src/main/resources/assets/ae2/models/part/level_emitter_status_on.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/monitor_bright_on.json b/src/main/resources/assets/ae2/models/part/monitor_bright_on.json
index 52d8697cde2..aea70c5e295 100644
--- a/src/main/resources/assets/ae2/models/part/monitor_bright_on.json
+++ b/src/main/resources/assets/ae2/models/part/monitor_bright_on.json
@@ -12,7 +12,7 @@
         "north": {
           "texture": "#lights",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/monitor_dark_on.json b/src/main/resources/assets/ae2/models/part/monitor_dark_on.json
index 122d96ddd27..10c4c3e3cf5 100644
--- a/src/main/resources/assets/ae2/models/part/monitor_dark_on.json
+++ b/src/main/resources/assets/ae2/models/part/monitor_dark_on.json
@@ -10,7 +10,7 @@
         "north": {
           "texture": "#lights",
           "tintindex": 2,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/monitor_medium_on.json b/src/main/resources/assets/ae2/models/part/monitor_medium_on.json
index 9a3fd9d9e27..0489b70ae15 100644
--- a/src/main/resources/assets/ae2/models/part/monitor_medium_on.json
+++ b/src/main/resources/assets/ae2/models/part/monitor_medium_on.json
@@ -10,7 +10,7 @@
         "north": {
           "texture": "#lights",
           "tintindex": 4,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/p2p/p2p_tunnel_status_has_channel.json b/src/main/resources/assets/ae2/models/part/p2p/p2p_tunnel_status_has_channel.json
index f02cda56b68..2f4c55a0478 100644
--- a/src/main/resources/assets/ae2/models/part/p2p/p2p_tunnel_status_has_channel.json
+++ b/src/main/resources/assets/ae2/models/part/p2p/p2p_tunnel_status_has_channel.json
@@ -12,13 +12,13 @@
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -30,13 +30,13 @@
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -48,13 +48,13 @@
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -66,13 +66,13 @@
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "down": {
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/p2p/p2p_tunnel_status_on.json b/src/main/resources/assets/ae2/models/part/p2p/p2p_tunnel_status_on.json
index 3a853a8f0c4..908795233cd 100644
--- a/src/main/resources/assets/ae2/models/part/p2p/p2p_tunnel_status_on.json
+++ b/src/main/resources/assets/ae2/models/part/p2p/p2p_tunnel_status_on.json
@@ -12,13 +12,13 @@
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -30,13 +30,13 @@
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -48,13 +48,13 @@
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -66,13 +66,13 @@
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "down": {
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/pattern_access_terminal_on.json b/src/main/resources/assets/ae2/models/part/pattern_access_terminal_on.json
index 6774eead5ae..e7488a8ab57 100644
--- a/src/main/resources/assets/ae2/models/part/pattern_access_terminal_on.json
+++ b/src/main/resources/assets/ae2/models/part/pattern_access_terminal_on.json
@@ -12,7 +12,7 @@
         "north": {
           "texture": "#lightsBright",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -23,7 +23,7 @@
         "north": {
           "texture": "#lightsMedium",
           "tintindex": 2,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -34,7 +34,7 @@
         "north": {
           "texture": "#lightsDark",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/pattern_encoding_terminal_on.json b/src/main/resources/assets/ae2/models/part/pattern_encoding_terminal_on.json
index 175b7591774..73f028195b2 100644
--- a/src/main/resources/assets/ae2/models/part/pattern_encoding_terminal_on.json
+++ b/src/main/resources/assets/ae2/models/part/pattern_encoding_terminal_on.json
@@ -12,7 +12,7 @@
         "north": {
           "texture": "#lightsBright",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -23,7 +23,7 @@
         "north": {
           "texture": "#lightsMedium",
           "tintindex": 2,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -34,7 +34,7 @@
         "north": {
           "texture": "#lightsDark",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/storage_bus_has_channel.json b/src/main/resources/assets/ae2/models/part/storage_bus_has_channel.json
index 93f99fed5dd..cce402cefc6 100644
--- a/src/main/resources/assets/ae2/models/part/storage_bus_has_channel.json
+++ b/src/main/resources/assets/ae2/models/part/storage_bus_has_channel.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/storage_bus_on.json b/src/main/resources/assets/ae2/models/part/storage_bus_on.json
index 48227535b4c..c552df4ec78 100644
--- a/src/main/resources/assets/ae2/models/part/storage_bus_on.json
+++ b/src/main/resources/assets/ae2/models/part/storage_bus_on.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/storage_monitor_locked_on.json b/src/main/resources/assets/ae2/models/part/storage_monitor_locked_on.json
index e35650baa35..fd0488dc298 100644
--- a/src/main/resources/assets/ae2/models/part/storage_monitor_locked_on.json
+++ b/src/main/resources/assets/ae2/models/part/storage_monitor_locked_on.json
@@ -12,7 +12,7 @@
         "north": {
           "texture": "#lightsBright",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -23,7 +23,7 @@
         "north": {
           "texture": "#lightsMedium",
           "tintindex": 2,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -34,7 +34,7 @@
         "north": {
           "texture": "#lightsDark",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/storage_monitor_on.json b/src/main/resources/assets/ae2/models/part/storage_monitor_on.json
index 63fa712f701..5a34e8b231d 100644
--- a/src/main/resources/assets/ae2/models/part/storage_monitor_on.json
+++ b/src/main/resources/assets/ae2/models/part/storage_monitor_on.json
@@ -11,7 +11,7 @@
         "north": {
           "texture": "#lightsBright",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -22,7 +22,7 @@
         "north": {
           "texture": "#lightsMedium",
           "tintindex": 2,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/terminal_on.json b/src/main/resources/assets/ae2/models/part/terminal_on.json
index c7309083aab..26c502c0d68 100644
--- a/src/main/resources/assets/ae2/models/part/terminal_on.json
+++ b/src/main/resources/assets/ae2/models/part/terminal_on.json
@@ -12,7 +12,7 @@
         "north": {
           "texture": "#lightsBright",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -23,7 +23,7 @@
         "north": {
           "texture": "#lightsMedium",
           "tintindex": 2,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -34,7 +34,7 @@
         "north": {
           "texture": "#lightsDark",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/toggle_bus_status_has_channel.json b/src/main/resources/assets/ae2/models/part/toggle_bus_status_has_channel.json
index 7d386c08be8..3ca8a5397f2 100644
--- a/src/main/resources/assets/ae2/models/part/toggle_bus_status_has_channel.json
+++ b/src/main/resources/assets/ae2/models/part/toggle_bus_status_has_channel.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/toggle_bus_status_on.json b/src/main/resources/assets/ae2/models/part/toggle_bus_status_on.json
index 696ebae9620..76ecdb14974 100644
--- a/src/main/resources/assets/ae2/models/part/toggle_bus_status_on.json
+++ b/src/main/resources/assets/ae2/models/part/toggle_bus_status_on.json
@@ -10,22 +10,22 @@
         "down": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "east": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/transition_plane_has_channel.json b/src/main/resources/assets/ae2/models/part/transition_plane_has_channel.json
index 90e9a0be99f..8571a89d7cb 100644
--- a/src/main/resources/assets/ae2/models/part/transition_plane_has_channel.json
+++ b/src/main/resources/assets/ae2/models/part/transition_plane_has_channel.json
@@ -26,13 +26,13 @@
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -44,13 +44,13 @@
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -62,13 +62,13 @@
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -80,13 +80,13 @@
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "down": {
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 1,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }
diff --git a/src/main/resources/assets/ae2/models/part/transition_plane_on.json b/src/main/resources/assets/ae2/models/part/transition_plane_on.json
index 43caaf03c33..038a4192b86 100644
--- a/src/main/resources/assets/ae2/models/part/transition_plane_on.json
+++ b/src/main/resources/assets/ae2/models/part/transition_plane_on.json
@@ -26,13 +26,13 @@
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "west": {
           "uv": [0, 7, 1, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -44,13 +44,13 @@
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "south": {
           "uv": [15, 7, 16, 9],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -62,13 +62,13 @@
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "up": {
           "uv": [7, 0, 9, 1],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     },
@@ -80,13 +80,13 @@
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         },
         "down": {
           "uv": [7, 15, 9, 16],
           "texture": "#indicator",
           "tintindex": 3,
-          "unlit": true
+          "neoforge_data": { "block_light": 15, "sky_light": 15 }
         }
       }
     }