From a15039cd6e977c7efbdc675fd3cf3e90ab2a264f Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Mon, 20 Apr 2026 16:52:14 +0300
Subject: [PATCH 01/14] Remove duplicates of vanilla blockstate properties

---
 .../api/block/property/GTBlockStateProperties.java |  2 --
 .../gregtechceu/gtceu/common/block/LampBlock.java  | 14 ++++++--------
 .../gtceu/common/data/models/GTModels.java         |  7 ++++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/property/GTBlockStateProperties.java b/src/main/java/com/gregtechceu/gtceu/api/block/property/GTBlockStateProperties.java
index b0cc876857f..12c81cd9a26 100644
--- a/src/main/java/com/gregtechceu/gtceu/api/block/property/GTBlockStateProperties.java
+++ b/src/main/java/com/gregtechceu/gtceu/api/block/property/GTBlockStateProperties.java
@@ -13,8 +13,6 @@ public class GTBlockStateProperties {
             Direction.Plane.VERTICAL);
 
     public static final BooleanProperty ACTIVE = BooleanProperty.create("active");
-    public static final BooleanProperty BLOOM = BooleanProperty.create("bloom");
-    public static final BooleanProperty INVERTED = BooleanProperty.create("inverted");
 
     public static final BooleanProperty NATURAL = BooleanProperty.create("natural");
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
index 881fa053d09..a8614e46927 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
@@ -1,7 +1,5 @@
 package com.gregtechceu.gtceu.common.block;
 
