diff --git a/kubejs/assets/tfg/blockstates/lunar_chorus_flower.json b/kubejs/assets/tfg/blockstates/lunar_chorus_flower.json new file mode 100644 index 000000000..0bf058066 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/lunar_chorus_flower.json @@ -0,0 +1,22 @@ +{ + "variants": { + "age=0": { + "model": "minecraft:block/chorus_flower" + }, + "age=1": { + "model": "minecraft:block/chorus_flower" + }, + "age=2": { + "model": "minecraft:block/chorus_flower" + }, + "age=3": { + "model": "minecraft:block/chorus_flower" + }, + "age=4": { + "model": "minecraft:block/chorus_flower" + }, + "age=5": { + "model": "minecraft:block/chorus_flower_dead" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/lunar_chorus_plant.json b/kubejs/assets/tfg/blockstates/lunar_chorus_plant.json new file mode 100644 index 000000000..c84cff188 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/lunar_chorus_plant.json @@ -0,0 +1,222 @@ +{ + "multipart": [ + { + "apply": { + "model": "minecraft:block/chorus_plant_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "minecraft:block/chorus_plant_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "minecraft:block/chorus_plant_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "minecraft:block/chorus_plant_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "minecraft:block/chorus_plant_side", + "uvlock": true, + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "minecraft:block/chorus_plant_side", + "uvlock": true, + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": [ + { + "model": "minecraft:block/chorus_plant_noside", + "weight": 2 + }, + { + "model": "minecraft:block/chorus_plant_noside1" + }, + { + "model": "minecraft:block/chorus_plant_noside2" + }, + { + "model": "minecraft:block/chorus_plant_noside3" + } + ], + "when": { + "north": "false" + } + }, + { + "apply": [ + { + "model": "minecraft:block/chorus_plant_noside1", + "uvlock": true, + "y": 90 + }, + { + "model": "minecraft:block/chorus_plant_noside2", + "uvlock": true, + "y": 90 + }, + { + "model": "minecraft:block/chorus_plant_noside3", + "uvlock": true, + "y": 90 + }, + { + "model": "minecraft:block/chorus_plant_noside", + "uvlock": true, + "weight": 2, + "y": 90 + } + ], + "when": { + "east": "false" + } + }, + { + "apply": [ + { + "model": "minecraft:block/chorus_plant_noside2", + "uvlock": true, + "y": 180 + }, + { + "model": "minecraft:block/chorus_plant_noside3", + "uvlock": true, + "y": 180 + }, + { + "model": "minecraft:block/chorus_plant_noside", + "uvlock": true, + "weight": 2, + "y": 180 + }, + { + "model": "minecraft:block/chorus_plant_noside1", + "uvlock": true, + "y": 180 + } + ], + "when": { + "south": "false" + } + }, + { + "apply": [ + { + "model": "minecraft:block/chorus_plant_noside3", + "uvlock": true, + "y": 270 + }, + { + "model": "minecraft:block/chorus_plant_noside", + "uvlock": true, + "weight": 2, + "y": 270 + }, + { + "model": "minecraft:block/chorus_plant_noside1", + "uvlock": true, + "y": 270 + }, + { + "model": "minecraft:block/chorus_plant_noside2", + "uvlock": true, + "y": 270 + } + ], + "when": { + "west": "false" + } + }, + { + "apply": [ + { + "model": "minecraft:block/chorus_plant_noside", + "uvlock": true, + "weight": 2, + "x": 270 + }, + { + "model": "minecraft:block/chorus_plant_noside3", + "uvlock": true, + "x": 270 + }, + { + "model": "minecraft:block/chorus_plant_noside1", + "uvlock": true, + "x": 270 + }, + { + "model": "minecraft:block/chorus_plant_noside2", + "uvlock": true, + "x": 270 + } + ], + "when": { + "up": "false" + } + }, + { + "apply": [ + { + "model": "minecraft:block/chorus_plant_noside3", + "uvlock": true, + "x": 90 + }, + { + "model": "minecraft:block/chorus_plant_noside2", + "uvlock": true, + "x": 90 + }, + { + "model": "minecraft:block/chorus_plant_noside1", + "uvlock": true, + "x": 90 + }, + { + "model": "minecraft:block/chorus_plant_noside", + "uvlock": true, + "weight": 2, + "x": 90 + } + ], + "when": { + "down": "false" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lunar_chorus_flower.json b/kubejs/assets/tfg/models/item/lunar_chorus_flower.json new file mode 100644 index 000000000..dc807298f --- /dev/null +++ b/kubejs/assets/tfg/models/item/lunar_chorus_flower.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:block/chorus_flower" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lunar_chorus_plant.json b/kubejs/assets/tfg/models/item/lunar_chorus_plant.json new file mode 100644 index 000000000..b0741a699 --- /dev/null +++ b/kubejs/assets/tfg/models/item/lunar_chorus_plant.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:block/chorus_plant" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lunar_roots.json b/kubejs/assets/tfg/models/item/lunar_roots.json new file mode 100644 index 000000000..ae4d2c6c0 --- /dev/null +++ b/kubejs/assets/tfg/models/item/lunar_roots.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/lunar_roots" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lunar_sprouts.json b/kubejs/assets/tfg/models/item/lunar_sprouts.json new file mode 100644 index 000000000..d596a4eb2 --- /dev/null +++ b/kubejs/assets/tfg/models/item/lunar_sprouts.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/lunar_sprouts" +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json b/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json new file mode 100644 index 000000000..4894d7536 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:chorus_fruit" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index 8829b9b7b..ba7135a58 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -42,10 +42,10 @@ [], [], [ - "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/dead_coral", "tfg:moon/surface/dead_coral_fans", - "tfg:moon/surface/loose_diorite_rocks" + "tfg:moon/surface/loose_diorite_rocks", + "tfg:moon/surface/warped_sprouts_patch" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_maria.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_maria.json index 799d47700..285956ec6 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_maria.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_maria.json @@ -43,10 +43,10 @@ [], [ "tfg:moon/surface/basalt_delta", + "tfg:moon/surface/loose_basalt_rocks", "tfg:moon/surface/warped_roots_patch", "tfg:moon/surface/warped_sprouts_patch", - "tfg:moon/surface/warped_vine", - "tfg:moon/surface/loose_basalt_rocks" + "tfg:moon/surface/warped_vine" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts.json index 5fab64afd..6e401b492 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts.json @@ -42,11 +42,11 @@ [], [], [ + "tfg:moon/surface/moon_rock_pile", + "tfg:moon/surface/loose_moon_stone_rocks", "tfg:moon/surface/warped_roots_patch", "tfg:moon/surface/warped_sprouts_patch", - "tfg:moon/surface/warped_vine", - "tfg:moon/surface/moon_rock_pile", - "tfg:moon/surface/loose_moon_stone_rocks" + "tfg:moon/surface/warped_vine" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts_sparse.json index c29419d5d..a591ccbc6 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts_sparse.json @@ -42,10 +42,10 @@ [], [], [ - "tfg:moon/surface/warped_roots_patch", - "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/moon_rock_pile", - "tfg:moon/surface/loose_moon_stone_rocks" + "tfg:moon/surface/loose_moon_stone_rocks", + "tfg:moon/surface/warped_roots_patch", + "tfg:moon/surface/warped_sprouts_patch" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_uplift.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_uplift.json index 918a4039f..a1a74b3c9 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_uplift.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_uplift.json @@ -42,9 +42,9 @@ [], [], [ - "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/gabbro_rock_pile", - "tfg:moon/surface/loose_gabbro_rocks" + "tfg:moon/surface/loose_gabbro_rocks", + "tfg:moon/surface/warped_sprouts_patch" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_plant.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_plant.json new file mode 100644 index 000000000..49508adb8 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_plant.json @@ -0,0 +1,6 @@ +{ + "type": "tfc:kelp_tree", + "config": { + "block": "tfc:plant/giant_kelp_flower" + } +} \ No newline at end of file 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 d64042025..9621d6667 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 @@ -6,10 +6,21 @@ "type": "minecraft:simple_block", "config": { "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "tfg:lunar_roots" - } + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 20, + "data": { + "Name": "tfg:lunar_roots" + } + }, + { + "weight": 50, + "data": { + "Name": "tfg:lunar_sprouts" + } + } + ] } } }, @@ -28,8 +39,8 @@ } ] }, - "tries": 36, - "xz_spread": 15, + "tries": 32, + "xz_spread": 16, "y_spread": 3 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_sprouts_patch.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_sprouts_patch.json index 35dba842b..e02154b2c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_sprouts_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_sprouts_patch.json @@ -28,7 +28,7 @@ } ] }, - "tries": 36, + "tries": 16, "xz_spread": 16, "y_spread": 3 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json index 551557c0c..f155395c6 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json @@ -47,8 +47,8 @@ }, "trunk_placer": { "type": "minecraft:straight_trunk_placer", - "base_height": 5, - "height_rand_a": 10, + "base_height": 10, + "height_rand_a": 20, "height_rand_b": 0 }, "trunk_provider": { diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_plant.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_plant.json new file mode 100644 index 000000000..be0efac2d --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_plant.json @@ -0,0 +1,16 @@ +{ + "feature": "tfg:moon/surface/chorus_plant", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json index bcf79d425..ebbca0ab5 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json @@ -1,6 +1,9 @@ { "feature": "tfg:moon/surface/warped_vine", "placement": [ + { + "type": "minecraft:biome" + }, { "type": "minecraft:rarity_filter", "chance": 2 diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 274b61bbe..e358cbc48 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -90,6 +90,7 @@ const registerAdAstraBlockTags = (event) => { event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/dacite') event.add('ad_astra:moon_stone_replaceables', 'ad_astra:moon_sand') + event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/hardened_moon_stone') event.add('ad_astra:moon_stone_replaceables', 'tfc:sand/white') event.add('ad_astra:moon_stone_replaceables', 'tfc:sand/black') event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/gravel/diorite') diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 95cdc5f73..8fae04ca9 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -744,7 +744,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:crimson_roots', //'minecraft:nether_brick', 'minecraft:nether_wart', - 'minecraft:twisting_vines', 'minecraft:warped_fungus', 'minecraft:respawn_anchor', 'minecraft:ghast_tear',