diff --git a/CHANGELOG.md b/CHANGELOG.md index 835fa9373..d91e5b91b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -78,6 +78,7 @@ - Backpack void upgrades are now cheaper @Pyritie - All tools should now have TFC damage types (#2868) @Pyritie - Added recipes for advanced GTCEu Terminals @TomPlop +- TFC magma blocks, lightblooms, and bulbkins now correctly have emissive textures @Pyritie ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie diff --git a/kubejs/assets/betterend/models/block/cave_pumpkin.json b/kubejs/assets/betterend/models/block/cave_pumpkin.json index a37a47661..05ba66f11 100644 --- a/kubejs/assets/betterend/models/block/cave_pumpkin.json +++ b/kubejs/assets/betterend/models/block/cave_pumpkin.json @@ -8,11 +8,13 @@ "top": "betterend:block/cave_pumpkin_top", "side": "betterend:block/cave_pumpkin_side" }, - "elements": [ + "elements": [ { "__comment": "Box1", "from": [ 1, 0, 1 ], "to": [ 15, 13, 15 ], + "forge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, "faces": { "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#lantern_bottom" }, "north": { "uv": [ 1, 3, 15, 16 ], "texture": "#lantern_side" }, diff --git a/kubejs/assets/tfc/models/block/rock/magma/andesite.json b/kubejs/assets/tfc/models/block/rock/magma/andesite.json new file mode 100644 index 000000000..11668294a --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/andesite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/andesite", + "particle": "tfc:block/rock/magma/andesite" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/basalt.json b/kubejs/assets/tfc/models/block/rock/magma/basalt.json new file mode 100644 index 000000000..8a4654eb8 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/basalt.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/basalt", + "particle": "tfc:block/rock/magma/basalt" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/dacite.json b/kubejs/assets/tfc/models/block/rock/magma/dacite.json new file mode 100644 index 000000000..682d84608 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/dacite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/dacite", + "particle": "tfc:block/rock/magma/dacite" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/diorite.json b/kubejs/assets/tfc/models/block/rock/magma/diorite.json new file mode 100644 index 000000000..7d100fee9 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/diorite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/diorite", + "particle": "tfc:block/rock/magma/diorite" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/gabbro.json b/kubejs/assets/tfc/models/block/rock/magma/gabbro.json new file mode 100644 index 000000000..3f684ae32 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/gabbro.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/gabbro", + "particle": "tfc:block/rock/magma/gabbro" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/granite.json b/kubejs/assets/tfc/models/block/rock/magma/granite.json new file mode 100644 index 000000000..e7d1706f7 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/granite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/granite", + "particle": "tfc:block/rock/magma/granite" + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/magma.json b/kubejs/assets/tfc/models/block/rock/magma/magma.json new file mode 100644 index 000000000..9a3d09c75 --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/magma.json @@ -0,0 +1,50 @@ +{ + "format_version": "1.9.0", + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "forge_data": { "block_light": 15, "sky_light": 15 }, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } +} diff --git a/kubejs/assets/tfc/models/block/rock/magma/rhyolite.json b/kubejs/assets/tfc/models/block/rock/magma/rhyolite.json new file mode 100644 index 000000000..f88af7a1a --- /dev/null +++ b/kubejs/assets/tfc/models/block/rock/magma/rhyolite.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/rock/magma/magma", + "textures": { + "0": "tfc:block/rock/magma/rhyolite", + "particle": "tfc:block/rock/magma/rhyolite" + } +} diff --git a/kubejs/assets/tfg/models/block/lunar_roots.json b/kubejs/assets/tfg/models/block/lunar_roots.json index cdb4e9ca0..dd0cf7f10 100644 --- a/kubejs/assets/tfg/models/block/lunar_roots.json +++ b/kubejs/assets/tfg/models/block/lunar_roots.json @@ -4,6 +4,101 @@ "ambientocclusion": "false", "textures": { "cross": "tfg:block/lunar_roots", + "emissive": "tfg:block/lunar_roots_e", "particle": "tfg:block/lunar_roots" - } + }, + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + }, + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "forge_data": { + "block_light": 15, + "sky_light": 15 + }, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#emissive" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#emissive" + } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "forge_data": { + "block_light": 15, + "sky_light": 15 + }, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#emissive" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#emissive" + } + } + } + ] } \ No newline at end of file