-import com.gregtechceu.gtceu.api.block.property.GTBlockStateProperties;
-
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -34,9 +32,9 @@
 @MethodsReturnNonnullByDefault
 public class LampBlock extends Block {
 
-    public static final BooleanProperty BLOOM = GTBlockStateProperties.BLOOM;
+    public static final BooleanProperty BLOOM = BlockStateProperties.BLOOM;
     public static final BooleanProperty LIGHT = BlockStateProperties.LIT;
-    public static final BooleanProperty INVERTED = GTBlockStateProperties.INVERTED;
+    public static final BooleanProperty INVERTED = BlockStateProperties.INVERTED;
     public static final BooleanProperty POWERED = BlockStateProperties.POWERED;
 
     public static final String TAG_INVERTED = "inverted";
@@ -56,7 +54,7 @@ public LampBlock(Properties properties, DyeColor color, boolean bordered) {
         this.color = color;
         this.bordered = bordered;
         registerDefaultState(defaultBlockState()
-                .setValue(GTBlockStateProperties.BLOOM, true)
+                .setValue(BLOOM, true)
                 .setValue(LIGHT, true)
                 .setValue(INVERTED, false)
                 .setValue(POWERED, false));
@@ -75,7 +73,7 @@ public static boolean isLightEnabled(BlockState state) {
     }
 
     public static boolean isBloomEnabled(BlockState state) {
-        return state.getValue(GTBlockStateProperties.BLOOM);
+        return state.getValue(BLOOM);
     }
 
     public static boolean isInverted(CompoundTag tag) {
@@ -92,7 +90,7 @@ public static boolean isBloomEnabled(CompoundTag tag) {
 
     public CompoundTag getTagFromState(BlockState state) {
         CompoundTag tag = new CompoundTag();
-        tag.putBoolean(TAG_BLOOM, state.getValue(GTBlockStateProperties.BLOOM));
+        tag.putBoolean(TAG_BLOOM, state.getValue(BLOOM));
         tag.putBoolean(TAG_LIT, state.getValue(LIGHT));
         tag.putBoolean(TAG_INVERTED, state.getValue(INVERTED));
         return tag;
@@ -110,7 +108,7 @@ public ItemStack getStackFromIndex(int i) {
 
     @Override
     protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-        super.createBlockStateDefinition(builder.add(INVERTED, GTBlockStateProperties.BLOOM, LIGHT, POWERED));
+        super.createBlockStateDefinition(builder.add(INVERTED, BLOOM, LIGHT, POWERED));
     }
 
     @Override
diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
index 6065874b12c..3f425bb11c0 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
@@ -23,6 +23,7 @@
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraftforge.client.model.generators.*;
 
@@ -94,17 +95,17 @@ public static NonNullBiConsumer<DataGenContext<Block, LampBlock>, RegistrateBloc
                         if (state.getValue(LampBlock.LIGHT)) {
                             ModelBuilder<?> model = prov.models()
                                     .getBuilder(ctx.getName() +
-                                            (state.getValue(GTBlockStateProperties.BLOOM) ? "_bloom" : ""))
+                                            (state.getValue(BlockStateProperties.BLOOM) ? "_bloom" : ""))
                                     .parent(parentOn);
                             if (border) {
                                 model.texture("active", "block/lamps/" + color.getName());
-                                if (state.getValue(GTBlockStateProperties.BLOOM)) {
+                                if (state.getValue(BlockStateProperties.BLOOM)) {
                                     model.texture("active_overlay", "block/lamps/" + color.getName() + "_emissive");
                                 } else {
                                     model.texture("active_overlay", "block/lamps/" + color.getName());
                                 }
                             } else {
-                                if (state.getValue(GTBlockStateProperties.BLOOM)) {
+                                if (state.getValue(BlockStateProperties.BLOOM)) {
                                     model.texture("active",
                                             "block/lamps/" + color.getName() + "_borderless_emissive");
                                 } else {

From 04c9cb085350d972b15c0668420c0b89bb0fec4b Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Mon, 20 Apr 2026 22:20:36 +0300
Subject: [PATCH 02/14] Reuse existing code instead of copypasting the same
 stuff over and over and

---
 .../gtceu/common/block/LampBlock.java         | 56 +++++++++----------
 .../gtceu/common/data/models/GTModels.java    | 30 +++++-----
 2 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
index a8614e46927..b1963400c8d 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
@@ -39,12 +39,11 @@ public class LampBlock extends Block {
 
     public static final String TAG_INVERTED = "inverted";
     public static final String TAG_BLOOM = "bloom";
-    public static final String TAG_LIT = "lit";
+    public static final String TAG_LIGHT = "lit";
 
-    public static final int BLOOM_FLAG = 1;
-    public static final int LIGHT_FLAG = 2;
-    public static final int INVERTED_FLAG = 4;
-    public static final int POWERED_FLAG = 8;
+    public static final int BLOOM_FLAG = 0b001;
+    public static final int LIGHT_FLAG = 0b010;
+    public static final int INVERTED_FLAG = 0b100;
 
     public final DyeColor color;
     public final boolean bordered;
@@ -61,7 +60,7 @@ public LampBlock(Properties properties, DyeColor color, boolean bordered) {
     }
 
     public static boolean isLightActive(BlockState state) {
-        return state.getValue(INVERTED) != state.getValue(POWERED);
+        return isInverted(state) != state.getValue(POWERED);
     }
 
     public static boolean isInverted(BlockState state) {
@@ -81,7 +80,7 @@ public static boolean isInverted(CompoundTag tag) {
     }
 
     public static boolean isLightEnabled(CompoundTag tag) {
-        return tag.getBoolean(TAG_LIT);
+        return tag.getBoolean(TAG_LIGHT);
     }
 
     public static boolean isBloomEnabled(CompoundTag tag) {
@@ -91,16 +90,16 @@ public static boolean isBloomEnabled(CompoundTag tag) {
     public CompoundTag getTagFromState(BlockState state) {
         CompoundTag tag = new CompoundTag();
         tag.putBoolean(TAG_BLOOM, state.getValue(BLOOM));
-        tag.putBoolean(TAG_LIT, state.getValue(LIGHT));
+        tag.putBoolean(TAG_LIGHT, state.getValue(LIGHT));
         tag.putBoolean(TAG_INVERTED, state.getValue(INVERTED));
         return tag;
     }
 
     public ItemStack getStackFromIndex(int i) {
         CompoundTag tag = new CompoundTag();
-        tag.putBoolean(LampBlock.TAG_INVERTED, (i & LampBlock.INVERTED_FLAG) == 0);
-        tag.putBoolean(LampBlock.TAG_BLOOM, (i & LampBlock.BLOOM_FLAG) == 0);
-        tag.putBoolean(LampBlock.TAG_LIT, (i & LampBlock.LIGHT_FLAG) == 0);
+        tag.putBoolean(LampBlock.TAG_INVERTED, (i & LampBlock.INVERTED_FLAG) != 0);
+        tag.putBoolean(LampBlock.TAG_BLOOM, (i & LampBlock.BLOOM_FLAG) != 0);
+        tag.putBoolean(LampBlock.TAG_LIGHT, (i & LampBlock.LIGHT_FLAG) != 0);
         ItemStack stack = new ItemStack(this);
         stack.setTag(tag);
         return stack;
@@ -108,12 +107,12 @@ public ItemStack getStackFromIndex(int i) {
 
     @Override
     protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-        super.createBlockStateDefinition(builder.add(INVERTED, BLOOM, LIGHT, POWERED));
+        builder.add(INVERTED, BLOOM, LIGHT, POWERED);
     }
 
     @Override
     public int getLightEmission(BlockState state, BlockGetter level, BlockPos pos) {
-        return state.getValue(LIGHT) && isLightActive(state) ? 15 : 0;
+        return isLightEnabled(state) && isLightActive(state) ? 15 : 0;
     }
 
     @Override
@@ -122,14 +121,18 @@ public BlockState getAppearance(BlockState state, BlockAndTintGetter level, Bloc
         return state.getBlock().defaultBlockState();
     }
 
+    public void update(BlockState state, Level level, BlockPos pos) {
+        if (state.getValue(POWERED) != level.hasNeighborSignal(pos)) {
+            level.setBlock(pos, state.cycle(POWERED),
+                    state.getValue(LIGHT) ? Block.UPDATE_ALL_IMMEDIATE : Block.UPDATE_ALL);
+        }
+    }
+
     @Override
     @SuppressWarnings("deprecation")
     public void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean movedByPiston) {
         if (!level.isClientSide) {
-            boolean powered = state.getValue(POWERED);
-            if (powered != level.hasNeighborSignal(pos)) {
-                level.setBlock(pos, state.setValue(POWERED, !powered), state.getValue(LIGHT) ? 2 | 8 : 2);
-            }
+            update(state, level, pos);
         }
         super.onPlace(state, level, pos, oldState, movedByPiston);
     }
@@ -139,19 +142,14 @@ public void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldS
     public void neighborChanged(BlockState state, Level level, BlockPos pos, Block neighborBlock, BlockPos neighborPos,
                                 boolean movedByPiston) {
         if (!level.isClientSide) {
-            boolean powered = state.getValue(POWERED);
-            if (powered != level.hasNeighborSignal(pos)) {
-                level.setBlock(pos, state.setValue(POWERED, !powered), state.getValue(LIGHT) ? 2 | 8 : 2);
-            }
+            update(state, level, pos);
         }
     }
 
     @Override
     @SuppressWarnings("deprecation")
     public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
-        if (state.getValue(POWERED) && !level.hasNeighborSignal(pos)) {
-            level.setBlock(pos, state.cycle(POWERED), state.getValue(LIGHT) ? 2 | 8 : 2);
-        }
+        update(state, level, pos);
     }
 
     @Override
@@ -167,12 +165,10 @@ public void appendHoverText(ItemStack stack, @Nullable BlockGetter level, List<C
                                 TooltipFlag flag) {
         if (stack.hasTag()) {
             var tag = stack.getTag();
-            if (isInverted(tag))
-                tooltip.add(Component.translatable("block.gtceu.lamp.tooltip.inverted"));
-            if (!isBloomEnabled(tag))
-                tooltip.add(Component.translatable("block.gtceu.lamp.tooltip.no_bloom"));
-            if (!isLightEnabled(tag))
-                tooltip.add(Component.translatable("block.gtceu.lamp.tooltip.no_light"));
+
+            if (isInverted(tag)) tooltip.add(Component.translatable("block.gtceu.lamp.tooltip.inverted"));
+            if (!isBloomEnabled(tag)) tooltip.add(Component.translatable("block.gtceu.lamp.tooltip.no_bloom"));
+            if (!isLightEnabled(tag)) tooltip.add(Component.translatable("block.gtceu.lamp.tooltip.no_light"));
         }
     }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
index 3f425bb11c0..76ff524c136 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
@@ -23,7 +23,6 @@
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraftforge.client.model.generators.*;
 
@@ -86,31 +85,29 @@ public static void rubberTreeSaplingModel(DataGenContext<Item, BlockItem> contex
     public static NonNullBiConsumer<DataGenContext<Block, LampBlock>, RegistrateBlockstateProvider> lampModel(DyeColor color,
                                                                                                               boolean border) {
         return (ctx, prov) -> {
+            final String colorName = color.getSerializedName();
             final String borderPart = (border ? "" : "_borderless");
             ModelFile parentOn = prov.models().getExistingFile(prov.modLoc("block/lamp" + borderPart));
             ModelFile parentOff = prov.models().getExistingFile(prov.modLoc("block/lamp" + borderPart + "_off"));
 
             prov.getVariantBuilder(ctx.getEntry())
-                    .forAllStates(state -> {
-                        if (state.getValue(LampBlock.LIGHT)) {
+                    .forAllStatesExcept(state -> {
+                        if (LampBlock.isLightActive(state)) {
                             ModelBuilder<?> model = prov.models()
-                                    .getBuilder(ctx.getName() +
-                                            (state.getValue(BlockStateProperties.BLOOM) ? "_bloom" : ""))
+                                    .getBuilder(ctx.getName() + (state.getValue(LampBlock.BLOOM) ? "_bloom" : ""))
                                     .parent(parentOn);
                             if (border) {
-                                model.texture("active", "block/lamps/" + color.getName());
-                                if (state.getValue(BlockStateProperties.BLOOM)) {
-                                    model.texture("active_overlay", "block/lamps/" + color.getName() + "_emissive");
+                                model.texture("active", "block/lamps/" + colorName);
+                                if (state.getValue(LampBlock.BLOOM)) {
+                                    model.texture("active_overlay", "block/lamps/" + colorName + "_emissive");
                                 } else {
-                                    model.texture("active_overlay", "block/lamps/" + color.getName());
+                                    model.texture("active_overlay", "block/lamps/" + colorName);
                                 }
                             } else {
-                                if (state.getValue(BlockStateProperties.BLOOM)) {
-                                    model.texture("active",
-                                            "block/lamps/" + color.getName() + "_borderless_emissive");
+                                if (state.getValue(LampBlock.BLOOM)) {
+                                    model.texture("active", "block/lamps/" + colorName + "_borderless_emissive");
                                 } else {
-                                    model.texture("active",
-                                            "block/lamps/" + color.getName() + "_borderless");
+                                    model.texture("active", "block/lamps/" + colorName + "_borderless");
                                 }
                             }
                             return ConfiguredModel.builder()
@@ -121,11 +118,10 @@ public static NonNullBiConsumer<DataGenContext<Block, LampBlock>, RegistrateBloc
                                     .modelFile(prov.models()
                                             .getBuilder(ctx.getName() + "_off")
                                             .parent(parentOff)
-                                            .texture("inactive",
-                                                    "block/lamps/" + color.getName() + "_off" + borderPart))
+                                            .texture("inactive", "block/lamps/" + colorName + "_off" + borderPart))
                                     .build();
                         }
-                    });
+                    }, LampBlock.LIGHT);
         };
     }
 

From 968b5d70e73bfbe917937237fe0c8d3666baa9ef Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Mon, 20 Apr 2026 22:21:08 +0300
Subject: [PATCH 03/14] Datagen

---
 .../blockstates/black_borderless_lamp.json    | 40 ++++---------------
 .../assets/gtceu/blockstates/black_lamp.json  | 40 ++++---------------
 .../blockstates/blue_borderless_lamp.json     | 40 ++++---------------
 .../assets/gtceu/blockstates/blue_lamp.json   | 40 ++++---------------
 .../blockstates/brown_borderless_lamp.json    | 40 ++++---------------
 .../assets/gtceu/blockstates/brown_lamp.json  | 40 ++++---------------
 .../blockstates/cyan_borderless_lamp.json     | 40 ++++---------------
 .../assets/gtceu/blockstates/cyan_lamp.json   | 40 ++++---------------
 .../blockstates/gray_borderless_lamp.json     | 40 ++++---------------
 .../assets/gtceu/blockstates/gray_lamp.json   | 40 ++++---------------
 .../blockstates/green_borderless_lamp.json    | 40 ++++---------------
 .../assets/gtceu/blockstates/green_lamp.json  | 40 ++++---------------
 .../light_blue_borderless_lamp.json           | 40 ++++---------------
 .../gtceu/blockstates/light_blue_lamp.json    | 40 ++++---------------
 .../light_gray_borderless_lamp.json           | 40 ++++---------------
 .../gtceu/blockstates/light_gray_lamp.json    | 40 ++++---------------
 .../blockstates/lime_borderless_lamp.json     | 40 ++++---------------
 .../assets/gtceu/blockstates/lime_lamp.json   | 40 ++++---------------
 .../blockstates/magenta_borderless_lamp.json  | 40 ++++---------------
 .../gtceu/blockstates/magenta_lamp.json       | 40 ++++---------------
 .../blockstates/orange_borderless_lamp.json   | 40 ++++---------------
 .../assets/gtceu/blockstates/orange_lamp.json | 40 ++++---------------
 .../blockstates/pink_borderless_lamp.json     | 40 ++++---------------
 .../assets/gtceu/blockstates/pink_lamp.json   | 40 ++++---------------
 .../blockstates/purple_borderless_lamp.json   | 40 ++++---------------
 .../assets/gtceu/blockstates/purple_lamp.json | 40 ++++---------------
 .../blockstates/red_borderless_lamp.json      | 40 ++++---------------
 .../assets/gtceu/blockstates/red_lamp.json    | 40 ++++---------------
 .../blockstates/white_borderless_lamp.json    | 40 ++++---------------
 .../assets/gtceu/blockstates/white_lamp.json  | 40 ++++---------------
 .../blockstates/yellow_borderless_lamp.json   | 40 ++++---------------
 .../assets/gtceu/blockstates/yellow_lamp.json | 40 ++++---------------
 32 files changed, 256 insertions(+), 1024 deletions(-)

diff --git a/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
index 65fa8c3d44e..2653760bdab 100644
--- a/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/black_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/black_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/black_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/black_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/black_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/black_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/black_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/black_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/black_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/black_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/black_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/black_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/black_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/black_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/black_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/black_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/black_lamp.json b/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
index cd4e0f92574..2ec244991e9 100644
--- a/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/black_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/black_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/black_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/black_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/black_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/black_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/black_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/black_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/black_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/black_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/black_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/black_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/black_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/black_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/black_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/black_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
index 45abae047a8..cf0137a72f6 100644
--- a/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/blue_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/blue_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/blue_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/blue_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/blue_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/blue_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/blue_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/blue_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/blue_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/blue_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/blue_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/blue_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/blue_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/blue_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/blue_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/blue_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json b/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
index 5ccc078cfcb..551d3d7ea75 100644
--- a/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/blue_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/blue_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/blue_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/blue_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/blue_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/blue_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/blue_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/blue_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/blue_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/blue_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/blue_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/blue_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/blue_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/blue_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/blue_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/blue_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
index d8b79bb47b1..648d1fc0c31 100644
--- a/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/brown_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/brown_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/brown_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/brown_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/brown_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/brown_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/brown_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/brown_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/brown_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/brown_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/brown_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/brown_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/brown_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/brown_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/brown_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/brown_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json b/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
index 7209c021b21..416b65492b9 100644
--- a/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/brown_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/brown_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/brown_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/brown_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/brown_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/brown_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/brown_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/brown_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/brown_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/brown_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/brown_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/brown_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/brown_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/brown_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/brown_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/brown_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json
index 5d8399dd750..dcc9951a482 100644
--- a/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/cyan_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/cyan_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/cyan_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/cyan_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/cyan_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/cyan_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/cyan_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/cyan_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/cyan_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/cyan_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/cyan_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/cyan_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/cyan_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/cyan_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/cyan_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/cyan_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json b/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
index 99f8b154d65..f99b1adf611 100644
--- a/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/cyan_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/cyan_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/cyan_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/cyan_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/cyan_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/cyan_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/cyan_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/cyan_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/cyan_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/cyan_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/cyan_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/cyan_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/cyan_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/cyan_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/cyan_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/cyan_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json
index 5edfd0e79ec..90e7a09ad9b 100644
--- a/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/gray_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/gray_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/gray_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/gray_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/gray_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/gray_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/gray_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/gray_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/gray_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/gray_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/gray_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/gray_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/gray_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/gray_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/gray_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/gray_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json b/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
index 2a297aa3b1a..fe235c636c8 100644
--- a/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/gray_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/gray_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/gray_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/gray_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/gray_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/gray_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/gray_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/gray_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/gray_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/gray_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/gray_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/gray_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/gray_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/gray_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/gray_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/gray_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json
index 20aa48033b5..2ba1217b905 100644
--- a/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/green_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/green_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/green_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/green_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/green_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/green_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/green_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/green_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/green_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/green_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/green_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/green_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/green_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/green_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/green_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/green_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/green_lamp.json b/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
index d3fc044531e..a399f46cc5b 100644
--- a/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/green_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/green_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/green_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/green_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/green_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/green_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/green_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/green_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/green_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/green_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/green_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/green_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/green_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/green_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/green_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/green_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json
index 3b2d626b772..04a4c1c3598 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/light_blue_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/light_blue_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/light_blue_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/light_blue_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/light_blue_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/light_blue_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/light_blue_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/light_blue_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/light_blue_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/light_blue_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/light_blue_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/light_blue_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/light_blue_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/light_blue_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/light_blue_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/light_blue_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json
index 789777c4058..5efb2370466 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/light_blue_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/light_blue_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/light_blue_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/light_blue_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/light_blue_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/light_blue_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/light_blue_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/light_blue_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/light_blue_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/light_blue_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/light_blue_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/light_blue_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/light_blue_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/light_blue_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/light_blue_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/light_blue_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json
index 25408c7c723..35a06427bfc 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/light_gray_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/light_gray_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/light_gray_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/light_gray_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/light_gray_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/light_gray_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/light_gray_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/light_gray_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/light_gray_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/light_gray_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/light_gray_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/light_gray_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/light_gray_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/light_gray_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/light_gray_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/light_gray_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json
index 077535ad407..1273f8861b2 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/light_gray_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/light_gray_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/light_gray_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/light_gray_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/light_gray_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/light_gray_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/light_gray_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/light_gray_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/light_gray_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/light_gray_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/light_gray_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/light_gray_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/light_gray_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/light_gray_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/light_gray_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/light_gray_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json
index b48cdc08daa..609090bca1a 100644
--- a/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/lime_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/lime_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/lime_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/lime_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/lime_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/lime_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/lime_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/lime_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/lime_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/lime_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/lime_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/lime_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/lime_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/lime_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/lime_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/lime_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json b/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
index d36a7c3e3a1..004a8210c98 100644
--- a/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/lime_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/lime_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/lime_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/lime_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/lime_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/lime_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/lime_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/lime_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/lime_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/lime_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/lime_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/lime_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/lime_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/lime_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/lime_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/lime_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json
index 4c25a94fcdb..662ea54a7d9 100644
--- a/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/magenta_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/magenta_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/magenta_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/magenta_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/magenta_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/magenta_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/magenta_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/magenta_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/magenta_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/magenta_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/magenta_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/magenta_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/magenta_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/magenta_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/magenta_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/magenta_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json b/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
index e3bfd66936c..709aa6b8536 100644
--- a/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/magenta_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/magenta_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/magenta_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/magenta_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/magenta_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/magenta_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/magenta_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/magenta_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/magenta_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/magenta_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/magenta_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/magenta_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/magenta_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/magenta_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/magenta_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/magenta_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json
index c82a39e4c91..8d3f051ad00 100644
--- a/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/orange_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/orange_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/orange_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/orange_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/orange_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/orange_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/orange_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/orange_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/orange_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/orange_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/orange_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/orange_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/orange_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/orange_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/orange_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/orange_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json b/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
index d4f1841d14e..fe41b1e40a8 100644
--- a/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/orange_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/orange_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/orange_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/orange_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/orange_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/orange_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/orange_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/orange_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/orange_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/orange_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/orange_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/orange_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/orange_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/orange_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/orange_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/orange_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json
index 277ac18c6bb..4a417644bef 100644
--- a/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/pink_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/pink_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/pink_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/pink_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/pink_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/pink_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/pink_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/pink_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/pink_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/pink_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/pink_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/pink_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/pink_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/pink_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/pink_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/pink_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json b/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
index a480a15edff..139d3938687 100644
--- a/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/pink_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/pink_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/pink_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/pink_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/pink_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/pink_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/pink_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/pink_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/pink_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/pink_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/pink_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/pink_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/pink_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/pink_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/pink_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/pink_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json
index 9328f5d1855..9061ec60bfd 100644
--- a/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/purple_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/purple_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/purple_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/purple_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/purple_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/purple_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/purple_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/purple_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/purple_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/purple_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/purple_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/purple_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/purple_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/purple_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/purple_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/purple_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json b/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
index 0ea9e2c4bc8..a2b8df6d91d 100644
--- a/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/purple_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/purple_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/purple_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/purple_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/purple_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/purple_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/purple_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/purple_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/purple_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/purple_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/purple_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/purple_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/purple_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/purple_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/purple_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/purple_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json
index a89947daaa0..f34d00b2679 100644
--- a/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/red_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/red_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/red_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/red_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/red_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/red_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/red_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/red_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/red_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/red_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/red_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/red_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/red_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/red_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/red_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/red_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/red_lamp.json b/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
index 5c68690f6bb..ed2b42645b0 100644
--- a/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/red_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/red_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/red_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/red_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/red_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/red_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/red_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/red_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/red_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/red_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/red_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/red_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/red_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/red_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/red_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/red_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json
index 329c333d42e..4445a730db2 100644
--- a/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/white_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/white_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/white_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/white_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/white_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/white_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/white_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/white_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/white_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/white_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/white_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/white_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/white_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/white_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/white_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/white_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/white_lamp.json b/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
index 38298650c47..285658d5da1 100644
--- a/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/white_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/white_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/white_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/white_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/white_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/white_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/white_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/white_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/white_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/white_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/white_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/white_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/white_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/white_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/white_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/white_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json
index cdf49a3e281..7260b08a785 100644
--- a/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/yellow_borderless_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/yellow_borderless_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/yellow_borderless_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/yellow_borderless_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/yellow_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/yellow_borderless_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/yellow_borderless_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/yellow_borderless_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/yellow_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/yellow_borderless_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/yellow_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/yellow_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/yellow_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/yellow_borderless_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/yellow_borderless_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/yellow_borderless_lamp_bloom"
     }
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json b/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
index 43509ebf6a3..2baa9b42b3f 100644
--- a/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
@@ -1,52 +1,28 @@
 {
   "variants": {
-    "bloom=false,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=false,powered=false": {
       "model": "gtceu:block/yellow_lamp_off"
     },
-    "bloom=false,inverted=false,lit=false,powered=true": {
-      "model": "gtceu:block/yellow_lamp_off"
-    },
-    "bloom=false,inverted=false,lit=true,powered=false": {
-      "model": "gtceu:block/yellow_lamp"
-    },
-    "bloom=false,inverted=false,lit=true,powered=true": {
-      "model": "gtceu:block/yellow_lamp"
-    },
-    "bloom=false,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/yellow_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=false,powered=true": {
-      "model": "gtceu:block/yellow_lamp_off"
-    },
-    "bloom=false,inverted=true,lit=true,powered=false": {
+    "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/yellow_lamp"
     },
-    "bloom=false,inverted=true,lit=true,powered=true": {
+    "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/yellow_lamp"
     },
-    "bloom=true,inverted=false,lit=false,powered=false": {
+    "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/yellow_lamp_off"
     },
-    "bloom=true,inverted=false,lit=false,powered=true": {
+    "bloom=true,inverted=false,powered=false": {
       "model": "gtceu:block/yellow_lamp_off"
     },
-    "bloom=true,inverted=false,lit=true,powered=false": {
+    "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/yellow_lamp_bloom"
     },
-    "bloom=true,inverted=false,lit=true,powered=true": {
+    "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/yellow_lamp_bloom"
     },
-    "bloom=true,inverted=true,lit=false,powered=false": {
-      "model": "gtceu:block/yellow_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=false,powered=true": {
+    "bloom=true,inverted=true,powered=true": {
       "model": "gtceu:block/yellow_lamp_off"
-    },
-    "bloom=true,inverted=true,lit=true,powered=false": {
-      "model": "gtceu:block/yellow_lamp_bloom"
-    },
-    "bloom=true,inverted=true,lit=true,powered=true": {
-      "model": "gtceu:block/yellow_lamp_bloom"
     }
   }
 }
\ No newline at end of file

From ed1b1071b73b23799552b88587f2ee915eb43ccf Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Sat, 25 Apr 2026 12:06:06 +0300
Subject: [PATCH 04/14] Remove unused helper methods

---
 .../decorator/GTLampItemOverlayRenderer.java  | 32 +++++++++----------
 .../gtceu/common/block/LampBlock.java         | 16 ++--------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/decorator/GTLampItemOverlayRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/decorator/GTLampItemOverlayRenderer.java
index e2b5853a3f3..32bf1087249 100644
--- a/src/main/java/com/gregtechceu/gtceu/client/renderer/item/decorator/GTLampItemOverlayRenderer.java
+++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/item/decorator/GTLampItemOverlayRenderer.java
@@ -31,25 +31,25 @@ public static OverlayType getOverlayType(boolean light, boolean bloom) {
 
     @Override
     public boolean render(GuiGraphics graphics, Font font, ItemStack stack, int xPosition, int yPosition) {
-        if (stack.hasTag()) {
-            var tag = stack.getOrCreateTag();
-            var overlayType = getOverlayType(isLightEnabled(tag), isBloomEnabled(tag));
-            if (overlayType == OverlayType.NONE) {
-                return true;
-            }
+        if (!stack.hasTag()) {
+            return false;
+        }
+        @SuppressWarnings("DataFlowIssue")
+        var overlayType = getOverlayType(isLightEnabled(stack.getTag()), isBloomEnabled(stack.getTag()));
+        if (overlayType == OverlayType.NONE) {
+            return false;
+        }
 
-            RenderSystem.disableDepthTest();
-            if (overlayType.noBloom()) {
-                GuiTextures.LAMP_NO_BLOOM.draw(graphics, 0, 0, xPosition, yPosition, 16, 16);
-            }
+        RenderSystem.disableDepthTest();
+        if (overlayType.noBloom()) {
+            GuiTextures.LAMP_NO_BLOOM.draw(graphics, 0, 0, xPosition, yPosition, 16, 16);
+        }
 
-            if (overlayType.noLight()) {
-                GuiTextures.LAMP_NO_LIGHT.draw(graphics, 0, 0, xPosition, yPosition, 16, 16);
-            }
-            RenderSystem.enableDepthTest();
-            return true;
+        if (overlayType.noLight()) {
+            GuiTextures.LAMP_NO_LIGHT.draw(graphics, 0, 0, xPosition, yPosition, 16, 16);
         }
-        return false;
+        RenderSystem.enableDepthTest();
+        return true;
     }
 
     public enum OverlayType {
diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
index b1963400c8d..f172a13d83a 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
@@ -60,19 +60,7 @@ public LampBlock(Properties properties, DyeColor color, boolean bordered) {
     }
 
     public static boolean isLightActive(BlockState state) {
-        return isInverted(state) != state.getValue(POWERED);
-    }
-
-    public static boolean isInverted(BlockState state) {
-        return state.getValue(INVERTED);
-    }
-
-    public static boolean isLightEnabled(BlockState state) {
-        return state.getValue(LIGHT);
-    }
-
-    public static boolean isBloomEnabled(BlockState state) {
-        return state.getValue(BLOOM);
+        return state.getValue(INVERTED) != state.getValue(POWERED);
     }
 
     public static boolean isInverted(CompoundTag tag) {
@@ -112,7 +100,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 
     @Override
     public int getLightEmission(BlockState state, BlockGetter level, BlockPos pos) {
-        return isLightEnabled(state) && isLightActive(state) ? 15 : 0;
+        return state.getValue(LIGHT) && isLightActive(state) ? 15 : 0;
     }
 
     @Override

From bb225e57e7d3adc1a62a44a7ca557b151a138e6d Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:26:59 +0300
Subject: [PATCH 05/14] Simplify them models again

---
 .../blockstates/black_borderless_lamp.json    |   4 +--
 .../assets/gtceu/blockstates/black_lamp.json  |   4 +--
 .../blockstates/blue_borderless_lamp.json     |   4 +--
 .../assets/gtceu/blockstates/blue_lamp.json   |   4 +--
 .../blockstates/brown_borderless_lamp.json    |   4 +--
 .../assets/gtceu/blockstates/brown_lamp.json  |   4 +--
 .../blockstates/cyan_borderless_lamp.json     |   4 +--
 .../assets/gtceu/blockstates/gray_lamp.json   |   4 +--
 .../blockstates/green_borderless_lamp.json    |   4 +--
 .../assets/gtceu/blockstates/green_lamp.json  |   4 +--
 .../light_blue_borderless_lamp.json           |   4 +--
 .../gtceu/blockstates/light_blue_lamp.json    |   4 +--
 .../light_gray_borderless_lamp.json           |   4 +--
 .../blockstates/lime_borderless_lamp.json     |   4 +--
 .../assets/gtceu/blockstates/lime_lamp.json   |   4 +--
 .../blockstates/magenta_borderless_lamp.json  |   4 +--
 .../gtceu/blockstates/magenta_lamp.json       |   4 +--
 .../blockstates/orange_borderless_lamp.json   |   4 +--
 .../assets/gtceu/blockstates/orange_lamp.json |   4 +--
 .../blockstates/purple_borderless_lamp.json   |   4 +--
 .../assets/gtceu/blockstates/purple_lamp.json |   4 +--
 .../blockstates/red_borderless_lamp.json      |   4 +--
 .../assets/gtceu/blockstates/red_lamp.json    |   4 +--
 .../blockstates/yellow_borderless_lamp.json   |   4 +--
 .../models/block/black_borderless_lamp.json   |   6 ----
 .../block/black_borderless_lamp_bloom.json    |   4 +--
 .../block/black_borderless_lamp_on.json       |   6 ++++
 .../assets/gtceu/models/block/black_lamp.json |   7 -----
 .../gtceu/models/block/black_lamp_bloom.json  |   2 +-
 .../gtceu/models/block/black_lamp_on.json     |   6 ++++
 .../models/block/blue_borderless_lamp.json    |   6 ----
 .../block/blue_borderless_lamp_bloom.json     |   4 +--
 .../block/blue_borderless_lamp_off.json       |   2 +-
 .../models/block/blue_borderless_lamp_on.json |   6 ++++
 .../assets/gtceu/models/block/blue_lamp.json  |   7 -----
 .../gtceu/models/block/blue_lamp_bloom.json   |   2 +-
 .../gtceu/models/block/blue_lamp_on.json      |   6 ++++
 .../models/block/brown_borderless_lamp.json   |   6 ----
 .../block/brown_borderless_lamp_bloom.json    |   4 +--
 .../block/brown_borderless_lamp_off.json      |   2 +-
 .../block/brown_borderless_lamp_on.json       |   6 ++++
 .../assets/gtceu/models/block/brown_lamp.json |   7 -----
 .../gtceu/models/block/brown_lamp_bloom.json  |   2 +-
 .../gtceu/models/block/brown_lamp_on.json     |   6 ++++
 .../models/block/cyan_borderless_lamp.json    |   6 ----
 .../block/cyan_borderless_lamp_bloom.json     |   4 +--
 .../block/cyan_borderless_lamp_off.json       |   2 +-
 .../models/block/cyan_borderless_lamp_on.json |   6 ++++
 .../assets/gtceu/models/block/cyan_lamp.json  |   7 -----
 .../gtceu/models/block/cyan_lamp_bloom.json   |   2 +-
 .../gtceu/models/block/cyan_lamp_on.json      |   6 ++++
 .../models/block/gray_borderless_lamp.json    |   6 ----
 .../block/gray_borderless_lamp_bloom.json     |   4 +--
 .../block/gray_borderless_lamp_off.json       |   2 +-
 .../models/block/gray_borderless_lamp_on.json |   6 ++++
 .../assets/gtceu/models/block/gray_lamp.json  |   7 -----
 .../gtceu/models/block/gray_lamp_bloom.json   |   2 +-
 .../gtceu/models/block/gray_lamp_on.json      |   6 ++++
 .../models/block/green_borderless_lamp.json   |   6 ----
 .../block/green_borderless_lamp_bloom.json    |   4 +--
 .../block/green_borderless_lamp_off.json      |   2 +-
 .../block/green_borderless_lamp_on.json       |   6 ++++
 .../assets/gtceu/models/block/green_lamp.json |   7 -----
 .../gtceu/models/block/green_lamp_bloom.json  |   2 +-
 .../gtceu/models/block/green_lamp_on.json     |   6 ++++
 .../block/light_blue_borderless_lamp.json     |   6 ----
 .../light_blue_borderless_lamp_bloom.json     |   4 +--
 .../block/light_blue_borderless_lamp_off.json |   2 +-
 .../block/light_blue_borderless_lamp_on.json  |   6 ++++
 .../gtceu/models/block/light_blue_lamp.json   |   7 -----
 .../models/block/light_blue_lamp_bloom.json   |   2 +-
 .../models/block/light_blue_lamp_on.json      |   6 ++++
 .../block/light_gray_borderless_lamp.json     |   6 ----
 .../light_gray_borderless_lamp_bloom.json     |   4 +--
 .../block/light_gray_borderless_lamp_off.json |   2 +-
 .../block/light_gray_borderless_lamp_on.json  |   6 ++++
 .../gtceu/models/block/light_gray_lamp.json   |   7 -----
 .../models/block/light_gray_lamp_on.json      |   6 ++++
 .../models/block/lime_borderless_lamp.json    |   6 ----
 .../block/lime_borderless_lamp_bloom.json     |   4 +--
 .../block/lime_borderless_lamp_off.json       |   2 +-
 .../models/block/lime_borderless_lamp_on.json |   6 ++++
 .../assets/gtceu/models/block/lime_lamp.json  |   7 -----
 .../gtceu/models/block/lime_lamp_bloom.json   |   2 +-
 .../gtceu/models/block/lime_lamp_on.json      |   6 ++++
 .../models/block/magenta_borderless_lamp.json |   6 ----
 .../block/magenta_borderless_lamp_bloom.json  |   4 +--
 .../block/magenta_borderless_lamp_off.json    |   2 +-
 .../block/magenta_borderless_lamp_on.json     |   6 ++++
 .../gtceu/models/block/magenta_lamp.json      |   7 -----
 .../models/block/magenta_lamp_bloom.json      |   2 +-
 .../gtceu/models/block/magenta_lamp_on.json   |   6 ++++
 .../models/block/orange_borderless_lamp.json  |   6 ----
 .../block/orange_borderless_lamp_bloom.json   |   4 +--
 .../block/orange_borderless_lamp_on.json      |   6 ++++
 .../gtceu/models/block/orange_lamp.json       |   7 -----
 .../gtceu/models/block/orange_lamp_bloom.json |   2 +-
 .../gtceu/models/block/orange_lamp_on.json    |   6 ++++
 .../models/block/pink_borderless_lamp.json    |   6 ----
 .../block/pink_borderless_lamp_bloom.json     |   4 +--
 .../block/pink_borderless_lamp_off.json       |   2 +-
 .../models/block/pink_borderless_lamp_on.json |   6 ++++
 .../assets/gtceu/models/block/pink_lamp.json  |   7 -----
 .../gtceu/models/block/pink_lamp_bloom.json   |   2 +-
 .../gtceu/models/block/pink_lamp_on.json      |   6 ++++
 .../models/block/purple_borderless_lamp.json  |   6 ----
 .../block/purple_borderless_lamp_off.json     |   2 +-
 .../block/purple_borderless_lamp_on.json      |   6 ++++
 .../gtceu/models/block/purple_lamp.json       |   7 -----
 .../gtceu/models/block/purple_lamp_bloom.json |   2 +-
 .../gtceu/models/block/purple_lamp_on.json    |   6 ++++
 .../models/block/red_borderless_lamp.json     |   6 ----
 .../block/red_borderless_lamp_bloom.json      |   4 +--
 .../models/block/red_borderless_lamp_off.json |   2 +-
 .../models/block/red_borderless_lamp_on.json  |   6 ++++
 .../assets/gtceu/models/block/red_lamp.json   |   7 -----
 .../gtceu/models/block/red_lamp_bloom.json    |   2 +-
 .../gtceu/models/block/red_lamp_on.json       |   6 ++++
 .../models/block/white_borderless_lamp.json   |   6 ----
 .../block/white_borderless_lamp_bloom.json    |   4 +--
 .../block/white_borderless_lamp_off.json      |   2 +-
 .../block/white_borderless_lamp_on.json       |   6 ++++
 .../assets/gtceu/models/block/white_lamp.json |   7 -----
 .../gtceu/models/block/white_lamp_bloom.json  |   2 +-
 .../gtceu/models/block/white_lamp_on.json     |   6 ++++
 .../models/block/yellow_borderless_lamp.json  |   6 ----
 .../block/yellow_borderless_lamp_bloom.json   |   4 +--
 .../block/yellow_borderless_lamp_off.json     |   2 +-
 .../block/yellow_borderless_lamp_on.json      |   6 ++++
 .../gtceu/models/block/yellow_lamp.json       |   7 -----
 .../gtceu/models/block/yellow_lamp_bloom.json |   2 +-
 .../gtceu/models/block/yellow_lamp_on.json    |   6 ++++
 .../models/item/black_borderless_lamp.json    |   2 +-
 .../assets/gtceu/models/item/black_lamp.json  |   2 +-
 .../models/item/blue_borderless_lamp.json     |   2 +-
 .../assets/gtceu/models/item/blue_lamp.json   |   2 +-
 .../models/item/brown_borderless_lamp.json    |   2 +-
 .../assets/gtceu/models/item/cyan_lamp.json   |   2 +-
 .../models/item/gray_borderless_lamp.json     |   2 +-
 .../assets/gtceu/models/item/gray_lamp.json   |   2 +-
 .../models/item/green_borderless_lamp.json    |   2 +-
 .../item/light_blue_borderless_lamp.json      |   2 +-
 .../gtceu/models/item/light_blue_lamp.json    |   2 +-
 .../item/light_gray_borderless_lamp.json      |   2 +-
 .../gtceu/models/item/light_gray_lamp.json    |   2 +-
 .../models/item/lime_borderless_lamp.json     |   2 +-
 .../models/item/magenta_borderless_lamp.json  |   2 +-
 .../gtceu/models/item/magenta_lamp.json       |   2 +-
 .../models/item/orange_borderless_lamp.json   |   2 +-
 .../assets/gtceu/models/item/orange_lamp.json |   2 +-
 .../models/item/pink_borderless_lamp.json     |   2 +-
 .../assets/gtceu/models/item/pink_lamp.json   |   2 +-
 .../models/item/purple_borderless_lamp.json   |   2 +-
 .../assets/gtceu/models/item/purple_lamp.json |   2 +-
 .../models/item/red_borderless_lamp.json      |   2 +-
 .../models/item/white_borderless_lamp.json    |   2 +-
 .../assets/gtceu/models/item/white_lamp.json  |   2 +-
 .../models/item/yellow_borderless_lamp.json   |   2 +-
 .../assets/gtceu/models/item/yellow_lamp.json |   2 +-
 .../gtceu/common/data/models/GTModels.java    |  27 ++++++++----------
 .../gtceu/models/block/cube/emissive/all.json |  12 ++++++++
 .../models/block/cube/emissive/default.json   |  19 ++++++++++++
 .../block/{lamp.json => lamp_bloom.json}      |   0
 .../models/block/lamp_borderless_bloom.json   |   6 ++++
 ...orderless.json => lamp_borderless_on.json} |   0
 .../assets/gtceu/models/block/lamp_on.json    |   6 ++++
 .../block/lamps/black_borderless_emissive.png | Bin 189 -> 0 bytes
 .../black_borderless_emissive.png.mcmeta      |   5 ----
 .../block/lamps/blue_borderless_emissive.png  | Bin 189 -> 0 bytes
 .../lamps/blue_borderless_emissive.png.mcmeta |   5 ----
 .../block/lamps/brown_borderless_emissive.png | Bin 189 -> 0 bytes
 .../brown_borderless_emissive.png.mcmeta      |   5 ----
 .../block/lamps/cyan_borderless_emissive.png  | Bin 189 -> 0 bytes
 .../lamps/cyan_borderless_emissive.png.mcmeta |   5 ----
 .../block/lamps/gray_borderless_emissive.png  | Bin 189 -> 0 bytes
 .../lamps/gray_borderless_emissive.png.mcmeta |   5 ----
 .../block/lamps/green_borderless_emissive.png | Bin 189 -> 0 bytes
 .../green_borderless_emissive.png.mcmeta      |   5 ----
 .../lamps/light_blue_borderless_emissive.png  | Bin 189 -> 0 bytes
 .../light_blue_borderless_emissive.png.mcmeta |   5 ----
 .../lamps/light_gray_borderless_emissive.png  | Bin 189 -> 0 bytes
 .../light_gray_borderless_emissive.png.mcmeta |   5 ----
 .../block/lamps/lime_borderless_emissive.png  | Bin 189 -> 0 bytes
 .../lamps/lime_borderless_emissive.png.mcmeta |   5 ----
 .../lamps/magenta_borderless_emissive.png     | Bin 189 -> 0 bytes
 .../magenta_borderless_emissive.png.mcmeta    |   5 ----
 .../lamps/orange_borderless_emissive.png      | Bin 189 -> 0 bytes
 .../orange_borderless_emissive.png.mcmeta     |   5 ----
 .../block/lamps/pink_borderless_emissive.png  | Bin 189 -> 0 bytes
 .../lamps/pink_borderless_emissive.png.mcmeta |   5 ----
 .../lamps/purple_borderless_emissive.png      | Bin 189 -> 0 bytes
 .../purple_borderless_emissive.png.mcmeta     |   5 ----
 .../block/lamps/red_borderless_emissive.png   | Bin 189 -> 0 bytes
 .../lamps/red_borderless_emissive.png.mcmeta  |   5 ----
 .../block/lamps/white_borderless_emissive.png | Bin 189 -> 0 bytes
 .../white_borderless_emissive.png.mcmeta      |   5 ----
 .../lamps/yellow_borderless_emissive.png      | Bin 189 -> 0 bytes
 .../yellow_borderless_emissive.png.mcmeta     |   5 ----
 198 files changed, 381 insertions(+), 437 deletions(-)
 create mode 100644 src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/black_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/blue_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/brown_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/cyan_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/gray_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/green_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/light_blue_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/light_gray_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/lime_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/magenta_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/orange_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/pink_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/purple_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/red_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/white_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_on.json
 create mode 100644 src/generated/resources/assets/gtceu/models/block/yellow_lamp_on.json
 create mode 100644 src/main/resources/assets/gtceu/models/block/cube/emissive/all.json
 create mode 100644 src/main/resources/assets/gtceu/models/block/cube/emissive/default.json
 rename src/main/resources/assets/gtceu/models/block/{lamp.json => lamp_bloom.json} (100%)
 create mode 100644 src/main/resources/assets/gtceu/models/block/lamp_borderless_bloom.json
 rename src/main/resources/assets/gtceu/models/block/{lamp_borderless.json => lamp_borderless_on.json} (100%)
 create mode 100644 src/main/resources/assets/gtceu/models/block/lamp_on.json
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png

diff --git a/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
index 2653760bdab..253a77bb05e 100644
--- a/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/black_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/black_borderless_lamp"
+      "model": "gtceu:block/black_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/black_borderless_lamp"
+      "model": "gtceu:block/black_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/black_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/black_lamp.json b/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
index 2ec244991e9..97737ee62ae 100644
--- a/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/black_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/black_lamp"
+      "model": "gtceu:block/black_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/black_lamp"
+      "model": "gtceu:block/black_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/black_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
index cf0137a72f6..7733a352429 100644
--- a/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/blue_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/blue_borderless_lamp"
+      "model": "gtceu:block/blue_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/blue_borderless_lamp"
+      "model": "gtceu:block/blue_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/blue_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json b/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
index 551d3d7ea75..cf1cbb4680b 100644
--- a/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/blue_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/blue_lamp"
+      "model": "gtceu:block/blue_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/blue_lamp"
+      "model": "gtceu:block/blue_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/blue_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
index 648d1fc0c31..1f94c32a9c8 100644
--- a/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/brown_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/brown_borderless_lamp"
+      "model": "gtceu:block/brown_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/brown_borderless_lamp"
+      "model": "gtceu:block/brown_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/brown_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json b/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
index 416b65492b9..778a11e8ba2 100644
--- a/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/brown_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/brown_lamp"
+      "model": "gtceu:block/brown_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/brown_lamp"
+      "model": "gtceu:block/brown_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/brown_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json
index dcc9951a482..059522192c9 100644
--- a/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/cyan_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/cyan_borderless_lamp"
+      "model": "gtceu:block/cyan_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/cyan_borderless_lamp"
+      "model": "gtceu:block/cyan_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/cyan_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json b/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
index fe235c636c8..02bc283ed22 100644
--- a/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/gray_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/gray_lamp"
+      "model": "gtceu:block/gray_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/gray_lamp"
+      "model": "gtceu:block/gray_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/gray_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json
index 2ba1217b905..4a2aa859750 100644
--- a/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/green_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/green_borderless_lamp"
+      "model": "gtceu:block/green_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/green_borderless_lamp"
+      "model": "gtceu:block/green_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/green_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/green_lamp.json b/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
index a399f46cc5b..8dd25b4bf15 100644
--- a/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/green_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/green_lamp"
+      "model": "gtceu:block/green_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/green_lamp"
+      "model": "gtceu:block/green_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/green_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json
index 04a4c1c3598..478555ea9d3 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/light_blue_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/light_blue_borderless_lamp"
+      "model": "gtceu:block/light_blue_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/light_blue_borderless_lamp"
+      "model": "gtceu:block/light_blue_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/light_blue_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json
index 5efb2370466..a9b2c1dfdc3 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/light_blue_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/light_blue_lamp"
+      "model": "gtceu:block/light_blue_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/light_blue_lamp"
+      "model": "gtceu:block/light_blue_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/light_blue_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json
index 35a06427bfc..a165753e8ed 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/light_gray_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/light_gray_borderless_lamp"
+      "model": "gtceu:block/light_gray_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/light_gray_borderless_lamp"
+      "model": "gtceu:block/light_gray_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/light_gray_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json
index 609090bca1a..893ead5ebb3 100644
--- a/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/lime_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/lime_borderless_lamp"
+      "model": "gtceu:block/lime_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/lime_borderless_lamp"
+      "model": "gtceu:block/lime_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/lime_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json b/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
index 004a8210c98..7d6989cd5e3 100644
--- a/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/lime_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/lime_lamp"
+      "model": "gtceu:block/lime_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/lime_lamp"
+      "model": "gtceu:block/lime_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/lime_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json
index 662ea54a7d9..71c9fe65e62 100644
--- a/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/magenta_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/magenta_borderless_lamp"
+      "model": "gtceu:block/magenta_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/magenta_borderless_lamp"
+      "model": "gtceu:block/magenta_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/magenta_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json b/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
index 709aa6b8536..3d696c9475e 100644
--- a/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/magenta_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/magenta_lamp"
+      "model": "gtceu:block/magenta_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/magenta_lamp"
+      "model": "gtceu:block/magenta_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/magenta_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json
index 8d3f051ad00..dc8a8a1774d 100644
--- a/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/orange_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/orange_borderless_lamp"
+      "model": "gtceu:block/orange_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/orange_borderless_lamp"
+      "model": "gtceu:block/orange_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/orange_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json b/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
index fe41b1e40a8..8d894e3c2e9 100644
--- a/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/orange_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/orange_lamp"
+      "model": "gtceu:block/orange_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/orange_lamp"
+      "model": "gtceu:block/orange_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/orange_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json
index 9061ec60bfd..49beb311e18 100644
--- a/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/purple_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/purple_borderless_lamp"
+      "model": "gtceu:block/purple_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/purple_borderless_lamp"
+      "model": "gtceu:block/purple_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/purple_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json b/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
index a2b8df6d91d..1cc72c942c7 100644
--- a/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/purple_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/purple_lamp"
+      "model": "gtceu:block/purple_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/purple_lamp"
+      "model": "gtceu:block/purple_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/purple_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json
index f34d00b2679..54eae2a378b 100644
--- a/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/red_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/red_borderless_lamp"
+      "model": "gtceu:block/red_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/red_borderless_lamp"
+      "model": "gtceu:block/red_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/red_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/red_lamp.json b/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
index ed2b42645b0..75b635491c2 100644
--- a/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/red_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/red_lamp"
+      "model": "gtceu:block/red_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/red_lamp"
+      "model": "gtceu:block/red_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/red_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json
index 7260b08a785..7ef79ba04fa 100644
--- a/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/yellow_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/yellow_borderless_lamp"
+      "model": "gtceu:block/yellow_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/yellow_borderless_lamp"
+      "model": "gtceu:block/yellow_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/yellow_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp.json
index 0c19aad913c..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/black_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_bloom.json
index 9fa8d3f38d4..806989d43ee 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/black_borderless_emissive"
+    "active": "gtceu:block/lamps/black_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_on.json
new file mode 100644
index 00000000000..4088ce5b9a5
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/black_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_lamp.json b/src/generated/resources/assets/gtceu/models/block/black_lamp.json
index ab020a51643..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/black",
-    "active_overlay": "gtceu:block/lamps/black"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/black_lamp_bloom.json
index 4f744418d6e..b16b8a9c982 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/black",
     "active_overlay": "gtceu:block/lamps/black_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/black_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/black_lamp_on.json
new file mode 100644
index 00000000000..4338bed5bae
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/black_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/black"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json
index 141172292fa..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/blue_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_bloom.json
index 7f670fdbd33..b2f0f987ed6 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/blue_borderless_emissive"
+    "active": "gtceu:block/lamps/blue_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_off.json
index bbddedf5449..848265e0d35 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/blue_off_borderless"
+    "inactive": "gtceu:block/lamps/blue_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_on.json
new file mode 100644
index 00000000000..589b7e72298
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/blue_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_lamp.json b/src/generated/resources/assets/gtceu/models/block/blue_lamp.json
index 5745ea7e123..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/blue",
-    "active_overlay": "gtceu:block/lamps/blue"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/blue_lamp_bloom.json
index 0aaa5323256..6b874a889e8 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/blue",
     "active_overlay": "gtceu:block/lamps/blue_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/blue_lamp_on.json
new file mode 100644
index 00000000000..a036cbc0712
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/blue_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/blue"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp.json
index b505d4b694d..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/brown_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_bloom.json
index aa7dbb55ca9..6b544f99c25 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/brown_borderless_emissive"
+    "active": "gtceu:block/lamps/brown_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_off.json
index b8f137c3256..1a64746e1b4 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/brown_off_borderless"
+    "inactive": "gtceu:block/lamps/brown_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_on.json
new file mode 100644
index 00000000000..2127af2c7ab
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/brown_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_lamp.json b/src/generated/resources/assets/gtceu/models/block/brown_lamp.json
index df6eb9f6ad9..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/brown",
-    "active_overlay": "gtceu:block/lamps/brown"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/brown_lamp_bloom.json
index 255f40f8292..99d9e783663 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/brown",
     "active_overlay": "gtceu:block/lamps/brown_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/brown_lamp_on.json
new file mode 100644
index 00000000000..3ba2b9fb583
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/brown_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/brown"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp.json
index f36df565587..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/cyan_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_bloom.json
index bc635568a38..b2811583923 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/cyan_borderless_emissive"
+    "active": "gtceu:block/lamps/cyan_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_off.json
index f96fa394e39..25d017cd16f 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/cyan_off_borderless"
+    "inactive": "gtceu:block/lamps/cyan_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_on.json
new file mode 100644
index 00000000000..6da55252e0e
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/cyan_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_lamp.json b/src/generated/resources/assets/gtceu/models/block/cyan_lamp.json
index 1bda83da437..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/cyan",
-    "active_overlay": "gtceu:block/lamps/cyan"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_bloom.json
index 664da2a906a..86bcd1a8bac 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/cyan",
     "active_overlay": "gtceu:block/lamps/cyan_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_on.json
new file mode 100644
index 00000000000..842d3a7e150
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/cyan"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp.json
index cb1c75e15eb..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/gray_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_bloom.json
index 02817b26ff0..fcd5fbd5d0e 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/gray_borderless_emissive"
+    "active": "gtceu:block/lamps/gray_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_off.json
index 3d630919ddc..e4ae459d0b0 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/gray_off_borderless"
+    "inactive": "gtceu:block/lamps/gray_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_on.json
new file mode 100644
index 00000000000..4a315f7c06b
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/gray_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_lamp.json b/src/generated/resources/assets/gtceu/models/block/gray_lamp.json
index 10a7355aad2..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/gray",
-    "active_overlay": "gtceu:block/lamps/gray"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/gray_lamp_bloom.json
index 395664b8592..5d93bf6c47d 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/gray",
     "active_overlay": "gtceu:block/lamps/gray_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/gray_lamp_on.json
new file mode 100644
index 00000000000..35830a31c7c
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/gray_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/gray"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp.json
index f53ba7ebb72..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/green_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_bloom.json
index 77b024546bc..d2aa2b73704 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/green_borderless_emissive"
+    "active": "gtceu:block/lamps/green_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_off.json
index b1f22b9681d..3ab0b42d3ad 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/green_off_borderless"
+    "inactive": "gtceu:block/lamps/green_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_on.json
new file mode 100644
index 00000000000..1516ef02e69
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/green_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_lamp.json b/src/generated/resources/assets/gtceu/models/block/green_lamp.json
index a79d65ee1a7..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/green",
-    "active_overlay": "gtceu:block/lamps/green"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/green_lamp_bloom.json
index 5611eae3d3e..d2e9ca3bd1c 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/green",
     "active_overlay": "gtceu:block/lamps/green_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/green_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/green_lamp_on.json
new file mode 100644
index 00000000000..e91d7abcdcb
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/green_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/green"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp.json
index 9cc7bf42d96..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/light_blue_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_bloom.json
index 67d13121e5e..0312ce6f180 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/light_blue_borderless_emissive"
+    "active": "gtceu:block/lamps/light_blue_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_off.json
index 8a476527d76..d94ec49a102 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/light_blue_off_borderless"
+    "inactive": "gtceu:block/lamps/light_blue_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_on.json
new file mode 100644
index 00000000000..288796028a4
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/light_blue_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp.json b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp.json
index c1a04f4f716..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/light_blue",
-    "active_overlay": "gtceu:block/lamps/light_blue"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_bloom.json
index c42aac43965..a8c2164a6c4 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/light_blue",
     "active_overlay": "gtceu:block/lamps/light_blue_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_on.json
new file mode 100644
index 00000000000..d04ee23320d
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/light_blue"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp.json
index 2d5c4a7dc0a..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/light_gray_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_bloom.json
index f1693f502ce..5066febf0b3 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/light_gray_borderless_emissive"
+    "active": "gtceu:block/lamps/light_gray_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_off.json
index 4a82d739b49..e4f0e8e573a 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/light_gray_off_borderless"
+    "inactive": "gtceu:block/lamps/light_gray_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_on.json
new file mode 100644
index 00000000000..749354c8ec9
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/light_gray_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp.json b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp.json
index 187128e5b5e..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/light_gray",
-    "active_overlay": "gtceu:block/lamps/light_gray"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_on.json
new file mode 100644
index 00000000000..6cd7d252d99
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/light_gray"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp.json
index e08dc19e73a..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/lime_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_bloom.json
index a3114c2c291..5da6a37bd34 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/lime_borderless_emissive"
+    "active": "gtceu:block/lamps/lime_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_off.json
index 983ce7d8035..ef82cdd5ba7 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/lime_off_borderless"
+    "inactive": "gtceu:block/lamps/lime_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_on.json
new file mode 100644
index 00000000000..fa848909ca9
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/lime_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_lamp.json b/src/generated/resources/assets/gtceu/models/block/lime_lamp.json
index 4be47ff4c57..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/lime",
-    "active_overlay": "gtceu:block/lamps/lime"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/lime_lamp_bloom.json
index 11569f18ac1..8fc9097d314 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/lime",
     "active_overlay": "gtceu:block/lamps/lime_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/lime_lamp_on.json
new file mode 100644
index 00000000000..e1a2fe27639
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/lime_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/lime"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp.json
index d76ba268ea5..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/magenta_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_bloom.json
index 5a35c2addcd..4ca7c826a0e 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/magenta_borderless_emissive"
+    "active": "gtceu:block/lamps/magenta_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_off.json
index e71bbf3ae42..32437f573d3 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/magenta_off_borderless"
+    "inactive": "gtceu:block/lamps/magenta_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_on.json
new file mode 100644
index 00000000000..075cd0952db
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/magenta_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_lamp.json b/src/generated/resources/assets/gtceu/models/block/magenta_lamp.json
index 5e808a5b3bb..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/magenta",
-    "active_overlay": "gtceu:block/lamps/magenta"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_bloom.json
index b12ad018601..104d503c092 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/magenta",
     "active_overlay": "gtceu:block/lamps/magenta_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_on.json
new file mode 100644
index 00000000000..dbd2f889c2e
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/magenta"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp.json
index 268c735b953..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/orange_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_bloom.json
index 4d8e9ee9970..067c4871c3f 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/orange_borderless_emissive"
+    "active": "gtceu:block/lamps/orange_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_on.json
new file mode 100644
index 00000000000..a9533a1401f
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/orange_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_lamp.json b/src/generated/resources/assets/gtceu/models/block/orange_lamp.json
index 575ac5eba7c..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/orange",
-    "active_overlay": "gtceu:block/lamps/orange"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/orange_lamp_bloom.json
index bca9ad4c8c9..94c480a414f 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/orange",
     "active_overlay": "gtceu:block/lamps/orange_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/orange_lamp_on.json
new file mode 100644
index 00000000000..7d7b2d2a0b6
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/orange_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/orange"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp.json
index 671ce70381d..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/pink_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_bloom.json
index e90375ef7e6..52767e59d91 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/pink_borderless_emissive"
+    "active": "gtceu:block/lamps/pink_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_off.json
index a6d100ca5f1..6208d2d9b2a 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/pink_off_borderless"
+    "inactive": "gtceu:block/lamps/pink_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_on.json
new file mode 100644
index 00000000000..7c871e10d88
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/pink_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_lamp.json b/src/generated/resources/assets/gtceu/models/block/pink_lamp.json
index 7c3c8fbcee4..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/pink",
-    "active_overlay": "gtceu:block/lamps/pink"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/pink_lamp_bloom.json
index 694392c18a0..e84579e9615 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/pink",
     "active_overlay": "gtceu:block/lamps/pink_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/pink_lamp_on.json
new file mode 100644
index 00000000000..854a85f2546
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/pink_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/pink"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp.json
index a70dc190f21..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/purple_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_off.json
index a2c85e59b51..166f5328f9e 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/purple_off_borderless"
+    "inactive": "gtceu:block/lamps/purple_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_on.json
new file mode 100644
index 00000000000..e31e7d0a584
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/purple_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_lamp.json b/src/generated/resources/assets/gtceu/models/block/purple_lamp.json
index 4a1ac93555d..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/purple",
-    "active_overlay": "gtceu:block/lamps/purple"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/purple_lamp_bloom.json
index 7461d1ab9ea..07a9193a2a9 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/purple",
     "active_overlay": "gtceu:block/lamps/purple_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/purple_lamp_on.json
new file mode 100644
index 00000000000..6e556400065
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/purple_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/purple"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp.json
index 475c552e60c..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/red_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_bloom.json
index ed52fab86ba..e68e1bdfde1 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/red_borderless_emissive"
+    "active": "gtceu:block/lamps/red_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_off.json
index 622bb2edfb0..21b0ec08285 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/red_off_borderless"
+    "inactive": "gtceu:block/lamps/red_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_on.json
new file mode 100644
index 00000000000..120c01ae392
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/red_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_lamp.json b/src/generated/resources/assets/gtceu/models/block/red_lamp.json
index d5ec2cf5431..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/red",
-    "active_overlay": "gtceu:block/lamps/red"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/red_lamp_bloom.json
index 439816ac989..bdd85e6f25b 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/red",
     "active_overlay": "gtceu:block/lamps/red_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/red_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/red_lamp_on.json
new file mode 100644
index 00000000000..e29d346ccfe
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/red_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/red"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp.json
index efaabb1b55e..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/white_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_bloom.json
index a77bbb1841a..9556f00bdb7 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/white_borderless_emissive"
+    "active": "gtceu:block/lamps/white_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_off.json
index 87da3643f27..f7d54a35b52 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/white_off_borderless"
+    "inactive": "gtceu:block/lamps/white_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_on.json
new file mode 100644
index 00000000000..42735b05883
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/white_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_lamp.json b/src/generated/resources/assets/gtceu/models/block/white_lamp.json
index cc2fa12fc0d..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/white",
-    "active_overlay": "gtceu:block/lamps/white"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/white_lamp_bloom.json
index 4e8878006b4..b71b3faf8eb 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/white",
     "active_overlay": "gtceu:block/lamps/white_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/white_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/white_lamp_on.json
new file mode 100644
index 00000000000..4522ed15ac7
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/white_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/white"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp.json
index 4df35813465..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp.json
@@ -1,6 +0,0 @@
-{
-  "parent": "gtceu:block/lamp_borderless",
-  "textures": {
-    "active": "gtceu:block/lamps/yellow_borderless"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_bloom.json
index 37c776a0d61..96b705cba28 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/yellow_borderless_emissive"
+    "active": "gtceu:block/lamps/yellow_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_off.json
index 9f5d3a4c284..ad77fe2b931 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/yellow_off_borderless"
+    "inactive": "gtceu:block/lamps/yellow_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_on.json
new file mode 100644
index 00000000000..aeadee0da31
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_borderless_on",
+  "textures": {
+    "active": "gtceu:block/lamps/yellow_borderless"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_lamp.json b/src/generated/resources/assets/gtceu/models/block/yellow_lamp.json
index 28dd1a7124a..e69de29bb2d 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_lamp.json
@@ -1,7 +0,0 @@
-{
-  "parent": "gtceu:block/lamp",
-  "textures": {
-    "active": "gtceu:block/lamps/yellow",
-    "active_overlay": "gtceu:block/lamps/yellow"
-  }
-}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_bloom.json
index 027d8c77f32..fb7e8ae71d2 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/yellow",
     "active_overlay": "gtceu:block/lamps/yellow_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_on.json
new file mode 100644
index 00000000000..0f532dc8561
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "gtceu:block/lamp_on",
+  "textures": {
+    "active": "gtceu:block/lamps/yellow"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/black_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/black_borderless_lamp.json
index cb306261be0..ed0af019e1a 100644
--- a/src/generated/resources/assets/gtceu/models/item/black_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/black_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/black_borderless_lamp"
+  "parent": "gtceu:block/black_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/black_lamp.json b/src/generated/resources/assets/gtceu/models/item/black_lamp.json
index 5009d942bb4..f8acb4b6c58 100644
--- a/src/generated/resources/assets/gtceu/models/item/black_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/black_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/black_lamp"
+  "parent": "gtceu:block/black_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/blue_borderless_lamp.json
index d7c6939c703..6e499dd5755 100644
--- a/src/generated/resources/assets/gtceu/models/item/blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/blue_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/blue_borderless_lamp"
+  "parent": "gtceu:block/blue_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/blue_lamp.json b/src/generated/resources/assets/gtceu/models/item/blue_lamp.json
index 21629af87f6..16b2ee53614 100644
--- a/src/generated/resources/assets/gtceu/models/item/blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/blue_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/blue_lamp"
+  "parent": "gtceu:block/blue_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/brown_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/brown_borderless_lamp.json
index 06c1a13eefe..c2d4ad2049a 100644
--- a/src/generated/resources/assets/gtceu/models/item/brown_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/brown_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/brown_borderless_lamp"
+  "parent": "gtceu:block/brown_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/cyan_lamp.json b/src/generated/resources/assets/gtceu/models/item/cyan_lamp.json
index 610b95fa37a..2f5b03f59d1 100644
--- a/src/generated/resources/assets/gtceu/models/item/cyan_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/cyan_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/cyan_lamp"
+  "parent": "gtceu:block/cyan_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/gray_borderless_lamp.json
index 077a9c52b0c..07abe6d60cd 100644
--- a/src/generated/resources/assets/gtceu/models/item/gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/gray_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/gray_borderless_lamp"
+  "parent": "gtceu:block/gray_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/gray_lamp.json b/src/generated/resources/assets/gtceu/models/item/gray_lamp.json
index f1f49ba032a..6bcd8b968b0 100644
--- a/src/generated/resources/assets/gtceu/models/item/gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/gray_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/gray_lamp"
+  "parent": "gtceu:block/gray_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/green_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/green_borderless_lamp.json
index 6c708589feb..8cf44bd24c4 100644
--- a/src/generated/resources/assets/gtceu/models/item/green_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/green_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/green_borderless_lamp"
+  "parent": "gtceu:block/green_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/light_blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/light_blue_borderless_lamp.json
index c1c2558ff1d..c3f886d6a75 100644
--- a/src/generated/resources/assets/gtceu/models/item/light_blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/light_blue_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/light_blue_borderless_lamp"
+  "parent": "gtceu:block/light_blue_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/light_blue_lamp.json b/src/generated/resources/assets/gtceu/models/item/light_blue_lamp.json
index 0aa9f92d08c..62046034a02 100644
--- a/src/generated/resources/assets/gtceu/models/item/light_blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/light_blue_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/light_blue_lamp"
+  "parent": "gtceu:block/light_blue_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/light_gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/light_gray_borderless_lamp.json
index ba98d5dba14..531884b2914 100644
--- a/src/generated/resources/assets/gtceu/models/item/light_gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/light_gray_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/light_gray_borderless_lamp"
+  "parent": "gtceu:block/light_gray_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/light_gray_lamp.json b/src/generated/resources/assets/gtceu/models/item/light_gray_lamp.json
index 4ff258a6e73..163222af84d 100644
--- a/src/generated/resources/assets/gtceu/models/item/light_gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/light_gray_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/light_gray_lamp"
+  "parent": "gtceu:block/light_gray_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/lime_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/lime_borderless_lamp.json
index 70e7956ac61..5030d4a6508 100644
--- a/src/generated/resources/assets/gtceu/models/item/lime_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/lime_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/lime_borderless_lamp"
+  "parent": "gtceu:block/lime_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/magenta_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/magenta_borderless_lamp.json
index a344a461960..09df14bd560 100644
--- a/src/generated/resources/assets/gtceu/models/item/magenta_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/magenta_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/magenta_borderless_lamp"
+  "parent": "gtceu:block/magenta_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/magenta_lamp.json b/src/generated/resources/assets/gtceu/models/item/magenta_lamp.json
index 917e0ebbd24..1f6f3693bab 100644
--- a/src/generated/resources/assets/gtceu/models/item/magenta_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/magenta_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/magenta_lamp"
+  "parent": "gtceu:block/magenta_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/orange_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/orange_borderless_lamp.json
index 2c20cdfa5ee..fbab08b7da6 100644
--- a/src/generated/resources/assets/gtceu/models/item/orange_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/orange_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/orange_borderless_lamp"
+  "parent": "gtceu:block/orange_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/orange_lamp.json b/src/generated/resources/assets/gtceu/models/item/orange_lamp.json
index f7bfda11c79..55faf24052a 100644
--- a/src/generated/resources/assets/gtceu/models/item/orange_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/orange_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/orange_lamp"
+  "parent": "gtceu:block/orange_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/pink_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/pink_borderless_lamp.json
index 974f41940c9..4c8ec0c54a6 100644
--- a/src/generated/resources/assets/gtceu/models/item/pink_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/pink_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/pink_borderless_lamp"
+  "parent": "gtceu:block/pink_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/pink_lamp.json b/src/generated/resources/assets/gtceu/models/item/pink_lamp.json
index f39eb45c972..dc4d410039f 100644
--- a/src/generated/resources/assets/gtceu/models/item/pink_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/pink_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/pink_lamp"
+  "parent": "gtceu:block/pink_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/purple_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/purple_borderless_lamp.json
index 32808b80261..b2cde70d299 100644
--- a/src/generated/resources/assets/gtceu/models/item/purple_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/purple_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/purple_borderless_lamp"
+  "parent": "gtceu:block/purple_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/purple_lamp.json b/src/generated/resources/assets/gtceu/models/item/purple_lamp.json
index bfb10ac85f3..83eaa30a9b4 100644
--- a/src/generated/resources/assets/gtceu/models/item/purple_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/purple_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/purple_lamp"
+  "parent": "gtceu:block/purple_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/red_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/red_borderless_lamp.json
index 91cf330777d..b59947db0e7 100644
--- a/src/generated/resources/assets/gtceu/models/item/red_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/red_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/red_borderless_lamp"
+  "parent": "gtceu:block/red_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/white_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/white_borderless_lamp.json
index 969bc638329..f094edd1151 100644
--- a/src/generated/resources/assets/gtceu/models/item/white_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/white_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/white_borderless_lamp"
+  "parent": "gtceu:block/white_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/white_lamp.json b/src/generated/resources/assets/gtceu/models/item/white_lamp.json
index 1c31c461357..bbc74c7fbad 100644
--- a/src/generated/resources/assets/gtceu/models/item/white_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/white_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/white_lamp"
+  "parent": "gtceu:block/white_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/yellow_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/yellow_borderless_lamp.json
index 9db7270eef3..fb25ba2c181 100644
--- a/src/generated/resources/assets/gtceu/models/item/yellow_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/yellow_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/yellow_borderless_lamp"
+  "parent": "gtceu:block/yellow_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/yellow_lamp.json b/src/generated/resources/assets/gtceu/models/item/yellow_lamp.json
index 0156ca91e9c..a24eeb91199 100644
--- a/src/generated/resources/assets/gtceu/models/item/yellow_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/yellow_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/yellow_lamp"
+  "parent": "gtceu:block/yellow_lamp_on"
 }
\ No newline at end of file
diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
index 76ff524c136..bff2a3624c7 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
@@ -85,30 +85,27 @@ public static void rubberTreeSaplingModel(DataGenContext<Item, BlockItem> contex
     public static NonNullBiConsumer<DataGenContext<Block, LampBlock>, RegistrateBlockstateProvider> lampModel(DyeColor color,
                                                                                                               boolean border) {
         return (ctx, prov) -> {
-            final String colorName = color.getSerializedName();
+            final String textureBase = "block/lamps/" + color.getSerializedName();
             final String borderPart = (border ? "" : "_borderless");
-            ModelFile parentOn = prov.models().getExistingFile(prov.modLoc("block/lamp" + borderPart));
-            ModelFile parentOff = prov.models().getExistingFile(prov.modLoc("block/lamp" + borderPart + "_off"));
+            final String parentModelBase = "block/lamp" + borderPart;
+
+            ModelFile parentBloom = prov.models().getExistingFile(prov.modLoc(parentModelBase + "_bloom"));
+            ModelFile parentOn = prov.models().getExistingFile(prov.modLoc(parentModelBase + "_on"));
+            ModelFile parentOff = prov.models().getExistingFile(prov.modLoc(parentModelBase + "_off"));
 
             prov.getVariantBuilder(ctx.getEntry())
                     .forAllStatesExcept(state -> {
                         if (LampBlock.isLightActive(state)) {
                             ModelBuilder<?> model = prov.models()
-                                    .getBuilder(ctx.getName() + (state.getValue(LampBlock.BLOOM) ? "_bloom" : ""))
-                                    .parent(parentOn);
+                                    .getBuilder(ctx.getName() + (state.getValue(LampBlock.BLOOM) ? "_bloom" : "_on"))
+                                    .parent(state.getValue(LampBlock.BLOOM) ? parentBloom : parentOn);
                             if (border) {
-                                model.texture("active", "block/lamps/" + colorName);
+                                model.texture("active", textureBase);
                                 if (state.getValue(LampBlock.BLOOM)) {
-                                    model.texture("active_overlay", "block/lamps/" + colorName + "_emissive");
-                                } else {
-                                    model.texture("active_overlay", "block/lamps/" + colorName);
+                                    model.texture("active_overlay", textureBase + "_emissive");
                                 }
                             } else {
-                                if (state.getValue(LampBlock.BLOOM)) {
-                                    model.texture("active", "block/lamps/" + colorName + "_borderless_emissive");
-                                } else {
-                                    model.texture("active", "block/lamps/" + colorName + "_borderless");
-                                }
+                                model.texture("active", textureBase + "_borderless");
                             }
                             return ConfiguredModel.builder()
                                     .modelFile(model)
@@ -118,7 +115,7 @@ public static NonNullBiConsumer<DataGenContext<Block, LampBlock>, RegistrateBloc
                                     .modelFile(prov.models()
                                             .getBuilder(ctx.getName() + "_off")
                                             .parent(parentOff)
-                                            .texture("inactive", "block/lamps/" + colorName + "_off" + borderPart))
+                                            .texture("inactive", textureBase + borderPart + "_off"))
                                     .build();
                         }
                     }, LampBlock.LIGHT);
diff --git a/src/main/resources/assets/gtceu/models/block/cube/emissive/all.json b/src/main/resources/assets/gtceu/models/block/cube/emissive/all.json
new file mode 100644
index 00000000000..d8542b27d73
--- /dev/null
+++ b/src/main/resources/assets/gtceu/models/block/cube/emissive/all.json
@@ -0,0 +1,12 @@
+{
+  "parent": "gtceu:block/cube/emissive/default",
+  "textures": {
+    "particle": "#all",
+    "down": "#all",
+    "up": "#all",
+    "north": "#all",
+    "east": "#all",
+    "south": "#all",
+    "west": "#all"
+  }
+}
diff --git a/src/main/resources/assets/gtceu/models/block/cube/emissive/default.json b/src/main/resources/assets/gtceu/models/block/cube/emissive/default.json
new file mode 100644
index 00000000000..039c4cdd6cb
--- /dev/null
+++ b/src/main/resources/assets/gtceu/models/block/cube/emissive/default.json
@@ -0,0 +1,19 @@
+{
+  "parent": "block/block",
+  "elements": [
+    {
+      "from": [  0,  0,  0 ],
+      "to":   [ 16, 16, 16 ],
+      "forge_data": { "block_light": 15, "sky_light": 15 },
+      "shade": false,
+      "faces": {
+        "down":  { "texture": "#down",  "cullface": "down"  },
+        "up":    { "texture": "#up",    "cullface": "up"    },
+        "north": { "texture": "#north", "cullface": "north" },
+        "south": { "texture": "#south", "cullface": "south" },
+        "west":  { "texture": "#west",  "cullface": "west"  },
+        "east":  { "texture": "#east",  "cullface": "east"  }
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/assets/gtceu/models/block/lamp.json b/src/main/resources/assets/gtceu/models/block/lamp_bloom.json
similarity index 100%
rename from src/main/resources/assets/gtceu/models/block/lamp.json
rename to src/main/resources/assets/gtceu/models/block/lamp_bloom.json
diff --git a/src/main/resources/assets/gtceu/models/block/lamp_borderless_bloom.json b/src/main/resources/assets/gtceu/models/block/lamp_borderless_bloom.json
new file mode 100644
index 00000000000..02221906a01
--- /dev/null
+++ b/src/main/resources/assets/gtceu/models/block/lamp_borderless_bloom.json
@@ -0,0 +1,6 @@
+{
+    "parent": "gtceu:block/cube/emissive/all",
+    "textures": {
+        "all": "#active"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/models/block/lamp_borderless.json b/src/main/resources/assets/gtceu/models/block/lamp_borderless_on.json
similarity index 100%
rename from src/main/resources/assets/gtceu/models/block/lamp_borderless.json
rename to src/main/resources/assets/gtceu/models/block/lamp_borderless_on.json
diff --git a/src/main/resources/assets/gtceu/models/block/lamp_on.json b/src/main/resources/assets/gtceu/models/block/lamp_on.json
new file mode 100644
index 00000000000..e24c1097eab
--- /dev/null
+++ b/src/main/resources/assets/gtceu/models/block/lamp_on.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "#active"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png
deleted file mode 100644
index e244fd2adef6d4b32c5b18ada674975e7ba8888b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBN?^R-J8EvHR)hYPG5F}XO5n0T@z;_sg8IR|$NC67kdb&7<NL&s*
zdyw~l0ncHFD(2JDD!=(>E>PwAqJGDD$tGthqt)7XJ~}C~C~`D!5EOF~_{H4fRG~EQ
c|L2Dcr{}XJriL!d1{%cR>FVdQ&MBb@0OEZ(G5`Po

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png
deleted file mode 100644
index d7c80de65b7b832cfdccb7491164de1d81f4478e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1l9%RQ_Kh?Sov<eV48Ku7U&$JR*x382Ao@Fyrz36)8YLTTd6q5Q)p7
zXAkloFyJ}tP{n*&TIDzY%mu1kU)1k7FWKZQWwcuR&POLj7DbNc4T54$0>7ABoGO&&
d{r~)s;q-jA#MIDb*+7FBJYD@<);T3K0RR|_I`;qo

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png
deleted file mode 100644
index 30bdb8600dd37720bb2d2f41a52e1b2a69149e94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lAyyf|=nntN}!&4<mNyFr2l9+AZi419+{nDKc2iWH!rt*47)h{Wa4
zvj=$(81Ni+sA4`Xt@4|H<^ol&FY0%kmuzyDGFq*D=cAJ%iy}w!20<|=fnUrmP8CY?
c{(pYRaC$ylVruBJY@k65p00i_>zopr0N=4XZ~y=R

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png
deleted file mode 100644
index 743480a2a9f20b4007a93a67f1c2cc2cecbe84a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lAiGW)Fb#6tqjn?85(tOE%actjR6Fz_7)VaDV6D^h@hww^AIArhBE
z&mQDGV8C<Op^Evmw90S(nG008zNp`EUb4wq%4oIrosUk6EQ%b>8wACi1b#8MI8`Xk
d`~UeN!|C~KiK(H>vVjIMc)I$ztaD0e0s!6SI&1&{

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png
deleted file mode 100644
index 2e0c168be730d95aabe86a7a824c068a82b39fb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lB7+}vDRTAG@g`m~w75hPgP5n0T@z;_sg8IR|$NC67kdb&7<NL&s*
zdyw~l0ncHFD(2JDD!=(>E>PwAqJGDD$tGthqt)7XJ~}C~C~`D!5EOF~_{H4fRG~EQ
c|L2Dcr{}XJriL!d1{%cR>FVdQ&MBb@0I)AP{Qv*}

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png
deleted file mode 100644
index 436ab101fa21cf9fc5d83a56b9b96e5137b75777..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBNGK0ackHNBm;m&ibuOPt!kH}&M2EM}}%y>M1MG8>R*3-o?MB;Mj
z*@L_X40sMZR572HR{708bAc+?7xg>NOEx)68Lig7^U+C>MUkU<gP@p`z%S+&rwXNc
c|35!uI6a>&F*S5qHqamjPgg&ebxsLQ09ZLWNdN!<

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png
deleted file mode 100644
index 77244678a75fae833c0362ff5baaa628624673e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1l9nxBGwIy8j7_|0nML{1zlw;1OBOz`%DHgc*<LuSfw3+IqS;hDclv
zJ$sP%fC0~8hbrdN(kj3CXD(3X`l5cvdC4YcDWlcecRo5PvM6#iZx9r768Od3;#8qD
d@BinA45#O_C8mZh%LW?6;OXk;vd$@?2>>77Jx2fl

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png
deleted file mode 100644
index 5e60a9410fef27a113f797c1ec17ecae0a1e06e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lAyZ{NO+8@DW6xFWN1wKYhvz$3Dlfr0NZ2s0kfUy%Y7wDojx43W4T
zdiEgi0Rx`H4pq#jrB#0O&s?C&^+o-T^O8-@Qbwz_?|gJpWKra3-XJLEB=C#5#i>GR
d-v7@J8BWh<OH2)2mJKwB!PC{xWt~$(69AMmJNN(q

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png
deleted file mode 100644
index cc1ddc19f0b51cda86d8eb3526a7b75fd1fa0074..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1l9n@{%FzHbdNLhSgWKBtU`%9+AZi419+{nDKc2iWH!rt*47)h{Wa4
zvj=$(81Ni+sA4`Xt@4|H<^ol&FY0%kmuzyDGFq*D=cAJ%iy}w!20<|=fnUrmP8CY?
c{(pYRaC$ylVruBJY@k65p00i_>zopr0DH7Kg8%>k

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png
deleted file mode 100644
index 6864250af2651621960ebec4a0b2da5c70b39a1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBd-{}8y^>^oGZtp3d^avza;1OBOz`%DHgc*<LuSfw3+IqS;hDclv
zJ$sP%fC0~8hbrdN(kj3CXD(3X`l5cvdC4YcDWlcecRo5PvM6#iZx9r768Od3;#8qD
d@BinA45#O_C8mZh%LW?6;OXk;vd$@?2>{YDJdXeX

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png
deleted file mode 100644
index 11bed397b8ea8077ff6c45fe6b46ddd58e0f912c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBdzs2Z%k;c6^nJJvbVIaW*kH}&M2EM}}%y>M1MG8>R*3-o?MB;Mj
z*@L_X40sMZR572HR{708bAc+?7xg>NOEx)68Lig7^U+C>MUkU<gP@p`z%S+&rwXNc
c|35!uI6a>&F*S5qHqamjPgg&ebxsLQ0I+g7@&Et;

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png
deleted file mode 100644
index 92802ad8825519a91097d63eb761797d60008bfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBdf99EYEnDy8&XHT3T@Df~@Q5sCVBk9p!i>lBSEK+1Z9QEaLnJPT
zo;}EWz<}qlLlyIBX_epnGZ(0GeNn&TykwKJl+kMKJ0G1CSrj>%HwcP33H)MiajH<7
d_y6-lhST%e5>rE$WdjXj@O1TaS?83{1OT0MJP7~*

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png
deleted file mode 100644
index 87fec534a79297de6623da3201ee4d220d81f30e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lAy+vxvN^>_U;w|SYL`GEurJR*x382Ao@Fyrz36)8YLTTd6q5Q)p7
zXAkloFyJ}tP{n*&TIDzY%mu1kU)1k7FWKZQWwcuR&POLj7DbNc4T54$0>7ABoGO&&
d{r~)s;q-jA#MIDb*+7FBJYD@<);T3K0RZ7#I%WU>

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png
deleted file mode 100644
index 88aa73ca7a2ee8376e66ea3631c4a2d53af11f47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBd-^l2#n(i$rbwQ^1y&%B?kH}&M2EM}}%y>M1MG8>R*3-o?MB;Mj
z*@L_X40sMZR572HR{708bAc+?7xg>NOEx)68Lig7^U+C>MUkU<gP@p`z%S+&rwXNc
c|35!uI6a>&F*S5qHqamjPgg&ebxsLQ05)wn;{X5v

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png
deleted file mode 100644
index 1efa7b0104965ba75f617611cf3e7c581292c805..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBd|NsA|@7|rgcdyR6t^*`k;1OBOz`%DHgc*<LuSfw3+IqS;hDclv
zJ$sP%fC0~8hbrdN(kj3CXD(3X`l5cvdC4YcDWlcecRo5PvM6#iZx9r768Od3;#8qD
d@BinA45#O_C8mZh%LW?6;OXk;vd$@?2>^UZJ^TOw

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png
deleted file mode 100644
index 4e2fd67dc41a4ef5c32da6593c0b394cfcca96da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBd|E|&d<LY<TNnfv6^AjXk;1OBOz`%DHgc*<LuSfw3+IqS;hDclv
zJ$sP%fC0~8hbrdN(kj3CXD(3X`l5cvdC4YcDWlcecRo5PvM6#iZx9r768Od3;#8qD
d@BinA45#O_C8mZh%LW?6;OXk;vd$@?2>{70JbC~C

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png.mcmeta
index 4da3f5f1299..e69de29bb2d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png.mcmeta
@@ -1,5 +0,0 @@
-{
-    "shimmer": {
-        "bloom": true
-    }
-}

From 727ae073f9d4615979be50f196ecf8c6ca38fc07 Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:28:22 +0300
Subject: [PATCH 06/14] Simplify lamps' "lit-on-placement" behavior by
 referencing how vanilla redstone lamps do it

---
 .../renderer/block/LampItemRenderer.java      |  2 +-
 .../gtceu/common/block/LampBlock.java         | 20 +++++++++----------
 .../gtceu/common/item/LampBlockItem.java      | 11 +++++-----
 .../gtceu/common/item/package-info.java       |  4 ++++
 4 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/com/gregtechceu/gtceu/common/item/package-info.java

diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java
index 268af12e43c..27d4057548b 100644
--- a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java
+++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java
@@ -48,7 +48,7 @@ public void renderByItem(@NotNull ItemStack stack, @NotNull ItemDisplayContext d
         if (!(stack.getItem() instanceof LampBlockItem item)) {
             return;
         }
-        BlockState state = item.getStateFromStack(stack, null);
+        BlockState state = item.getStateFromStack(stack, item.getBlock().defaultBlockState());
         BakedModel p_model = blockRenderer.getBlockModel(state);
 
         for (var model : p_model.getRenderPasses(stack, true)) {
diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
index f172a13d83a..cd2cddcd00f 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/block/LampBlock.java
@@ -11,6 +11,7 @@
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
@@ -98,6 +99,13 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
         builder.add(INVERTED, BLOOM, LIGHT, POWERED);
     }
 
+    @Override
+    public @Nullable BlockState getStateForPlacement(BlockPlaceContext context) {
+        BlockState originalState = super.getStateForPlacement(context);
+        if (originalState == null) return null;
+        return originalState.setValue(POWERED, context.getLevel().hasNeighborSignal(context.getClickedPos()));
+    }
+
     @Override
     public int getLightEmission(BlockState state, BlockGetter level, BlockPos pos) {
         return state.getValue(LIGHT) && isLightActive(state) ? 15 : 0;
@@ -111,18 +119,8 @@ public BlockState getAppearance(BlockState state, BlockAndTintGetter level, Bloc
 
     public void update(BlockState state, Level level, BlockPos pos) {
         if (state.getValue(POWERED) != level.hasNeighborSignal(pos)) {
-            level.setBlock(pos, state.cycle(POWERED),
-                    state.getValue(LIGHT) ? Block.UPDATE_ALL_IMMEDIATE : Block.UPDATE_ALL);
-        }
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean movedByPiston) {
-        if (!level.isClientSide) {
-            update(state, level, pos);
+            level.setBlock(pos, state.cycle(POWERED), Block.UPDATE_CLIENTS);
         }
-        super.onPlace(state, level, pos, oldState, movedByPiston);
     }
 
     @Override
diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java
index c1e59d991b2..22fdb6e30f7 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java
@@ -41,26 +41,25 @@ public LampBlockItem(LampBlock block, Properties properties) {
         }
     }
 
-    @NotNull
     @Override
     public LampBlock getBlock() {
         return (LampBlock) super.getBlock();
     }
 
-    @Nullable
     @Override
-    protected BlockState getPlacementState(BlockPlaceContext context) {
+    protected @Nullable BlockState getPlacementState(BlockPlaceContext context) {
         BlockState state = super.getPlacementState(context);
+        if (state == null) return null;
+
         return getStateFromStack(context.getItemInHand(), state);
     }
 
-    public BlockState getStateFromStack(ItemStack stack, @Nullable BlockState baseState) {
+    public BlockState getStateFromStack(ItemStack stack, BlockState baseState) {
         if (!stack.hasTag() || !stack.is(this)) {
             return baseState;
         }
         var tag = stack.getTag();
-        return (baseState != null ? baseState : getBlock().defaultBlockState())
-                .setValue(LampBlock.INVERTED, isInverted(tag))
+        return baseState.setValue(LampBlock.INVERTED, isInverted(tag))
                 .setValue(LampBlock.BLOOM, isBloomEnabled(tag))
                 .setValue(LampBlock.LIGHT, isLightEnabled(tag));
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/package-info.java b/src/main/java/com/gregtechceu/gtceu/common/item/package-info.java
new file mode 100644
index 00000000000..0febddd4076
--- /dev/null
+++ b/src/main/java/com/gregtechceu/gtceu/common/item/package-info.java
@@ -0,0 +1,4 @@
+@NotNullByDefault
+package com.gregtechceu.gtceu.common.item;
+
+import org.jetbrains.annotations.NotNullByDefault;

From ecc84ab9e8b3cdbb9da5f12a4efec691726c199b Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Fri, 1 May 2026 11:49:45 +0300
Subject: [PATCH 07/14] Forgot to unshelve this bit :3

---
 .../com/gregtechceu/gtceu/common/data/GTBlocks.java |   3 +++
 .../lamps/black_borderless_emissive.png.mcmeta      |   0
 ..._off_borderless.png => black_borderless_off.png} | Bin
 .../block/lamps/blue_borderless_emissive.png.mcmeta |   0
 ...e_off_borderless.png => blue_borderless_off.png} | Bin
 .../lamps/brown_borderless_emissive.png.mcmeta      |   0
 ..._off_borderless.png => brown_borderless_off.png} | Bin
 .../block/lamps/cyan_borderless_emissive.png.mcmeta |   0
 ...n_off_borderless.png => cyan_borderless_off.png} | Bin
 .../block/lamps/gray_borderless_emissive.png.mcmeta |   0
 ...y_off_borderless.png => gray_borderless_off.png} | Bin
 .../lamps/green_borderless_emissive.png.mcmeta      |   0
 ..._off_borderless.png => green_borderless_off.png} | Bin
 .../lamps/light_blue_borderless_emissive.png.mcmeta |   0
 ...borderless.png => light_blue_borderless_off.png} | Bin
 .../lamps/light_gray_borderless_emissive.png.mcmeta |   0
 ...borderless.png => light_gray_borderless_off.png} | Bin
 .../block/lamps/lime_borderless_emissive.png.mcmeta |   0
 ...e_off_borderless.png => lime_borderless_off.png} | Bin
 .../lamps/magenta_borderless_emissive.png.mcmeta    |   0
 ...ff_borderless.png => magenta_borderless_off.png} | Bin
 .../lamps/orange_borderless_emissive.png.mcmeta     |   0
 ...off_borderless.png => orange_borderless_off.png} | Bin
 .../block/lamps/pink_borderless_emissive.png.mcmeta |   0
 ...k_off_borderless.png => pink_borderless_off.png} | Bin
 .../lamps/purple_borderless_emissive.png.mcmeta     |   0
 ...off_borderless.png => purple_borderless_off.png} | Bin
 .../block/lamps/red_borderless_emissive.png.mcmeta  |   0
 ...ed_off_borderless.png => red_borderless_off.png} | Bin
 .../lamps/white_borderless_emissive.png.mcmeta      |   0
 ..._off_borderless.png => white_borderless_off.png} | Bin
 .../lamps/yellow_borderless_emissive.png.mcmeta     |   0
 ...off_borderless.png => yellow_borderless_off.png} | Bin
 33 files changed, 3 insertions(+)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{black_off_borderless.png => black_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{blue_off_borderless.png => blue_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{brown_off_borderless.png => brown_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{cyan_off_borderless.png => cyan_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{gray_off_borderless.png => gray_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{green_off_borderless.png => green_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_blue_off_borderless.png => light_blue_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_gray_off_borderless.png => light_gray_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{lime_off_borderless.png => lime_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{magenta_off_borderless.png => magenta_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{orange_off_borderless.png => orange_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{pink_off_borderless.png => pink_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{purple_off_borderless.png => purple_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{red_off_borderless.png => red_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{white_off_borderless.png => white_borderless_off.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{yellow_off_borderless.png => yellow_borderless_off.png} (100%)

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
index b2a8f0e4f87..9e1956a1489 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
@@ -15,6 +15,7 @@
 import com.gregtechceu.gtceu.api.item.*;
 import com.gregtechceu.gtceu.api.machine.multiblock.IBatteryData;
 import com.gregtechceu.gtceu.api.pipenet.longdistance.LongDistancePipeBlock;
+import com.gregtechceu.gtceu.client.model.item.CustomItemRendererModel;
 import com.gregtechceu.gtceu.common.block.*;
 import com.gregtechceu.gtceu.common.block.explosive.IndustrialTNTBlock;
 import com.gregtechceu.gtceu.common.block.explosive.PowderbarrelBlock;
@@ -1300,6 +1301,7 @@ public static void generateStoneBlocks() {
                             .addLayer(() -> RenderType::cutout)
                             .blockstate(GTModels.lampModel(dyeColor, true))
                             .item(LampBlockItem::new)
+                            .model((ctx, prov) -> prov.blockItem(ctx::get, "_on"))
                             .build()
                             .register());
         }
@@ -1312,6 +1314,7 @@ public static void generateStoneBlocks() {
                     .properties(p -> p.strength(0.3f, 8.0f).sound(SoundType.GLASS))
                     .blockstate(GTModels.lampModel(dyeColor, false))
                     .item(LampBlockItem::new)
+                    .model((ctx, prov) -> prov.blockItem(ctx::get, "_on"))
                     .build()
                     .register());
         }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/black_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/blue_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/brown_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/cyan_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/gray_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/green_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_blue_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_gray_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/lime_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/magenta_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/orange_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/pink_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/purple_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/red_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/white_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_off.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png.mcmeta
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_off_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_off.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/yellow_off_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_off.png

From 776b53471918ed33a8d859e572a41332226a3c79 Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Fri, 1 May 2026 11:54:36 +0300
Subject: [PATCH 08/14] Datagen

---
 .../resources/assets/gtceu/blockstates/cyan_lamp.json     | 4 ++--
 .../assets/gtceu/blockstates/gray_borderless_lamp.json    | 4 ++--
 .../assets/gtceu/blockstates/light_gray_lamp.json         | 4 ++--
 .../assets/gtceu/blockstates/pink_borderless_lamp.json    | 4 ++--
 .../resources/assets/gtceu/blockstates/pink_lamp.json     | 4 ++--
 .../assets/gtceu/blockstates/white_borderless_lamp.json   | 4 ++--
 .../resources/assets/gtceu/blockstates/white_lamp.json    | 4 ++--
 .../resources/assets/gtceu/blockstates/yellow_lamp.json   | 4 ++--
 .../assets/gtceu/models/block/black_borderless_lamp.json  | 0
 .../gtceu/models/block/black_borderless_lamp_off.json     | 2 +-
 .../resources/assets/gtceu/models/block/black_lamp.json   | 0
 .../assets/gtceu/models/block/blue_borderless_lamp.json   | 0
 .../resources/assets/gtceu/models/block/blue_lamp.json    | 0
 .../assets/gtceu/models/block/brown_borderless_lamp.json  | 0
 .../resources/assets/gtceu/models/block/brown_lamp.json   | 0
 .../assets/gtceu/models/block/cyan_borderless_lamp.json   | 0
 .../resources/assets/gtceu/models/block/cyan_lamp.json    | 0
 .../assets/gtceu/models/block/gray_borderless_lamp.json   | 0
 .../resources/assets/gtceu/models/block/gray_lamp.json    | 0
 .../assets/gtceu/models/block/green_borderless_lamp.json  | 0
 .../resources/assets/gtceu/models/block/green_lamp.json   | 0
 .../gtceu/models/block/light_blue_borderless_lamp.json    | 0
 .../assets/gtceu/models/block/light_blue_lamp.json        | 0
 .../gtceu/models/block/light_gray_borderless_lamp.json    | 0
 .../assets/gtceu/models/block/light_gray_lamp.json        | 0
 .../assets/gtceu/models/block/light_gray_lamp_bloom.json  | 2 +-
 .../assets/gtceu/models/block/lime_borderless_lamp.json   | 0
 .../resources/assets/gtceu/models/block/lime_lamp.json    | 0
 .../gtceu/models/block/magenta_borderless_lamp.json       | 0
 .../resources/assets/gtceu/models/block/magenta_lamp.json | 0
 .../assets/gtceu/models/block/orange_borderless_lamp.json | 0
 .../gtceu/models/block/orange_borderless_lamp_off.json    | 2 +-
 .../resources/assets/gtceu/models/block/orange_lamp.json  | 0
 .../assets/gtceu/models/block/pink_borderless_lamp.json   | 0
 .../resources/assets/gtceu/models/block/pink_lamp.json    | 0
 .../assets/gtceu/models/block/purple_borderless_lamp.json | 0
 .../gtceu/models/block/purple_borderless_lamp_bloom.json  | 4 ++--
 .../resources/assets/gtceu/models/block/purple_lamp.json  | 0
 .../assets/gtceu/models/block/red_borderless_lamp.json    | 0
 .../resources/assets/gtceu/models/block/red_lamp.json     | 0
 .../assets/gtceu/models/block/white_borderless_lamp.json  | 0
 .../resources/assets/gtceu/models/block/white_lamp.json   | 0
 .../assets/gtceu/models/block/yellow_borderless_lamp.json | 0
 .../resources/assets/gtceu/models/block/yellow_lamp.json  | 0
 .../resources/assets/gtceu/models/item/brown_lamp.json    | 2 +-
 .../assets/gtceu/models/item/cyan_borderless_lamp.json    | 2 +-
 .../resources/assets/gtceu/models/item/green_lamp.json    | 2 +-
 .../resources/assets/gtceu/models/item/lime_lamp.json     | 2 +-
 .../resources/assets/gtceu/models/item/red_lamp.json      | 2 +-
 .../java/com/gregtechceu/gtceu/common/data/GTBlocks.java  | 8 +++++---
 50 files changed, 31 insertions(+), 29 deletions(-)
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/black_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/black_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/blue_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/brown_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/cyan_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/gray_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/green_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/green_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/light_blue_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/light_gray_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/lime_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/magenta_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/orange_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/pink_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/purple_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/red_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/red_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/white_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/white_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp.json
 delete mode 100644 src/generated/resources/assets/gtceu/models/block/yellow_lamp.json

diff --git a/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json b/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
index f99b1adf611..fc2113dab49 100644
--- a/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/cyan_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/cyan_lamp"
+      "model": "gtceu:block/cyan_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/cyan_lamp"
+      "model": "gtceu:block/cyan_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/cyan_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json
index 90e7a09ad9b..ea09a42e8ea 100644
--- a/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/gray_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/gray_borderless_lamp"
+      "model": "gtceu:block/gray_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/gray_borderless_lamp"
+      "model": "gtceu:block/gray_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/gray_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json
index 1273f8861b2..7b84870486a 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/light_gray_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/light_gray_lamp"
+      "model": "gtceu:block/light_gray_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/light_gray_lamp"
+      "model": "gtceu:block/light_gray_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/light_gray_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json
index 4a417644bef..7fe0a82fa09 100644
--- a/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/pink_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/pink_borderless_lamp"
+      "model": "gtceu:block/pink_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/pink_borderless_lamp"
+      "model": "gtceu:block/pink_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/pink_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json b/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
index 139d3938687..a810f47ca34 100644
--- a/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/pink_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/pink_lamp"
+      "model": "gtceu:block/pink_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/pink_lamp"
+      "model": "gtceu:block/pink_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/pink_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json
index 4445a730db2..f0b9254457d 100644
--- a/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/white_borderless_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/white_borderless_lamp"
+      "model": "gtceu:block/white_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/white_borderless_lamp"
+      "model": "gtceu:block/white_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/white_borderless_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/white_lamp.json b/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
index 285658d5da1..762183f229b 100644
--- a/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/white_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/white_lamp"
+      "model": "gtceu:block/white_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/white_lamp"
+      "model": "gtceu:block/white_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/white_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json b/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
index 2baa9b42b3f..b0a4e50e0ef 100644
--- a/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
@@ -4,10 +4,10 @@
       "model": "gtceu:block/yellow_lamp_off"
     },
     "bloom=false,inverted=false,powered=true": {
-      "model": "gtceu:block/yellow_lamp"
+      "model": "gtceu:block/yellow_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
-      "model": "gtceu:block/yellow_lamp"
+      "model": "gtceu:block/yellow_lamp_on"
     },
     "bloom=false,inverted=true,powered=true": {
       "model": "gtceu:block/yellow_lamp_off"
diff --git a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_off.json
index c5e5fbca676..fbf18fc840e 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/black_off_borderless"
+    "inactive": "gtceu:block/lamps/black_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_lamp.json b/src/generated/resources/assets/gtceu/models/block/black_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_lamp.json b/src/generated/resources/assets/gtceu/models/block/blue_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_lamp.json b/src/generated/resources/assets/gtceu/models/block/brown_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_lamp.json b/src/generated/resources/assets/gtceu/models/block/cyan_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_lamp.json b/src/generated/resources/assets/gtceu/models/block/gray_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/green_lamp.json b/src/generated/resources/assets/gtceu/models/block/green_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp.json b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp.json b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_bloom.json
index 82851dde5f8..fbd8eab992f 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_bloom.json
@@ -1,5 +1,5 @@
 {
-  "parent": "gtceu:block/lamp",
+  "parent": "gtceu:block/lamp_bloom",
   "textures": {
     "active": "gtceu:block/lamps/light_gray",
     "active_overlay": "gtceu:block/lamps/light_gray_emissive"
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_lamp.json b/src/generated/resources/assets/gtceu/models/block/lime_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_lamp.json b/src/generated/resources/assets/gtceu/models/block/magenta_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_off.json
index f9df9f88ee8..81dcf02aa53 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
   "parent": "gtceu:block/lamp_borderless_off",
   "textures": {
-    "inactive": "gtceu:block/lamps/orange_off_borderless"
+    "inactive": "gtceu:block/lamps/orange_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_lamp.json b/src/generated/resources/assets/gtceu/models/block/orange_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_lamp.json b/src/generated/resources/assets/gtceu/models/block/pink_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_bloom.json
index d29ca9d4594..99666122896 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless",
+  "parent": "gtceu:block/lamp_borderless_bloom",
   "textures": {
-    "active": "gtceu:block/lamps/purple_borderless_emissive"
+    "active": "gtceu:block/lamps/purple_borderless"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_lamp.json b/src/generated/resources/assets/gtceu/models/block/purple_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/red_lamp.json b/src/generated/resources/assets/gtceu/models/block/red_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/white_lamp.json b/src/generated/resources/assets/gtceu/models/block/white_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_lamp.json b/src/generated/resources/assets/gtceu/models/block/yellow_lamp.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/generated/resources/assets/gtceu/models/item/brown_lamp.json b/src/generated/resources/assets/gtceu/models/item/brown_lamp.json
index 2a031d3fe68..ad3b6275060 100644
--- a/src/generated/resources/assets/gtceu/models/item/brown_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/brown_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/brown_lamp"
+  "parent": "gtceu:block/brown_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/cyan_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/cyan_borderless_lamp.json
index 2ebe5ae1902..d5c0a34f9bc 100644
--- a/src/generated/resources/assets/gtceu/models/item/cyan_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/cyan_borderless_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/cyan_borderless_lamp"
+  "parent": "gtceu:block/cyan_borderless_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/green_lamp.json b/src/generated/resources/assets/gtceu/models/item/green_lamp.json
index 34ee0923956..52f0520f0c5 100644
--- a/src/generated/resources/assets/gtceu/models/item/green_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/green_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/green_lamp"
+  "parent": "gtceu:block/green_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/lime_lamp.json b/src/generated/resources/assets/gtceu/models/item/lime_lamp.json
index a154c799b5e..6075dceafbd 100644
--- a/src/generated/resources/assets/gtceu/models/item/lime_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/lime_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/lime_lamp"
+  "parent": "gtceu:block/lime_lamp_on"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/red_lamp.json b/src/generated/resources/assets/gtceu/models/item/red_lamp.json
index 1c324092d6b..b1a7a1ee344 100644
--- a/src/generated/resources/assets/gtceu/models/item/red_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/red_lamp.json
@@ -1,3 +1,3 @@
 {
-  "parent": "gtceu:block/red_lamp"
+  "parent": "gtceu:block/red_lamp_on"
 }
\ No newline at end of file
diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
index 9e1956a1489..0fb295c79ce 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
@@ -15,7 +15,7 @@
 import com.gregtechceu.gtceu.api.item.*;
 import com.gregtechceu.gtceu.api.machine.multiblock.IBatteryData;
 import com.gregtechceu.gtceu.api.pipenet.longdistance.LongDistancePipeBlock;
-import com.gregtechceu.gtceu.client.model.item.CustomItemRendererModel;
+import com.gregtechceu.gtceu.client.model.item.CustomItemRendererWrapperModel;
 import com.gregtechceu.gtceu.common.block.*;
 import com.gregtechceu.gtceu.common.block.explosive.IndustrialTNTBlock;
 import com.gregtechceu.gtceu.common.block.explosive.PowderbarrelBlock;
@@ -1301,7 +1301,8 @@ public static void generateStoneBlocks() {
                             .addLayer(() -> RenderType::cutout)
                             .blockstate(GTModels.lampModel(dyeColor, true))
                             .item(LampBlockItem::new)
-                            .model((ctx, prov) -> prov.blockItem(ctx::get, "_on"))
+                            .model((ctx, prov) -> prov.blockItem(ctx::get, "_on")
+                                    .customLoader(CustomItemRendererWrapperModel.Builder::begin).end())
                             .build()
                             .register());
         }
@@ -1314,7 +1315,8 @@ public static void generateStoneBlocks() {
                     .properties(p -> p.strength(0.3f, 8.0f).sound(SoundType.GLASS))
                     .blockstate(GTModels.lampModel(dyeColor, false))
                     .item(LampBlockItem::new)
-                    .model((ctx, prov) -> prov.blockItem(ctx::get, "_on"))
+                    .model((ctx, prov) -> prov.blockItem(ctx::get, "_on")
+                            .customLoader(CustomItemRendererWrapperModel.Builder::begin).end())
                     .build()
                     .register());
         }

From ce6121a419545d673d3cbef6443f08bacfa72b51 Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Fri, 1 May 2026 13:15:13 +0300
Subject: [PATCH 09/14] Rename all the lamp texture files to be more
 descriptive

---
 .../gtceu/textures/block/lamps/black.png.mcmeta   |   6 ------
 .../lamps/{black_emissive.png => black_bloom.png} | Bin
 .../textures/block/lamps/black_bloom.png.mcmeta   |   9 +++++++++
 ...black_ctm_emissive.png => black_bloom_ctm.png} | Bin
 ...sive.png.mcmeta => black_bloom_ctm.png.mcmeta} |   0
 ..._borderless.png => black_borderless_bloom.png} | Bin
 ...g.mcmeta => black_borderless_bloom.png.mcmeta} |   0
 .../textures/block/lamps/black_borderless_on.png  | Bin 0 -> 189 bytes
 .../block/lamps/black_emissive.png.mcmeta         |   9 ---------
 .../textures/block/lamps/black_off.png.mcmeta     |   6 +++---
 .../block/lamps/{black.png => black_on.png}       | Bin
 .../textures/block/lamps/black_on.png.mcmeta      |   6 ++++++
 .../lamps/{black_ctm.png => black_on_ctm.png}     | Bin
 .../gtceu/textures/block/lamps/blue.png.mcmeta    |   5 -----
 .../lamps/{blue_emissive.png => blue_bloom.png}   | Bin
 .../textures/block/lamps/blue_bloom.png.mcmeta    |   8 ++++++++
 .../{blue_ctm_emissive.png => blue_bloom_ctm.png} | Bin
 ...ssive.png.mcmeta => blue_bloom_ctm.png.mcmeta} |   0
 ...ng.mcmeta => blue_borderless_bloom.png.mcmeta} |   0
 .../textures/block/lamps/blue_borderless_on.png   | Bin 0 -> 189 bytes
 .../textures/block/lamps/blue_emissive.png.mcmeta |   8 --------
 .../textures/block/lamps/blue_off.png.mcmeta      |   6 +++---
 .../block/lamps/{blue.png => blue_on.png}         | Bin
 .../gtceu/textures/block/lamps/blue_on.png.mcmeta |   5 +++++
 .../block/lamps/{blue_ctm.png => blue_on_ctm.png} | Bin
 .../gtceu/textures/block/lamps/brown.png.mcmeta   |   5 -----
 .../lamps/{brown_emissive.png => brown_bloom.png} | Bin
 .../textures/block/lamps/brown_bloom.png.mcmeta   |   8 ++++++++
 ...brown_ctm_emissive.png => brown_bloom_ctm.png} | Bin
 ...sive.png.mcmeta => brown_bloom_ctm.png.mcmeta} |   0
 ...g.mcmeta => brown_borderless_bloom.png.mcmeta} |   0
 .../textures/block/lamps/brown_borderless_on.png  | Bin 0 -> 189 bytes
 .../block/lamps/brown_emissive.png.mcmeta         |   8 --------
 .../textures/block/lamps/brown_off.png.mcmeta     |   6 +++---
 .../block/lamps/{brown.png => brown_on.png}       | Bin
 .../textures/block/lamps/brown_on.png.mcmeta      |   5 +++++
 .../lamps/{brown_ctm.png => brown_on_ctm.png}     | Bin
 .../gtceu/textures/block/lamps/cyan.png.mcmeta    |   5 -----
 .../lamps/{cyan_emissive.png => cyan_bloom.png}   | Bin
 .../textures/block/lamps/cyan_bloom.png.mcmeta    |   8 ++++++++
 .../{cyan_ctm_emissive.png => cyan_bloom_ctm.png} | Bin
 ...ssive.png.mcmeta => cyan_bloom_ctm.png.mcmeta} |   0
 ...ng.mcmeta => cyan_borderless_bloom.png.mcmeta} |   0
 .../textures/block/lamps/cyan_borderless_on.png   | Bin 0 -> 189 bytes
 .../textures/block/lamps/cyan_emissive.png.mcmeta |   8 --------
 .../textures/block/lamps/cyan_off.png.mcmeta      |   6 +++---
 .../block/lamps/{cyan.png => cyan_on.png}         | Bin
 .../gtceu/textures/block/lamps/cyan_on.png.mcmeta |   5 +++++
 .../block/lamps/{cyan_ctm.png => cyan_on_ctm.png} | Bin
 .../gtceu/textures/block/lamps/gray.png.mcmeta    |   5 -----
 .../lamps/{gray_emissive.png => gray_bloom.png}   | Bin
 .../textures/block/lamps/gray_bloom.png.mcmeta    |   8 ++++++++
 .../{gray_ctm_emissive.png => gray_bloom_ctm.png} | Bin
 ...ssive.png.mcmeta => gray_bloom_ctm.png.mcmeta} |   0
 ...y_borderless.png => gray_borderless_bloom.png} | Bin
 ...ng.mcmeta => gray_borderless_bloom.png.mcmeta} |   0
 .../textures/block/lamps/gray_borderless_on.png   | Bin 0 -> 189 bytes
 .../textures/block/lamps/gray_emissive.png.mcmeta |   8 --------
 .../textures/block/lamps/gray_off.png.mcmeta      |   6 +++---
 .../block/lamps/{gray.png => gray_on.png}         | Bin
 .../gtceu/textures/block/lamps/gray_on.png.mcmeta |   5 +++++
 .../block/lamps/{gray_ctm.png => gray_on_ctm.png} | Bin
 .../gtceu/textures/block/lamps/green.png.mcmeta   |   5 -----
 .../lamps/{green_emissive.png => green_bloom.png} | Bin
 .../textures/block/lamps/green_bloom.png.mcmeta   |   8 ++++++++
 ...green_ctm_emissive.png => green_bloom_ctm.png} | Bin
 ...sive.png.mcmeta => green_bloom_ctm.png.mcmeta} |   0
 ..._borderless.png => green_borderless_bloom.png} | Bin
 ...g.mcmeta => green_borderless_bloom.png.mcmeta} |   0
 .../textures/block/lamps/green_borderless_on.png  | Bin 0 -> 189 bytes
 .../block/lamps/green_emissive.png.mcmeta         |   8 --------
 .../textures/block/lamps/green_off.png.mcmeta     |   6 +++---
 .../block/lamps/{green.png => green_on.png}       | Bin
 .../textures/block/lamps/green_on.png.mcmeta      |   5 +++++
 .../lamps/{green_ctm.png => green_on_ctm.png}     | Bin
 .../textures/block/lamps/light_blue.png.mcmeta    |   5 -----
 ...ght_blue_emissive.png => light_blue_bloom.png} | Bin
 .../block/lamps/light_blue_bloom.png.mcmeta       |   8 ++++++++
 ..._ctm_emissive.png => light_blue_bloom_ctm.png} | Bin
 ...png.mcmeta => light_blue_bloom_ctm.png.mcmeta} |   0
 ...erless.png => light_blue_borderless_bloom.png} | Bin
 ...eta => light_blue_borderless_bloom.png.mcmeta} |   0
 .../block/lamps/light_blue_borderless_on.png      | Bin 0 -> 189 bytes
 .../block/lamps/light_blue_emissive.png.mcmeta    |   8 --------
 .../block/lamps/light_blue_off.png.mcmeta         |   6 +++---
 .../lamps/{light_blue.png => light_blue_on.png}   | Bin
 .../textures/block/lamps/light_blue_on.png.mcmeta |   5 +++++
 .../{light_blue_ctm.png => light_blue_on_ctm.png} | Bin
 .../textures/block/lamps/light_gray.png.mcmeta    |   5 -----
 ...ght_gray_emissive.png => light_gray_bloom.png} | Bin
 .../block/lamps/light_gray_bloom.png.mcmeta       |   8 ++++++++
 ..._ctm_emissive.png => light_gray_bloom_ctm.png} | Bin
 ...png.mcmeta => light_gray_bloom_ctm.png.mcmeta} |   0
 ...erless.png => light_gray_borderless_bloom.png} | Bin
 ...eta => light_gray_borderless_bloom.png.mcmeta} |   0
 .../block/lamps/light_gray_borderless_on.png      | Bin 0 -> 189 bytes
 .../block/lamps/light_gray_emissive.png.mcmeta    |   8 --------
 .../block/lamps/light_gray_off.png.mcmeta         |   6 +++---
 .../lamps/{light_gray.png => light_gray_on.png}   | Bin
 .../textures/block/lamps/light_gray_on.png.mcmeta |   5 +++++
 .../{light_gray_ctm.png => light_gray_on_ctm.png} | Bin
 .../gtceu/textures/block/lamps/lime.png.mcmeta    |   5 -----
 .../lamps/{lime_emissive.png => lime_bloom.png}   | Bin
 .../textures/block/lamps/lime_bloom.png.mcmeta    |   8 ++++++++
 .../{lime_ctm_emissive.png => lime_bloom_ctm.png} | Bin
 .../block/lamps/lime_bloom_ctm.png.mcmeta         |   5 +++++
 ...e_borderless.png => lime_borderless_bloom.png} | Bin
 .../block/lamps/lime_borderless_bloom.png.mcmeta  |   5 +++++
 .../textures/block/lamps/lime_borderless_on.png   | Bin 0 -> 189 bytes
 .../textures/block/lamps/lime_emissive.png.mcmeta |   8 --------
 .../textures/block/lamps/lime_off.png.mcmeta      |   6 +++---
 .../block/lamps/{lime.png => lime_on.png}         | Bin
 .../gtceu/textures/block/lamps/lime_on.png.mcmeta |   5 +++++
 .../block/lamps/{lime_ctm.png => lime_on_ctm.png} | Bin
 .../gtceu/textures/block/lamps/magenta.png.mcmeta |   5 -----
 .../{magenta_emissive.png => magenta_bloom.png}   | Bin
 .../textures/block/lamps/magenta_bloom.png.mcmeta |   8 ++++++++
 ...nta_ctm_emissive.png => magenta_bloom_ctm.png} | Bin
 .../block/lamps/magenta_bloom_ctm.png.mcmeta      |   5 +++++
 ...orderless.png => magenta_borderless_bloom.png} | Bin
 .../lamps/magenta_borderless_bloom.png.mcmeta     |   5 +++++
 .../block/lamps/magenta_borderless_on.png         | Bin 0 -> 189 bytes
 .../block/lamps/magenta_emissive.png.mcmeta       |   8 --------
 .../textures/block/lamps/magenta_off.png.mcmeta   |   6 +++---
 .../block/lamps/{magenta.png => magenta_on.png}   | Bin
 .../textures/block/lamps/magenta_on.png.mcmeta    |   5 +++++
 .../lamps/{magenta_ctm.png => magenta_on_ctm.png} | Bin
 .../gtceu/textures/block/lamps/orange.png.mcmeta  |   5 -----
 .../{orange_emissive.png => orange_bloom.png}     | Bin
 .../textures/block/lamps/orange_bloom.png.mcmeta  |   8 ++++++++
 ...ange_ctm_emissive.png => orange_bloom_ctm.png} | Bin
 .../block/lamps/orange_bloom_ctm.png.mcmeta       |   5 +++++
 .../block/lamps/orange_borderless_bloom.png       | Bin 0 -> 189 bytes
 .../lamps/orange_borderless_bloom.png.mcmeta      |   5 +++++
 ...ge_borderless.png => orange_borderless_on.png} | Bin
 .../block/lamps/orange_emissive.png.mcmeta        |   8 --------
 .../textures/block/lamps/orange_off.png.mcmeta    |   6 +++---
 .../block/lamps/{orange.png => orange_on.png}     | Bin
 .../textures/block/lamps/orange_on.png.mcmeta     |   5 +++++
 .../lamps/{orange_ctm.png => orange_on_ctm.png}   | Bin
 .../gtceu/textures/block/lamps/pink.png.mcmeta    |   5 -----
 .../lamps/{pink_emissive.png => pink_bloom.png}   | Bin
 .../textures/block/lamps/pink_bloom.png.mcmeta    |   8 ++++++++
 .../{pink_ctm_emissive.png => pink_bloom_ctm.png} | Bin
 .../block/lamps/pink_bloom_ctm.png.mcmeta         |   5 +++++
 ...k_borderless.png => pink_borderless_bloom.png} | Bin
 .../block/lamps/pink_borderless_bloom.png.mcmeta  |   5 +++++
 .../textures/block/lamps/pink_borderless_on.png   | Bin 0 -> 189 bytes
 .../textures/block/lamps/pink_emissive.png.mcmeta |   8 --------
 .../textures/block/lamps/pink_off.png.mcmeta      |   6 +++---
 .../block/lamps/{pink.png => pink_on.png}         | Bin
 .../gtceu/textures/block/lamps/pink_on.png.mcmeta |   5 +++++
 .../block/lamps/{pink_ctm.png => pink_on_ctm.png} | Bin
 .../gtceu/textures/block/lamps/purple.png.mcmeta  |   5 -----
 .../{purple_emissive.png => purple_bloom.png}     | Bin
 .../textures/block/lamps/purple_bloom.png.mcmeta  |   8 ++++++++
 ...rple_ctm_emissive.png => purple_bloom_ctm.png} | Bin
 .../block/lamps/purple_bloom_ctm.png.mcmeta       |   5 +++++
 ...borderless.png => purple_borderless_bloom.png} | Bin
 .../lamps/purple_borderless_bloom.png.mcmeta      |   5 +++++
 .../textures/block/lamps/purple_borderless_on.png | Bin 0 -> 189 bytes
 .../block/lamps/purple_emissive.png.mcmeta        |   8 --------
 .../textures/block/lamps/purple_off.png.mcmeta    |   6 +++---
 .../block/lamps/{purple.png => purple_on.png}     | Bin
 .../textures/block/lamps/purple_on.png.mcmeta     |   5 +++++
 .../lamps/{purple_ctm.png => purple_on_ctm.png}   | Bin
 .../gtceu/textures/block/lamps/red.png.mcmeta     |   5 -----
 .../lamps/{red_emissive.png => red_bloom.png}     | Bin
 .../textures/block/lamps/red_bloom.png.mcmeta     |   8 ++++++++
 .../{red_ctm_emissive.png => red_bloom_ctm.png}   | Bin
 .../textures/block/lamps/red_bloom_ctm.png.mcmeta |   5 +++++
 ...ed_borderless.png => red_borderless_bloom.png} | Bin
 .../block/lamps/red_borderless_bloom.png.mcmeta   |   5 +++++
 .../textures/block/lamps/red_borderless_on.png    | Bin 0 -> 189 bytes
 .../textures/block/lamps/red_emissive.png.mcmeta  |   8 --------
 .../gtceu/textures/block/lamps/red_off.png.mcmeta |   6 +++---
 .../textures/block/lamps/{red.png => red_on.png}  | Bin
 .../gtceu/textures/block/lamps/red_on.png.mcmeta  |   5 +++++
 .../block/lamps/{red_ctm.png => red_on_ctm.png}   | Bin
 .../gtceu/textures/block/lamps/white.png.mcmeta   |   5 -----
 .../lamps/{white_emissive.png => white_bloom.png} | Bin
 .../textures/block/lamps/white_bloom.png.mcmeta   |   8 ++++++++
 ...white_ctm_emissive.png => white_bloom_ctm.png} | Bin
 .../block/lamps/white_bloom_ctm.png.mcmeta        |   5 +++++
 ..._borderless.png => white_borderless_bloom.png} | Bin
 .../block/lamps/white_borderless_bloom.png.mcmeta |   5 +++++
 .../textures/block/lamps/white_borderless_on.png  | Bin 0 -> 189 bytes
 .../block/lamps/white_emissive.png.mcmeta         |   8 --------
 .../textures/block/lamps/white_off.png.mcmeta     |   6 +++---
 .../block/lamps/{white.png => white_on.png}       | Bin
 .../textures/block/lamps/white_on.png.mcmeta      |   5 +++++
 .../lamps/{white_ctm.png => white_on_ctm.png}     | Bin
 .../gtceu/textures/block/lamps/yellow.png.mcmeta  |   5 -----
 .../{yellow_emissive.png => yellow_bloom.png}     | Bin
 .../textures/block/lamps/yellow_bloom.png.mcmeta  |   8 ++++++++
 ...llow_ctm_emissive.png => yellow_bloom_ctm.png} | Bin
 .../block/lamps/yellow_bloom_ctm.png.mcmeta       |   5 +++++
 ...borderless.png => yellow_borderless_bloom.png} | Bin
 .../lamps/yellow_borderless_bloom.png.mcmeta      |   5 +++++
 .../textures/block/lamps/yellow_borderless_on.png | Bin 0 -> 189 bytes
 .../block/lamps/yellow_emissive.png.mcmeta        |   8 --------
 .../textures/block/lamps/yellow_off.png.mcmeta    |   6 +++---
 .../block/lamps/{yellow.png => yellow_on.png}     | Bin
 .../textures/block/lamps/yellow_on.png.mcmeta     |   5 +++++
 .../lamps/{yellow_ctm.png => yellow_on_ctm.png}   | Bin
 205 files changed, 338 insertions(+), 258 deletions(-)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/black.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{black_emissive.png => black_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/black_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{black_ctm_emissive.png => black_bloom_ctm.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{black_ctm_emissive.png.mcmeta => black_bloom_ctm.png.mcmeta} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{black_borderless.png => black_borderless_bloom.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{blue_ctm_emissive.png.mcmeta => black_borderless_bloom.png.mcmeta} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/black_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{black.png => black_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/black_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{black_ctm.png => black_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/blue.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{blue_emissive.png => blue_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{blue_ctm_emissive.png => blue_bloom_ctm.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{brown_ctm_emissive.png.mcmeta => blue_bloom_ctm.png.mcmeta} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{cyan_ctm_emissive.png.mcmeta => blue_borderless_bloom.png.mcmeta} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/blue_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{blue.png => blue_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{blue_ctm.png => blue_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/brown.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{brown_emissive.png => brown_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{brown_ctm_emissive.png => brown_bloom_ctm.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{gray_ctm_emissive.png.mcmeta => brown_bloom_ctm.png.mcmeta} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{green_ctm_emissive.png.mcmeta => brown_borderless_bloom.png.mcmeta} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/brown_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{brown.png => brown_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{brown_ctm.png => brown_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/cyan.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{cyan_emissive.png => cyan_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{cyan_ctm_emissive.png => cyan_bloom_ctm.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_blue_ctm_emissive.png.mcmeta => cyan_bloom_ctm.png.mcmeta} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_gray_ctm_emissive.png.mcmeta => cyan_borderless_bloom.png.mcmeta} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/cyan_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{cyan.png => cyan_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{cyan_ctm.png => cyan_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/gray.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{gray_emissive.png => gray_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{gray_ctm_emissive.png => gray_bloom_ctm.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{lime_ctm_emissive.png.mcmeta => gray_bloom_ctm.png.mcmeta} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{gray_borderless.png => gray_borderless_bloom.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{magenta_ctm_emissive.png.mcmeta => gray_borderless_bloom.png.mcmeta} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/gray_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{gray.png => gray_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{gray_ctm.png => gray_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/green.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{green_emissive.png => green_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/green_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{green_ctm_emissive.png => green_bloom_ctm.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{orange_ctm_emissive.png.mcmeta => green_bloom_ctm.png.mcmeta} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{green_borderless.png => green_borderless_bloom.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{pink_ctm_emissive.png.mcmeta => green_borderless_bloom.png.mcmeta} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/green_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{green.png => green_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/green_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{green_ctm.png => green_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_blue.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_blue_emissive.png => light_blue_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_blue_ctm_emissive.png => light_blue_bloom_ctm.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{purple_ctm_emissive.png.mcmeta => light_blue_bloom_ctm.png.mcmeta} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_blue_borderless.png => light_blue_borderless_bloom.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{red_ctm_emissive.png.mcmeta => light_blue_borderless_bloom.png.mcmeta} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_blue_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_blue.png => light_blue_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_blue_ctm.png => light_blue_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_gray.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_gray_emissive.png => light_gray_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_gray_ctm_emissive.png => light_gray_bloom_ctm.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{white_ctm_emissive.png.mcmeta => light_gray_bloom_ctm.png.mcmeta} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_gray_borderless.png => light_gray_borderless_bloom.png} (100%)
 rename src/main/resources/assets/gtceu/textures/block/lamps/{yellow_ctm_emissive.png.mcmeta => light_gray_borderless_bloom.png.mcmeta} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_gray_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_gray.png => light_gray_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{light_gray_ctm.png => light_gray_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{lime_emissive.png => lime_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{lime_ctm_emissive.png => lime_bloom_ctm.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{lime_borderless.png => lime_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_bloom.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{lime.png => lime_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{lime_ctm.png => lime_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{magenta_emissive.png => magenta_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{magenta_ctm_emissive.png => magenta_bloom_ctm.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{magenta_borderless.png => magenta_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_bloom.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{magenta.png => magenta_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{magenta_ctm.png => magenta_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{orange_emissive.png => orange_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{orange_ctm_emissive.png => orange_bloom_ctm.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_bloom.png
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{orange_borderless.png => orange_borderless_on.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{orange.png => orange_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{orange_ctm.png => orange_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{pink_emissive.png => pink_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{pink_ctm_emissive.png => pink_bloom_ctm.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{pink_borderless.png => pink_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_bloom.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{pink.png => pink_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{pink_ctm.png => pink_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{purple_emissive.png => purple_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{purple_ctm_emissive.png => purple_bloom_ctm.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{purple_borderless.png => purple_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_bloom.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{purple.png => purple_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{purple_ctm.png => purple_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{red_emissive.png => red_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{red_ctm_emissive.png => red_bloom_ctm.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_bloom_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{red_borderless.png => red_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_bloom.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{red.png => red_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{red_ctm.png => red_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{white_emissive.png => white_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{white_ctm_emissive.png => white_bloom_ctm.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_bloom_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{white_borderless.png => white_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_bloom.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{white.png => white_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{white_ctm.png => white_on_ctm.png} (100%)
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{yellow_emissive.png => yellow_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{yellow_ctm_emissive.png => yellow_bloom_ctm.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{yellow_borderless.png => yellow_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_bloom.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_on.png
 delete mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_emissive.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{yellow.png => yellow_on.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{yellow_ctm.png => yellow_on_ctm.png} (100%)

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black.png.mcmeta
deleted file mode 100644
index 8f14d9b9cb1..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/black.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/black_ctm"
-  }
-}
-
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/black_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/black_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/black_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_bloom.png.mcmeta
new file mode 100644
index 00000000000..ff453012c57
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/black_bloom.png.mcmeta
@@ -0,0 +1,9 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/black_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
+
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/black_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/black_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/black_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/black_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/black_bloom_ctm.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/black_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_bloom.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/blue_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_bloom.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..e244fd2adef6d4b32c5b18ada674975e7ba8888b
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBN?^R-J8EvHR)hYPG5F}XO5n0T@z;_sg8IR|$NC67kdb&7<NL&s*
zdyw~l0ncHFD(2JDD!=(>E>PwAqJGDD$tGthqt)7XJ~}C~C~`D!5EOF~_{H4fRG~EQ
c|L2Dcr{}XJriL!d1{%cR>FVdQ&MBb@0OEZ(G5`Po

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_emissive.png.mcmeta
deleted file mode 100644
index 986fc3c4b9b..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/black_emissive.png.mcmeta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/black_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
-
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_off.png.mcmeta
index 077f1b444bc..28943d615fd 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/black_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/black_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/black_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/black_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black.png b/src/main/resources/assets/gtceu/textures/block/lamps/black_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/black.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/black_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_on.png.mcmeta
new file mode 100644
index 00000000000..e72a3217be3
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/black_on.png.mcmeta
@@ -0,0 +1,6 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/black_on_ctm"
+    }
+}
+
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/black_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/black_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/black_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue.png.mcmeta
deleted file mode 100644
index b2d32fbdde0..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/blue.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/blue_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/blue_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom.png.mcmeta
new file mode 100644
index 00000000000..313de4456f9
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/blue_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/blue_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/brown_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/blue_bloom_ctm.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_bloom.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/cyan_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_bloom.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7c80de65b7b832cfdccb7491164de1d81f4478e
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1l9%RQ_Kh?Sov<eV48Ku7U&$JR*x382Ao@Fyrz36)8YLTTd6q5Q)p7
zXAkloFyJ}tP{n*&TIDzY%mu1kU)1k7FWKZQWwcuR&POLj7DbNc4T54$0>7ABoGO&&
d{r~)s;q-jA#MIDb*+7FBJYD@<);T3K0RR|_I`;qo

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_emissive.png.mcmeta
deleted file mode 100644
index 6c7c62e8adb..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/blue_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/blue_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_off.png.mcmeta
index 6692caee337..e6c3f4b96e9 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/blue_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/blue_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/blue_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/blue_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue.png b/src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/blue.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png.mcmeta
new file mode 100644
index 00000000000..79a2198d59b
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/blue_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/blue_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/blue_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/blue_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown.png.mcmeta
deleted file mode 100644
index 10bc639e0fc..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/brown.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/brown_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/brown_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom.png.mcmeta
new file mode 100644
index 00000000000..5db8b403bd9
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/brown_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/brown_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/gray_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/brown_bloom_ctm.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_bloom.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/green_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_bloom.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..30bdb8600dd37720bb2d2f41a52e1b2a69149e94
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lAyyf|=nntN}!&4<mNyFr2l9+AZi419+{nDKc2iWH!rt*47)h{Wa4
zvj=$(81Ni+sA4`Xt@4|H<^ol&FY0%kmuzyDGFq*D=cAJ%iy}w!20<|=fnUrmP8CY?
c{(pYRaC$ylVruBJY@k65p00i_>zopr0N=4XZ~y=R

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_emissive.png.mcmeta
deleted file mode 100644
index 5716c714030..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/brown_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/brown_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_off.png.mcmeta
index f222ed9e8ac..8115cf5c3cb 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/brown_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/brown_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/brown_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/brown_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown.png b/src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/brown.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png.mcmeta
new file mode 100644
index 00000000000..ee6259838ef
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/brown_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/brown_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/brown_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/brown_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan.png.mcmeta
deleted file mode 100644
index c0f13e9c0bf..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/cyan.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/cyan_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/cyan_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom.png.mcmeta
new file mode 100644
index 00000000000..65522bdc8fb
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/cyan_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/cyan_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_blue_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/cyan_bloom_ctm.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_bloom.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_gray_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_bloom.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..743480a2a9f20b4007a93a67f1c2cc2cecbe84a3
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lAiGW)Fb#6tqjn?85(tOE%actjR6Fz_7)VaDV6D^h@hww^AIArhBE
z&mQDGV8C<Op^Evmw90S(nG008zNp`EUb4wq%4oIrosUk6EQ%b>8wACi1b#8MI8`Xk
d`~UeN!|C~KiK(H>vVjIMc)I$ztaD0e0s!6SI&1&{

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_emissive.png.mcmeta
deleted file mode 100644
index b1725e83fa5..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/cyan_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_off.png.mcmeta
index 0e6b73d84f3..edcb44542fe 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/cyan_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/cyan_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan.png b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/cyan.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png.mcmeta
new file mode 100644
index 00000000000..6483ae26412
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/cyan_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/cyan_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/cyan_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray.png.mcmeta
deleted file mode 100644
index 4cc28d73d35..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/gray.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/gray_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/gray_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom.png.mcmeta
new file mode 100644
index 00000000000..ce76a054ea7
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/gray_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/gray_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/lime_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/gray_bloom_ctm.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_bloom.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_bloom.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e0c168be730d95aabe86a7a824c068a82b39fb9
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lB7+}vDRTAG@g`m~w75hPgP5n0T@z;_sg8IR|$NC67kdb&7<NL&s*
zdyw~l0ncHFD(2JDD!=(>E>PwAqJGDD$tGthqt)7XJ~}C~C~`D!5EOF~_{H4fRG~EQ
c|L2Dcr{}XJriL!d1{%cR>FVdQ&MBb@0I)AP{Qv*}

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_emissive.png.mcmeta
deleted file mode 100644
index c55ae8fc192..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/gray_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/gray_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_off.png.mcmeta
index 1bf1376070e..3ec9391d805 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/gray_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/gray_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/gray_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/gray_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray.png b/src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/gray.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png.mcmeta
new file mode 100644
index 00000000000..d2f32855b00
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/gray_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/gray_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/gray_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/gray_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green.png.mcmeta
deleted file mode 100644
index 8c0cb78a3db..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/green.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/green_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/green_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/green_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/green_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_bloom.png.mcmeta
new file mode 100644
index 00000000000..38fe7740e76
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/green_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/green_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/green_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/green_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/green_bloom_ctm.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/green_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_bloom.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/pink_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_bloom.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..436ab101fa21cf9fc5d83a56b9b96e5137b75777
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBNGK0ackHNBm;m&ibuOPt!kH}&M2EM}}%y>M1MG8>R*3-o?MB;Mj
z*@L_X40sMZR572HR{708bAc+?7xg>NOEx)68Lig7^U+C>MUkU<gP@p`z%S+&rwXNc
c|35!uI6a>&F*S5qHqamjPgg&ebxsLQ09ZLWNdN!<

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_emissive.png.mcmeta
deleted file mode 100644
index 61c740ca6c9..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/green_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/green_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_off.png.mcmeta
index 183ef8c6ac6..34ae9f7ae18 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/green_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/green_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/green_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green.png b/src/main/resources/assets/gtceu/textures/block/lamps/green_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/green.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/green_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_on.png.mcmeta
new file mode 100644
index 00000000000..65f635a9895
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/green_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/green_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/green_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/green_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue.png.mcmeta
deleted file mode 100644
index 7be5820dc99..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/light_blue_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_blue_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom.png.mcmeta
new file mode 100644
index 00000000000..00958024c4a
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/light_blue_ctm_emissive"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_blue_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/purple_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_blue_bloom_ctm.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_bloom.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/red_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_bloom.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..77244678a75fae833c0362ff5baaa628624673e0
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1l9nxBGwIy8j7_|0nML{1zlw;1OBOz`%DHgc*<LuSfw3+IqS;hDclv
zJ$sP%fC0~8hbrdN(kj3CXD(3X`l5cvdC4YcDWlcecRo5PvM6#iZx9r768Od3;#8qD
d@BinA45#O_C8mZh%LW?6;OXk;vd$@?2>>77Jx2fl

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_emissive.png.mcmeta
deleted file mode 100644
index 3c37363340e..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/light_blue_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_off.png.mcmeta
index 36da8684b59..4bcde263e5f 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/light_blue_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/light_blue_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_blue.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png.mcmeta
new file mode 100644
index 00000000000..42b7bded3b7
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/light_blue_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_blue_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray.png.mcmeta
deleted file mode 100644
index d9f02a1f1eb..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/light_gray_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_gray_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom.png.mcmeta
new file mode 100644
index 00000000000..3b30d57e8c1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/light_gray_ctm_emissive"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_gray_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/white_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_gray_bloom_ctm.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_bloom.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/yellow_ctm_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_bloom.png.mcmeta
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e60a9410fef27a113f797c1ec17ecae0a1e06e1
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lAyZ{NO+8@DW6xFWN1wKYhvz$3Dlfr0NZ2s0kfUy%Y7wDojx43W4T
zdiEgi0Rx`H4pq#jrB#0O&s?C&^+o-T^O8-@Qbwz_?|gJpWKra3-XJLEB=C#5#i>GR
d-v7@J8BWh<OH2)2mJKwB!PC{xWt~$(69AMmJNN(q

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_emissive.png.mcmeta
deleted file mode 100644
index f198565e7c6..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/light_gray_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_off.png.mcmeta
index 74f9b7d0d2e..5cfccb7226f 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/light_gray_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/light_gray_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_gray.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png.mcmeta
new file mode 100644
index 00000000000..03713929f54
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/light_gray_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_gray_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime.png.mcmeta
deleted file mode 100644
index c1576b94772..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/lime.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/lime_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/lime_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom.png.mcmeta
new file mode 100644
index 00000000000..4b238ac69c1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/lime_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/lime_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom_ctm.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_bloom.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_bloom.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc1ddc19f0b51cda86d8eb3526a7b75fd1fa0074
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1l9n@{%FzHbdNLhSgWKBtU`%9+AZi419+{nDKc2iWH!rt*47)h{Wa4
zvj=$(81Ni+sA4`Xt@4|H<^ol&FY0%kmuzyDGFq*D=cAJ%iy}w!20<|=fnUrmP8CY?
c{(pYRaC$ylVruBJY@k65p00i_>zopr0DH7Kg8%>k

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_emissive.png.mcmeta
deleted file mode 100644
index 2eddeede772..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/lime_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/lime_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_off.png.mcmeta
index 3ece38171e2..52dfcbae47c 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/lime_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/lime_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/lime_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime.png b/src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/lime.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png.mcmeta
new file mode 100644
index 00000000000..0f6f0a5c102
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/lime_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/lime_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/lime_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/lime_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta.png.mcmeta
deleted file mode 100644
index 8296eb3a51b..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/magenta.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/magenta_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/magenta_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom.png.mcmeta
new file mode 100644
index 00000000000..b4e1d4d53b6
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/magenta_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom_ctm.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_bloom.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_bloom.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..6864250af2651621960ebec4a0b2da5c70b39a1f
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBd-{}8y^>^oGZtp3d^avza;1OBOz`%DHgc*<LuSfw3+IqS;hDclv
zJ$sP%fC0~8hbrdN(kj3CXD(3X`l5cvdC4YcDWlcecRo5PvM6#iZx9r768Od3;#8qD
d@BinA45#O_C8mZh%LW?6;OXk;vd$@?2>{YDJdXeX

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_emissive.png.mcmeta
deleted file mode 100644
index bbcbde7bc8b..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/magenta_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_off.png.mcmeta
index c5d19b0dac8..5809d1c23a4 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/magenta_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/magenta_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta.png b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/magenta.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png.mcmeta
new file mode 100644
index 00000000000..d8075083a4c
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/magenta_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/magenta_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange.png.mcmeta
deleted file mode 100644
index 53fdb4a15cd..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/orange.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/orange_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/orange_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom.png.mcmeta
new file mode 100644
index 00000000000..eb9d61c06c6
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/orange_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom_ctm.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_bloom.png b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_bloom.png
new file mode 100644
index 0000000000000000000000000000000000000000..11bed397b8ea8077ff6c45fe6b46ddd58e0f912c
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBdzs2Z%k;c6^nJJvbVIaW*kH}&M2EM}}%y>M1MG8>R*3-o?MB;Mj
z*@L_X40sMZR572HR{708bAc+?7xg>NOEx)68Lig7^U+C>MUkU<gP@p`z%S+&rwXNc
c|35!uI6a>&F*S5qHqamjPgg&ebxsLQ0I+g7@&Et;

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_bloom.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_bloom.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_emissive.png.mcmeta
deleted file mode 100644
index 6bd561037cd..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/orange_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/orange_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_off.png.mcmeta
index 2d87bf7df39..eabf6bb2656 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/orange_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/orange_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/orange_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange.png b/src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/orange.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png.mcmeta
new file mode 100644
index 00000000000..516a9b648c9
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/orange_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/orange_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/orange_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink.png.mcmeta
deleted file mode 100644
index 37808e80592..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/pink.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/pink_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/pink_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom.png.mcmeta
new file mode 100644
index 00000000000..29c10bfe24d
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/pink_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/pink_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom_ctm.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_bloom.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_bloom.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..92802ad8825519a91097d63eb761797d60008bfc
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBdf99EYEnDy8&XHT3T@Df~@Q5sCVBk9p!i>lBSEK+1Z9QEaLnJPT
zo;}EWz<}qlLlyIBX_epnGZ(0GeNn&TykwKJl+kMKJ0G1CSrj>%HwcP33H)MiajH<7
d_y6-lhST%e5>rE$WdjXj@O1TaS?83{1OT0MJP7~*

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_emissive.png.mcmeta
deleted file mode 100644
index 8ca9c17de14..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/pink_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/pink_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_off.png.mcmeta
index 7894d02278d..ce444d36c89 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/pink_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/pink_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/pink_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink.png b/src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/pink.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png.mcmeta
new file mode 100644
index 00000000000..9ac68a15fc5
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/pink_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/pink_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/pink_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/pink_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple.png.mcmeta
deleted file mode 100644
index 121eed221ea..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/purple.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/purple_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/purple_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom.png.mcmeta
new file mode 100644
index 00000000000..942e844eaa7
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/purple_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/purple_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom_ctm.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_bloom.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_bloom.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..87fec534a79297de6623da3201ee4d220d81f30e
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lAy+vxvN^>_U;w|SYL`GEurJR*x382Ao@Fyrz36)8YLTTd6q5Q)p7
zXAkloFyJ}tP{n*&TIDzY%mu1kU)1k7FWKZQWwcuR&POLj7DbNc4T54$0>7ABoGO&&
d{r~)s;q-jA#MIDb*+7FBJYD@<);T3K0RZ7#I%WU>

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_emissive.png.mcmeta
deleted file mode 100644
index 8c82cc421b1..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/purple_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/purple_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_off.png.mcmeta
index e912715ff62..067da7a4996 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/purple_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/purple_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/purple_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple.png b/src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/purple.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png.mcmeta
new file mode 100644
index 00000000000..28d7bf0b948
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/purple_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/purple_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/purple_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/purple_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red.png.mcmeta
deleted file mode 100644
index b0bef295adf..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/red.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/red_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/red_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/red_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/red_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_bloom.png.mcmeta
new file mode 100644
index 00000000000..70de0198151
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/red_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/red_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/red_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/red_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_bloom_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_bloom_ctm.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_bloom_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/red_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_bloom.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_bloom.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..88aa73ca7a2ee8376e66ea3631c4a2d53af11f47
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBd-^l2#n(i$rbwQ^1y&%B?kH}&M2EM}}%y>M1MG8>R*3-o?MB;Mj
z*@L_X40sMZR572HR{708bAc+?7xg>NOEx)68Lig7^U+C>MUkU<gP@p`z%S+&rwXNc
c|35!uI6a>&F*S5qHqamjPgg&ebxsLQ05)wn;{X5v

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_emissive.png.mcmeta
deleted file mode 100644
index 71f134efd0c..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/red_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/red_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_off.png.mcmeta
index d9f98de71da..be15cc2a979 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/red_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/red_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/red_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red.png b/src/main/resources/assets/gtceu/textures/block/lamps/red_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/red.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/red_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_on.png.mcmeta
new file mode 100644
index 00000000000..4680e682514
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/red_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/red_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/red_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/red_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white.png.mcmeta
deleted file mode 100644
index d21e74fd68e..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/white.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/white_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/white_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/white_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/white_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_bloom.png.mcmeta
new file mode 100644
index 00000000000..8a579d67dd6
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/white_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/white_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/white_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/white_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_bloom_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_bloom_ctm.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_bloom_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/white_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_bloom.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_bloom.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..1efa7b0104965ba75f617611cf3e7c581292c805
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBd|NsA|@7|rgcdyR6t^*`k;1OBOz`%DHgc*<LuSfw3+IqS;hDclv
zJ$sP%fC0~8hbrdN(kj3CXD(3X`l5cvdC4YcDWlcecRo5PvM6#iZx9r768Od3;#8qD
d@BinA45#O_C8mZh%LW?6;OXk;vd$@?2>^UZJ^TOw

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_emissive.png.mcmeta
deleted file mode 100644
index 5b460863ca0..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/white_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/white_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_off.png.mcmeta
index 8defbca3800..2c90d5cde00 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/white_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/white_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/white_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white.png b/src/main/resources/assets/gtceu/textures/block/lamps/white_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/white.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/white_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_on.png.mcmeta
new file mode 100644
index 00000000000..f3975e3b071
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/white_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/white_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/white_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/white_on_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow.png.mcmeta
deleted file mode 100644
index 92cd97707cd..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/yellow.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/yellow_ctm"
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/yellow_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom.png.mcmeta
new file mode 100644
index 00000000000..99638cdc659
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom.png.mcmeta
@@ -0,0 +1,8 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/yellow_bloom_ctm"
+    },
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_ctm_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/yellow_ctm_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom_ctm.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom_ctm.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_bloom.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_bloom.png.mcmeta
new file mode 100644
index 00000000000..4da3f5f1299
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_bloom.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": true
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_on.png b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e2fd67dc41a4ef5c32da6593c0b394cfcca96da
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0E6_;1lBd|E|&d<LY<TNnfv6^AjXk;1OBOz`%DHgc*<LuSfw3+IqS;hDclv
zJ$sP%fC0~8hbrdN(kj3CXD(3X`l5cvdC4YcDWlcecRo5PvM6#iZx9r768Od3;#8qD
d@BinA45#O_C8mZh%LW?6;OXk;vd$@?2>{70JbC~C

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_emissive.png.mcmeta
deleted file mode 100644
index 4e0110c9e7c..00000000000
--- a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_emissive.png.mcmeta
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ldlib": {
-    "connection": "gtceu:block/lamps/yellow_ctm_emissive"
-  },
-  "shimmer": {
-    "bloom": true
-  }
-}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_off.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_off.png.mcmeta
index 160ab566143..d582a53eb12 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_off.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_off.png.mcmeta
@@ -1,5 +1,5 @@
 {
-  "ldlib": {
-    "connection": "gtceu:block/lamps/yellow_off_ctm"
-  }
+    "ldlib": {
+        "connection": "gtceu:block/lamps/yellow_off_ctm"
+    }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow.png b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/yellow.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png.mcmeta
new file mode 100644
index 00000000000..782d3bf17a3
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "ldlib": {
+        "connection": "gtceu:block/lamps/yellow_on_ctm"
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_ctm.png b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on_ctm.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/yellow_ctm.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/yellow_on_ctm.png

From 20a521b6a2e4af036de484705ca62209a2c7e97e Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Fri, 1 May 2026 13:18:17 +0300
Subject: [PATCH 10/14] Explicitly disable bloom on non-emissive active
 textures

---
 .../block/lamps/black_borderless_on.png.mcmeta      |   5 +++++
 .../gtceu/textures/block/lamps/black_on.png.mcmeta  |   4 +++-
 .../textures/block/lamps/black_on_ctm.png.mcmeta    |   5 +++++
 ...lue_borderless.png => blue_borderless_bloom.png} | Bin
 .../block/lamps/blue_borderless_on.png.mcmeta       |   5 +++++
 .../gtceu/textures/block/lamps/blue_on.png.mcmeta   |   3 +++
 .../textures/block/lamps/blue_on_ctm.png.mcmeta     |   5 +++++
 ...wn_borderless.png => brown_borderless_bloom.png} | Bin
 .../block/lamps/brown_borderless_on.png.mcmeta      |   5 +++++
 .../gtceu/textures/block/lamps/brown_on.png.mcmeta  |   3 +++
 .../textures/block/lamps/brown_on_ctm.png.mcmeta    |   5 +++++
 ...yan_borderless.png => cyan_borderless_bloom.png} | Bin
 .../block/lamps/cyan_borderless_on.png.mcmeta       |   5 +++++
 .../gtceu/textures/block/lamps/cyan_on.png.mcmeta   |   3 +++
 .../textures/block/lamps/cyan_on_ctm.png.mcmeta     |   5 +++++
 .../block/lamps/gray_borderless_on.png.mcmeta       |   5 +++++
 .../gtceu/textures/block/lamps/gray_on.png.mcmeta   |   3 +++
 .../textures/block/lamps/gray_on_ctm.png.mcmeta     |   5 +++++
 .../block/lamps/green_borderless_on.png.mcmeta      |   5 +++++
 .../textures/block/lamps/green_ctm_on.png.mcmeta    |   5 +++++
 .../gtceu/textures/block/lamps/green_on.png.mcmeta  |   3 +++
 .../block/lamps/light_blue_borderless_on.png.mcmeta |   5 +++++
 .../textures/block/lamps/light_blue_on.png.mcmeta   |   3 +++
 .../block/lamps/light_blue_on_ctm.png.mcmeta        |   5 +++++
 .../block/lamps/light_gray_borderless_on.png.mcmeta |   5 +++++
 .../textures/block/lamps/light_gray_on.png.mcmeta   |   3 +++
 .../block/lamps/light_gray_on_ctm.png.mcmeta        |   5 +++++
 .../block/lamps/lime_borderless_on.png.mcmeta       |   5 +++++
 .../gtceu/textures/block/lamps/lime_on.png.mcmeta   |   3 +++
 .../textures/block/lamps/lime_on_ctm.png.mcmeta     |   5 +++++
 .../block/lamps/magenta_borderless_on.png.mcmeta    |   5 +++++
 .../textures/block/lamps/magenta_ctm.png.mcmeta     |   5 +++++
 .../textures/block/lamps/magenta_on.png.mcmeta      |   3 +++
 .../block/lamps/orange_borderless_on.png.mcmeta     |   5 +++++
 .../textures/block/lamps/orange_ctm_on.png.mcmeta   |   5 +++++
 .../gtceu/textures/block/lamps/orange_on.png.mcmeta |   3 +++
 .../block/lamps/pink_borderless_on.png.mcmeta       |   5 +++++
 .../gtceu/textures/block/lamps/pink_on.png.mcmeta   |   3 +++
 .../textures/block/lamps/pink_on_ctm.png.mcmeta     |   5 +++++
 .../block/lamps/purple_borderless_on.png.mcmeta     |   5 +++++
 .../gtceu/textures/block/lamps/purple_on.png.mcmeta |   3 +++
 .../textures/block/lamps/purple_on_ctm.png.mcmeta   |   5 +++++
 .../block/lamps/red_borderless_on.png.mcmeta        |   5 +++++
 .../gtceu/textures/block/lamps/red_on.png.mcmeta    |   3 +++
 .../textures/block/lamps/red_on_ctm.png.mcmeta      |   5 +++++
 .../block/lamps/white_borderless_on.png.mcmeta      |   5 +++++
 .../gtceu/textures/block/lamps/white_on.png.mcmeta  |   3 +++
 .../textures/block/lamps/white_on_ctm.png.mcmeta    |   5 +++++
 .../block/lamps/yellow_borderless_on.png.mcmeta     |   5 +++++
 .../gtceu/textures/block/lamps/yellow_on.png.mcmeta |   3 +++
 .../textures/block/lamps/yellow_on_ctm.png.mcmeta   |   5 +++++
 51 files changed, 208 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/black_on_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{blue_borderless.png => blue_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/blue_on_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{brown_borderless.png => brown_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/brown_on_ctm.png.mcmeta
 rename src/main/resources/assets/gtceu/textures/block/lamps/{cyan_borderless.png => cyan_borderless_bloom.png} (100%)
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/cyan_on_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/gray_on_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/green_ctm_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/lime_on_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/pink_on_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/purple_on_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/red_on_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/white_on_ctm.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_on.png.mcmeta
 create mode 100644 src/main/resources/assets/gtceu/textures/block/lamps/yellow_on_ctm.png.mcmeta

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_on.png.mcmeta
index e72a3217be3..5c13fcde49a 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/black_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/black_on.png.mcmeta
@@ -1,6 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/black_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
-
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/black_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/black_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/black_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png.mcmeta
index 79a2198d59b..116a33b1c75 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/blue_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/blue_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/blue_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/blue_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png.mcmeta
index ee6259838ef..16ca1f1305f 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/brown_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/brown_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/brown_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/brown_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless.png b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_bloom.png
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png.mcmeta
index 6483ae26412..1e35d272972 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/cyan_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png.mcmeta
index d2f32855b00..cbc26838129 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/gray_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/gray_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/gray_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/gray_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..95ef0aa75d1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+w{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_ctm_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_ctm_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_ctm_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_on.png.mcmeta
index 65f635a9895..6074941a516 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/green_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/green_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png.mcmeta
index 42b7bded3b7..dafb5e4a108 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/light_blue_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png.mcmeta
index 03713929f54..3761d1c9e64 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/light_gray_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png.mcmeta
index 0f6f0a5c102..41bab1624eb 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/lime_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/lime_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png.mcmeta
index d8075083a4c..0278b6ccc48 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/magenta_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_ctm_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png.mcmeta
index 516a9b648c9..17eea4ce1ed 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/orange_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png.mcmeta
index 9ac68a15fc5..cf9b95eb37d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/pink_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/pink_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png.mcmeta
index 28d7bf0b948..e2f7fcfda8a 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/purple_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/purple_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_on.png.mcmeta
index 4680e682514..bb34744e74d 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/red_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/red_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/red_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_on.png.mcmeta
index f3975e3b071..9c7a3a147a8 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/white_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/white_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/white_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_on.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png.mcmeta
index 782d3bf17a3..ebf371f8d42 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png.mcmeta
@@ -1,5 +1,8 @@
 {
     "ldlib": {
         "connection": "gtceu:block/lamps/yellow_on_ctm"
+    },
+    "shimmer": {
+        "bloom": false
     }
 }
diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on_ctm.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on_ctm.png.mcmeta
new file mode 100644
index 00000000000..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on_ctm.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "shimmer": {
+        "bloom": false
+    }
+}

From e93774869a09953e4c04905ac566f8c3cd631cd6 Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Fri, 1 May 2026 13:19:21 +0300
Subject: [PATCH 11/14] Actually commit the item model loader thing :ICANT:

---
 .../models/item/black_borderless_lamp.json    |   3 +-
 .../assets/gtceu/models/item/black_lamp.json  |   3 +-
 .../models/item/blue_borderless_lamp.json     |   3 +-
 .../assets/gtceu/models/item/blue_lamp.json   |   3 +-
 .../models/item/brown_borderless_lamp.json    |   3 +-
 .../assets/gtceu/models/item/brown_lamp.json  |   3 +-
 .../models/item/cyan_borderless_lamp.json     |   3 +-
 .../assets/gtceu/models/item/cyan_lamp.json   |   3 +-
 .../models/item/gray_borderless_lamp.json     |   3 +-
 .../assets/gtceu/models/item/gray_lamp.json   |   3 +-
 .../models/item/green_borderless_lamp.json    |   3 +-
 .../assets/gtceu/models/item/green_lamp.json  |   3 +-
 .../item/light_blue_borderless_lamp.json      |   3 +-
 .../gtceu/models/item/light_blue_lamp.json    |   3 +-
 .../item/light_gray_borderless_lamp.json      |   3 +-
 .../gtceu/models/item/light_gray_lamp.json    |   3 +-
 .../models/item/lime_borderless_lamp.json     |   3 +-
 .../assets/gtceu/models/item/lime_lamp.json   |   3 +-
 .../models/item/magenta_borderless_lamp.json  |   3 +-
 .../gtceu/models/item/magenta_lamp.json       |   3 +-
 .../models/item/orange_borderless_lamp.json   |   3 +-
 .../assets/gtceu/models/item/orange_lamp.json |   3 +-
 .../models/item/pink_borderless_lamp.json     |   3 +-
 .../assets/gtceu/models/item/pink_lamp.json   |   3 +-
 .../models/item/purple_borderless_lamp.json   |   3 +-
 .../assets/gtceu/models/item/purple_lamp.json |   3 +-
 .../models/item/red_borderless_lamp.json      |   3 +-
 .../assets/gtceu/models/item/red_lamp.json    |   3 +-
 .../models/item/white_borderless_lamp.json    |   3 +-
 .../assets/gtceu/models/item/white_lamp.json  |   3 +-
 .../models/item/yellow_borderless_lamp.json   |   3 +-
 .../assets/gtceu/models/item/yellow_lamp.json |   3 +-
 .../gregtechceu/gtceu/client/ClientProxy.java |   2 +
 .../item/CustomItemRendererWrapperModel.java  | 118 ++++++++++++++++++
 .../gtceu/common/item/LampBlockItem.java      |  33 -----
 35 files changed, 184 insertions(+), 65 deletions(-)
 create mode 100644 src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java

diff --git a/src/generated/resources/assets/gtceu/models/item/black_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/black_borderless_lamp.json
index ed0af019e1a..6687667af09 100644
--- a/src/generated/resources/assets/gtceu/models/item/black_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/black_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/black_borderless_lamp_on"
+  "parent": "gtceu:block/black_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/black_lamp.json b/src/generated/resources/assets/gtceu/models/item/black_lamp.json
index f8acb4b6c58..e62b6eb1a31 100644
--- a/src/generated/resources/assets/gtceu/models/item/black_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/black_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/black_lamp_on"
+  "parent": "gtceu:block/black_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/blue_borderless_lamp.json
index 6e499dd5755..6be5450c479 100644
--- a/src/generated/resources/assets/gtceu/models/item/blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/blue_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/blue_borderless_lamp_on"
+  "parent": "gtceu:block/blue_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/blue_lamp.json b/src/generated/resources/assets/gtceu/models/item/blue_lamp.json
index 16b2ee53614..de1c8120ab8 100644
--- a/src/generated/resources/assets/gtceu/models/item/blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/blue_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/blue_lamp_on"
+  "parent": "gtceu:block/blue_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/brown_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/brown_borderless_lamp.json
index c2d4ad2049a..9589e825df6 100644
--- a/src/generated/resources/assets/gtceu/models/item/brown_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/brown_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/brown_borderless_lamp_on"
+  "parent": "gtceu:block/brown_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/brown_lamp.json b/src/generated/resources/assets/gtceu/models/item/brown_lamp.json
index ad3b6275060..39a84542a71 100644
--- a/src/generated/resources/assets/gtceu/models/item/brown_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/brown_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/brown_lamp_on"
+  "parent": "gtceu:block/brown_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/cyan_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/cyan_borderless_lamp.json
index d5c0a34f9bc..d2b34bc59bb 100644
--- a/src/generated/resources/assets/gtceu/models/item/cyan_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/cyan_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/cyan_borderless_lamp_on"
+  "parent": "gtceu:block/cyan_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/cyan_lamp.json b/src/generated/resources/assets/gtceu/models/item/cyan_lamp.json
index 2f5b03f59d1..bc6c0567f96 100644
--- a/src/generated/resources/assets/gtceu/models/item/cyan_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/cyan_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/cyan_lamp_on"
+  "parent": "gtceu:block/cyan_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/gray_borderless_lamp.json
index 07abe6d60cd..7da9421fe50 100644
--- a/src/generated/resources/assets/gtceu/models/item/gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/gray_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/gray_borderless_lamp_on"
+  "parent": "gtceu:block/gray_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/gray_lamp.json b/src/generated/resources/assets/gtceu/models/item/gray_lamp.json
index 6bcd8b968b0..5cf076a9278 100644
--- a/src/generated/resources/assets/gtceu/models/item/gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/gray_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/gray_lamp_on"
+  "parent": "gtceu:block/gray_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/green_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/green_borderless_lamp.json
index 8cf44bd24c4..c7ed6dd65d4 100644
--- a/src/generated/resources/assets/gtceu/models/item/green_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/green_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/green_borderless_lamp_on"
+  "parent": "gtceu:block/green_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/green_lamp.json b/src/generated/resources/assets/gtceu/models/item/green_lamp.json
index 52f0520f0c5..fc4daaf5844 100644
--- a/src/generated/resources/assets/gtceu/models/item/green_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/green_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/green_lamp_on"
+  "parent": "gtceu:block/green_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/light_blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/light_blue_borderless_lamp.json
index c3f886d6a75..33f49789bb0 100644
--- a/src/generated/resources/assets/gtceu/models/item/light_blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/light_blue_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/light_blue_borderless_lamp_on"
+  "parent": "gtceu:block/light_blue_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/light_blue_lamp.json b/src/generated/resources/assets/gtceu/models/item/light_blue_lamp.json
index 62046034a02..7449e1518bc 100644
--- a/src/generated/resources/assets/gtceu/models/item/light_blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/light_blue_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/light_blue_lamp_on"
+  "parent": "gtceu:block/light_blue_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/light_gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/light_gray_borderless_lamp.json
index 531884b2914..fa560db1c71 100644
--- a/src/generated/resources/assets/gtceu/models/item/light_gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/light_gray_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/light_gray_borderless_lamp_on"
+  "parent": "gtceu:block/light_gray_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/light_gray_lamp.json b/src/generated/resources/assets/gtceu/models/item/light_gray_lamp.json
index 163222af84d..fe36c479756 100644
--- a/src/generated/resources/assets/gtceu/models/item/light_gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/light_gray_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/light_gray_lamp_on"
+  "parent": "gtceu:block/light_gray_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/lime_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/lime_borderless_lamp.json
index 5030d4a6508..e43bd72af35 100644
--- a/src/generated/resources/assets/gtceu/models/item/lime_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/lime_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/lime_borderless_lamp_on"
+  "parent": "gtceu:block/lime_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/lime_lamp.json b/src/generated/resources/assets/gtceu/models/item/lime_lamp.json
index 6075dceafbd..093378d1532 100644
--- a/src/generated/resources/assets/gtceu/models/item/lime_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/lime_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/lime_lamp_on"
+  "parent": "gtceu:block/lime_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/magenta_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/magenta_borderless_lamp.json
index 09df14bd560..670775f1bff 100644
--- a/src/generated/resources/assets/gtceu/models/item/magenta_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/magenta_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/magenta_borderless_lamp_on"
+  "parent": "gtceu:block/magenta_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/magenta_lamp.json b/src/generated/resources/assets/gtceu/models/item/magenta_lamp.json
index 1f6f3693bab..ee1ec757f48 100644
--- a/src/generated/resources/assets/gtceu/models/item/magenta_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/magenta_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/magenta_lamp_on"
+  "parent": "gtceu:block/magenta_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/orange_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/orange_borderless_lamp.json
index fbab08b7da6..1426608173e 100644
--- a/src/generated/resources/assets/gtceu/models/item/orange_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/orange_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/orange_borderless_lamp_on"
+  "parent": "gtceu:block/orange_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/orange_lamp.json b/src/generated/resources/assets/gtceu/models/item/orange_lamp.json
index 55faf24052a..41f72caa2fb 100644
--- a/src/generated/resources/assets/gtceu/models/item/orange_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/orange_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/orange_lamp_on"
+  "parent": "gtceu:block/orange_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/pink_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/pink_borderless_lamp.json
index 4c8ec0c54a6..9fd2fdd0db0 100644
--- a/src/generated/resources/assets/gtceu/models/item/pink_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/pink_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/pink_borderless_lamp_on"
+  "parent": "gtceu:block/pink_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/pink_lamp.json b/src/generated/resources/assets/gtceu/models/item/pink_lamp.json
index dc4d410039f..9fa2bff4a21 100644
--- a/src/generated/resources/assets/gtceu/models/item/pink_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/pink_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/pink_lamp_on"
+  "parent": "gtceu:block/pink_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/purple_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/purple_borderless_lamp.json
index b2cde70d299..40c5aeaa976 100644
--- a/src/generated/resources/assets/gtceu/models/item/purple_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/purple_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/purple_borderless_lamp_on"
+  "parent": "gtceu:block/purple_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/purple_lamp.json b/src/generated/resources/assets/gtceu/models/item/purple_lamp.json
index 83eaa30a9b4..a8b2562ec7e 100644
--- a/src/generated/resources/assets/gtceu/models/item/purple_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/purple_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/purple_lamp_on"
+  "parent": "gtceu:block/purple_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/red_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/red_borderless_lamp.json
index b59947db0e7..7bf485233f0 100644
--- a/src/generated/resources/assets/gtceu/models/item/red_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/red_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/red_borderless_lamp_on"
+  "parent": "gtceu:block/red_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/red_lamp.json b/src/generated/resources/assets/gtceu/models/item/red_lamp.json
index b1a7a1ee344..7555f5f86a3 100644
--- a/src/generated/resources/assets/gtceu/models/item/red_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/red_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/red_lamp_on"
+  "parent": "gtceu:block/red_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/white_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/white_borderless_lamp.json
index f094edd1151..aaf55615fda 100644
--- a/src/generated/resources/assets/gtceu/models/item/white_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/white_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/white_borderless_lamp_on"
+  "parent": "gtceu:block/white_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/white_lamp.json b/src/generated/resources/assets/gtceu/models/item/white_lamp.json
index bbc74c7fbad..b6319a67503 100644
--- a/src/generated/resources/assets/gtceu/models/item/white_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/white_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/white_lamp_on"
+  "parent": "gtceu:block/white_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/yellow_borderless_lamp.json b/src/generated/resources/assets/gtceu/models/item/yellow_borderless_lamp.json
index fb25ba2c181..4bd3f95fbf8 100644
--- a/src/generated/resources/assets/gtceu/models/item/yellow_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/yellow_borderless_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/yellow_borderless_lamp_on"
+  "parent": "gtceu:block/yellow_borderless_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/item/yellow_lamp.json b/src/generated/resources/assets/gtceu/models/item/yellow_lamp.json
index a24eeb91199..3062cae0d56 100644
--- a/src/generated/resources/assets/gtceu/models/item/yellow_lamp.json
+++ b/src/generated/resources/assets/gtceu/models/item/yellow_lamp.json
@@ -1,3 +1,4 @@
 {
-  "parent": "gtceu:block/yellow_lamp_on"
+  "parent": "gtceu:block/yellow_lamp_on",
+  "loader": "gtceu:custom_item_renderer_wrapper"
 }
\ No newline at end of file
diff --git a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
index 9a0574d59a7..295ff1fea16 100644
--- a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
+++ b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
@@ -9,6 +9,7 @@
 import com.gregtechceu.gtceu.api.item.IComponentItem;
 import com.gregtechceu.gtceu.api.item.IGTTool;
 import com.gregtechceu.gtceu.client.model.item.FacadeUnbakedModel;
+import com.gregtechceu.gtceu.client.model.item.CustomItemRendererWrapperModel;
 import com.gregtechceu.gtceu.client.model.machine.MachineModelLoader;
 import com.gregtechceu.gtceu.client.model.pipe.PipeModel;
 import com.gregtechceu.gtceu.client.model.pipe.PipeModelLoader;
@@ -175,6 +176,7 @@ public void onRegisterModelLoaders(ModelEvent.RegisterGeometryLoaders event) {
         event.register(MachineModelLoader.ID.getPath(), MachineModelLoader.INSTANCE);
         event.register(PipeModelLoader.ID.getPath(), PipeModelLoader.INSTANCE);
         event.register("facade", FacadeUnbakedModel.Loader.INSTANCE);
+        event.register(CustomItemRendererWrapperModel.TYPE_ID.getPath(), CustomItemRendererWrapperModel.Loader.INSTANCE);
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java
new file mode 100644
index 00000000000..1a703b59dae
--- /dev/null
+++ b/src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java
@@ -0,0 +1,118 @@
+package com.gregtechceu.gtceu.client.model.item;
+
+import com.gregtechceu.gtceu.GTCEu;
+
+import net.minecraft.client.renderer.block.model.BlockModel;
+import net.minecraft.client.renderer.block.model.ItemOverrides;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.Material;
+import net.minecraft.client.resources.model.ModelBaker;
+import net.minecraft.client.resources.model.ModelState;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.client.extensions.common.IClientItemExtensions;
+import net.minecraftforge.client.model.BakedModelWrapper;
+import net.minecraftforge.client.model.generators.CustomLoaderBuilder;
+import net.minecraftforge.client.model.generators.ModelBuilder;
+import net.minecraftforge.client.model.geometry.*;
+import net.minecraftforge.common.data.ExistingFileHelper;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Function;
+
+/**
+ * Custom model type that simply overrides {@link BakedModel#isCustomRenderer()} to always return true so
+ * {@link IClientItemExtensions#getCustomRenderer()} can work. Does nothing on blocks.
+ *
+ * <p>
+ * Use it on an item model builder like this:
+ * <pre>{@code
+ *      prov.getBuilder(ctx.getId())
+ *              .customLoader(CustomItemRendererModel.Builder::begin).end()
+ *              // ...
+ * }</pre>
+ */
+public class CustomItemRendererWrapperModel implements IUnbakedGeometry<CustomItemRendererWrapperModel> {
+
+    public static final ResourceLocation TYPE_ID = GTCEu.id("custom_item_renderer_wrapper");
+
+    private final BlockModel parent;
+
+    public CustomItemRendererWrapperModel(BlockModel parent) {
+        this.parent = parent;
+    }
+
+    @Override
+    public BakedModel bake(IGeometryBakingContext context, ModelBaker baker,
+                           Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState,
+                           ItemOverrides overrides, ResourceLocation modelLocation) {
+        BlockModel owner = parent;
+        if (context instanceof BlockGeometryBakingContext blockContext) owner = blockContext.owner;
+
+        BakedModel originalModel = parent.bake(baker, owner, spriteGetter, modelState, modelLocation, context.isGui3d());
+        return new Baked(originalModel);
+    }
+
+    public static final class Baked extends BakedModelWrapper<BakedModel> {
+
+        public Baked(BakedModel originalModel) {
+            super(originalModel);
+        }
+
+        @Override
+        public boolean isCustomRenderer() {
+            return true;
+        }
+    }
+
+    public static final class Loader implements IGeometryLoader<CustomItemRendererWrapperModel> {
+
+        public static final CustomItemRendererWrapperModel.Loader INSTANCE = new CustomItemRendererWrapperModel.Loader();
+//         private static final ThreadLocal<Boolean> currentlyParsing = new ThreadLocal<>();
+
+        private Loader() {}
+
+        @Override
+        public @Nullable CustomItemRendererWrapperModel read(JsonObject json, JsonDeserializationContext context) throws JsonParseException {
+//             if (Boolean.TRUE.equals(currentlyParsing.get())) {
+//                 // if this is called from the inner context.deserialize(...) invocation, return null so the vanilla
+//                 // model is parsed instead
+//                 return null;
+//             }
+//             try {
+//                 currentlyParsing.set(Boolean.TRUE);
+//
+            // remove the loader field and parse it again as a normal vanilla model
+            json.remove("loader");
+
+            return new CustomItemRendererWrapperModel(context.deserialize(json, BlockModel.class));
+//             } finally {
+//                 currentlyParsing.remove();
+//             }
+        }
+    }
+
+    /**
+     * Use this to add the model type to an item model generator, like this:
+     * <pre>{@code
+     *      prov.withExistingParent(ctx::get, ctx.id())
+     *              .customLoader(CustomItemRendererModel.Builder::begin).end()
+     *              // ...
+     * }</pre>
+     */
+    public static final class Builder<T extends ModelBuilder<T>> extends CustomLoaderBuilder<T> {
+
+        public Builder(T parent, ExistingFileHelper existingFileHelper) {
+            super(TYPE_ID, parent, existingFileHelper);
+        }
+
+        public static <T extends ModelBuilder<T>> Builder<T> begin(T parent, ExistingFileHelper existingFileHelper) {
+            return new Builder<>(parent, existingFileHelper);
+        }
+
+    }
+}
diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java
index 22fdb6e30f7..fd9ba7ea4c1 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java
@@ -1,25 +1,17 @@
 package com.gregtechceu.gtceu.common.item;
 
-import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.client.renderer.block.LampItemRenderer;
-import com.gregtechceu.gtceu.client.util.ModelUtils;
 import com.gregtechceu.gtceu.common.block.LampBlock;
 
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
-import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.core.NonNullList;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.client.extensions.common.IClientItemExtensions;
-import net.minecraftforge.client.model.BakedModelWrapper;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
@@ -35,10 +27,6 @@ public class LampBlockItem extends BlockItem {
 
     public LampBlockItem(LampBlock block, Properties properties) {
         super(block, properties);
-
-        if (GTCEu.isClientSide()) {
-            ClientCallWrapper.registerEventListener(this);
-        }
     }
 
     @Override
@@ -80,25 +68,4 @@ public BlockEntityWithoutLevelRenderer getCustomRenderer() {
             }
         });
     }
-
-    private static class ClientCallWrapper {
-
-        private static void registerEventListener(LampBlockItem item) {
-            ModelUtils.registerBakeEventListener(false, event -> {
-                ResourceLocation model = BuiltInRegistries.ITEM.getKey(item).withPrefix("item/");
-                BakedModel original = event.getModels().get(model);
-                if (original == null) {
-                    model = new ModelResourceLocation(model, "inventory");
-                    original = event.getModels().get(model);
-                }
-                event.getModels().put(model, new BakedModelWrapper<>(original) {
-
-                    @Override
-                    public boolean isCustomRenderer() {
-                        return true;
-                    }
-                });
-            });
-        }
-    }
 }

From 5055eccf0f518bda27d54a77500c2d39c280b7b4 Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Fri, 1 May 2026 13:27:33 +0300
Subject: [PATCH 12/14] Redo the block models based on the renamed textures

---
 .../blockstates/black_borderless_lamp.json    | 14 +---
 .../assets/gtceu/blockstates/black_lamp.json  | 14 +---
 .../blockstates/blue_borderless_lamp.json     | 14 +---
 .../assets/gtceu/blockstates/blue_lamp.json   | 14 +---
 .../blockstates/brown_borderless_lamp.json    | 14 +---
 .../assets/gtceu/blockstates/brown_lamp.json  | 14 +---
 .../blockstates/cyan_borderless_lamp.json     | 14 +---
 .../assets/gtceu/blockstates/cyan_lamp.json   | 14 +---
 .../blockstates/gray_borderless_lamp.json     | 14 +---
 .../assets/gtceu/blockstates/gray_lamp.json   | 14 +---
 .../blockstates/green_borderless_lamp.json    | 14 +---
 .../assets/gtceu/blockstates/green_lamp.json  | 14 +---
 .../light_blue_borderless_lamp.json           | 14 +---
 .../gtceu/blockstates/light_blue_lamp.json    | 14 +---
 .../light_gray_borderless_lamp.json           | 14 +---
 .../gtceu/blockstates/light_gray_lamp.json    | 14 +---
 .../blockstates/lime_borderless_lamp.json     | 14 +---
 .../assets/gtceu/blockstates/lime_lamp.json   | 14 +---
 .../blockstates/magenta_borderless_lamp.json  | 14 +---
 .../gtceu/blockstates/magenta_lamp.json       | 14 +---
 .../blockstates/orange_borderless_lamp.json   | 14 +---
 .../assets/gtceu/blockstates/orange_lamp.json | 14 +---
 .../blockstates/pink_borderless_lamp.json     | 14 +---
 .../assets/gtceu/blockstates/pink_lamp.json   | 14 +---
 .../blockstates/purple_borderless_lamp.json   | 14 +---
 .../assets/gtceu/blockstates/purple_lamp.json | 14 +---
 .../blockstates/red_borderless_lamp.json      | 14 +---
 .../assets/gtceu/blockstates/red_lamp.json    | 14 +---
 .../blockstates/white_borderless_lamp.json    | 14 +---
 .../assets/gtceu/blockstates/white_lamp.json  | 14 +---
 .../blockstates/yellow_borderless_lamp.json   | 14 +---
 .../assets/gtceu/blockstates/yellow_lamp.json | 14 +---
 .../block/black_borderless_lamp_bloom.json    |  4 +-
 .../block/black_borderless_lamp_off.json      |  4 +-
 .../block/black_borderless_lamp_on.json       |  4 +-
 .../gtceu/models/block/black_lamp_bloom.json  |  6 +-
 .../gtceu/models/block/black_lamp_off.json    |  4 +-
 .../gtceu/models/block/black_lamp_on.json     |  4 +-
 .../block/blue_borderless_lamp_bloom.json     |  4 +-
 .../block/blue_borderless_lamp_off.json       |  4 +-
 .../models/block/blue_borderless_lamp_on.json |  4 +-
 .../gtceu/models/block/blue_lamp_bloom.json   |  6 +-
 .../gtceu/models/block/blue_lamp_off.json     |  4 +-
 .../gtceu/models/block/blue_lamp_on.json      |  4 +-
 .../block/brown_borderless_lamp_bloom.json    |  4 +-
 .../block/brown_borderless_lamp_off.json      |  4 +-
 .../block/brown_borderless_lamp_on.json       |  4 +-
 .../gtceu/models/block/brown_lamp_bloom.json  |  6 +-
 .../gtceu/models/block/brown_lamp_off.json    |  4 +-
 .../gtceu/models/block/brown_lamp_on.json     |  4 +-
 .../block/cyan_borderless_lamp_bloom.json     |  4 +-
 .../block/cyan_borderless_lamp_off.json       |  4 +-
 .../models/block/cyan_borderless_lamp_on.json |  4 +-
 .../gtceu/models/block/cyan_lamp_bloom.json   |  6 +-
 .../gtceu/models/block/cyan_lamp_off.json     |  4 +-
 .../gtceu/models/block/cyan_lamp_on.json      |  4 +-
 .../block/gray_borderless_lamp_bloom.json     |  4 +-
 .../block/gray_borderless_lamp_off.json       |  4 +-
 .../models/block/gray_borderless_lamp_on.json |  4 +-
 .../gtceu/models/block/gray_lamp_bloom.json   |  6 +-
 .../gtceu/models/block/gray_lamp_off.json     |  4 +-
 .../gtceu/models/block/gray_lamp_on.json      |  4 +-
 .../block/green_borderless_lamp_bloom.json    |  4 +-
 .../block/green_borderless_lamp_off.json      |  4 +-
 .../block/green_borderless_lamp_on.json       |  4 +-
 .../gtceu/models/block/green_lamp_bloom.json  |  6 +-
 .../gtceu/models/block/green_lamp_off.json    |  4 +-
 .../gtceu/models/block/green_lamp_on.json     |  4 +-
 .../light_blue_borderless_lamp_bloom.json     |  4 +-
 .../block/light_blue_borderless_lamp_off.json |  4 +-
 .../block/light_blue_borderless_lamp_on.json  |  4 +-
 .../models/block/light_blue_lamp_bloom.json   |  6 +-
 .../models/block/light_blue_lamp_off.json     |  4 +-
 .../models/block/light_blue_lamp_on.json      |  4 +-
 .../light_gray_borderless_lamp_bloom.json     |  4 +-
 .../block/light_gray_borderless_lamp_off.json |  4 +-
 .../block/light_gray_borderless_lamp_on.json  |  4 +-
 .../models/block/light_gray_lamp_bloom.json   |  6 +-
 .../models/block/light_gray_lamp_off.json     |  4 +-
 .../models/block/light_gray_lamp_on.json      |  4 +-
 .../block/lime_borderless_lamp_bloom.json     |  4 +-
 .../block/lime_borderless_lamp_off.json       |  4 +-
 .../models/block/lime_borderless_lamp_on.json |  4 +-
 .../gtceu/models/block/lime_lamp_bloom.json   |  6 +-
 .../gtceu/models/block/lime_lamp_off.json     |  4 +-
 .../gtceu/models/block/lime_lamp_on.json      |  4 +-
 .../block/magenta_borderless_lamp_bloom.json  |  4 +-
 .../block/magenta_borderless_lamp_off.json    |  4 +-
 .../block/magenta_borderless_lamp_on.json     |  4 +-
 .../models/block/magenta_lamp_bloom.json      |  6 +-
 .../gtceu/models/block/magenta_lamp_off.json  |  4 +-
 .../gtceu/models/block/magenta_lamp_on.json   |  4 +-
 .../block/orange_borderless_lamp_bloom.json   |  4 +-
 .../block/orange_borderless_lamp_off.json     |  4 +-
 .../block/orange_borderless_lamp_on.json      |  4 +-
 .../gtceu/models/block/orange_lamp_bloom.json |  6 +-
 .../gtceu/models/block/orange_lamp_off.json   |  4 +-
 .../gtceu/models/block/orange_lamp_on.json    |  4 +-
 .../block/pink_borderless_lamp_bloom.json     |  4 +-
 .../block/pink_borderless_lamp_off.json       |  4 +-
 .../models/block/pink_borderless_lamp_on.json |  4 +-
 .../gtceu/models/block/pink_lamp_bloom.json   |  6 +-
 .../gtceu/models/block/pink_lamp_off.json     |  4 +-
 .../gtceu/models/block/pink_lamp_on.json      |  4 +-
 .../block/purple_borderless_lamp_bloom.json   |  4 +-
 .../block/purple_borderless_lamp_off.json     |  4 +-
 .../block/purple_borderless_lamp_on.json      |  4 +-
 .../gtceu/models/block/purple_lamp_bloom.json |  6 +-
 .../gtceu/models/block/purple_lamp_off.json   |  4 +-
 .../gtceu/models/block/purple_lamp_on.json    |  4 +-
 .../block/red_borderless_lamp_bloom.json      |  4 +-
 .../models/block/red_borderless_lamp_off.json |  4 +-
 .../models/block/red_borderless_lamp_on.json  |  4 +-
 .../gtceu/models/block/red_lamp_bloom.json    |  6 +-
 .../gtceu/models/block/red_lamp_off.json      |  4 +-
 .../gtceu/models/block/red_lamp_on.json       |  4 +-
 .../block/white_borderless_lamp_bloom.json    |  4 +-
 .../block/white_borderless_lamp_off.json      |  4 +-
 .../block/white_borderless_lamp_on.json       |  4 +-
 .../gtceu/models/block/white_lamp_bloom.json  |  6 +-
 .../gtceu/models/block/white_lamp_off.json    |  4 +-
 .../gtceu/models/block/white_lamp_on.json     |  4 +-
 .../block/yellow_borderless_lamp_bloom.json   |  4 +-
 .../block/yellow_borderless_lamp_off.json     |  4 +-
 .../block/yellow_borderless_lamp_on.json      |  4 +-
 .../gtceu/models/block/yellow_lamp_bloom.json |  6 +-
 .../gtceu/models/block/yellow_lamp_off.json   |  4 +-
 .../gtceu/models/block/yellow_lamp_on.json    |  4 +-
 .../gtceu/common/data/models/GTModels.java    | 78 +++++++++++--------
 .../assets/gtceu/models/block/lamp_bloom.json |  7 --
 .../models/block/lamp_borderless_bloom.json   |  6 --
 .../models/block/lamp_borderless_off.json     |  6 --
 .../models/block/lamp_borderless_on.json      |  6 --
 .../assets/gtceu/models/block/lamp_off.json   |  6 --
 .../assets/gtceu/models/block/lamp_on.json    |  6 --
 135 files changed, 382 insertions(+), 597 deletions(-)
 delete mode 100644 src/main/resources/assets/gtceu/models/block/lamp_bloom.json
 delete mode 100644 src/main/resources/assets/gtceu/models/block/lamp_borderless_bloom.json
 delete mode 100644 src/main/resources/assets/gtceu/models/block/lamp_borderless_off.json
 delete mode 100644 src/main/resources/assets/gtceu/models/block/lamp_borderless_on.json
 delete mode 100644 src/main/resources/assets/gtceu/models/block/lamp_off.json
 delete mode 100644 src/main/resources/assets/gtceu/models/block/lamp_on.json

diff --git a/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
index 253a77bb05e..97853c6f4d0 100644
--- a/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/black_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/black_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/black_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/black_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/black_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/black_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/black_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/black_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/black_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/black_lamp.json b/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
index 97737ee62ae..81156012927 100644
--- a/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/black_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/black_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/black_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/black_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/black_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/black_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/black_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/black_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/black_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
index 7733a352429..bb291ad2047 100644
--- a/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/blue_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/blue_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/blue_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/blue_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/blue_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/blue_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/blue_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/blue_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/blue_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json b/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
index cf1cbb4680b..9c19e8da3d8 100644
--- a/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/blue_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/blue_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/blue_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/blue_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/blue_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/blue_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/blue_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/blue_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/blue_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
index 1f94c32a9c8..cbee9003ac0 100644
--- a/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/brown_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/brown_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/brown_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/brown_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/brown_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/brown_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/brown_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/brown_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/brown_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json b/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
index 778a11e8ba2..56110da11a7 100644
--- a/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/brown_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/brown_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/brown_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/brown_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/brown_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/brown_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/brown_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/brown_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/brown_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json
index 059522192c9..8175c9abed0 100644
--- a/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/cyan_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/cyan_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/cyan_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/cyan_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/cyan_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/cyan_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/cyan_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/cyan_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/cyan_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/cyan_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json b/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
index fc2113dab49..f292981ff50 100644
--- a/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/cyan_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/cyan_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/cyan_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/cyan_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/cyan_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/cyan_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/cyan_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/cyan_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/cyan_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json
index ea09a42e8ea..442a729bc4d 100644
--- a/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/gray_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/gray_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/gray_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/gray_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/gray_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/gray_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/gray_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/gray_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/gray_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/gray_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json b/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
index 02bc283ed22..843bb33ec48 100644
--- a/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/gray_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/gray_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/gray_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/gray_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/gray_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/gray_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/gray_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/gray_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/gray_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json
index 4a2aa859750..847a974e5c4 100644
--- a/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/green_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/green_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/green_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/green_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/green_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/green_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/green_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/green_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/green_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/green_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/green_lamp.json b/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
index 8dd25b4bf15..9dbaf15893f 100644
--- a/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/green_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/green_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/green_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/green_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/green_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/green_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/green_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/green_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/green_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json
index 478555ea9d3..43fab9b074b 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_blue_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/light_blue_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/light_blue_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/light_blue_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/light_blue_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/light_blue_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/light_blue_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/light_blue_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/light_blue_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/light_blue_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json
index a9b2c1dfdc3..fc79dd9b307 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_blue_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/light_blue_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/light_blue_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/light_blue_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/light_blue_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/light_blue_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/light_blue_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/light_blue_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/light_blue_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/light_blue_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json
index a165753e8ed..2192a344758 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_gray_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/light_gray_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/light_gray_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/light_gray_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/light_gray_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/light_gray_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/light_gray_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/light_gray_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/light_gray_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/light_gray_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json b/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json
index 7b84870486a..5d1b6fefffa 100644
--- a/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/light_gray_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/light_gray_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/light_gray_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/light_gray_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/light_gray_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/light_gray_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/light_gray_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/light_gray_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/light_gray_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/light_gray_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json
index 893ead5ebb3..2420bc3f72e 100644
--- a/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/lime_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/lime_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/lime_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/lime_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/lime_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/lime_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/lime_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/lime_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/lime_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/lime_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json b/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
index 7d6989cd5e3..e9b97975762 100644
--- a/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/lime_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/lime_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/lime_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/lime_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/lime_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/lime_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/lime_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/lime_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/lime_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json
index 71c9fe65e62..1f8587f047a 100644
--- a/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/magenta_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/magenta_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/magenta_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/magenta_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/magenta_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/magenta_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/magenta_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/magenta_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/magenta_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/magenta_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json b/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
index 3d696c9475e..2faa7c6a171 100644
--- a/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/magenta_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/magenta_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/magenta_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/magenta_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/magenta_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/magenta_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/magenta_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/magenta_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/magenta_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json
index dc8a8a1774d..8ff33a7b548 100644
--- a/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/orange_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/orange_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/orange_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/orange_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/orange_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/orange_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/orange_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/orange_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/orange_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/orange_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json b/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
index 8d894e3c2e9..e0a78e8c7c6 100644
--- a/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/orange_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/orange_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/orange_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/orange_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/orange_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/orange_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/orange_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/orange_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/orange_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json
index 7fe0a82fa09..5d6c9e8308f 100644
--- a/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/pink_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/pink_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/pink_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/pink_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/pink_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/pink_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/pink_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/pink_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/pink_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/pink_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json b/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
index a810f47ca34..9e24ef2b9c0 100644
--- a/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/pink_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/pink_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/pink_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/pink_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/pink_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/pink_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/pink_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/pink_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/pink_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json
index 49beb311e18..9e692ebe06c 100644
--- a/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/purple_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/purple_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/purple_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/purple_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/purple_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/purple_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/purple_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/purple_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/purple_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/purple_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json b/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
index 1cc72c942c7..2a90b827c2f 100644
--- a/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/purple_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/purple_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/purple_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/purple_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/purple_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/purple_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/purple_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/purple_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/purple_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json
index 54eae2a378b..8787b668a2e 100644
--- a/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/red_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/red_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/red_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/red_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/red_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/red_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/red_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/red_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/red_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/red_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/red_lamp.json b/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
index 75b635491c2..7be57f1c43e 100644
--- a/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/red_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/red_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/red_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/red_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/red_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/red_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/red_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/red_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/red_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json
index f0b9254457d..5bbaea32235 100644
--- a/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/white_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/white_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/white_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/white_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/white_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/white_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/white_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/white_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/white_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/white_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/white_lamp.json b/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
index 762183f229b..235580f3c74 100644
--- a/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/white_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/white_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/white_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/white_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/white_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/white_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/white_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/white_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/white_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json
index 7ef79ba04fa..1b26ed2cc83 100644
--- a/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/yellow_borderless_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/yellow_borderless_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/yellow_borderless_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/yellow_borderless_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/yellow_borderless_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/yellow_borderless_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/yellow_borderless_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/yellow_borderless_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/yellow_borderless_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/yellow_borderless_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json b/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
index b0a4e50e0ef..52290ca38ed 100644
--- a/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
@@ -1,27 +1,21 @@
 {
   "variants": {
-    "bloom=false,inverted=false,powered=false": {
-      "model": "gtceu:block/yellow_lamp_off"
-    },
     "bloom=false,inverted=false,powered=true": {
       "model": "gtceu:block/yellow_lamp_on"
     },
     "bloom=false,inverted=true,powered=false": {
       "model": "gtceu:block/yellow_lamp_on"
     },
-    "bloom=false,inverted=true,powered=true": {
-      "model": "gtceu:block/yellow_lamp_off"
-    },
-    "bloom=true,inverted=false,powered=false": {
-      "model": "gtceu:block/yellow_lamp_off"
-    },
     "bloom=true,inverted=false,powered=true": {
       "model": "gtceu:block/yellow_lamp_bloom"
     },
     "bloom=true,inverted=true,powered=false": {
       "model": "gtceu:block/yellow_lamp_bloom"
     },
-    "bloom=true,inverted=true,powered=true": {
+    "inverted=false,powered=false": {
+      "model": "gtceu:block/yellow_lamp_off"
+    },
+    "inverted=true,powered=true": {
       "model": "gtceu:block/yellow_lamp_off"
     }
   }
diff --git a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_bloom.json
index 806989d43ee..84bf95a6728 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/black_borderless"
+    "all": "gtceu:block/lamps/black_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_off.json
index fbf18fc840e..4a829a6ad52 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/black_borderless_off"
+    "all": "gtceu:block/lamps/black_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_on.json
index 4088ce5b9a5..c71c031329c 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/black_borderless"
+    "all": "gtceu:block/lamps/black_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/black_lamp_bloom.json
index b16b8a9c982..427daa8afdf 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/black",
-    "active_overlay": "gtceu:block/lamps/black_emissive"
+    "bot_all": "gtceu:block/lamps/black_on",
+    "top_all": "gtceu:block/lamps/black_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/black_lamp_off.json
index 67e619c38b3..f2fecdb1e43 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/black_off"
+    "all": "gtceu:block/lamps/black_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/black_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/black_lamp_on.json
index 4338bed5bae..9ee4e86cc5a 100644
--- a/src/generated/resources/assets/gtceu/models/block/black_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/black_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/black"
+    "all": "gtceu:block/lamps/black_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_bloom.json
index b2f0f987ed6..0011ef3c6f0 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/blue_borderless"
+    "all": "gtceu:block/lamps/blue_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_off.json
index 848265e0d35..7ca660957c8 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/blue_borderless_off"
+    "all": "gtceu:block/lamps/blue_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_on.json
index 589b7e72298..b9acea8c973 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/blue_borderless"
+    "all": "gtceu:block/lamps/blue_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/blue_lamp_bloom.json
index 6b874a889e8..ef6ba5696bc 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/blue",
-    "active_overlay": "gtceu:block/lamps/blue_emissive"
+    "bot_all": "gtceu:block/lamps/blue_on",
+    "top_all": "gtceu:block/lamps/blue_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/blue_lamp_off.json
index e7af08e18d8..032ce1fa952 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/blue_off"
+    "all": "gtceu:block/lamps/blue_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/blue_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/blue_lamp_on.json
index a036cbc0712..8c9a34b36fd 100644
--- a/src/generated/resources/assets/gtceu/models/block/blue_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/blue_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/blue"
+    "all": "gtceu:block/lamps/blue_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_bloom.json
index 6b544f99c25..e400f4678c0 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/brown_borderless"
+    "all": "gtceu:block/lamps/brown_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_off.json
index 1a64746e1b4..bba67282027 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/brown_borderless_off"
+    "all": "gtceu:block/lamps/brown_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_on.json
index 2127af2c7ab..a20d0afcddb 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/brown_borderless"
+    "all": "gtceu:block/lamps/brown_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/brown_lamp_bloom.json
index 99d9e783663..0f27a4f6a3d 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/brown",
-    "active_overlay": "gtceu:block/lamps/brown_emissive"
+    "bot_all": "gtceu:block/lamps/brown_on",
+    "top_all": "gtceu:block/lamps/brown_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/brown_lamp_off.json
index 2c55e947692..357bef0d258 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/brown_off"
+    "all": "gtceu:block/lamps/brown_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/brown_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/brown_lamp_on.json
index 3ba2b9fb583..0e6666b4e36 100644
--- a/src/generated/resources/assets/gtceu/models/block/brown_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/brown_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/brown"
+    "all": "gtceu:block/lamps/brown_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_bloom.json
index b2811583923..de82dc89e33 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/cyan_borderless"
+    "all": "gtceu:block/lamps/cyan_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_off.json
index 25d017cd16f..6fb11a17b7b 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/cyan_borderless_off"
+    "all": "gtceu:block/lamps/cyan_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_on.json
index 6da55252e0e..c0e8af19db9 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/cyan_borderless"
+    "all": "gtceu:block/lamps/cyan_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_bloom.json
index 86bcd1a8bac..37a42dedd9c 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/cyan",
-    "active_overlay": "gtceu:block/lamps/cyan_emissive"
+    "bot_all": "gtceu:block/lamps/cyan_on",
+    "top_all": "gtceu:block/lamps/cyan_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_off.json
index e21e83f6b59..f58a6d864b0 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/cyan_off"
+    "all": "gtceu:block/lamps/cyan_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/cyan_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_on.json
index 842d3a7e150..a201888613e 100644
--- a/src/generated/resources/assets/gtceu/models/block/cyan_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/cyan"
+    "all": "gtceu:block/lamps/cyan_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_bloom.json
index fcd5fbd5d0e..cdfa930d4ab 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/gray_borderless"
+    "all": "gtceu:block/lamps/gray_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_off.json
index e4ae459d0b0..19f1e00b343 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/gray_borderless_off"
+    "all": "gtceu:block/lamps/gray_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_on.json
index 4a315f7c06b..9b0e770ada4 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/gray_borderless"
+    "all": "gtceu:block/lamps/gray_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/gray_lamp_bloom.json
index 5d93bf6c47d..1b8cc849039 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/gray",
-    "active_overlay": "gtceu:block/lamps/gray_emissive"
+    "bot_all": "gtceu:block/lamps/gray_on",
+    "top_all": "gtceu:block/lamps/gray_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/gray_lamp_off.json
index 857a1e007af..8ea12673777 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/gray_off"
+    "all": "gtceu:block/lamps/gray_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/gray_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/gray_lamp_on.json
index 35830a31c7c..fb1d4ae4e38 100644
--- a/src/generated/resources/assets/gtceu/models/block/gray_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/gray_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/gray"
+    "all": "gtceu:block/lamps/gray_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_bloom.json
index d2aa2b73704..a3c12918450 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/green_borderless"
+    "all": "gtceu:block/lamps/green_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_off.json
index 3ab0b42d3ad..9789455ac66 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/green_borderless_off"
+    "all": "gtceu:block/lamps/green_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_on.json
index 1516ef02e69..69c162257f5 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/green_borderless"
+    "all": "gtceu:block/lamps/green_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/green_lamp_bloom.json
index d2e9ca3bd1c..3f6670c421d 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/green",
-    "active_overlay": "gtceu:block/lamps/green_emissive"
+    "bot_all": "gtceu:block/lamps/green_on",
+    "top_all": "gtceu:block/lamps/green_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/green_lamp_off.json
index a781dd834e5..b44425c6bc5 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/green_off"
+    "all": "gtceu:block/lamps/green_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/green_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/green_lamp_on.json
index e91d7abcdcb..cd73aef17dd 100644
--- a/src/generated/resources/assets/gtceu/models/block/green_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/green_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/green"
+    "all": "gtceu:block/lamps/green_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_bloom.json
index 0312ce6f180..c08ba739772 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/light_blue_borderless"
+    "all": "gtceu:block/lamps/light_blue_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_off.json
index d94ec49a102..9da3136a30d 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/light_blue_borderless_off"
+    "all": "gtceu:block/lamps/light_blue_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_on.json
index 288796028a4..ea38166c34b 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/light_blue_borderless"
+    "all": "gtceu:block/lamps/light_blue_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_bloom.json
index a8c2164a6c4..6469144f0b9 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/light_blue",
-    "active_overlay": "gtceu:block/lamps/light_blue_emissive"
+    "bot_all": "gtceu:block/lamps/light_blue_on",
+    "top_all": "gtceu:block/lamps/light_blue_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_off.json
index 9ca034a540f..ea47a19ef88 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/light_blue_off"
+    "all": "gtceu:block/lamps/light_blue_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_on.json
index d04ee23320d..2052658c63a 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/light_blue"
+    "all": "gtceu:block/lamps/light_blue_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_bloom.json
index 5066febf0b3..de53bed3353 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/light_gray_borderless"
+    "all": "gtceu:block/lamps/light_gray_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_off.json
index e4f0e8e573a..e57d3fabb65 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/light_gray_borderless_off"
+    "all": "gtceu:block/lamps/light_gray_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_on.json
index 749354c8ec9..89218f8e4a3 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/light_gray_borderless"
+    "all": "gtceu:block/lamps/light_gray_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_bloom.json
index fbd8eab992f..611b72c98c0 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/light_gray",
-    "active_overlay": "gtceu:block/lamps/light_gray_emissive"
+    "bot_all": "gtceu:block/lamps/light_gray_on",
+    "top_all": "gtceu:block/lamps/light_gray_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_off.json
index 6808ffb2a93..ff0920de1be 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/light_gray_off"
+    "all": "gtceu:block/lamps/light_gray_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_on.json
index 6cd7d252d99..e4a69e78934 100644
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/light_gray"
+    "all": "gtceu:block/lamps/light_gray_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_bloom.json
index 5da6a37bd34..3b1ed1ddc9e 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/lime_borderless"
+    "all": "gtceu:block/lamps/lime_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_off.json
index ef82cdd5ba7..c5091a54d19 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/lime_borderless_off"
+    "all": "gtceu:block/lamps/lime_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_on.json
index fa848909ca9..73ac58e411e 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/lime_borderless"
+    "all": "gtceu:block/lamps/lime_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/lime_lamp_bloom.json
index 8fc9097d314..f79021145b0 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/lime",
-    "active_overlay": "gtceu:block/lamps/lime_emissive"
+    "bot_all": "gtceu:block/lamps/lime_on",
+    "top_all": "gtceu:block/lamps/lime_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/lime_lamp_off.json
index 7ca5c8f6e44..36e09351341 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/lime_off"
+    "all": "gtceu:block/lamps/lime_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/lime_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/lime_lamp_on.json
index e1a2fe27639..18b5c9eccc6 100644
--- a/src/generated/resources/assets/gtceu/models/block/lime_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/lime_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/lime"
+    "all": "gtceu:block/lamps/lime_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_bloom.json
index 4ca7c826a0e..90195b3f19a 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/magenta_borderless"
+    "all": "gtceu:block/lamps/magenta_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_off.json
index 32437f573d3..e6710d1e964 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/magenta_borderless_off"
+    "all": "gtceu:block/lamps/magenta_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_on.json
index 075cd0952db..7c4aa82512d 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/magenta_borderless"
+    "all": "gtceu:block/lamps/magenta_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_bloom.json
index 104d503c092..8eb805cb832 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/magenta",
-    "active_overlay": "gtceu:block/lamps/magenta_emissive"
+    "bot_all": "gtceu:block/lamps/magenta_on",
+    "top_all": "gtceu:block/lamps/magenta_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_off.json
index e677abbc662..64b0dc4e9cd 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/magenta_off"
+    "all": "gtceu:block/lamps/magenta_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/magenta_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_on.json
index dbd2f889c2e..20e2ed02625 100644
--- a/src/generated/resources/assets/gtceu/models/block/magenta_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/magenta"
+    "all": "gtceu:block/lamps/magenta_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_bloom.json
index 067c4871c3f..81536dc6a70 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/orange_borderless"
+    "all": "gtceu:block/lamps/orange_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_off.json
index 81dcf02aa53..f781a2b8762 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/orange_borderless_off"
+    "all": "gtceu:block/lamps/orange_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_on.json
index a9533a1401f..ffec850d72c 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/orange_borderless"
+    "all": "gtceu:block/lamps/orange_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/orange_lamp_bloom.json
index 94c480a414f..3045830d91b 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/orange",
-    "active_overlay": "gtceu:block/lamps/orange_emissive"
+    "bot_all": "gtceu:block/lamps/orange_on",
+    "top_all": "gtceu:block/lamps/orange_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/orange_lamp_off.json
index 29c97af7074..de39687d8da 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/orange_off"
+    "all": "gtceu:block/lamps/orange_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/orange_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/orange_lamp_on.json
index 7d7b2d2a0b6..65cd2273595 100644
--- a/src/generated/resources/assets/gtceu/models/block/orange_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/orange_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/orange"
+    "all": "gtceu:block/lamps/orange_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_bloom.json
index 52767e59d91..5a298459c50 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/pink_borderless"
+    "all": "gtceu:block/lamps/pink_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_off.json
index 6208d2d9b2a..962c65646e6 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/pink_borderless_off"
+    "all": "gtceu:block/lamps/pink_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_on.json
index 7c871e10d88..8f4a7fcb799 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/pink_borderless"
+    "all": "gtceu:block/lamps/pink_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/pink_lamp_bloom.json
index e84579e9615..144a0dcb047 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/pink",
-    "active_overlay": "gtceu:block/lamps/pink_emissive"
+    "bot_all": "gtceu:block/lamps/pink_on",
+    "top_all": "gtceu:block/lamps/pink_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/pink_lamp_off.json
index 6716a235cab..707ec2c9982 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/pink_off"
+    "all": "gtceu:block/lamps/pink_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/pink_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/pink_lamp_on.json
index 854a85f2546..fa06f4f6e76 100644
--- a/src/generated/resources/assets/gtceu/models/block/pink_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/pink_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/pink"
+    "all": "gtceu:block/lamps/pink_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_bloom.json
index 99666122896..28b54f45dbe 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/purple_borderless"
+    "all": "gtceu:block/lamps/purple_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_off.json
index 166f5328f9e..a12c3968109 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/purple_borderless_off"
+    "all": "gtceu:block/lamps/purple_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_on.json
index e31e7d0a584..b313f200246 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/purple_borderless"
+    "all": "gtceu:block/lamps/purple_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/purple_lamp_bloom.json
index 07a9193a2a9..83a55660012 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/purple",
-    "active_overlay": "gtceu:block/lamps/purple_emissive"
+    "bot_all": "gtceu:block/lamps/purple_on",
+    "top_all": "gtceu:block/lamps/purple_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/purple_lamp_off.json
index 6bda97ffb1e..378bca56b81 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/purple_off"
+    "all": "gtceu:block/lamps/purple_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/purple_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/purple_lamp_on.json
index 6e556400065..216ad36e72e 100644
--- a/src/generated/resources/assets/gtceu/models/block/purple_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/purple_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/purple"
+    "all": "gtceu:block/lamps/purple_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_bloom.json
index e68e1bdfde1..cb7e9583f35 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/red_borderless"
+    "all": "gtceu:block/lamps/red_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_off.json
index 21b0ec08285..c17f27750c3 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/red_borderless_off"
+    "all": "gtceu:block/lamps/red_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_on.json
index 120c01ae392..38711361d15 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/red_borderless"
+    "all": "gtceu:block/lamps/red_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/red_lamp_bloom.json
index bdd85e6f25b..4996b59bd99 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/red",
-    "active_overlay": "gtceu:block/lamps/red_emissive"
+    "bot_all": "gtceu:block/lamps/red_on",
+    "top_all": "gtceu:block/lamps/red_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/red_lamp_off.json
index 50ccba6a18b..5da56197c86 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/red_off"
+    "all": "gtceu:block/lamps/red_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/red_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/red_lamp_on.json
index e29d346ccfe..660fc75af74 100644
--- a/src/generated/resources/assets/gtceu/models/block/red_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/red_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/red"
+    "all": "gtceu:block/lamps/red_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_bloom.json
index 9556f00bdb7..8065c4ba9e8 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/white_borderless"
+    "all": "gtceu:block/lamps/white_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_off.json
index f7d54a35b52..c43350e52d2 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/white_borderless_off"
+    "all": "gtceu:block/lamps/white_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_on.json
index 42735b05883..c106322df04 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/white_borderless"
+    "all": "gtceu:block/lamps/white_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/white_lamp_bloom.json
index b71b3faf8eb..3588487560f 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/white",
-    "active_overlay": "gtceu:block/lamps/white_emissive"
+    "bot_all": "gtceu:block/lamps/white_on",
+    "top_all": "gtceu:block/lamps/white_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/white_lamp_off.json
index 0980e4043b6..50ee7565b29 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/white_off"
+    "all": "gtceu:block/lamps/white_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/white_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/white_lamp_on.json
index 4522ed15ac7..423335f86a7 100644
--- a/src/generated/resources/assets/gtceu/models/block/white_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/white_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/white"
+    "all": "gtceu:block/lamps/white_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_bloom.json
index 96b705cba28..82152b81991 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_bloom.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_bloom",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/yellow_borderless"
+    "all": "gtceu:block/lamps/yellow_borderless_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_off.json
index ad77fe2b931..100c3289a58 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/yellow_borderless_off"
+    "all": "gtceu:block/lamps/yellow_borderless_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_on.json
index aeadee0da31..5ffac8d2686 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_borderless_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/yellow_borderless"
+    "all": "gtceu:block/lamps/yellow_borderless_on"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_lamp_bloom.json b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_bloom.json
index fb7e8ae71d2..238e070caf7 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_lamp_bloom.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_bloom.json
@@ -1,7 +1,7 @@
 {
-  "parent": "gtceu:block/lamp_bloom",
+  "parent": "gtceu:block/cube_2_layer/all",
   "textures": {
-    "active": "gtceu:block/lamps/yellow",
-    "active_overlay": "gtceu:block/lamps/yellow_emissive"
+    "bot_all": "gtceu:block/lamps/yellow_on",
+    "top_all": "gtceu:block/lamps/yellow_bloom"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_lamp_off.json b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_off.json
index 4cc92527118..551aca30aca 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_lamp_off.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_off.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_off",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "inactive": "gtceu:block/lamps/yellow_off"
+    "all": "gtceu:block/lamps/yellow_off"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/gtceu/models/block/yellow_lamp_on.json b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_on.json
index 0f532dc8561..b8028838773 100644
--- a/src/generated/resources/assets/gtceu/models/block/yellow_lamp_on.json
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_on.json
@@ -1,6 +1,6 @@
 {
-  "parent": "gtceu:block/lamp_on",
+  "parent": "gtceu:block/cube/emissive/all",
   "textures": {
-    "active": "gtceu:block/lamps/yellow"
+    "all": "gtceu:block/lamps/yellow_on"
   }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
index bff2a3624c7..12fe1cbfa01 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/data/models/GTModels.java
@@ -82,43 +82,57 @@ public static void rubberTreeSaplingModel(DataGenContext<Item, BlockItem> contex
         provider.generated(context, provider.modLoc("block/" + provider.name(context)));
     }
 
+    public static final ResourceLocation CUBE_ALL_EMISSIVE = GTCEu.id("block/cube/emissive/all");
+
     public static NonNullBiConsumer<DataGenContext<Block, LampBlock>, RegistrateBlockstateProvider> lampModel(DyeColor color,
                                                                                                               boolean border) {
         return (ctx, prov) -> {
-            final String textureBase = "block/lamps/" + color.getSerializedName();
-            final String borderPart = (border ? "" : "_borderless");
-            final String parentModelBase = "block/lamp" + borderPart;
-
-            ModelFile parentBloom = prov.models().getExistingFile(prov.modLoc(parentModelBase + "_bloom"));
-            ModelFile parentOn = prov.models().getExistingFile(prov.modLoc(parentModelBase + "_on"));
-            ModelFile parentOff = prov.models().getExistingFile(prov.modLoc(parentModelBase + "_off"));
+            final String textureBase = "block/lamps/" + color.getSerializedName() + (border ? "" : "_borderless");
+
+            var onModel = prov.models().withExistingParent(ctx.getName() + "_on", CUBE_ALL_EMISSIVE)
+                    .texture("all", prov.modLoc(textureBase + "_on"));
+            var offModel = prov.models().cubeAll(ctx.getName() + "_off", prov.modLoc(textureBase + "_off"));
+
+            var bloomModel = prov.models().withExistingParent(ctx.getName() + "_bloom",
+                    border ? GTCEu.id("block/cube_2_layer/all") : CUBE_ALL_EMISSIVE);
+            if (border) {
+                bloomModel.texture("bot_all", textureBase + "_on");
+                bloomModel.texture("top_all", textureBase + "_bloom");
+            } else {
+                bloomModel.texture("all", textureBase + "_bloom");
+            }
 
             prov.getVariantBuilder(ctx.getEntry())
-                    .forAllStatesExcept(state -> {
-                        if (LampBlock.isLightActive(state)) {
-                            ModelBuilder<?> model = prov.models()
-                                    .getBuilder(ctx.getName() + (state.getValue(LampBlock.BLOOM) ? "_bloom" : "_on"))
-                                    .parent(state.getValue(LampBlock.BLOOM) ? parentBloom : parentOn);
-                            if (border) {
-                                model.texture("active", textureBase);
-                                if (state.getValue(LampBlock.BLOOM)) {
-                                    model.texture("active_overlay", textureBase + "_emissive");
-                                }
-                            } else {
-                                model.texture("active", textureBase + "_borderless");
-                            }
-                            return ConfiguredModel.builder()
-                                    .modelFile(model)
-                                    .build();
-                        } else {
-                            return ConfiguredModel.builder()
-                                    .modelFile(prov.models()
-                                            .getBuilder(ctx.getName() + "_off")
-                                            .parent(parentOff)
-                                            .texture("inactive", textureBase + borderPart + "_off"))
-                                    .build();
-                        }
-                    }, LampBlock.LIGHT);
+                    // spotless:off
+                    .partialState()
+                        .with(LampBlock.INVERTED, false).with(LampBlock.POWERED, false)
+                        .modelForState().modelFile(offModel)
+                        .addModel()
+                    .partialState()
+                        .with(LampBlock.INVERTED, true).with(LampBlock.POWERED, true)
+                        .modelForState().modelFile(offModel)
+                        .addModel()
+                    .partialState()
+                        .with(LampBlock.INVERTED, false).with(LampBlock.POWERED, true)
+                        .with(LampBlock.BLOOM, false)
+                        .modelForState().modelFile(onModel)
+                        .addModel()
+                    .partialState()
+                        .with(LampBlock.INVERTED, true).with(LampBlock.POWERED, false)
+                        .with(LampBlock.BLOOM, false)
+                        .modelForState().modelFile(onModel)
+                        .addModel()
+                    .partialState()
+                        .with(LampBlock.INVERTED, false).with(LampBlock.POWERED, true)
+                        .with(LampBlock.BLOOM, true)
+                        .modelForState().modelFile(bloomModel)
+                        .addModel()
+                    .partialState()
+                        .with(LampBlock.INVERTED, true).with(LampBlock.POWERED, false)
+                        .with(LampBlock.BLOOM, true)
+                        .modelForState().modelFile(bloomModel)
+                        .addModel();
+                    // spotless:on
         };
     }
 
diff --git a/src/main/resources/assets/gtceu/models/block/lamp_bloom.json b/src/main/resources/assets/gtceu/models/block/lamp_bloom.json
deleted file mode 100644
index a86c495dab1..00000000000
--- a/src/main/resources/assets/gtceu/models/block/lamp_bloom.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "parent": "gtceu:block/cube_2_layer/all",
-    "textures": {
-        "bot_all": "#active",
-        "top_all": "#active_overlay"
-    }
-}
diff --git a/src/main/resources/assets/gtceu/models/block/lamp_borderless_bloom.json b/src/main/resources/assets/gtceu/models/block/lamp_borderless_bloom.json
deleted file mode 100644
index 02221906a01..00000000000
--- a/src/main/resources/assets/gtceu/models/block/lamp_borderless_bloom.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "gtceu:block/cube/emissive/all",
-    "textures": {
-        "all": "#active"
-    }
-}
diff --git a/src/main/resources/assets/gtceu/models/block/lamp_borderless_off.json b/src/main/resources/assets/gtceu/models/block/lamp_borderless_off.json
deleted file mode 100644
index d1a845c5f33..00000000000
--- a/src/main/resources/assets/gtceu/models/block/lamp_borderless_off.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "#inactive"
-    }
-}
diff --git a/src/main/resources/assets/gtceu/models/block/lamp_borderless_on.json b/src/main/resources/assets/gtceu/models/block/lamp_borderless_on.json
deleted file mode 100644
index e24c1097eab..00000000000
--- a/src/main/resources/assets/gtceu/models/block/lamp_borderless_on.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "#active"
-    }
-}
diff --git a/src/main/resources/assets/gtceu/models/block/lamp_off.json b/src/main/resources/assets/gtceu/models/block/lamp_off.json
deleted file mode 100644
index d1a845c5f33..00000000000
--- a/src/main/resources/assets/gtceu/models/block/lamp_off.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "#inactive"
-    }
-}
diff --git a/src/main/resources/assets/gtceu/models/block/lamp_on.json b/src/main/resources/assets/gtceu/models/block/lamp_on.json
deleted file mode 100644
index e24c1097eab..00000000000
--- a/src/main/resources/assets/gtceu/models/block/lamp_on.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "#active"
-    }
-}

From 0fd706d9d0b129e36142cca175a910f7644beda1 Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Fri, 1 May 2026 13:27:39 +0300
Subject: [PATCH 13/14] Fix typo

---
 .../gtceu/textures/block/lamps/green_borderless_on.png.mcmeta   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png.mcmeta
index 95ef0aa75d1..4662e246aa1 100644
--- a/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png.mcmeta
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png.mcmeta
@@ -1,4 +1,4 @@
-w{
+{
     "shimmer": {
         "bloom": false
     }

From 7135524a54752a6cfddcca6933110f31b78c6b45 Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Fri, 1 May 2026 13:30:36 +0300
Subject: [PATCH 14/14] spotless

---
 .../gregtechceu/gtceu/client/ClientProxy.java |  4 +-
 .../item/CustomItemRendererWrapperModel.java  | 40 +++++--------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
index 295ff1fea16..668e0c8388f 100644
--- a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
+++ b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
@@ -8,8 +8,8 @@
 import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition;
 import com.gregtechceu.gtceu.api.item.IComponentItem;
 import com.gregtechceu.gtceu.api.item.IGTTool;
-import com.gregtechceu.gtceu.client.model.item.FacadeUnbakedModel;
 import com.gregtechceu.gtceu.client.model.item.CustomItemRendererWrapperModel;
+import com.gregtechceu.gtceu.client.model.item.FacadeUnbakedModel;
 import com.gregtechceu.gtceu.client.model.machine.MachineModelLoader;
 import com.gregtechceu.gtceu.client.model.pipe.PipeModel;
 import com.gregtechceu.gtceu.client.model.pipe.PipeModelLoader;
@@ -176,7 +176,7 @@ public void onRegisterModelLoaders(ModelEvent.RegisterGeometryLoaders event) {
         event.register(MachineModelLoader.ID.getPath(), MachineModelLoader.INSTANCE);
         event.register(PipeModelLoader.ID.getPath(), PipeModelLoader.INSTANCE);
         event.register("facade", FacadeUnbakedModel.Loader.INSTANCE);
-        event.register(CustomItemRendererWrapperModel.TYPE_ID.getPath(), CustomItemRendererWrapperModel.Loader.INSTANCE);
+        event.register(CustomItemRendererWrapperModel.ID.getPath(), CustomItemRendererWrapperModel.Loader.INSTANCE);
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java b/src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java
index 1a703b59dae..c0b127f80d7 100644
--- a/src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java
+++ b/src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java
@@ -19,11 +19,10 @@
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Function;
 
+// spotless:off
 /**
  * Custom model type that simply overrides {@link BakedModel#isCustomRenderer()} to always return true so
  * {@link IClientItemExtensions#getCustomRenderer()} can work. Does nothing on blocks.
@@ -31,14 +30,15 @@
  * <p>
  * Use it on an item model builder like this:
  * <pre>{@code
- *      prov.getBuilder(ctx.getId())
- *              .customLoader(CustomItemRendererModel.Builder::begin).end()
- *              // ...
+ * prov.getBuilder(ctx.getId())
+ *         .customLoader(CustomItemRendererModel.Builder::begin).end()
+ *         // ...
  * }</pre>
  */
+// spotless:on
 public class CustomItemRendererWrapperModel implements IUnbakedGeometry<CustomItemRendererWrapperModel> {
 
-    public static final ResourceLocation TYPE_ID = GTCEu.id("custom_item_renderer_wrapper");
+    public static final ResourceLocation ID = GTCEu.id("custom_item_renderer_wrapper");
 
     private final BlockModel parent;
 
@@ -53,7 +53,8 @@ public BakedModel bake(IGeometryBakingContext context, ModelBaker baker,
         BlockModel owner = parent;
         if (context instanceof BlockGeometryBakingContext blockContext) owner = blockContext.owner;
 
-        BakedModel originalModel = parent.bake(baker, owner, spriteGetter, modelState, modelLocation, context.isGui3d());
+        BakedModel originalModel = parent.bake(baker, owner, spriteGetter, modelState, modelLocation,
+                context.isGui3d());
         return new Baked(originalModel);
     }
 
@@ -72,47 +73,26 @@ public boolean isCustomRenderer() {
     public static final class Loader implements IGeometryLoader<CustomItemRendererWrapperModel> {
 
         public static final CustomItemRendererWrapperModel.Loader INSTANCE = new CustomItemRendererWrapperModel.Loader();
-//         private static final ThreadLocal<Boolean> currentlyParsing = new ThreadLocal<>();
 
         private Loader() {}
 
         @Override
-        public @Nullable CustomItemRendererWrapperModel read(JsonObject json, JsonDeserializationContext context) throws JsonParseException {
-//             if (Boolean.TRUE.equals(currentlyParsing.get())) {
-//                 // if this is called from the inner context.deserialize(...) invocation, return null so the vanilla
-//                 // model is parsed instead
-//                 return null;
-//             }
-//             try {
-//                 currentlyParsing.set(Boolean.TRUE);
-//
+        public CustomItemRendererWrapperModel read(JsonObject json, JsonDeserializationContext context) {
             // remove the loader field and parse it again as a normal vanilla model
             json.remove("loader");
 
             return new CustomItemRendererWrapperModel(context.deserialize(json, BlockModel.class));
-//             } finally {
-//                 currentlyParsing.remove();
-//             }
         }
     }
 
-    /**
-     * Use this to add the model type to an item model generator, like this:
-     * <pre>{@code
-     *      prov.withExistingParent(ctx::get, ctx.id())
-     *              .customLoader(CustomItemRendererModel.Builder::begin).end()
-     *              // ...
-     * }</pre>
-     */
     public static final class Builder<T extends ModelBuilder<T>> extends CustomLoaderBuilder<T> {
 
         public Builder(T parent, ExistingFileHelper existingFileHelper) {
-            super(TYPE_ID, parent, existingFileHelper);
+            super(ID, parent, existingFileHelper);
         }
 
         public static <T extends ModelBuilder<T>> Builder<T> begin(T parent, ExistingFileHelper existingFileHelper) {
             return new Builder<>(parent, existingFileHelper);
         }
-
     }
 }