diff --git a/kubejs/assets/betterend/lang/en_us.json b/kubejs/assets/betterend/lang/en_us.json index 5f870d052..34b08d443 100644 --- a/kubejs/assets/betterend/lang/en_us.json +++ b/kubejs/assets/betterend/lang/en_us.json @@ -15,6 +15,7 @@ "block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony", "block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony", "block.betterend.bushy_grass": "Novagrass", + "block.betterend.bulb_moss": "Bulb Moss", "block.betterend.cave_bush": "Carmine Lamella", "block.betterend.cave_bush_fallen": "Small Carmine Lamella", "block.betterend.cave_grass": "Vermilligma", diff --git a/kubejs/server_scripts/beneath/tags.js b/kubejs/server_scripts/beneath/tags.js index 1d4c050a0..4550fb5c7 100644 --- a/kubejs/server_scripts/beneath/tags.js +++ b/kubejs/server_scripts/beneath/tags.js @@ -42,6 +42,11 @@ const registerBeneathItemTags = (event) => { event.add('forge:mushrooms', '#beneath:mushrooms') event.remove('beneath:sparks_on_sulfur') + + event.add('tfc:firepit_kindling', 'beneath:crimson_straw') + event.add('tfc:firepit_kindling', 'beneath:warped_straw') + event.add('tfc:pit_kiln_straw', 'beneath:crimson_straw') + event.add('tfc:pit_kiln_straw', 'beneath:warped_straw') event.remove('minecraft:leaves', 'beneath:wood/leaves/crimson') event.remove('minecraft:leaves', 'beneath:wood/leaves/warped') diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js index 812f216fb..a88a7c5a9 100644 --- a/kubejs/startup_scripts/betterend/blocks.js +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -72,24 +72,49 @@ function registerBetterEndBlocks(event) { // Water surface - event.create('betterend:flamaea', 'tfg:floating_plant') + event.create('betterend:flamaea', 'tfg:floating_decorative_plant') .soundType('crop') .box(1, 0, 1, 15, 2, 15) .mapColor('color_light_blue') .tagItem('tfg:mars_plants') .tagItem('forge:mushrooms') + .tagBlock('minecraft:replaceable') - event.create('betterend:lacugrove', 'tfg:floating_plant') + event.create('betterend:lacugrove', 'tfg:floating_decorative_plant') .xz_offset(false) .soundType('crop') .box(0, 0, 0, 16, 1, 16) .mapColor('color_cyan') .tagItem('tfg:mars_plants') + .tagBlock('minecraft:replaceable') // Mosses / Can go on sides of blocks - - //createPlant(event, 'aurant_polypore', 'mars') - //createPlant(event, 'purple_polypore', 'mars') + + // TODO: needs features + event.create('betterend:aurant_polypore', 'tfg:attached_decorative_plant') + .soundType('nether_wart') + .tagItem('tfg:mars_plants') + .tagItem('forge:mushrooms') + .tagBlock('minecraft:replaceable') + + event.create('betterend:purple_polypore', 'tfg:attached_decorative_plant') + .soundType('nether_wart') + .tagItem('tfg:mars_plants') + .tagItem('forge:mushrooms') + .tagBlock('minecraft:replaceable') + + event.create('betterend:filalux_wings', 'tfg:attached_decorative_plant') + .soundType('nether_wart') + .allowVertical(true) + .tagItem('tfg:mars_plants') + .tagItem('forge:mushrooms') + .tagBlock('minecraft:replaceable') + + event.create('betterend:bulb_moss', 'tfg:attached_decorative_plant') + .soundType('crop') + .lootItem('tfc:straw') + .tagItem('tfg:mars_plants') + .tagBlock('minecraft:replaceable') // Leaves @@ -105,6 +130,7 @@ function registerBetterEndBlocks(event) { leaves.defaultCutout() leaves.soundType('azalea_leaves') leaves.tagBlock('minecraft:mineable/hoe') + leaves.tagBlock('minecraft:replaceable') // TODO: kjs-tfc 1.3.3 will have an option to disable tinting on leaves leaves.models((modelType, generator) => { if (modelType.layers != 8) { @@ -128,6 +154,7 @@ function registerBetterEndBlocks(event) { leaves.defaultCutout() leaves.soundType('azalea_leaves') leaves.tagBlock('minecraft:mineable/hoe') + leaves.tagBlock('minecraft:replaceable') // TODO: kjs-tfc 1.3.3 will have an option to disable tinting on leaves leaves.models((modelType, generator) => { if (modelType.layers != 8) {