Skip to content

Fix lamps' variations not working as advertised #4804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gustovafing merged 14 commits into from
May 1, 2026
Merged

Fix lamps' variations not working as advertised #4804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a15039c
Remove duplicates of vanilla blockstate properties
screret Apr 20, 2026
04c9cb0
Reuse existing code instead of copypasting the same stuff over and ov…
screret Apr 20, 2026
968b5d7
Datagen
screret Apr 20, 2026
ed1b107
Remove unused helper methods
screret Apr 25, 2026
bb225e5
Simplify them models again
screret Apr 27, 2026
727ae07
Simplify lamps' "lit-on-placement" behavior by referencing how vanill…
screret Apr 27, 2026
ecc84ab
Forgot to unshelve this bit :3
screret May 1, 2026
776b534
Datagen
screret May 1, 2026
ce6121a
Rename all the lamp texture files to be more descriptive
screret May 1, 2026
20a521b
Explicitly disable bloom on non-emissive active textures
screret May 1, 2026
e937748
Actually commit the item model loader thing :ICANT:
screret May 1, 2026
5055ecc
Redo the block models based on the renamed textures
screret May 1, 2026
0fd706d
Fix typo
screret May 1, 2026
7135524
spotless
screret May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
46 changes: 8 additions & 38 deletions src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
46 changes: 8 additions & 38 deletions src/generated/resources/assets/gtceu/blockstates/black_lamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
46 changes: 8 additions & 38 deletions src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
46 changes: 8 additions & 38 deletions src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
46 changes: 8 additions & 38 deletions src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
46 changes: 8 additions & 38 deletions src/generated/resources/assets/gtceu/blockstates/brown_lamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
Loading
Loading