Moved some items from tfg-core (#1242)

* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
Redeix 2025-07-03 18:01:20 -05:00 committed by GitHub
parent 352c97a966
commit 256d976531
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 246 additions and 4 deletions

View file

@ -0,0 +1,10 @@
{
"variants": {
"half=lower": {
"model": "tfg:block/corallium_arenicolus_0_bottom"
},
"half=upper": {
"model": "tfg:block/corallium_arenicolus_0_top"
}
}
}

View file

@ -0,0 +1,203 @@
{
"format_version": "1.21.6",
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "tfg:block/planets/venus/corallium_arenicolus_0",
"particle": "tfg:block/planets/venus/corallium_arenicolus_0"
},
"elements": [
{
"from": [-0.5, 0, 7.4],
"to": [15.5, 32, 7.4],
"rotation": {"angle": -45, "axis": "y", "origin": [7.5, 0, 7.4]},
"faces": {
"north": {"uv": [8, 0, 0, 16], "texture": "#0"},
"east": {"uv": [0, 0, 0, 16], "texture": "#0"},
"south": {"uv": [0, 0, 8, 16], "texture": "#0"},
"west": {"uv": [0, 0, 0, 16], "texture": "#0"},
"up": {"uv": [8, 0, 0, 0], "texture": "#0"},
"down": {"uv": [8, 0, 0, 0], "texture": "#0"}
}
},
{
"from": [8.8, 0, -0.6],
"to": [8.8, 32, 15.4],
"rotation": {"angle": -45, "axis": "y", "origin": [8.8, 0, 7.4]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#0"},
"east": {"uv": [8, 0, 0, 16], "texture": "#0"},
"south": {"uv": [0, 0, 0, 16], "texture": "#0"},
"west": {"uv": [0, 0, 8, 16], "texture": "#0"},
"up": {"uv": [8, 0, 0, 0], "rotation": 90, "texture": "#0"},
"down": {"uv": [8, 0, 0, 0], "rotation": 270, "texture": "#0"}
}
},
{
"from": [4.7, 6.1, 4.6],
"to": [2.5, 3.9, 2.4],
"rotation": {"angle": 0, "axis": "y", "origin": [4.7, 6.1, 4.6]},
"faces": {
"north": {"uv": [8, 1, 9, 2], "texture": "#0"},
"east": {"uv": [9, 1, 8, 2], "texture": "#0"},
"south": {"uv": [8, 1, 9, 2], "texture": "#0"},
"west": {"uv": [9, 1, 8, 2], "texture": "#0"},
"up": {"uv": [9, 2, 8, 1], "texture": "#0"},
"down": {"uv": [8, 1, 9, 2], "texture": "#0"}
}
},
{
"from": [2.6, 4, 2.5],
"to": [4.6, 6, 4.5],
"rotation": {"angle": 0, "axis": "y", "origin": [2.6, 4, 2.5]},
"faces": {
"north": {"uv": [8, 0, 9, 1], "texture": "#0"},
"east": {"uv": [9, 0, 8, 1], "texture": "#0"},
"south": {"uv": [8, 0, 9, 1], "texture": "#0"},
"west": {"uv": [9, 0, 8, 1], "texture": "#0"},
"up": {"uv": [9, 1, 8, 0], "texture": "#0"},
"down": {"uv": [8, 0, 9, 1], "texture": "#0"}
}
},
{
"from": [12.6, 10.1, 12.4],
"to": [10.4, 7.9, 10.2],
"rotation": {"angle": 0, "axis": "y", "origin": [12.6, 10.1, 12.4]},
"faces": {
"north": {"uv": [8, 1, 9, 2], "texture": "#0"},
"east": {"uv": [9, 1, 8, 2], "texture": "#0"},
"south": {"uv": [8, 1, 9, 2], "texture": "#0"},
"west": {"uv": [9, 1, 8, 2], "texture": "#0"},
"up": {"uv": [9, 2, 8, 1], "texture": "#0"},
"down": {"uv": [8, 1, 9, 2], "texture": "#0"}
}
},
{
"from": [10.5, 8, 10.3],
"to": [12.5, 10, 12.3],
"rotation": {"angle": 0, "axis": "y", "origin": [10.5, 8, 10.3]},
"faces": {
"north": {"uv": [8, 0, 9, 1], "texture": "#0"},
"east": {"uv": [9, 0, 8, 1], "texture": "#0"},
"south": {"uv": [8, 0, 9, 1], "texture": "#0"},
"west": {"uv": [9, 0, 8, 1], "texture": "#0"},
"up": {"uv": [9, 1, 8, 0], "texture": "#0"},
"down": {"uv": [8, 0, 9, 1], "texture": "#0"}
}
},
{
"from": [5.9, 11.1, 12.4],
"to": [3.7, 8.9, 10.2],
"rotation": {"angle": 0, "axis": "y", "origin": [5.9, 11.1, 12.4]},
"faces": {
"north": {"uv": [8, 1, 9, 2], "texture": "#0"},
"east": {"uv": [9, 1, 8, 2], "texture": "#0"},
"south": {"uv": [8, 1, 9, 2], "texture": "#0"},
"west": {"uv": [9, 1, 8, 2], "texture": "#0"},
"up": {"uv": [9, 2, 8, 1], "texture": "#0"},
"down": {"uv": [8, 1, 9, 2], "texture": "#0"}
}
},
{
"from": [3.8, 9, 10.3],
"to": [5.8, 11, 12.3],
"rotation": {"angle": 0, "axis": "y", "origin": [3.8, 9, 10.3]},
"faces": {
"north": {"uv": [8, 0, 9, 1], "texture": "#0"},
"east": {"uv": [9, 0, 8, 1], "texture": "#0"},
"south": {"uv": [8, 0, 9, 1], "texture": "#0"},
"west": {"uv": [9, 0, 8, 1], "texture": "#0"},
"up": {"uv": [9, 1, 8, 0], "texture": "#0"},
"down": {"uv": [8, 0, 9, 1], "texture": "#0"}
}
},
{
"from": [13.7, 7.1, 4.6],
"to": [11.5, 4.9, 2.4],
"rotation": {"angle": 0, "axis": "y", "origin": [13.7, 7.1, 4.6]},
"faces": {
"north": {"uv": [8, 1, 9, 2], "texture": "#0"},
"east": {"uv": [9, 1, 8, 2], "texture": "#0"},
"south": {"uv": [8, 1, 9, 2], "texture": "#0"},
"west": {"uv": [9, 1, 8, 2], "texture": "#0"},
"up": {"uv": [9, 2, 8, 1], "texture": "#0"},
"down": {"uv": [8, 1, 9, 2], "texture": "#0"}
}
},
{
"from": [11.6, 5, 2.5],
"to": [13.6, 7, 4.5],
"rotation": {"angle": 0, "axis": "y", "origin": [11.6, 5, 2.5]},
"faces": {
"north": {"uv": [8, 0, 9, 1], "texture": "#0"},
"east": {"uv": [9, 0, 8, 1], "texture": "#0"},
"south": {"uv": [8, 0, 9, 1], "texture": "#0"},
"west": {"uv": [9, 0, 8, 1], "texture": "#0"},
"up": {"uv": [9, 1, 8, 0], "texture": "#0"},
"down": {"uv": [8, 0, 9, 1], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.3, 0.3, 0.3]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.3, 0.3, 0.3]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"scale": [0.3, 0.3, 0.3]
},
"firstperson_lefthand": {
"rotation": [0, -135, 0],
"scale": [0.3, 0.3, 0.3]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.2, 0.2, 0.2]
},
"gui": {
"rotation": [30, -135, 0],
"translation": [0, -3.25, 0],
"scale": [0.5, 0.5, 0.5]
},
"fixed": {
"rotation": [0, 90, 0],
"translation": [0, -3.25, 0.75],
"scale": [0.5, 0.5, 0.5]
}
},
"groups": [
0,
1,
{
"name": "berry1",
"origin": [5.1, 6.1, 5.1],
"color": 0,
"children": [2, 3]
},
{
"name": "berry2",
"origin": [5.1, 6.1, 5.1],
"color": 0,
"children": [4, 5]
},
{
"name": "berry3",
"origin": [5.1, 6.1, 5.1],
"color": 0,
"children": [6, 7]
},
{
"name": "berry4",
"origin": [5.1, 6.1, 5.1],
"color": 0,
"children": [8, 9]
}
]
}

