diff --git a/kubejs/assets/ad_astra/lang/en_us.json b/kubejs/assets/ad_astra/lang/en_us.json index 1d25fce85..4204dae61 100644 --- a/kubejs/assets/ad_astra/lang/en_us.json +++ b/kubejs/assets/ad_astra/lang/en_us.json @@ -24,6 +24,7 @@ "block.ad_astra.moon_deepslate": "Raw Norite", "block.ad_astra.cheese_block": "Moon Cheese Block", "block.ad_astra.moon_cheese_ore": "Anorthosite Cheese Ore", + "block.ad_astra.glacian_leaves": "Glacian Lamella", "block.ad_astra.mars_sand": "Argillite Sand", "block.ad_astra.mars_stone": "Raw Argillite", "block.ad_astra.mars_cobblestone": "Argillite Cobble", diff --git a/kubejs/assets/ad_astra/textures/item/glacian_stripped.png b/kubejs/assets/ad_astra/textures/item/glacian_stripped.png index 3655423e0..47f3e7809 100644 Binary files a/kubejs/assets/ad_astra/textures/item/glacian_stripped.png and b/kubejs/assets/ad_astra/textures/item/glacian_stripped.png differ diff --git a/kubejs/assets/ad_astra/textures/item/glacian_wood.png b/kubejs/assets/ad_astra/textures/item/glacian_wood.png new file mode 100644 index 000000000..3bcbeb3f7 Binary files /dev/null and b/kubejs/assets/ad_astra/textures/item/glacian_wood.png differ diff --git a/kubejs/assets/ad_astra/textures/item/glacian_wood_stripped.png b/kubejs/assets/ad_astra/textures/item/glacian_wood_stripped.png new file mode 100644 index 000000000..3655423e0 Binary files /dev/null and b/kubejs/assets/ad_astra/textures/item/glacian_wood_stripped.png differ diff --git a/kubejs/assets/betterend/blockstates/glacian_hymenophore.json b/kubejs/assets/betterend/blockstates/glacian_hymenophore.json new file mode 100644 index 000000000..bd9d1ae9f --- /dev/null +++ b/kubejs/assets/betterend/blockstates/glacian_hymenophore.json @@ -0,0 +1,10 @@ +{ + "variants": { + "facing=up": { "model": "betterend:block/mossy_glowshroom_fur" }, + "facing=down": { "model": "betterend:block/mossy_glowshroom_fur", "x": 180 }, + "facing=north": { "model": "betterend:block/mossy_glowshroom_fur", "x": 90 }, + "facing=south": { "model": "betterend:block/mossy_glowshroom_fur", "x": 90, "y": 180 }, + "facing=east": { "model": "betterend:block/mossy_glowshroom_fur", "x": 90, "y": 90 }, + "facing=west": { "model": "betterend:block/mossy_glowshroom_fur", "x": 90, "y": 270 } + } +} diff --git a/kubejs/assets/betterend/lang/en_us.json b/kubejs/assets/betterend/lang/en_us.json index 47632b839..7ebc3612a 100644 --- a/kubejs/assets/betterend/lang/en_us.json +++ b/kubejs/assets/betterend/lang/en_us.json @@ -46,6 +46,7 @@ "block.betterend.flamaea": "Flamaea Mushroom", "block.betterend.flammalix": "Flammalix Mushroom", "block.betterend.fracturn": "Fracturn", + "block.betterend.glacian_hymenophore": "Glacian Hymenophore", "block.betterend.globulagus": "Globulagus", "block.betterend.hydralux": "Hydralux", "block.betterend.hydralux_sapling": "Hydralux Sprout", diff --git a/kubejs/assets/betterend/models/block/mossy_glowshroom_fur.json b/kubejs/assets/betterend/models/block/mossy_glowshroom_fur.json new file mode 100644 index 000000000..3eff83e4e --- /dev/null +++ b/kubejs/assets/betterend/models/block/mossy_glowshroom_fur.json @@ -0,0 +1,75 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/mossy_glowshroom_fur", + "texture": "betterend:block/mossy_glowshroom_fur" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -8 ], + "to": [ 16, 0, 8 ], + "rotation": { "origin": [ 0, 0, 8 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 8 ], + "to": [ 16, 0.001, 24 ], + "rotation": { "origin": [ 0, 0.000000954, 8 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY4", + "from": [ 8, -0.001, 0 ], + "to": [ 24, 0, 16 ], + "rotation": { "origin": [ 8, 0, 16 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -8, 0, 2 ], + "to": [ 8, 0.001, 18 ], + "rotation": { "origin": [ 8, 0, 18 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneX6", + "from": [ 0, 0, -6.5 ], + "to": [ 0.001, 16, 16 ], + "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneX6", + "from": [ -6.5, 0, 15.999 ], + "to": [ 16, 16, 16 ], + "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/glacian_hymenophore.json b/kubejs/assets/betterend/models/item/glacian_hymenophore.json new file mode 100644 index 000000000..ae580c40a --- /dev/null +++ b/kubejs/assets/betterend/models/item/glacian_hymenophore.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/mossy_glowshroom_fur" + } +} diff --git a/kubejs/assets/betterend/textures/block/mossy_glowshroom_fur.png b/kubejs/assets/betterend/textures/block/mossy_glowshroom_fur.png new file mode 100644 index 000000000..ceecc3352 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/mossy_glowshroom_fur.png differ diff --git a/kubejs/assets/create/lang/en_us.json b/kubejs/assets/create/lang/en_us.json index 68b84fa1f..417c99027 100644 --- a/kubejs/assets/create/lang/en_us.json +++ b/kubejs/assets/create/lang/en_us.json @@ -11,6 +11,14 @@ "block.create.dark_oak_window_pane": "Hickory Window Pane", "block.create.cherry_window": "Fig Window", "block.create.cherry_window_pane": "Fig Window Pane", + "block.create.spruce_window": "Cypress Window", + "block.create.spruce_window_pane": "Cypress Window Pane", + "block.create.jungle_window": "Teak Window", + "block.create.jungle_window_pane": "Teak Window Pane", + "block.create.birch_window": "Eucalyptus Window", + "block.create.birch_window_pane": "Eucalyptus Window Pane", + "block.create.acacia_window": "Baobab Window", + "block.create.acacia_window_pane": "Baobab Window Pane", "block.create.andesite_bars": "Metal Bars", "block.create.andesite_belt_funnel": "Metal Belt Funnel", "block.create.andesite_casing": "Metal Casing", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 89362b53c..48d8e1152 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -427,6 +427,12 @@ "block.tfg.lunar_sprouts": "Lunar Lightgrass", "block.tfg.lunar_chorus_plant": "Chorus Plant", "block.tfg.lunar_chorus_flower": "Chorus Flower", + "block.tfg.glacian_log": "Glacian Stem", + "block.tfg.glacian_log_stripped": "Stripped Glacian Stem", + "block.tfg.glacian_wood": "Glacian Hyphae", + "block.tfg.glacian_wood_stripped": "Stripped Glacian Hyphae", + "block.tfg.glacian_leaves": "Glacian Lamella", + "block.tfg.glacian_leaves_fallen": "Small Glacian Lamella", "block.tfg.marker.moon": "The Moon", "block.tfg.marker.mars": "Mars", "block.tfg.marker.venus": "Venus", diff --git a/kubejs/assets/tfg/models/block/glacian_leaves.json b/kubejs/assets/tfg/models/block/glacian_leaves.json new file mode 100644 index 000000000..dae36775d --- /dev/null +++ b/kubejs/assets/tfg/models/block/glacian_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "ad_astra:block/glacian_leaves" + } +} diff --git a/kubejs/assets/tfg/models/block/glacian_log.json b/kubejs/assets/tfg/models/block/glacian_log.json new file mode 100644 index 000000000..29a5234e9 --- /dev/null +++ b/kubejs/assets/tfg/models/block/glacian_log.json @@ -0,0 +1,3 @@ +{ + "parent": "ad_astra:block/glacian_log" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/glacian_log_stripped.json b/kubejs/assets/tfg/models/block/glacian_log_stripped.json new file mode 100644 index 000000000..4117baf75 --- /dev/null +++ b/kubejs/assets/tfg/models/block/glacian_log_stripped.json @@ -0,0 +1,3 @@ +{ + "parent": "ad_astra:block/stripped_glacian_log" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/glacian_wood.json b/kubejs/assets/tfg/models/block/glacian_wood.json new file mode 100644 index 000000000..a6e8ccaff --- /dev/null +++ b/kubejs/assets/tfg/models/block/glacian_wood.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ad_astra:block/glacian_log" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/glacian_wood_stripped.json b/kubejs/assets/tfg/models/block/glacian_wood_stripped.json new file mode 100644 index 000000000..8d4bf366e --- /dev/null +++ b/kubejs/assets/tfg/models/block/glacian_wood_stripped.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ad_astra:block/stripped_glacian_log" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/glacian_leaves.json b/kubejs/assets/tfg/models/item/glacian_leaves.json new file mode 100644 index 000000000..5ea01f7de --- /dev/null +++ b/kubejs/assets/tfg/models/item/glacian_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "ad_astra:block/glacian_leaves" +} diff --git a/kubejs/assets/tfg/models/item/glacian_leaves_fallen.json b/kubejs/assets/tfg/models/item/glacian_leaves_fallen.json new file mode 100644 index 000000000..29ba722f9 --- /dev/null +++ b/kubejs/assets/tfg/models/item/glacian_leaves_fallen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ad_astra:block/glacian_leaves" + } +} diff --git a/kubejs/assets/tfg/models/item/glacian_log.json b/kubejs/assets/tfg/models/item/glacian_log.json new file mode 100644 index 000000000..195fdca45 --- /dev/null +++ b/kubejs/assets/tfg/models/item/glacian_log.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ad_astra:item/glacian_log" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/glacian_log_stripped.json b/kubejs/assets/tfg/models/item/glacian_log_stripped.json new file mode 100644 index 000000000..ee96860d2 --- /dev/null +++ b/kubejs/assets/tfg/models/item/glacian_log_stripped.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ad_astra:item/glacian_stripped" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/glacian_wood.json b/kubejs/assets/tfg/models/item/glacian_wood.json new file mode 100644 index 000000000..5a8f789c1 --- /dev/null +++ b/kubejs/assets/tfg/models/item/glacian_wood.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ad_astra:item/glacian_wood" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/glacian_wood_stripped.json b/kubejs/assets/tfg/models/item/glacian_wood_stripped.json new file mode 100644 index 000000000..adf24750b --- /dev/null +++ b/kubejs/assets/tfg/models/item/glacian_wood_stripped.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ad_astra:item/glacian_wood_stripped" + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/glacian_log.json b/kubejs/data/tfg/loot_tables/blocks/glacian_log.json new file mode 100644 index 000000000..3c14af50d --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/glacian_log.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "ad_astra:glacian_log" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/glacian_log_stripped.json b/kubejs/data/tfg/loot_tables/blocks/glacian_log_stripped.json new file mode 100644 index 000000000..cdef4fd1b --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/glacian_log_stripped.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "ad_astra:stripped_glacian_log" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_mini_1.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_mini_1.nbt new file mode 100644 index 000000000..2e5a22fba Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_mini_1.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_1.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_1.nbt new file mode 100644 index 000000000..29d38d91c Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_1.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_2.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_2.nbt new file mode 100644 index 000000000..038c80e20 Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_2.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_3.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_3.nbt new file mode 100644 index 000000000..5ed47cb9c Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_3.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_4.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_4.nbt new file mode 100644 index 000000000..c4ae38ee1 Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_4.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_5.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_5.nbt new file mode 100644 index 000000000..32f721f37 Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_5.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_6.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_6.nbt new file mode 100644 index 000000000..279a11056 Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_6.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_7.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_7.nbt new file mode 100644 index 000000000..e902363ff Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_7.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_8.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_8.nbt new file mode 100644 index 000000000..49630952d Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_8.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_9.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_9.nbt new file mode 100644 index 000000000..52814281e Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_stem_9.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_1.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_1.nbt new file mode 100644 index 000000000..bee809e1c Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_1.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_2.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_2.nbt new file mode 100644 index 000000000..5f7fcd49d Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_2.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_3.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_3.nbt new file mode 100644 index 000000000..a61f82ef1 Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_3.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_4.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_4.nbt new file mode 100644 index 000000000..eca996a3f Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_4.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_5.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_5.nbt new file mode 100644 index 000000000..ff4c562af Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_5.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_6.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_6.nbt new file mode 100644 index 000000000..9125c7259 Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_6.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_7.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_7.nbt new file mode 100644 index 000000000..ad3b66d70 Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_7.nbt differ diff --git a/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_8.nbt b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_8.nbt new file mode 100644 index 000000000..17ecf5f35 Binary files /dev/null and b/kubejs/data/tfg/structures/trees/mossy_glowshroom_top_8.nbt differ diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian.json new file mode 100644 index 000000000..a6669a17f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian.json @@ -0,0 +1,50 @@ +{ + "type": "tfc:stacked_tree", + "config": { + "layers": [ + { + "templates": [ + "tfg:trees/mossy_glowshroom_stem_1", + "tfg:trees/mossy_glowshroom_stem_2", + "tfg:trees/mossy_glowshroom_stem_3", + "tfg:trees/mossy_glowshroom_stem_4", + "tfg:trees/mossy_glowshroom_stem_5", + "tfg:trees/mossy_glowshroom_stem_6", + "tfg:trees/mossy_glowshroom_stem_7", + "tfg:trees/mossy_glowshroom_stem_8", + "tfg:trees/mossy_glowshroom_stem_9" + ], + "min_count": 1, + "max_count": 1 + }, + { + "templates": [ + "tfg:trees/mossy_glowshroom_top_1", + "tfg:trees/mossy_glowshroom_top_2", + "tfg:trees/mossy_glowshroom_top_3", + "tfg:trees/mossy_glowshroom_top_4", + "tfg:trees/mossy_glowshroom_top_5", + "tfg:trees/mossy_glowshroom_top_6", + "tfg:trees/mossy_glowshroom_top_7", + "tfg:trees/mossy_glowshroom_top_8" + ], + "min_count": 1, + "max_count": 1 + } + ], + "trunk": { + "state": { + "Name": "tfg:glacian_log" + }, + "min_height": 0, + "max_height": 1, + "wide": true + }, + "placement": { + "width": 1, + "height": 10, + "allow_submerged": false, + "allow_deeply_submerged": false + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_dead.json new file mode 100644 index 000000000..ea2ff6e15 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_dead.json @@ -0,0 +1,36 @@ +{ + "type": "tfc:stacked_tree", + "config": { + "layers": [ + { + "templates": [ + "tfg:trees/mossy_glowshroom_stem_1", + "tfg:trees/mossy_glowshroom_stem_2", + "tfg:trees/mossy_glowshroom_stem_3", + "tfg:trees/mossy_glowshroom_stem_4", + "tfg:trees/mossy_glowshroom_stem_5", + "tfg:trees/mossy_glowshroom_stem_6", + "tfg:trees/mossy_glowshroom_stem_7", + "tfg:trees/mossy_glowshroom_stem_8", + "tfg:trees/mossy_glowshroom_stem_9" + ], + "min_count": 1, + "max_count": 1 + } + ], + "trunk": { + "state": { + "Name": "tfg:glacian_log" + }, + "min_height": 0, + "max_height": 1, + "wide": true + }, + "placement": { + "width": 1, + "height": 1, + "allow_submerged": true, + "allow_deeply_submerged": false + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_mini.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_mini.json new file mode 100644 index 000000000..ebb41deb7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_mini.json @@ -0,0 +1,22 @@ +{ + "type": "tfc:random_tree", + "config": { + "structures": [ + "tfg:trees/mossy_glowshroom_mini_1" + ], + "trunk": { + "state": { + "Name": "tfg:glacian_log" + }, + "min_height": 0, + "max_height": 1, + "wide": true + }, + "placement": { + "width": 4, + "height": 10, + "allow_submerged": false, + "allow_deeply_submerged": false + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian.json new file mode 100644 index 000000000..78afaf5f7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian.json @@ -0,0 +1,14 @@ +{ + "feature": "tfg:mars/tree/glacian", + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": -2 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_dead.json new file mode 100644 index 000000000..78afaf5f7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_dead.json @@ -0,0 +1,14 @@ +{ + "feature": "tfg:mars/tree/glacian", + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": -2 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_mini.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_mini.json new file mode 100644 index 000000000..4d65cea53 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_mini.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/glacian_mini", + "placement": [] +} \ 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 cb111a645..c701ba7b1 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -366,8 +366,11 @@ 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', 'ad_astra:glacian_log') + 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', 'species:alphacene_moss_block') + event.add('tfg:heightmap_ignore', 'minecraft:ice') global.AD_ASTRA_WOOD.forEach(wood => { @@ -512,9 +515,9 @@ const registerAdAstraPlacedFeatures = (event) => { //#region Mars // Craters - event.add('tfg:mars_craters', 'tfg:mars/terrain/crater_extra_large') - event.add('tfg:mars_craters', 'tfg:mars/terrain/crater_large') - event.add('tfg:mars_craters', 'tfg:mars/terrain/crater_medium') + //event.add('tfg:mars_craters', 'tfg:mars/terrain/crater_extra_large') + //event.add('tfg:mars_craters', 'tfg:mars/terrain/crater_large') + //event.add('tfg:mars_craters', 'tfg:mars/terrain/crater_medium') // Underground decoration event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/ice_cave') diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 1de29293f..cfc093340 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -864,7 +864,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.maxTemp(-85) + climate.maxTemp(-89) }, faunaData => { faunaData.solidGround(true) diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index 0adc7fb17..fd6f2342a 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -30,9 +30,9 @@ TFCEvents.worldgenData(event => { 'beneath:wood/log/crimson', // fallen log 'beneath:wood/fallen_leaves/crimson', // fallen leaves [ // ground cover - 'minecraft:crimson_fungus', - 'beneath:wood/fallen_leaves/crimson', - 'beneath:wood/twig/crimson', + '2 minecraft:crimson_fungus', + '3 beneath:wood/fallen_leaves/crimson', + '2 beneath:wood/twig/crimson', 'tfg:groundcover/wraptor_feather', 'tfg:groundcover/glider_feather' ], @@ -60,9 +60,9 @@ TFCEvents.worldgenData(event => { 'beneath:wood/log/warped', 'beneath:wood/fallen_leaves/warped', [ - 'minecraft:warped_fungus', - 'beneath:wood/fallen_leaves/warped', - 'beneath:wood/twig/warped', + '2 minecraft:warped_fungus', + '3 beneath:wood/fallen_leaves/warped', + '2 beneath:wood/twig/warped', 'tfg:groundcover/wraptor_feather', 'tfg:groundcover/glider_feather' ], @@ -84,10 +84,10 @@ TFCEvents.worldgenData(event => { null, null, [ - "ad_astra:aeronos_mushroom", + "2 ad_astra:aeronos_mushroom", + '3 tfg:groundcover/aeronos_stick', 'tfg:groundcover/wraptor_feather', - 'tfg:groundcover/glider_feather', - 'tfg:groundcover/aeronos_stick' + 'tfg:groundcover/glider_feather' ], 'tfg:mars/tree/aeronos', 'tfg:mars/tree/aeronos_dead', @@ -107,10 +107,10 @@ TFCEvents.worldgenData(event => { null, null, [ - "ad_astra:strophar_mushroom", + "2 ad_astra:strophar_mushroom", + '3 tfg:groundcover/strophar_stick', 'tfg:groundcover/wraptor_feather', - 'tfg:groundcover/glider_feather', - 'tfg:groundcover/strophar_stick' + 'tfg:groundcover/glider_feather' ], 'tfg:mars/tree/strophar', 'tfg:mars/tree/strophar_dead', @@ -129,10 +129,10 @@ TFCEvents.worldgenData(event => { null, null, [ - "species:alphacene_mushroom", + "2 species:alphacene_mushroom", + '3 tfg:groundcover/alphacene_stick', 'tfg:groundcover/wraptor_feather', - 'tfg:groundcover/glider_feather', - 'tfg:groundcover/alphacene_stick' + 'tfg:groundcover/glider_feather' ], 'species:alphacene_mushroom', 'tfg:mars/tree/alphacene_dead', @@ -141,7 +141,26 @@ TFCEvents.worldgenData(event => { placement => {} ) - // TODO: glacian + event.forestEntry('tfg:mars/glacian_forest_entry', + climate => { + climate.maxTemp(-82) + climate.fuzzy(true) + }, + 'ad_astra:glacian_log', + 'tfg:glacian_leaves', + null, + null, + [ + "2 betterend:glacian_hymenophore[facing=up]", + "4 tfg:glacian_leaves_fallen", + '2 tfg:groundcover/glacian_stick' + ], + 'tfg:mars/tree/glacian', + 'tfg:mars/tree/glacian_dead', + 'tfg:mars/tree/glacian', + null, null, null, null, null, null, + placement => {} + ) }) function registerTFGForestConfiguredFeatures(event) { @@ -150,4 +169,5 @@ function registerTFGForestConfiguredFeatures(event) { event.add('tfg:mars_forest_entries', 'tfg:mars/aeronos_forest_entry') event.add('tfg:mars_forest_entries', 'tfg:mars/strophar_forest_entry') event.add('tfg:mars_forest_entries', 'tfg:mars/alphacene_forest_entry') + event.add('tfg:mars_forest_entries', 'tfg:mars/glacian_forest_entry') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 7eaf90394..1e7f5d197 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -998,8 +998,10 @@ const registerTFGBlockTags = (event) => { event.add('tfg:decorative_plant_attachable', '#minecraft:logs') event.add('tfg:decorative_plant_attachable', 'minecraft:mushroom_stem') event.add('tfg:decorative_plant_attachable', 'species:alphacene_mushroom_block') + event.add('tfg:decorative_plant_attachable', 'species:alphacene_moss_block') event.add('tfg:decorative_plant_attachable', 'ad_astra:aeronos_cap') event.add('tfg:decorative_plant_attachable', 'ad_astra:strophar_cap') + event.add('tfg:decorative_plant_attachable', 'tfg:glacian_leaves') event.add('tfg:decorative_plant_attachable', 'minecraft:nether_wart_block') event.add('tfg:decorative_plant_attachable', 'minecraft:warped_wart_block') event.add('tfg:decorative_plant_attachable', 'betterend:cave_bush') diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js index ba0537636..88ac307d1 100644 --- a/kubejs/startup_scripts/betterend/blocks.js +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -95,7 +95,6 @@ function registerBetterEndBlocks(event) { // Mosses / Can go on sides of blocks - // TODO: needs features event.create('betterend:aurant_polypore', 'tfg:attached_decorative_plant') .soundType('nether_wart') .tagItem('tfg:mars_plants') @@ -125,6 +124,14 @@ function registerBetterEndBlocks(event) { .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') + // Used for glacian trees + event.create('betterend:glacian_hymenophore', 'tfg:attached_decorative_plant') + .soundType('crop') + .allowVertical(true) + .tagItem('tfg:mars_plants') + .tagBlock('minecraft:replaceable') + .tagBlock('tfg:do_not_destroy_in_space') + // Leaves event.create('betterend:cave_bush', 'tfc:leaves') @@ -177,13 +184,7 @@ function registerBetterEndBlocks(event) { }) }) - // "Structures"? - // blue_vine (blue) - // glowing pillar (orange) - // large amaranita - // end lily - // end lotus - // lanceleaf + // Tall plants event.create('betterend:large_amaranita_mushroom', 'tfg:tall_decorative_plant') .height(3) diff --git a/kubejs/startup_scripts/tfg/blocks.plants.js b/kubejs/startup_scripts/tfg/blocks.plants.js index bb2d3331a..793c4194c 100644 --- a/kubejs/startup_scripts/tfg/blocks.plants.js +++ b/kubejs/startup_scripts/tfg/blocks.plants.js @@ -328,10 +328,59 @@ const registerTFGCrops = (event) => { .defaultCutout() event.create('tfg:saplings/glacian', 'tfc:sapling') - .features('tfg:mars/tree/glacian') + .features('tfg:mars/tree/glacian_mini') .tagBoth('minecraft:sapling') .tagBlock('tfg:do_not_destroy_in_space') .growthDays(9) .soundType('nether_wart') .defaultCutout() + + // Glacian tree stuff + event.create('tfg:glacian_leaves', 'tfc:leaves') + .soundType('azalea_leaves') + .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfg:do_not_destroy_in_space') + .mapColor('snow') + .seasonalColors(false) + .fallenLeaves(leaves => { + leaves.noCollision() + leaves.notSolid() + leaves.defaultCutout() + leaves.soundType('azalea_leaves') + leaves.tagBlock('minecraft:mineable/hoe') + leaves.tagBlock('minecraft:replaceable') + leaves.noDynamicTinting() + leaves.models((modelType, generator) => { + if (modelType.layers != 8) { + generator.parent("tfc:block/groundcover/fallen_leaves_height" + modelType.height); + generator.texture("all", "ad_astra:block/glacian_leaves"); + } else { + generator.parent("ad_astra:block/glacian_leaves"); + } + }) + }) + + event.create('tfg:glacian_wood', 'tfc:log') + .tagBoth('minecraft:logs') + .tagItem('minecraft:logs_that_burn') + .tagItem('ad_astra:glacian_logs') + .tagBlock('minecraft:mineable/axe') + .soundType('wood') + .stripped(stripped => { + stripped.tagBoth('minecraft:logs') + stripped.tagItem('minecraft:logs_that_burn') + stripped.tagItem('ad_astra:glacian_logs') + stripped.tagBlock('minecraft:mineable/axe') + stripped.soundType('wood') + }) + + event.create('tfg:glacian_log', 'tfc:log') + .tagBoth('minecraft:logs') + .tagBoth('c:hidden_from_recipe_viewers') + .soundType('wood') + .stripped(stripped => { + stripped.tagBoth('minecraft:logs') + stripped.tagBoth('c:hidden_from_recipe_viewers') + stripped.soundType('wood') + }) } \ No newline at end of file