diff --git a/kubejs/assets/tfg/blockstates/dry_ice.json b/kubejs/assets/tfg/blockstates/dry_ice.json new file mode 100644 index 000000000..468500b10 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/dry_ice.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/dry_ice" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/mars_ice.json b/kubejs/assets/tfg/blockstates/mars_ice.json new file mode 100644 index 000000000..64ba0b063 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/mars_ice.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/mars_ice" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/mars_icicle.json b/kubejs/assets/tfg/blockstates/mars_icicle.json new file mode 100644 index 000000000..5ab911d50 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/mars_icicle.json @@ -0,0 +1,10 @@ +{ + "variants": { + "tip=true": { + "model": "tfg:block/mars_icicle_tip" + }, + "tip=false": { + "model": "tfg:block/mars_icicle" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/dry_ice.json b/kubejs/assets/tfg/models/block/dry_ice.json new file mode 100644 index 000000000..cca6834d8 --- /dev/null +++ b/kubejs/assets/tfg/models/block/dry_ice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/dry_ice" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/mars_ice.json b/kubejs/assets/tfg/models/block/mars_ice.json new file mode 100644 index 000000000..b1203b72f --- /dev/null +++ b/kubejs/assets/tfg/models/block/mars_ice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/mars_ice" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/mars_icicle.json b/kubejs/assets/tfg/models/block/mars_icicle.json new file mode 100644 index 000000000..11457fdfd --- /dev/null +++ b/kubejs/assets/tfg/models/block/mars_icicle.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/thin_spike", + "textures": { + "0": "tfg:block/mars_ice", + "particle": "tfg:block/mars_ice" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/mars_icicle_tip.json b/kubejs/assets/tfg/models/block/mars_icicle_tip.json new file mode 100644 index 000000000..3e5d99685 --- /dev/null +++ b/kubejs/assets/tfg/models/block/mars_icicle_tip.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/thin_spike_tip", + "textures": { + "0": "tfg:block/mars_ice", + "particle": "tfg:block/mars_ice" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/mars_ice.json b/kubejs/assets/tfg/models/item/mars_ice.json new file mode 100644 index 000000000..14f420372 --- /dev/null +++ b/kubejs/assets/tfg/models/item/mars_ice.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/mars_ice" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/mars_icicle.json b/kubejs/assets/tfg/models/item/mars_icicle.json new file mode 100644 index 000000000..0db1e4971 --- /dev/null +++ b/kubejs/assets/tfg/models/item/mars_icicle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfc:item/icicle" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/mars_ice.png b/kubejs/assets/tfg/textures/block/mars_ice.png new file mode 100644 index 000000000..e6d432f00 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/mars_ice.png differ diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index 24a8f5ae3..62a67e208 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -24,7 +24,8 @@ [], [ "tfg:mars/terrain/spice_disc", - "tfg:mars/terrain/red_quicksand" + "tfg:mars/terrain/red_quicksand", + "tfg:mars/terrain/powder_snow" ], [], [], @@ -39,7 +40,8 @@ ], [ - "tfg:glow_lichen" + "tfg:glow_lichen", + "tfg:mars/terrain/mars_poles" ] ], "has_precipitation": false, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index b82c2399b..2359b826f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -23,7 +23,8 @@ ], [], [ - "tfg:mars/terrain/red_quicksand" + "tfg:mars/terrain/red_quicksand", + "tfg:mars/terrain/powder_snow" ], [], [], diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/mars_poles.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/mars_poles.json new file mode 100644 index 000000000..c02cbc969 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/mars_poles.json @@ -0,0 +1,8 @@ +{ + "type": "tfg:martian_poles", + "config": { + "snowStartTemp": -95, + "snowFinishTemp": -100, + "maximumTemp": -90 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/powder_snow.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/powder_snow.json new file mode 100644 index 000000000..7167f6780 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/powder_snow.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfc:soil_disc", + "config": { + "min_radius": 2, + "max_radius": 3, + "height": 1, + "states": [ + { + "replace": "minecraft:red_sand", + "with": "minecraft:powder_snow" + }, + { + "replace": "ad_astra:mars_sand", + "with": "minecraft:powder_snow" + } + ] + } + }, + "placement": [] + }, + "tries": 8, + "xz_spread": 8, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/red_quicksand.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/red_quicksand.json index 34758d489..1c7c6642b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/red_quicksand.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/red_quicksand.json @@ -7,7 +7,7 @@ "config": { "min_radius": 2, "max_radius": 3, - "height": 2, + "height": 1, "states": [ { "replace": "minecraft:red_sand", diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/icicle.json b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/icicle.json index f20647777..25ed26db5 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/icicle.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/icicle.json @@ -1,7 +1,7 @@ { "type": "tfc:thin_spike", "config": { - "state": "tfc:icicle", + "state": "tfg:mars_icicle", "radius": 10, "tries": 50, "min_height": 2, diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/icicle_extra.json b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/icicle_extra.json index f20647777..25ed26db5 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/icicle_extra.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/icicle_extra.json @@ -1,7 +1,7 @@ { "type": "tfc:thin_spike", "config": { - "state": "tfc:icicle", + "state": "tfg:mars_icicle", "radius": 10, "tries": 50, "min_height": 2, diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json index be43f7d56..d998fe967 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json @@ -5,6 +5,10 @@ "type": "minecraft:rarity_filter", "chance": 35 }, + { + "type": "tfc:climate", + "min_temperature": -95 + }, { "type": "minecraft:in_square" }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json index 14a27341b..ca7882712 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json @@ -5,6 +5,10 @@ "type": "minecraft:rarity_filter", "chance": 60 }, + { + "type": "tfc:climate", + "min_temperature": -65 + }, { "type": "minecraft:in_square" }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/mars_poles.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/mars_poles.json new file mode 100644 index 000000000..a80af522f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/mars_poles.json @@ -0,0 +1,9 @@ +{ + "feature": "tfg:mars/terrain/mars_poles", + "placement": [ + { + "type": "minecraft:count", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/powder_snow.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/powder_snow.json new file mode 100644 index 000000000..59e1c318b --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/powder_snow.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:mars/terrain/powder_snow", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 15 + }, + { + "type": "tfc:climate", + "max_temperature": -97 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/red_quicksand.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/red_quicksand.json index 17fcd34fb..dcd745543 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/red_quicksand.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/red_quicksand.json @@ -5,6 +5,10 @@ "type": "minecraft:rarity_filter", "chance": 15 }, + { + "type": "tfc:climate", + "min_temperature": -97 + }, { "type": "minecraft:in_square" }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json index 34bc3b272..df7a41469 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json @@ -3,7 +3,7 @@ "placement": [ { "type": "tfc:climate", - "max_temperature": -87 + "max_temperature": -97 }, { "type": "minecraft:count", @@ -20,7 +20,7 @@ "absolute": -16 }, "max_inclusive": { - "absolute": 110 + "absolute": 95 } } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json index 24c33f3d3..462a4977b 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json @@ -1,6 +1,10 @@ { "feature": "tfg:mars/underground/icicle", "placement": [ + { + "type": "tfc:climate", + "max_temperature": -50 + }, { "type": "minecraft:count", "count": 10 @@ -19,10 +23,6 @@ "absolute": 100 } } - }, - { - "type": "tfc:climate", - "max_temperature": -30 } ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json index 3da33c42c..917518ef5 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json @@ -1,6 +1,10 @@ { "feature": "tfg:mars/underground/icicle_extra", "placement": [ + { + "type": "tfc:climate", + "max_temperature": -85 + }, { "type": "minecraft:count", "count": 10 @@ -19,10 +23,6 @@ "absolute": 150 } } - }, - { - "type": "tfc:climate", - "max_temperature": -70 } ] } \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index dbdd54d4d..3afc79885 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -370,12 +370,13 @@ const registerAdAstraBlockTags = (event) => { event.add('tfg:heightmap_ignore', 'minecraft:warped_wart_block') event.add('tfg:heightmap_ignore', 'species:alphacene_mushroom_block') event.add('tfg:heightmap_ignore', 'species:alphacene_mushroom_growth') - event.add('tfg:heightmap_ignore', 'tfg:glacian_log') - event.add('tfg:heightmap_ignore', 'tfg:glacian_wood') event.add('tfg:heightmap_ignore', 'tfg:glacian_leaves') event.add('tfg:heightmap_ignore', 'betterend:glacian_hymenophore') event.add('tfg:heightmap_ignore', 'species:alphacene_moss_block') event.add('tfg:heightmap_ignore', 'minecraft:ice') + + event.add('tfc:can_be_snow_piled', 'ad_astra:aeronos_mushroom') + event.add('tfc:can_be_snow_piled', 'ad_astra:strophar_mushroom') global.AD_ASTRA_WOOD.forEach(wood => { @@ -425,15 +426,6 @@ const registerAdAstraBiomeTags = (event) => { event.add('tfg:has_light_sand_particles', 'tfg:mars/rusticus_edge') event.add('tfg:has_light_sand_particles', 'tfg:mars/sangnum_edge') event.add('tfg:has_light_sand_particles', 'tfg:mars/martian_river') - - event.add('waves:has_waves', 'tfg:mars/martian_river') - event.add('waves:has_waves', 'tfg:mars/martian_mountains') - event.add('waves:has_waves', 'tfg:mars/amber_plains') - event.add('waves:has_waves', 'tfg:mars/amber_hills') - event.add('waves:has_waves', 'tfg:mars/rusticus_plains') - event.add('waves:has_waves', 'tfg:mars/rusticus_hills') - event.add('waves:has_waves', 'tfg:mars/sangnum_plains') - event.add('waves:has_waves', 'tfg:mars/sangnum_hills') } const registerAdAstraEntityTypeTags = (event) => { @@ -632,6 +624,7 @@ const registerAdAstraPlacedFeatures = (event) => { // Top layer event.add("tfg:mars_top_layer_modification", "tfg:glow_lichen") event.add("tfg:mars_top_layer_modification", "tfc:surface_loose_rocks") + event.add("tfg:mars_top_layer_modification", "tfg:mars/terrain/mars_poles") //#endregion diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 3206f3f62..83a035138 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -185,4 +185,9 @@ const registerMinecraftBlockTags = (event) => { //#region event.removeAll('minecraft:sniffer_diggable_block') + + event.add('tfc:can_be_snow_piled', 'minecraft:crimson_fungus') + event.add('tfc:can_be_snow_piled', 'minecraft:warped_fungus') + event.add('tfc:can_be_snow_piled', 'minecraft:torchflower') + event.add('tfc:can_be_snow_piled', 'minecraft:pitcher_plant') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index bfb4b956d..9f5f69ef2 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -461,6 +461,8 @@ function registerTFCBlockTags(event) { event.add("minecraft:stone_buttons", `tfc:rock/button/${stone}`); event.add("minecraft:buttons", `tfc:rock/button/${stone}`); }); + + event.add('tfc:can_be_snow_piled', 'tfc:groundcover/feather'); } /** @param {TagEvent.Fluid} event */ diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 93be7f78f..6c27034a0 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -876,7 +876,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.maxTemp(-99) + climate.maxTemp(-100) }, faunaData => { faunaData.solidGround(true) @@ -885,7 +885,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-95) + climate.minTemp(-97) climate.maxTemp(-30) climate.fuzzy(true) }, @@ -896,7 +896,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-85) + climate.minTemp(-95) climate.fuzzy(true) }, faunaData => { @@ -906,7 +906,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-95) + climate.minTemp(-105) climate.fuzzy(true) }, faunaData => { @@ -916,7 +916,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-100) + climate.minTemp(-102) climate.fuzzy(true) }, faunaData => { @@ -926,7 +926,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-85) + climate.minTemp(-90) climate.fuzzy(true) }, faunaData => { @@ -936,7 +936,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-105) + climate.minTemp(-106) climate.fuzzy(true) }, faunaData => { @@ -946,7 +946,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-85) + climate.minTemp(-90) climate.fuzzy(true) }, faunaData => { @@ -956,7 +956,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-95) + climate.minTemp(-100) climate.fuzzy(true) }, faunaData => { @@ -966,7 +966,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-95) + climate.minTemp(-100) climate.fuzzy(true) }, faunaData => { diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index d60cf8b99..42f4a041b 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -20,8 +20,8 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/crimson_forest_entry', climate => { - climate.maxTemp(-26) - climate.minTemp(-98) + climate.maxTemp(-24) + climate.minTemp(-101) climate.minRain(-12) climate.fuzzy(true) }, @@ -75,7 +75,7 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/aeronos_forest_entry', climate => { - climate.minTemp(-87) + climate.minTemp(-92) climate.minRain(-14) climate.fuzzy(true) }, @@ -98,7 +98,7 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/strophar_forest_entry', climate => { - climate.minTemp(-83) + climate.minTemp(-92) climate.maxRain(2) climate.fuzzy(true) }, @@ -143,7 +143,7 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/glacian_forest_entry', climate => { - climate.maxTemp(-87) + climate.maxTemp(-92) climate.fuzzy(true) }, 'tfg:glacian_wood_stripped', diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 7c5ad28dc..30af3b056 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -1086,6 +1086,13 @@ const registerTFGBlockTags = (event) => { event.add('tfg:decorative_plant_attachable', 'minecraft:warped_wart_block') event.add('tfg:decorative_plant_attachable', 'betterend:cave_bush') event.add('tfg:decorative_plant_attachable', 'betterend:lucernia_leaves') + + event.add('minecraft:mineable/pickaxe', 'tfg:mars_ice') + event.add('minecraft:mineable/pickaxe', 'tfg:dry_ice') + event.add('tfcambiental:cold_stuff', 'tfg:mars_ice') + event.add('tfcambiental:cold_stuff', 'tfg:dry_ice') + event.add('minecraft:ice', 'tfg:mars_ice') + event.add('minecraft:ice', 'tfg:dry_ice') } //#endregion @@ -1117,7 +1124,6 @@ const registerTFGFluidTags = (event) => { event.add('tfc:usable_in_barrel', 'gtceu:seed_oil') event.add('forge:liquid', 'tfg:semiheavy_ammoniacal_water') - event.add('waves:has_waves', 'tfg:semiheavy_ammoniacal_water') event.add('tfc:any_water', 'tfg:semiheavy_ammoniacal_water') event.add('tfc:hydrating', 'tfg:semiheavy_ammoniacal_water') event.add('tfc:drinkables', 'tfg:semiheavy_ammoniacal_water') diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js index d2f2a66b9..49d5cf1fe 100644 --- a/kubejs/startup_scripts/betterend/blocks.js +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -66,12 +66,12 @@ function registerBetterEndBlocks(event) { // 1 block tall waterlogged - createPlant(event, 'charnia_orange', 'mars') - createPlant(event, 'charnia_cyan', 'mars') - createPlant(event, 'charnia_green', 'mars') - createPlant(event, 'charnia_light_blue', 'mars') - createPlant(event, 'charnia_purple', 'mars') - createPlant(event, 'charnia_red', 'mars') + createWaterPlant(event, 'charnia_orange', 'mars') + createWaterPlant(event, 'charnia_cyan', 'mars') + createWaterPlant(event, 'charnia_green', 'mars') + createWaterPlant(event, 'charnia_light_blue', 'mars') + createWaterPlant(event, 'charnia_purple', 'mars') + createWaterPlant(event, 'charnia_red', 'mars') // Water surface @@ -83,6 +83,7 @@ function registerBetterEndBlocks(event) { .tagItem('forge:mushrooms') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('minecraft:replaceable') + .tagBlock('tfc:can_be_ice_piled') event.create('betterend:lacugrove', 'tfg:floating_decorative_plant') .xz_offset(false) @@ -92,6 +93,7 @@ function registerBetterEndBlocks(event) { .tagItem('tfg:mars_plants') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('minecraft:replaceable') + .tagBlock('tfc:can_be_ice_piled') // Mosses / Can go on sides of blocks @@ -222,4 +224,18 @@ function createPlant(event, id, planet) { .tagItem(`tfg:${planet}_plants`) .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfc:can_be_snow_piled') +} + +/** + * @param {any} event + * @param {string} id + * @param {string} planet + */ +function createWaterPlant(event, id, planet) { + return event.create(`betterend:${id}`, 'tfg:decorative_plant') + .tagItem(`tfg:${planet}_plants`) + .tagBlock('minecraft:replaceable') + .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfc:can_be_ice_piled') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 75c9463ab..8f76bd102 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -7,22 +7,6 @@ const registerTFGBlocks = (event) => { registerTFGSupportBlocks(event) registerTFGAqueductBlocks(event) registerTFGCrops(event) - - event.create('tfg:dry_ice', 'tfg:particle_emitter') - .textureAll('tfg:block/dry_ice') - .soundType('bone_block') - .hardness(1) - .resistance(1) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('tfcambiental:cold_stuff') - .defaultTranslucent() - .mapColor('color_white') - .speedFactor(1.2) - .particleOffset(1, 1, 1) - .particleVelocity(0.05, 0, 0.05) - .particle('minecraft:campfire_cosy_smoke') - .particleCount(2) - .particleForced(false) event.create('tfg:exhaust_vent_particle', 'tfg:particle_emitter') .textureAll('tfg:block/titanium_concrete') diff --git a/kubejs/startup_scripts/tfg/blocks.plants.js b/kubejs/startup_scripts/tfg/blocks.plants.js index e38c08339..2cf1bbd53 100644 --- a/kubejs/startup_scripts/tfg/blocks.plants.js +++ b/kubejs/startup_scripts/tfg/blocks.plants.js @@ -36,6 +36,7 @@ const registerTFGCrops = (event) => { .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') .tagBlock('minecraft:flowers') + .tagBlock('tfc:can_be_snow_piled') .tagItem('c:hidden_from_recipe_viewers') event.create('tfg:rapeseed', 'tfc:double_crop') @@ -62,6 +63,7 @@ const registerTFGCrops = (event) => { .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') .tagBlock('minecraft:flowers') + .tagBlock('tfc:can_be_snow_piled') .tagItem('c:hidden_from_recipe_viewers') event.create('tfg:flax', 'tfc:double_crop') @@ -95,6 +97,7 @@ const registerTFGCrops = (event) => { .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfc:can_be_snow_piled') .tagItem('c:hidden_from_recipe_viewers') // Mars Crops @@ -126,6 +129,7 @@ const registerTFGCrops = (event) => { .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfc:can_be_snow_piled') .tagItem('c:hidden_from_recipe_viewers') @@ -156,6 +160,7 @@ const registerTFGCrops = (event) => { .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfc:can_be_snow_piled') .tagItem('c:hidden_from_recipe_viewers') @@ -196,6 +201,7 @@ const registerTFGCrops = (event) => { .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfc:can_be_snow_piled') .tagItem('c:hidden_from_recipe_viewers') @@ -232,6 +238,7 @@ const registerTFGCrops = (event) => { .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfc:can_be_snow_piled') .tagItem('c:hidden_from_recipe_viewers') @@ -265,6 +272,7 @@ const registerTFGCrops = (event) => { .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfc:can_be_snow_piled') .tagItem('c:hidden_from_recipe_viewers') @@ -299,6 +307,7 @@ const registerTFGCrops = (event) => { .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfc:can_be_snow_piled') .tagItem('c:hidden_from_recipe_viewers') // Mars Saplings @@ -307,6 +316,7 @@ const registerTFGCrops = (event) => { .features('tfg:mars/tree/crimson') .tagBoth('minecraft:saplings') .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfc:can_be_snow_piled') .growthDays(6) .soundType('nether_wart') .defaultCutout() @@ -315,6 +325,7 @@ const registerTFGCrops = (event) => { .features('tfg:mars/tree/warped') .tagBoth('minecraft:saplings') .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfc:can_be_snow_piled') .growthDays(6) .soundType('nether_wart') .defaultCutout() @@ -323,6 +334,7 @@ const registerTFGCrops = (event) => { .features('species:alphacene_mushroom') .tagBoth('minecraft:saplings') .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfc:can_be_snow_piled') .growthDays(3) .soundType('nether_wart') .defaultCutout() @@ -331,6 +343,7 @@ const registerTFGCrops = (event) => { .features('tfg:mars/tree/strophar') .tagBoth('minecraft:saplings') .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfc:can_be_snow_piled') .growthDays(7) .soundType('nether_wart') .defaultCutout() @@ -339,6 +352,7 @@ const registerTFGCrops = (event) => { .features('tfg:mars/tree/aeronos') .tagBoth('minecraft:saplings') .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfc:can_be_snow_piled') .growthDays(9) .soundType('nether_wart') .defaultCutout() @@ -347,6 +361,7 @@ const registerTFGCrops = (event) => { .features('tfg:mars/tree/glacian_mini') .tagBoth('minecraft:saplings') .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfc:can_be_snow_piled') .growthDays(9) .soundType('nether_wart') .defaultCutout() diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 037e0ffb3..7d74bb4f2 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -1430,6 +1430,7 @@ function registerTFGSpaceBlocks(event) { .groundCoverModelShape('feather') .withPreexistingItem('wan_ancient_beasts:glider_feather') .textureAll('wan_ancient_beasts:item/glider_feather') + .tagBlock('tfc:can_be_snow_piled') event.create('tfg:groundcover/wraptor_feather', 'tfc:ground_cover') .box(4, 0, 4, 12, 2, 12) @@ -1437,11 +1438,13 @@ function registerTFGSpaceBlocks(event) { .groundCoverModelShape('feather') .withPreexistingItem('minecraft:feather') .textureAll('tfg:item/wraptor_wool') + .tagBlock('tfc:can_be_snow_piled') event.create('tfg:groundcover/aeronos_stick', 'tfc:ground_cover') .box(3, 0, 3, 13, 3, 13) .groundCoverModelShape('twig') .withPreexistingItem('tfg:twigs/aeronos') + .tagBlock('tfc:can_be_snow_piled') .texture('particle', 'ad_astra:block/aeronos_stem') .texture('all', 'ad_astra:block/aeronos_stem') .texture('top', 'ad_astra:block/aeronos_stem_inside') @@ -1450,6 +1453,7 @@ function registerTFGSpaceBlocks(event) { .box(3, 0, 3, 13, 3, 13) .groundCoverModelShape('twig') .withPreexistingItem('tfg:twigs/strophar') + .tagBlock('tfc:can_be_snow_piled') .texture('particle', 'ad_astra:block/strophar_stem') .texture('all', 'ad_astra:block/strophar_stem') .texture('top', 'ad_astra:block/strophar_stem_inside') @@ -1458,6 +1462,7 @@ function registerTFGSpaceBlocks(event) { .box(3, 0, 3, 13, 3, 13) .groundCoverModelShape('twig') .withPreexistingItem('tfg:twigs/glacian') + .tagBlock('tfc:can_be_snow_piled') .texture('particle', 'ad_astra:block/glacian_log') .texture('all', 'ad_astra:block/glacian_log') .texture('top', 'ad_astra:block/glacian_log_top') @@ -1466,6 +1471,7 @@ function registerTFGSpaceBlocks(event) { .box(3, 0, 3, 13, 3, 13) .groundCoverModelShape('twig') .withPreexistingItem('tfg:twigs/alphacene') + .tagBlock('tfc:can_be_snow_piled') .texture('particle', 'species:block/alphacene_mushroom_block') .texture('all', 'species:block/alphacene_mushroom_block') .texture('top', 'minecraft:block/mushroom_stem')