View file

@ -215,10 +215,7 @@ function registerTFGSpaceBlocks(event) {
// #region Plants
/*
* Default box for single_plant = (3.0F, 0.0F, 3.0F, 13.0F, 7.0F, 13.0F)
* Default box for double_plants--Per half = (2.0F, 0.0F, 2.0F, 14.0F, 16.0F, 14.0F)
* Default box for smoke_emitter--Emits Signal smoke = (2.0F, 0.0F, 2.0F, 14.0F, 16.0F, 14.0F)
* Default box for light_smoke_emitter--Emits Cozy smoke = (2.0F, 0.0F, 2.0F, 14.0F, 16.0F, 14.0F)
Custom TFG Builder information https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-TFG-Custom-Kubejs-Scripts
*/
event.create('tfg:lunar_roots', 'tfg:decorative_plant')
@ -262,6 +259,38 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfg:venus_plants')
.box(3, 0, 3, 13, 14, 13)
event.create('tfg:geyser_source', 'tfg:particle_emitter_decoration')
.soundType('dripstone_block')
.mapColor('color_white')
.resistance(6)
.hardness(1.5)
.particleOffset(0.3, 1, 0.3)
.particleVelocity(0, 0.1, 0)
.particle('minecraft:campfire_signal_smoke')
.particleCount(5)
.particleForced(true)
event.create('tfg:geyser_source_small', 'tfg:particle_emitter_decoration')
.soundType('dripstone_block')
.mapColor('color_white')
.resistance(6)
.hardness(1.5)
.particleOffset(0.3, 1, 0.3)
.particleVelocity(0, 0.05, 0)
.particle('minecraft:campfire_cosy_smoke')
.particleCount(2)
.particleForced(false)
event.create('tfg:stromatolite_cluster_small', 'tfg:decorative_plant')
.soundType('dripstone_block')
.mapColor('color_brown')
.box(3, 0, 3, 13, 6, 13)
event.create('tfg:stromatolite_cluster_medium', 'tfg:decorative_plant')
.soundType('dripstone_block')
.mapColor('color_brown')
.box(3, 0, 3, 13, 14, 13)
// #endregion
//#region Venus Blocks