diff --git a/kubejs/assets/tfg/blockstates/lunar_roots.json b/kubejs/assets/tfg/blockstates/lunar_roots.json new file mode 100644 index 000000000..6bc896131 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/lunar_roots.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/lunar_roots" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/lunar_warped_roots.json b/kubejs/assets/tfg/blockstates/lunar_warped_roots.json deleted file mode 100644 index 65b82b957..000000000 --- a/kubejs/assets/tfg/blockstates/lunar_warped_roots.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tfg:block/lunar_warped_roots" - } - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/lunar_roots.json b/kubejs/assets/tfg/models/block/lunar_roots.json new file mode 100644 index 000000000..c3b5df882 --- /dev/null +++ b/kubejs/assets/tfg/models/block/lunar_roots.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/warped_roots", + "render_type": "cutout_mipped", + "ambientocclusion": "false", + "textures": { + "cross": "tfg:block/lunar_roots" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/lunar_sprouts.json b/kubejs/assets/tfg/models/block/lunar_sprouts.json index 8e4d7832e..f0efe5537 100644 --- a/kubejs/assets/tfg/models/block/lunar_sprouts.json +++ b/kubejs/assets/tfg/models/block/lunar_sprouts.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/dead_tube_coral", + "parent": "minecraft:block/nether_sprouts", "render_type": "cutout_mipped", "ambientocclusion": "false", "textures": { - "cross": "minecraft:block/nether_sprouts" + "cross": "tfg:block/lunar_sprouts" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/lunar_warped_roots.json b/kubejs/assets/tfg/models/block/lunar_warped_roots.json deleted file mode 100644 index ef7c1608f..000000000 --- a/kubejs/assets/tfg/models/block/lunar_warped_roots.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/dead_tube_coral", - "render_type": "cutout_mipped", - "ambientocclusion": "false", - "textures": { - "cross": "minecraft:block/warped_roots" - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/lunar_roots.png b/kubejs/assets/tfg/textures/block/lunar_roots.png new file mode 100644 index 000000000..c1f3ed78d Binary files /dev/null and b/kubejs/assets/tfg/textures/block/lunar_roots.png differ diff --git a/kubejs/assets/tfg/textures/block/lunar_roots_layer_0_emissive.png b/kubejs/assets/tfg/textures/block/lunar_roots_layer_0_emissive.png new file mode 100644 index 000000000..67a89356c Binary files /dev/null and b/kubejs/assets/tfg/textures/block/lunar_roots_layer_0_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/lunar_sprouts.png b/kubejs/assets/tfg/textures/block/lunar_sprouts.png new file mode 100644 index 000000000..cfb2b26f5 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/lunar_sprouts.png differ diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_roots_patch.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_roots_patch.json index fd3649fdd..d64042025 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_roots_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_roots_patch.json @@ -8,7 +8,7 @@ "to_place": { "type": "minecraft:simple_state_provider", "state": { - "Name": "tfg:lunar_warped_roots" + "Name": "tfg:lunar_roots" } } } diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 4fe02dfc8..c4d74bdba 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -1,19 +1,19 @@ function registerTFGSpaceBlocks(event) { // TODO: replace these two with new blocks from tfg-core so they have a proper CanSurvive - event.create('tfg:lunar_warped_roots') - .soundType('nether_sprouts') - .hardness(0.2) - .item(item => { - item.modelJson({ parent: 'minecraft:item/warped_roots' }) - }) - .tagBlock('tfc:can_carve') - .fullBlock(false) - .defaultCutout() - .model('tfg:block/lunar_warped_roots') - .box(3, 0, 3, 12, 12, 12, true) - .noCollision() - .noDrops() + //event.create('tfg:lunar_warped_roots') + // .soundType('nether_sprouts') + // .hardness(0.2) + // .item(item => { + // item.modelJson({ parent: 'minecraft:item/warped_roots' }) + // }) + // .tagBlock('tfc:can_carve') + // .fullBlock(false) + // .defaultCutout() + // .model('tfg:block/lunar_warped_roots') + // .box(3, 0, 3, 12, 12, 12, true) + // .noCollision() + // .noDrops() event.create('tfg:lunar_sprouts') .soundType('nether_sprouts')