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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/black_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/black_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/black_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/black_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/black_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/black_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..81156012927 100644
--- a/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/black_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/black_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/black_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/black_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/black_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/black_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/blue_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/blue_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/blue_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/blue_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/blue_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/blue_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..9c19e8da3d8 100644
--- a/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/blue_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/blue_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/blue_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/blue_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/blue_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/blue_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/brown_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/brown_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/brown_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/brown_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/brown_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/brown_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..56110da11a7 100644
--- a/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/brown_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/brown_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/brown_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/brown_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/brown_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/brown_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/cyan_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/cyan_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/cyan_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/cyan_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/cyan_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/cyan_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..f292981ff50 100644
--- a/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/cyan_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/cyan_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/cyan_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/cyan_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/cyan_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/cyan_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/cyan_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/gray_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/gray_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/gray_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/gray_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/gray_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/gray_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..843bb33ec48 100644
--- a/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/gray_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/gray_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/gray_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/gray_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/gray_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/gray_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/gray_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/green_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/green_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/green_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/green_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/green_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/green_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..9dbaf15893f 100644
--- a/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/green_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/green_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/green_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/green_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/green_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/green_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/green_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/light_blue_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/light_blue_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/light_blue_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/light_blue_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/light_blue_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/light_blue_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/light_blue_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/light_blue_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/light_blue_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/light_blue_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/light_blue_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/light_blue_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/light_gray_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/light_gray_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/light_gray_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/light_gray_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/light_gray_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/light_gray_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/light_gray_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/light_gray_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/light_gray_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/light_gray_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/light_gray_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/light_gray_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/lime_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/lime_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/lime_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/lime_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/lime_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/lime_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..e9b97975762 100644
--- a/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/lime_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/lime_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/lime_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/lime_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/lime_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/lime_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/lime_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/magenta_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/magenta_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/magenta_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/magenta_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/magenta_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/magenta_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..2faa7c6a171 100644
--- a/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/magenta_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/magenta_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/magenta_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/magenta_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/magenta_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/magenta_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/magenta_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/orange_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/orange_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/orange_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/orange_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/orange_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/orange_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..e0a78e8c7c6 100644
--- a/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/orange_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/orange_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/orange_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/orange_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/orange_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/orange_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/orange_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/pink_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/pink_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/pink_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/pink_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/pink_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/pink_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..9e24ef2b9c0 100644
--- a/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/pink_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/pink_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/pink_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/pink_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/pink_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/pink_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/pink_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/purple_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/purple_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/purple_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/purple_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/purple_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/purple_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..2a90b827c2f 100644
--- a/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/purple_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/purple_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/purple_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/purple_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/purple_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/purple_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/purple_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/red_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/red_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/red_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/red_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/red_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/red_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..7be57f1c43e 100644
--- a/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/red_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/red_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/red_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/red_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/red_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/red_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/red_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/white_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/white_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/white_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/white_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/white_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/white_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..235580f3c74 100644
--- a/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/white_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/white_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/white_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/white_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/white_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/white_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/white_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..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,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/yellow_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/yellow_borderless_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/yellow_borderless_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/yellow_borderless_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/yellow_borderless_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/yellow_borderless_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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..52290ca38ed 100644
--- a/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
+++ b/src/generated/resources/assets/gtceu/blockstates/yellow_lamp.json
@@ -1,52 +1,22 @@
{
"variants": {
- "bloom=false,inverted=false,lit=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=false,powered=true": {
+ "model": "gtceu:block/yellow_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=false": {
- "model": "gtceu:block/yellow_lamp"
+ "bloom=false,inverted=true,powered=false": {
+ "model": "gtceu:block/yellow_lamp_on"
},
- "bloom=false,inverted=true,lit=true,powered=true": {
- "model": "gtceu:block/yellow_lamp"
- },
- "bloom=true,inverted=false,lit=false,powered=false": {
- "model": "gtceu:block/yellow_lamp_off"
- },
- "bloom=true,inverted=false,lit=false,powered=true": {
- "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": {
+ "inverted=false,powered=false": {
"model": "gtceu:block/yellow_lamp_off"
},
- "bloom=true,inverted=true,lit=false,powered=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
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 0c19aad913c..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/black_borderless_emissive"
+ "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 c5e5fbca676..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..c71c031329c
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/black_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/black_lamp.json
deleted file mode 100644
index ab020a51643..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/black_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..9ee4e86cc5a
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/black_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json
deleted file mode 100644
index 141172292fa..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/blue_borderless_emissive"
+ "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 bbddedf5449..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..b9acea8c973
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/blue_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/blue_lamp.json
deleted file mode 100644
index 5745ea7e123..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/blue_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..8c9a34b36fd
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/blue_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp.json
deleted file mode 100644
index b505d4b694d..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/brown_borderless_emissive"
+ "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 b8f137c3256..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..a20d0afcddb
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/brown_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/brown_lamp.json
deleted file mode 100644
index df6eb9f6ad9..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/brown_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..0e6666b4e36
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/brown_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp.json
deleted file mode 100644
index f36df565587..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/cyan_borderless_emissive"
+ "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 f96fa394e39..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..c0e8af19db9
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/cyan_lamp.json
deleted file mode 100644
index 1bda83da437..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/cyan_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..a201888613e
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/cyan_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp.json
deleted file mode 100644
index cb1c75e15eb..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/gray_borderless_emissive"
+ "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 3d630919ddc..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..9b0e770ada4
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/gray_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/gray_lamp.json
deleted file mode 100644
index 10a7355aad2..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/gray_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..fb1d4ae4e38
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/gray_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp.json
deleted file mode 100644
index f53ba7ebb72..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/green_borderless_emissive"
+ "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 b1f22b9681d..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..69c162257f5
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/green_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/green_lamp.json
deleted file mode 100644
index a79d65ee1a7..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/green_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..cd73aef17dd
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/green_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp.json
deleted file mode 100644
index 9cc7bf42d96..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/light_blue_borderless_emissive"
+ "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 8a476527d76..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..ea38166c34b
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp.json
deleted file mode 100644
index c1a04f4f716..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/light_blue_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..2052658c63a
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/light_blue_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp.json
deleted file mode 100644
index 2d5c4a7dc0a..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/light_gray_borderless_emissive"
+ "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 4a82d739b49..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..89218f8e4a3
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp.json
deleted file mode 100644
index 187128e5b5e..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/light_gray_lamp.json
+++ /dev/null
@@ -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_bloom.json b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_bloom.json
index 82851dde5f8..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",
+ "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
new file mode 100644
index 00000000000..e4a69e78934
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/light_gray_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp.json
deleted file mode 100644
index e08dc19e73a..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/lime_borderless_emissive"
+ "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 983ce7d8035..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..73ac58e411e
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/lime_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/lime_lamp.json
deleted file mode 100644
index 4be47ff4c57..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/lime_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..18b5c9eccc6
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/lime_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp.json
deleted file mode 100644
index d76ba268ea5..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/magenta_borderless_emissive"
+ "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 e71bbf3ae42..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..7c4aa82512d
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/magenta_lamp.json
deleted file mode 100644
index 5e808a5b3bb..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/magenta_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..20e2ed02625
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/magenta_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp.json
deleted file mode 100644
index 268c735b953..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/orange_borderless_emissive"
+ "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 f9df9f88ee8..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..ffec850d72c
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/orange_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/orange_lamp.json
deleted file mode 100644
index 575ac5eba7c..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/orange_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..65cd2273595
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/orange_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp.json
deleted file mode 100644
index 671ce70381d..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/pink_borderless_emissive"
+ "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 a6d100ca5f1..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..8f4a7fcb799
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/pink_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/pink_lamp.json
deleted file mode 100644
index 7c3c8fbcee4..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/pink_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..fa06f4f6e76
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/pink_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp.json
deleted file mode 100644
index a70dc190f21..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp.json
+++ /dev/null
@@ -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_bloom.json b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_bloom.json
index d29ca9d4594..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/purple_borderless_emissive"
+ "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 a2c85e59b51..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..b313f200246
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/purple_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/purple_lamp.json
deleted file mode 100644
index 4a1ac93555d..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/purple_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..216ad36e72e
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/purple_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp.json
deleted file mode 100644
index 475c552e60c..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/red_borderless_emissive"
+ "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 622bb2edfb0..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..38711361d15
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/red_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/red_lamp.json
deleted file mode 100644
index d5ec2cf5431..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/red_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..660fc75af74
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/red_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp.json
deleted file mode 100644
index efaabb1b55e..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/white_borderless_emissive"
+ "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 87da3643f27..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..c106322df04
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/white_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/white_lamp.json
deleted file mode 100644
index cc2fa12fc0d..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/white_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..423335f86a7
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/white_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp.json
deleted file mode 100644
index 4df35813465..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp.json
+++ /dev/null
@@ -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..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",
+ "parent": "gtceu:block/cube/emissive/all",
"textures": {
- "active": "gtceu:block/lamps/yellow_borderless_emissive"
+ "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 9f5d3a4c284..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_off_borderless"
+ "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
new file mode 100644
index 00000000000..5ffac8d2686
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_borderless_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "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.json b/src/generated/resources/assets/gtceu/models/block/yellow_lamp.json
deleted file mode 100644
index 28dd1a7124a..00000000000
--- a/src/generated/resources/assets/gtceu/models/block/yellow_lamp.json
+++ /dev/null
@@ -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..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",
+ "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
new file mode 100644
index 00000000000..b8028838773
--- /dev/null
+++ b/src/generated/resources/assets/gtceu/models/block/yellow_lamp_on.json
@@ -0,0 +1,6 @@
+{
+ "parent": "gtceu:block/cube/emissive/all",
+ "textures": {
+ "all": "gtceu:block/lamps/yellow_on"
+ }
+}
\ 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..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"
+ "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 5009d942bb4..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"
+ "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 d7c6939c703..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"
+ "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 21629af87f6..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"
+ "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 06c1a13eefe..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"
+ "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 2a031d3fe68..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"
+ "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 2ebe5ae1902..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"
+ "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 610b95fa37a..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"
+ "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 077a9c52b0c..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"
+ "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 f1f49ba032a..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"
+ "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 6c708589feb..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"
+ "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 34ee0923956..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"
+ "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 c1c2558ff1d..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"
+ "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 0aa9f92d08c..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"
+ "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 ba98d5dba14..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"
+ "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 4ff258a6e73..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"
+ "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 70e7956ac61..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"
+ "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 a154c799b5e..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"
+ "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 a344a461960..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"
+ "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 917e0ebbd24..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"
+ "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 2c20cdfa5ee..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"
+ "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 f7bfda11c79..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"
+ "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 974f41940c9..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"
+ "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 f39eb45c972..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"
+ "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 32808b80261..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"
+ "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 bfb10ac85f3..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"
+ "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 91cf330777d..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"
+ "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 1c324092d6b..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"
+ "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 969bc638329..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"
+ "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 1c31c461357..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"
+ "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 9db7270eef3..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"
+ "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 0156ca91e9c..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"
+ "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/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/client/ClientProxy.java b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
index 9a0574d59a7..668e0c8388f 100644
--- a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
+++ b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
@@ -8,6 +8,7 @@
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.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;
@@ -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.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..c0b127f80d7
--- /dev/null
+++ b/src/main/java/com/gregtechceu/gtceu/client/model/item/CustomItemRendererWrapperModel.java
@@ -0,0 +1,98 @@
+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 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.
+ *
+ *
+ * Use it on an item model builder like this:
+ *
{@code
+ * prov.getBuilder(ctx.getId())
+ * .customLoader(CustomItemRendererModel.Builder::begin).end()
+ * // ...
+ * }
+ */
+// spotless:on
+public class CustomItemRendererWrapperModel implements IUnbakedGeometry {
+
+ public static final ResourceLocation 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 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 {
+
+ public Baked(BakedModel originalModel) {
+ super(originalModel);
+ }
+
+ @Override
+ public boolean isCustomRenderer() {
+ return true;
+ }
+ }
+
+ public static final class Loader implements IGeometryLoader {
+
+ public static final CustomItemRendererWrapperModel.Loader INSTANCE = new CustomItemRendererWrapperModel.Loader();
+
+ private Loader() {}
+
+ @Override
+ 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));
+ }
+ }
+
+ public static final class Builder> extends CustomLoaderBuilder {
+
+ public Builder(T parent, ExistingFileHelper existingFileHelper) {
+ super(ID, parent, existingFileHelper);
+ }
+
+ public static > Builder begin(T parent, ExistingFileHelper existingFileHelper) {
+ return new Builder<>(parent, existingFileHelper);
+ }
+ }
+}
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/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 881fa053d09..cd2cddcd00f 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;
@@ -13,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;
@@ -34,19 +33,18 @@
@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";
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;
@@ -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));
@@ -66,24 +64,12 @@ public static boolean isLightActive(BlockState state) {
return state.getValue(INVERTED) != 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(GTBlockStateProperties.BLOOM);
- }
-
public static boolean isInverted(CompoundTag tag) {
return tag.getBoolean(TAG_INVERTED);
}
public static boolean isLightEnabled(CompoundTag tag) {
- return tag.getBoolean(TAG_LIT);
+ return tag.getBoolean(TAG_LIGHT);
}
public static boolean isBloomEnabled(CompoundTag tag) {
@@ -92,17 +78,17 @@ 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_LIT, state.getValue(LIGHT));
+ tag.putBoolean(TAG_BLOOM, state.getValue(BLOOM));
+ 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;
@@ -110,7 +96,14 @@ public ItemStack getStackFromIndex(int i) {
@Override
protected void createBlockStateDefinition(StateDefinition.Builder builder) {
- super.createBlockStateDefinition(builder.add(INVERTED, GTBlockStateProperties.BLOOM, LIGHT, POWERED));
+ 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
@@ -124,16 +117,10 @@ public BlockState getAppearance(BlockState state, BlockAndTintGetter level, Bloc
return state.getBlock().defaultBlockState();
}
- @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);
- }
+ public void update(BlockState state, Level level, BlockPos pos) {
+ if (state.getValue(POWERED) != level.hasNeighborSignal(pos)) {
+ level.setBlock(pos, state.cycle(POWERED), Block.UPDATE_CLIENTS);
}
- super.onPlace(state, level, pos, oldState, movedByPiston);
}
@Override
@@ -141,19 +128,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
@@ -169,12 +151,10 @@ public void appendHoverText(ItemStack stack, @Nullable BlockGetter level, List RenderType::cutout)
.blockstate(GTModels.lampModel(dyeColor, true))
.item(LampBlockItem::new)
+ .model((ctx, prov) -> prov.blockItem(ctx::get, "_on")
+ .customLoader(CustomItemRendererWrapperModel.Builder::begin).end())
.build()
.register());
}
@@ -1312,6 +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")
+ .customLoader(CustomItemRendererWrapperModel.Builder::begin).end())
.build()
.register());
}
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..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,49 +82,57 @@ public static void rubberTreeSaplingModel(DataGenContext 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, RegistrateBlockstateProvider> lampModel(DyeColor color,
boolean border) {
return (ctx, prov) -> {
- 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 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())
- .forAllStates(state -> {
- if (state.getValue(LampBlock.LIGHT)) {
- ModelBuilder model = prov.models()
- .getBuilder(ctx.getName() +
- (state.getValue(GTBlockStateProperties.BLOOM) ? "_bloom" : ""))
- .parent(parentOn);
- if (border) {
- model.texture("active", "block/lamps/" + color.getName());
- if (state.getValue(GTBlockStateProperties.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)) {
- model.texture("active",
- "block/lamps/" + color.getName() + "_borderless_emissive");
- } else {
- model.texture("active",
- "block/lamps/" + color.getName() + "_borderless");
- }
- }
- return ConfiguredModel.builder()
- .modelFile(model)
- .build();
- } else {
- return ConfiguredModel.builder()
- .modelFile(prov.models()
- .getBuilder(ctx.getName() + "_off")
- .parent(parentOff)
- .texture("inactive",
- "block/lamps/" + color.getName() + "_off" + borderPart))
- .build();
- }
- });
+ // 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/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java
index c1e59d991b2..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,32 +27,27 @@ public class LampBlockItem extends BlockItem {
public LampBlockItem(LampBlock block, Properties properties) {
super(block, properties);
-
- if (GTCEu.isClientSide()) {
- ClientCallWrapper.registerEventListener(this);
- }
}
- @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));
}
@@ -81,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;
- }
- });
- });
- }
- }
}
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;
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.json
deleted file mode 100644
index a86c495dab1..00000000000
--- a/src/main/resources/assets/gtceu/models/block/lamp.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.json b/src/main/resources/assets/gtceu/models/block/lamp_borderless.json
deleted file mode 100644
index e24c1097eab..00000000000
--- a/src/main/resources/assets/gtceu/models/block/lamp_borderless.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_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_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/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_borderless_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_borderless_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/black_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/black_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_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/black_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/black_borderless_on.png
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_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..5c13fcde49a
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/black_on.png.mcmeta
@@ -0,0 +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_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/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.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/blue_borderless_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/blue_borderless_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/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_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/blue_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_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/blue_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/blue_borderless_on.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_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..116a33b1c75
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/blue_on.png.mcmeta
@@ -0,0 +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_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/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.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/brown_borderless_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/brown_borderless_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/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_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/brown_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_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/brown_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/brown_borderless_on.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_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..16ca1f1305f
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/brown_on.png.mcmeta
@@ -0,0 +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_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/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.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/cyan_borderless_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/cyan_borderless_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/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_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/cyan_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_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/cyan_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/cyan_borderless_on.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_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..1e35d272972
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/cyan_on.png.mcmeta
@@ -0,0 +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_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/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.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/gray_borderless_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/gray_borderless_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/gray_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/gray_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_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/gray_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/gray_borderless_on.png
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_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..cbc26838129
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/gray_on.png.mcmeta
@@ -0,0 +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_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/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.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/green_borderless_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/green_borderless_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/green_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/green_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_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/green_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png
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..4662e246aa1
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_borderless_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "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_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..6074941a516
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/green_on.png.mcmeta
@@ -0,0 +1,8 @@
+{
+ "ldlib": {
+ "connection": "gtceu:block/lamps/green_on_ctm"
+ },
+ "shimmer": {
+ "bloom": false
+ }
+}
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/light_blue_borderless_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/light_blue_borderless_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/light_blue_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/light_blue_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_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_blue_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_blue_borderless_on.png
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_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..dafb5e4a108
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_blue_on.png.mcmeta
@@ -0,0 +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_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_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.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/light_gray_borderless_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/light_gray_borderless_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/light_gray_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/light_gray_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_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/light_gray_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/light_gray_borderless_on.png
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_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..3761d1c9e64
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/light_gray_on.png.mcmeta
@@ -0,0 +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_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/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.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_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/lime_bloom_ctm.png.mcmeta
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_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_bloom.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/lime_borderless_bloom.png.mcmeta
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/lime_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/lime_borderless_on.png
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_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..41bab1624eb
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/lime_on.png.mcmeta
@@ -0,0 +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_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/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.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_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/magenta_bloom_ctm.png.mcmeta
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_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_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/magenta_borderless_bloom.png.mcmeta
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/magenta_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/magenta_borderless_on.png
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_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..0278b6ccc48
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/magenta_on.png.mcmeta
@@ -0,0 +1,8 @@
+{
+ "ldlib": {
+ "connection": "gtceu:block/lamps/magenta_on_ctm"
+ },
+ "shimmer": {
+ "bloom": false
+ }
+}
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_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/orange_bloom_ctm.png.mcmeta
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_bloom.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/orange_borderless_bloom.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/orange_borderless_bloom.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/orange_borderless_bloom.png.mcmeta
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/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_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_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..17eea4ce1ed
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/orange_on.png.mcmeta
@@ -0,0 +1,8 @@
+{
+ "ldlib": {
+ "connection": "gtceu:block/lamps/orange_on_ctm"
+ },
+ "shimmer": {
+ "bloom": false
+ }
+}
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_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/pink_bloom_ctm.png.mcmeta
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_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/pink_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/pink_borderless_bloom.png.mcmeta
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/pink_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/pink_borderless_on.png
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_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..cf9b95eb37d
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/pink_on.png.mcmeta
@@ -0,0 +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_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/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.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_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/purple_bloom_ctm.png.mcmeta
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_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_bloom.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/purple_borderless_bloom.png.mcmeta
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/purple_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/purple_borderless_on.png
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_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..e2f7fcfda8a
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/purple_on.png.mcmeta
@@ -0,0 +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_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/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.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_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/red_bloom_ctm.png.mcmeta
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_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/red_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/red_borderless_bloom.png.mcmeta
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/red_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/red_borderless_on.png
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_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..bb34744e74d
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/red_on.png.mcmeta
@@ -0,0 +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_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/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.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_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/white_bloom_ctm.png.mcmeta
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_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_bloom.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/white_borderless_bloom.png.mcmeta
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/white_borderless_emissive.png b/src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/white_borderless_on.png
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_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..9c7a3a147a8
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/white_on.png.mcmeta
@@ -0,0 +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_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/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.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_borderless_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom_ctm.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png.mcmeta
rename to src/main/resources/assets/gtceu/textures/block/lamps/yellow_bloom_ctm.png.mcmeta
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_ctm_emissive.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_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/yellow_borderless_bloom.png.mcmeta
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
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_on.png
similarity index 100%
rename from src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_emissive.png
rename to src/main/resources/assets/gtceu/textures/block/lamps/yellow_borderless_on.png
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_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..ebf371f8d42
--- /dev/null
+++ b/src/main/resources/assets/gtceu/textures/block/lamps/yellow_on.png.mcmeta
@@ -0,0 +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_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
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
+ }
+}