diff --git a/kubejs/server_scripts/endermanoverhaul/tags.js b/kubejs/server_scripts/endermanoverhaul/tags.js index 8185fce25..a10f0dd9d 100644 --- a/kubejs/server_scripts/endermanoverhaul/tags.js +++ b/kubejs/server_scripts/endermanoverhaul/tags.js @@ -18,7 +18,7 @@ const registerEndermanOverhaulItemTags = (event) => { const registerEndermanOverhaulBlockTags = (event) => { - event.add('endermanoverhaul:cave_enderman_holdable', 'forge:ores') - event.add('endermanoverhaul:cave_enderman_holdable', 'minecraft:base_stone_nether') + event.add('endermanoverhaul:cave_enderman_holdable', '#forge:ores') + event.add('endermanoverhaul:cave_enderman_holdable', '#minecraft:base_stone_nether') } \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 2c029750c..83dac430a 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -6,57 +6,81 @@ * @param {TagEvent.Item} event */ const registerMinecraftItemTags = (event) => { - global.MINECRAFT_DISABLED_ITEMS.forEach(item => { - event.removeAllTagsFrom(item) - event.add('c:hidden_from_recipe_viewers', item) - }) + global.MINECRAFT_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) - global.MINECRAFT_HIDED_ITEMS.forEach(item => { - event.add('c:hidden_from_recipe_viewers', item) - }) + global.MINECRAFT_HIDED_ITEMS.forEach(item => { + event.add('c:hidden_from_recipe_viewers', item) + }) - // Hide potions - event.add('c:hidden_from_recipe_viewers', /minecraft.*potion.*/) + // Hide potions + event.add('c:hidden_from_recipe_viewers', /minecraft.*potion.*/) - // Теперь обсидиан сторадж блок - event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') + // Теперь обсидиан сторадж блок + event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') - // Бамбуковые полублоки - event.add('tfg:bamboo_slabs', 'minecraft:bamboo_slab') - event.add('tfg:bamboo_slabs', 'minecraft:bamboo_mosaic_slab') + // Бамбуковые полублоки + event.add('tfg:bamboo_slabs', 'minecraft:bamboo_slab') + event.add('tfg:bamboo_slabs', 'minecraft:bamboo_mosaic_slab') - event.remove('minecraft:creeper_drop_music_discs', ['minecraft:music_disc_11']) + event.remove('minecraft:creeper_drop_music_discs', ['minecraft:music_disc_11']) - event.remove('forge:gems', 'minecraft:charcoal') - event.remove('forge:gems', 'minecraft:coal') - event.remove('forge:gems', 'minecraft:flint') + event.remove('forge:gems', 'minecraft:charcoal') + event.remove('forge:gems', 'minecraft:coal') + event.remove('forge:gems', 'minecraft:flint') - event.add('tfc:colored_terracotta', 'minecraft:white_terracotta') + event.add('tfc:colored_terracotta', 'minecraft:white_terracotta') - event.add('tfc:bells', 'minecraft:bell') + event.add('tfc:bells', 'minecraft:bell') + + event.add('tfc:makes_black_dye', 'minecraft:ink_sac') + event.add('tfc:makes_white_dye', 'minecraft:bone_meal') - event.add('tfc:makes_black_dye', 'minecraft:ink_sac') - event.add('tfc:makes_white_dye', 'minecraft:bone_meal') - event.add('create:blaze_burner_fuel/regular', 'minecraft:coal') event.add('create:blaze_burner_fuel/regular', 'minecraft:charcoal') event.add("tfg:rubber_plants", "minecraft:spore_blossom") - event.add('tfg:stonecutting/crackrack', 'minecraft:nether_brick_fence') + event.add('tfg:stonecutting/crackrack', 'minecraft:nether_brick_fence') } const registerMinecraftBlockTags = (event) => { - global.MINECRAFT_DISABLED_ITEMS.forEach(item => { - event.removeAllTagsFrom(item) - }) + global.MINECRAFT_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) - // Stops saws from being able to pick up ice - event.remove('minecraft:ice', 'minecraft:ice') - event.remove('minecraft:ice', 'tfc:sea_ice') + // Stops saws from being able to pick up ice + event.remove('minecraft:ice', 'minecraft:ice') + event.remove('minecraft:ice', 'tfc:sea_ice') - // Теперь обсидиан сторадж блок - event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') - - event.add('minecraft:mineable/pickaxe', 'minecraft:glowstone') + // Теперь обсидиан сторадж блок + event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') + + event.add('minecraft:mineable/pickaxe', 'minecraft:glowstone') + + // Things endermen can pick up and move around + event.removeAll('minecraft:enderman_holdable'); + event.add('minecraft:enderman_holdable', '#tfc:dirt') + event.add('minecraft:enderman_holdable', '#tfc:mud') + event.add('minecraft:enderman_holdable', '#tfc:loose_rocks') + event.add('minecraft:enderman_holdable', '#forge:gravel') + event.add('minecraft:enderman_holdable', '#forge:sand') + event.add('minecraft:enderman_holdable', '#forge:cobblestone') + event.add('minecraft:enderman_holdable', '#tfc:plants') + event.add('minecraft:enderman_holdable', '#tfg:plants/beneath') + event.add('minecraft:enderman_holdable', '#tfg:moon_plants') + event.add('minecraft:enderman_holdable', '#tfg:mars_plants') + event.add('minecraft:enderman_holdable', '#tfg:venus_plants') + event.add('minecraft:enderman_holdable', '#tfg:mercury_plants') + event.add('minecraft:enderman_holdable', '#tfg:europa_plants') + event.add('minecraft:enderman_holdable', 'tfc:pumpkin') + event.add('minecraft:enderman_holdable', 'tfc:melon') + event.add('minecraft:enderman_holdable', 'betterend:cave_pumpkin') + event.add('minecraft:enderman_holdable', '#minecraft:leaves') + event.add('minecraft:enderman_holdable', 'beneath:wood/leaves/crimson') + event.add('minecraft:enderman_holdable', 'beneath:wood/leaves/warped') + event.add('minecraft:enderman_holdable', 'tfg:glacian_leaves') + event.add('minecraft:enderman_holdable', '#tfg:solid_leaves') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/beneath/tags.beneath.js b/kubejs/server_scripts/tfg/beneath/tags.beneath.js index b5d3b554e..ce5e1a4b1 100644 --- a/kubejs/server_scripts/tfg/beneath/tags.beneath.js +++ b/kubejs/server_scripts/tfg/beneath/tags.beneath.js @@ -1,5 +1,19 @@ "use strict"; +/** + * @property {string[]} beneath_plants - List of Beneath plants to be added to the `tfg:plants/beneath` tag. +*/ +const beneath_plants = [ + 'beneath:gleamflower', + 'beneath:burpflower', + 'minecraft:big_dripleaf', + 'minecraft:small_dripleaf', + 'minecraft:glow_lichen', + 'minecraft:hanging_roots', + 'minecraft:spore_blossom', + '#beneath:mushrooms' +]; + function registerTFGBeneathItemTags(event) { event.add("minecraft:piglin_loved", "gtceu:tiny_pyrite_dust"); @@ -14,19 +28,6 @@ function registerTFGBeneathItemTags(event) { event.remove('createaddition:plants', 'minecraft:moss_carpet') - /** - * @property {string[]} beneath_plants - List of Beneath plants to be added to the `tfg:plants/beneath` tag. - */ - const beneath_plants = [ - 'beneath:gleamflower', - 'beneath:burpflower', - 'minecraft:big_dripleaf', - 'minecraft:small_dripleaf', - 'minecraft:glow_lichen', - 'minecraft:hanging_roots', - 'minecraft:spore_blossom', - '#beneath:mushrooms' - ]; beneath_plants.forEach(plant => event.add('tfg:plants/beneath', plant) ); @@ -46,6 +47,10 @@ function registerTFGBeneathBlockTags(event) { event.remove('tfc:plants', 'beneath:gleamflower') event.remove('tfc:plants', 'beneath:burpflower') + + beneath_plants.forEach(plant => + event.add('tfg:plants/beneath', plant) + ); event.add('minecraft:lush_ground_replaceable', 'minecraft:blackstone') event.add('beneath:nether_bush_plantable_on', 'minecraft:blackstone') diff --git a/kubejs/server_scripts/tfg/mars/tags.mars.js b/kubejs/server_scripts/tfg/mars/tags.mars.js index e7a130957..fcecf3062 100644 --- a/kubejs/server_scripts/tfg/mars/tags.mars.js +++ b/kubejs/server_scripts/tfg/mars/tags.mars.js @@ -238,9 +238,6 @@ function registerTFGMarsBlockTags(event) { event.add('tfg:heightmap_ignore', 'tfg:aeronos_cap') event.add('tfg:heightmap_ignore', 'tfg:strophar_cap') - event.remove('minecraft:enderman_holdable', 'minecraft:crimson_fungus') - event.remove('minecraft:enderman_holdable', 'minecraft:warped_fungus') - event.remove('ad_astra:strophar_caps', 'ad_astra:strophar_cap') event.remove('ad_astra:aeronos_caps', 'ad_astra:aeronos_cap') diff --git a/kubejs/server_scripts/tfg/moon/tags.moon.js b/kubejs/server_scripts/tfg/moon/tags.moon.js index 33b50a4d3..90fe8cdae 100644 --- a/kubejs/server_scripts/tfg/moon/tags.moon.js +++ b/kubejs/server_scripts/tfg/moon/tags.moon.js @@ -2,9 +2,6 @@ function registerTFGMoonItemTags(event) { - event.add('tfg:moon_plants', 'tfg:lunar_roots') - event.add('tfg:moon_plants', 'tfg:lunar_sprouts') - event.add('tfc:compost_greens_high', 'minecraft:pearlescent_froglight') event.add('tfc:compost_greens_high', 'minecraft:verdant_froglight') event.add('tfc:compost_greens_high', 'minecraft:ochre_froglight') diff --git a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js index 01a941a77..e8c1f7f7d 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js +++ b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js @@ -28,8 +28,10 @@ function registerTFGStoneItemTags(event) { material = rock.material.replace(/tfg:/g, ''); if (rock.raw != null) { - event.add('tfc:rock/raw', rock.raw.block); - event.add('forge:stone', rock.raw.block); + if (rock.collapsible) { + event.add('tfc:rock/raw', rock.raw.block); + event.add('forge:stone', rock.raw.block); + } addToTfcTag(rock.raw.block); addToMaterialTag(material, rock.raw.block); diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 6770553fe..a778f5a80 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -525,6 +525,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:warped_fungus_on_a_stick', 'minecraft:carrot_on_a_stick', 'minecraft:carrot', + 'minecraft:melon', 'minecraft:pumpkin', 'minecraft:suspicious_stew', 'minecraft:mycelium', diff --git a/kubejs/startup_scripts/tfg/mars/blocks.mars_deco.js b/kubejs/startup_scripts/tfg/mars/blocks.mars_deco.js index 86ccf9ea9..93f846ad4 100644 --- a/kubejs/startup_scripts/tfg/mars/blocks.mars_deco.js +++ b/kubejs/startup_scripts/tfg/mars/blocks.mars_deco.js @@ -54,8 +54,8 @@ function registerTFGWorldGenMarsDecoBlocks(event) { .soundType('crop') .box(1, 0, 1, 15, 2, 15) .mapColor('color_light_blue') - .tagItem('tfg:mars_plants') - .tagItem('forge:mushrooms') + .tagBoth('tfg:mars_plants') + .tagBoth('forge:mushrooms') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('minecraft:replaceable') .tagBlock('tfc:can_be_ice_piled') @@ -65,7 +65,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { .soundType('crop') .box(0, 0, 0, 16, 1, 16) .mapColor('color_cyan') - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('minecraft:replaceable') .tagBlock('tfc:can_be_ice_piled') @@ -74,30 +74,30 @@ function registerTFGWorldGenMarsDecoBlocks(event) { event.create('betterend:aurant_polypore', 'tfg:attached_decorative_plant') .soundType('nether_wart') - .tagItem('tfg:mars_plants') - .tagItem('forge:mushrooms') + .tagBoth('tfg:mars_plants') + .tagBoth('forge:mushrooms') .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:purple_polypore', 'tfg:attached_decorative_plant') .soundType('nether_wart') - .tagItem('tfg:mars_plants') - .tagItem('forge:mushrooms') + .tagBoth('tfg:mars_plants') + .tagBoth('forge:mushrooms') .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:filalux_wings', 'tfg:attached_decorative_plant') .soundType('nether_wart') .allowVertical(true) - .tagItem('tfg:mars_plants') - .tagItem('forge:mushrooms') + .tagBoth('tfg:mars_plants') + .tagBoth('forge:mushrooms') .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:bulb_moss', 'tfg:attached_decorative_plant') .soundType('crop') .lootItem('tfc:straw') - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') @@ -116,7 +116,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { .tagBlock('tfg:do_not_destroy_in_space') .mapColor('fire') .seasonalColors(false) - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .fallenLeaves(leaves => { leaves.noCollision() leaves.notSolid() @@ -141,7 +141,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { .tagBlock('tfg:do_not_destroy_in_space') .mapColor('color_orange') .seasonalColors(false) - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .fallenLeaves(leaves => { leaves.noCollision() leaves.notSolid() @@ -165,7 +165,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { event.create('betterend:large_amaranita_mushroom', 'tfg:tall_decorative_plant') .height(3) .soundType('nether_wart') - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .tagBlock('tfg:do_not_destroy_in_space') .tagItem('forge:mushrooms') .mapColor('fire') @@ -173,7 +173,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { event.create('betterend:lanceleaf', 'tfg:tall_decorative_plant') .height(5) .soundType('crop') - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .tagBlock('tfg:do_not_destroy_in_space') .mapColor('color_orange') diff --git a/kubejs/startup_scripts/tfg/moon/blocks.moon_deco.js b/kubejs/startup_scripts/tfg/moon/blocks.moon_deco.js index 0cd4d8935..edb53fbab 100644 --- a/kubejs/startup_scripts/tfg/moon/blocks.moon_deco.js +++ b/kubejs/startup_scripts/tfg/moon/blocks.moon_deco.js @@ -7,18 +7,18 @@ function registerTFGWorldGenMoonDecoBlocks(event) { event.create('tfg:lunar_roots', 'tfg:decorative_plant') .soundType('nether_wart') .lightLevel(0.4) - .tagItem('tfg:moon_plants') + .tagBoth('tfg:moon_plants') .tagBlock('minecraft:replaceable') event.create('tfg:lunar_sprouts', 'tfg:decorative_plant') .soundType('nether_wart') - .tagItem('tfg:moon_plants') + .tagBoth('tfg:moon_plants') .tagBlock('minecraft:replaceable') event.create('betterend:chorus_lily', 'tfc:ground_cover') .soundType('cherry_wood') .hardness(0.5) - .tagItem('tfg:moon_plants') + .tagBoth('tfg:moon_plants') .tagBlock('minecraft:mineable/hoe') .tagBlock('tfg:do_not_destroy_in_space') .mapColor('terracotta_white') diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index c142430a7..a5db21f7e 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -322,7 +322,7 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .soundType('nether_wart') .mapColor('green_terracotta') .box(3, 0, 3, 13, 16, 13) - .tagItem('tfg:venus_plants') + .tagBoth('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:hydralux_large', 'tfg:tall_decorative_plant') @@ -330,22 +330,18 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .soundType('nether_wart') .mapColor('green_terracotta') .box(3, 0, 3, 13, 16, 13) - .tagItem('tfg:venus_plants') + .tagBoth('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') - event.create('betterend:shadow_plant', 'tfg:decorative_plant') - .soundType('crop') - .mapColor('none') + createPlant(event, "shadow_plant", "venus") .box(3, 0, 3, 13, 10, 13) - .tagItem('tfg:venus_plants') - .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:twisted_vine', 'tfg:tall_decorative_plant') .height(3) .soundType('crop') .mapColor('none') .box(3, 0, 3, 13, 16, 13) - .tagItem('tfg:venus_plants') + .tagBoth('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/worldgen/utility.js b/kubejs/startup_scripts/tfg/worldgen/utility.js index 83e19c2f5..825fa631b 100644 --- a/kubejs/startup_scripts/tfg/worldgen/utility.js +++ b/kubejs/startup_scripts/tfg/worldgen/utility.js @@ -9,7 +9,7 @@ */ function createPlant(event, id, planet) { return event.create(`betterend:${id}`, 'tfg:decorative_plant') - .tagItem(`tfg:${planet}_plants`) + .tagBoth(`tfg:${planet}_plants`) .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('tfc:can_be_snow_piled') @@ -22,7 +22,7 @@ function createPlant(event, id, planet) { */ function createWaterPlant(event, id, planet) { return event.create(`betterend:${id}`, 'tfg:decorative_plant') - .tagItem(`tfg:${planet}_plants`) + .tagBoth(`tfg:${planet}_plants`) .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('tfc:can_be_ice_piled')