diff --git a/src/generated/resources/assets/aether_ii/blockstates/cirrus_succulent.json b/src/generated/resources/assets/aether_ii/blockstates/cirrus_succulent.json new file mode 100644 index 0000000000..dc153bc55a --- /dev/null +++ b/src/generated/resources/assets/aether_ii/blockstates/cirrus_succulent.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "aether_ii:block/cirrus_succulent_bottom" + }, + "half=upper": { + "model": "aether_ii:block/cirrus_succulent_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/blockstates/cumulonimbus_bush.json b/src/generated/resources/assets/aether_ii/blockstates/cumulonimbus_bush.json new file mode 100644 index 0000000000..66e223add1 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/blockstates/cumulonimbus_bush.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "aether_ii:block/cumulonimbus_bush_bottom" + }, + "half=upper": { + "model": "aether_ii:block/cumulonimbus_bush_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/blockstates/cumulus_bush.json b/src/generated/resources/assets/aether_ii/blockstates/cumulus_bush.json new file mode 100644 index 0000000000..4a2cde743d --- /dev/null +++ b/src/generated/resources/assets/aether_ii/blockstates/cumulus_bush.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "aether_ii:block/cumulus_bush" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/blockstates/royal_stratus_fern.json b/src/generated/resources/assets/aether_ii/blockstates/royal_stratus_fern.json new file mode 100644 index 0000000000..5e1030fb44 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/blockstates/royal_stratus_fern.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "aether_ii:block/royal_stratus_fern" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/items/cirrus_succulent.json b/src/generated/resources/assets/aether_ii/items/cirrus_succulent.json new file mode 100644 index 0000000000..b1162eae15 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/items/cirrus_succulent.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "aether_ii:item/cirrus_succulent" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/items/cumulonimbus_bush.json b/src/generated/resources/assets/aether_ii/items/cumulonimbus_bush.json new file mode 100644 index 0000000000..67832f99ff --- /dev/null +++ b/src/generated/resources/assets/aether_ii/items/cumulonimbus_bush.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "aether_ii:item/cumulonimbus_bush" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/items/cumulus_bush.json b/src/generated/resources/assets/aether_ii/items/cumulus_bush.json new file mode 100644 index 0000000000..507aee6551 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/items/cumulus_bush.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "aether_ii:item/cumulus_bush" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/items/royal_stratus_fern.json b/src/generated/resources/assets/aether_ii/items/royal_stratus_fern.json new file mode 100644 index 0000000000..c56bd3f569 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/items/royal_stratus_fern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "aether_ii:block/royal_stratus_fern" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/lang/en_us.json b/src/generated/resources/assets/aether_ii/lang/en_us.json index f4ad931bcd..cb08c526a6 100644 --- a/src/generated/resources/assets/aether_ii/lang/en_us.json +++ b/src/generated/resources/assets/aether_ii/lang/en_us.json @@ -306,15 +306,24 @@ "attributes.aether_ii.venom_effect_resistance": "%s Buildup Resistance", "attributes.aether_ii.webbed_effect_resistance": "%s Buildup Resistance", "attributes.aether_ii.wound_effect_resistance": "%s Buildup Resistance", + "biome.aether_ii.aercloud_sea": "Aercloud Sea", + "biome.aether_ii.arctic_expanse": "Arctic Expanse", + "biome.aether_ii.arctic_undercloud": "Arctic Undercloud", "biome.aether_ii.battleground_wastes": "Battleground Wastes", "biome.aether_ii.contaminated_jungle": "Contaminated Jungle", "biome.aether_ii.enduring_woodland": "Enduring Woodland", - "biome.aether_ii.expanse": "Expanse", "biome.aether_ii.flourishing_field": "Flourishing Field", "biome.aether_ii.frigid_sierra": "Frigid Sierra", "biome.aether_ii.frozen_lakes": "Frozen Lakes", "biome.aether_ii.glistening_swamp": "Glistening Swamp", + "biome.aether_ii.hestveil_caverns": "Hestveil Caverns", + "biome.aether_ii.highfields_expanse": "Highfields Expanse", + "biome.aether_ii.highfields_undercloud": "Highfields Undercloud", + "biome.aether_ii.irradiated_expanse": "Irradiated Expanse", + "biome.aether_ii.irradiated_undercloud": "Irradiated Undercloud", + "biome.aether_ii.magnetic_expanse": "Magnetic Expanse", "biome.aether_ii.magnetic_scar": "Magnetic Scar", + "biome.aether_ii.magnetic_undercloud": "Magnetic Undercloud", "biome.aether_ii.sheer_tundra": "Sheer Tundra", "biome.aether_ii.shimmering_basin": "Shimmering Basin", "biome.aether_ii.shrouded_forest": "Shrouded Forest", @@ -435,6 +444,7 @@ "block.aether_ii.bryalinn_moss_flowers": "Bryalinn Moss Flowers", "block.aether_ii.bryalinn_moss_vines": "Bryalinn Moss Vines", "block.aether_ii.carrion_cutting": "Carrion Cutting", + "block.aether_ii.cirrus_succulent": "Cirrus Succulent", "block.aether_ii.cloudwool": "Cloudwool", "block.aether_ii.cloudwool_bedroll": "Cloudwool Bedroll", "block.aether_ii.cloudwool_carpet": "Cloudwool Carpet", @@ -446,6 +456,8 @@ "block.aether_ii.corrobonite_ore": "Corrobonite Ore", "block.aether_ii.crude_scatterglass": "Crude Scatterglass", "block.aether_ii.crude_scatterglass_pane": "Crude Scatterglass Pane", + "block.aether_ii.cumulonimbus_bush": "Cumulonimbus Bush", + "block.aether_ii.cumulus_bush": "Cumulus Bush", "block.aether_ii.curved_arkenium_bars": "Curved Arkenium Bars", "block.aether_ii.cyan_arilum_lantern": "Cyan Arilum Lantern", "block.aether_ii.cyan_cloudwool": "Cyan Cloudwool", @@ -733,6 +745,7 @@ "block.aether_ii.rotshroom_slab": "Rotshroom Slab", "block.aether_ii.rotshroom_stem": "Rotshroom Stem", "block.aether_ii.rotshroom_toadstool": "Rotshroom Toadstool", + "block.aether_ii.royal_stratus_fern": "Royal Stratus Fern", "block.aether_ii.rusted_ferrosite": "Rusted Ferrosite", "block.aether_ii.rustic_arkenium_bars": "Rustic Arkenium Bars", "block.aether_ii.rustic_arkenium_lantern": "Rustic Arkenium Lantern", diff --git a/src/generated/resources/assets/aether_ii/models/block/cirrus_succulent_bottom.json b/src/generated/resources/assets/aether_ii/models/block/cirrus_succulent_bottom.json new file mode 100644 index 0000000000..408063393e --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/block/cirrus_succulent_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "aether_ii:block/template_cirrus_succulent", + "textures": { + "cross": "aether_ii:block/cirrus_succulent_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/block/cirrus_succulent_top.json b/src/generated/resources/assets/aether_ii/models/block/cirrus_succulent_top.json new file mode 100644 index 0000000000..fc8c08037f --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/block/cirrus_succulent_top.json @@ -0,0 +1,6 @@ +{ + "parent": "aether_ii:block/template_cirrus_succulent", + "textures": { + "cross": "aether_ii:block/cirrus_succulent_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/block/cumulonimbus_bush_bottom.json b/src/generated/resources/assets/aether_ii/models/block/cumulonimbus_bush_bottom.json new file mode 100644 index 0000000000..8f6d7f8be1 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/block/cumulonimbus_bush_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "aether_ii:block/cumulonimbus_bush_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/block/cumulonimbus_bush_top.json b/src/generated/resources/assets/aether_ii/models/block/cumulonimbus_bush_top.json new file mode 100644 index 0000000000..795594cd31 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/block/cumulonimbus_bush_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "aether_ii:block/cumulonimbus_bush_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/block/cumulus_bush.json b/src/generated/resources/assets/aether_ii/models/block/cumulus_bush.json new file mode 100644 index 0000000000..a3a751b248 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/block/cumulus_bush.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "aether_ii:block/cumulus_bush" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/block/royal_stratus_fern.json b/src/generated/resources/assets/aether_ii/models/block/royal_stratus_fern.json new file mode 100644 index 0000000000..986dda2b9d --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/block/royal_stratus_fern.json @@ -0,0 +1,10 @@ +{ + "parent": "aether_ii:block/template_royal_stratus_fern", + "textures": { + "base": "aether_ii:block/royal_stratus_fern_base", + "bottom": "aether_ii:block/royal_stratus_fern_bottom", + "leaf": "aether_ii:block/royal_stratus_fern_leaf", + "particle": "aether_ii:block/royal_stratus_fern_base", + "top": "aether_ii:block/royal_stratus_fern_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/item/cirrus_succulent.json b/src/generated/resources/assets/aether_ii/models/item/cirrus_succulent.json new file mode 100644 index 0000000000..47ab5178fa --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/item/cirrus_succulent.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "aether_ii:item/cirrus_succulent" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/item/cumulonimbus_bush.json b/src/generated/resources/assets/aether_ii/models/item/cumulonimbus_bush.json new file mode 100644 index 0000000000..b91de4945b --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/item/cumulonimbus_bush.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "aether_ii:item/cumulonimbus_bush" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/item/cumulus_bush.json b/src/generated/resources/assets/aether_ii/models/item/cumulus_bush.json new file mode 100644 index 0000000000..fefd77265f --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/item/cumulus_bush.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "aether_ii:block/cumulus_bush" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/advancement/explore_aether.json b/src/generated/resources/data/aether_ii/advancement/explore_aether.json index 26b7e1ed68..05ad017512 100644 --- a/src/generated/resources/data/aether_ii/advancement/explore_aether.json +++ b/src/generated/resources/data/aether_ii/advancement/explore_aether.json @@ -1,6 +1,54 @@ { "parent": "aether_ii:incubate_moa", "criteria": { + "aercloud_sea": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biomes": "aether_ii:aercloud_sea" + } + } + } + ] + }, + "trigger": "minecraft:location" + }, + "arctic_expanse": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biomes": "aether_ii:arctic_expanse" + } + } + } + ] + }, + "trigger": "minecraft:location" + }, + "arctic_undercloud": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biomes": "aether_ii:arctic_undercloud" + } + } + } + ] + }, + "trigger": "minecraft:location" + }, "battleground_wastes": { "conditions": { "player": [ @@ -129,6 +177,86 @@ }, "trigger": "minecraft:location" }, + "highfields_expanse": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biomes": "aether_ii:highfields_expanse" + } + } + } + ] + }, + "trigger": "minecraft:location" + }, + "highfields_undercloud": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biomes": "aether_ii:highfields_undercloud" + } + } + } + ] + }, + "trigger": "minecraft:location" + }, + "irradiated_expanse": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biomes": "aether_ii:irradiated_expanse" + } + } + } + ] + }, + "trigger": "minecraft:location" + }, + "irradiated_undercloud": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biomes": "aether_ii:irradiated_undercloud" + } + } + } + ] + }, + "trigger": "minecraft:location" + }, + "magnetic_expanse": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biomes": "aether_ii:magnetic_expanse" + } + } + } + ] + }, + "trigger": "minecraft:location" + }, "magnetic_scar": { "conditions": { "player": [ @@ -145,6 +273,22 @@ }, "trigger": "minecraft:location" }, + "magnetic_undercloud": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biomes": "aether_ii:magnetic_undercloud" + } + } + } + ] + }, + "trigger": "minecraft:location" + }, "sheer_tundra": { "conditions": { "player": [ @@ -298,6 +442,33 @@ [ "battleground_wastes" ], + [ + "aercloud_sea" + ], + [ + "highfields_expanse" + ], + [ + "magnetic_expanse" + ], + [ + "arctic_expanse" + ], + [ + "irradiated_expanse" + ], + [ + "highfields_undercloud" + ], + [ + "magnetic_undercloud" + ], + [ + "arctic_undercloud" + ], + [ + "irradiated_undercloud" + ], [ "hestveil_caverns" ] diff --git a/src/generated/resources/data/aether_ii/advancement/recipes/misc/cyan_dye_from_royal_stratus_fern.json b/src/generated/resources/data/aether_ii/advancement/recipes/misc/cyan_dye_from_royal_stratus_fern.json new file mode 100644 index 0000000000..d728f997f0 --- /dev/null +++ b/src/generated/resources/data/aether_ii/advancement/recipes/misc/cyan_dye_from_royal_stratus_fern.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_royal_stratus_fern": { + "conditions": { + "items": [ + { + "items": "aether_ii:royal_stratus_fern" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "aether_ii:cyan_dye_from_royal_stratus_fern" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_royal_stratus_fern" + ] + ], + "rewards": { + "recipes": [ + "aether_ii:cyan_dye_from_royal_stratus_fern" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/advancement/recipes/misc/orange_dye_from_cirrus_succulent.json b/src/generated/resources/data/aether_ii/advancement/recipes/misc/orange_dye_from_cirrus_succulent.json new file mode 100644 index 0000000000..a27fa252f8 --- /dev/null +++ b/src/generated/resources/data/aether_ii/advancement/recipes/misc/orange_dye_from_cirrus_succulent.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cirrus_succulent": { + "conditions": { + "items": [ + { + "items": "aether_ii:cirrus_succulent" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "aether_ii:orange_dye_from_cirrus_succulent" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cirrus_succulent" + ] + ], + "rewards": { + "recipes": [ + "aether_ii:orange_dye_from_cirrus_succulent" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/data_maps/worldgen/biome/aether_grass_color.json b/src/generated/resources/data/aether_ii/data_maps/worldgen/biome/aether_grass_color.json index dcf4361f5b..d67466f4e9 100644 --- a/src/generated/resources/data/aether_ii/data_maps/worldgen/biome/aether_grass_color.json +++ b/src/generated/resources/data/aether_ii/data_maps/worldgen/biome/aether_grass_color.json @@ -3,7 +3,6 @@ "#aether_ii:arctic": 12450303, "#aether_ii:highfields": 11927504, "#aether_ii:irradiated": 16768409, - "#aether_ii:magnetic": 13238225, - "aether_ii:expanse": 11927504 + "#aether_ii:magnetic": 13238225 } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/dimension/aether_holy_isles.json b/src/generated/resources/data/aether_ii/dimension/aether_holy_isles.json index 79808c1e66..1113accdf6 100644 --- a/src/generated/resources/data/aether_ii/dimension/aether_holy_isles.json +++ b/src/generated/resources/data/aether_ii/dimension/aether_holy_isles.json @@ -9,11 +9,11 @@ "biome": "aether_ii:frozen_lakes", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.5, + -0.225, 1.5 ], "erosion": [ @@ -39,8 +39,8 @@ "biome": "aether_ii:frozen_lakes", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ -2.0, @@ -69,11 +69,11 @@ "biome": "aether_ii:enduring_woodland", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 0.3 ], "erosion": [ @@ -99,11 +99,11 @@ "biome": "aether_ii:sheer_tundra", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 0.3 ], "erosion": [ @@ -129,11 +129,11 @@ "biome": "aether_ii:enduring_woodland", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 0.3 ], "erosion": [ @@ -159,8 +159,8 @@ "biome": "aether_ii:frigid_sierra", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ 0.3, @@ -189,8 +189,8 @@ "biome": "aether_ii:sheer_tundra", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ 0.3, @@ -219,8 +219,8 @@ "biome": "aether_ii:enduring_woodland", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ 0.3, @@ -249,8 +249,8 @@ "biome": "aether_ii:frigid_sierra", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ 0.65, @@ -279,11 +279,11 @@ "biome": "aether_ii:shimmering_basin", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.5, + -0.225, 1.5 ], "erosion": [ @@ -309,8 +309,8 @@ "biome": "aether_ii:shimmering_basin", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ -2.0, @@ -339,11 +339,11 @@ "biome": "aether_ii:flourishing_field", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -369,11 +369,11 @@ "biome": "aether_ii:verdant_woods", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -399,11 +399,11 @@ "biome": "aether_ii:flourishing_field", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -429,11 +429,11 @@ "biome": "aether_ii:shrouded_forest", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -459,11 +459,11 @@ "biome": "aether_ii:verdant_woods", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -489,11 +489,11 @@ "biome": "aether_ii:flourishing_field", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -519,11 +519,11 @@ "biome": "aether_ii:shrouded_forest", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -549,11 +549,11 @@ "biome": "aether_ii:flourishing_field", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -579,11 +579,11 @@ "biome": "aether_ii:verdant_woods", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -609,11 +609,11 @@ "biome": "aether_ii:flourishing_field", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -639,11 +639,11 @@ "biome": "aether_ii:verdant_woods", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -673,7 +673,7 @@ 1.5 ], "depth": [ - -1.5, + -0.225, 1.5 ], "erosion": [ @@ -681,8 +681,8 @@ 1.5 ], "humidity": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "offset": 0.0, "temperature": [ @@ -711,8 +711,8 @@ 1.5 ], "humidity": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "offset": 0.0, "temperature": [ @@ -729,11 +729,11 @@ "biome": "aether_ii:violet_highwoods", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -759,11 +759,11 @@ "biome": "aether_ii:magnetic_scar", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -789,11 +789,11 @@ "biome": "aether_ii:turquoise_forest", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -819,11 +819,11 @@ "biome": "aether_ii:magnetic_scar", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -849,11 +849,11 @@ "biome": "aether_ii:violet_highwoods", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -879,11 +879,11 @@ "biome": "aether_ii:magnetic_scar", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -909,11 +909,11 @@ "biome": "aether_ii:turquoise_forest", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -939,11 +939,11 @@ "biome": "aether_ii:magnetic_scar", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -969,11 +969,11 @@ "biome": "aether_ii:magnetic_scar", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -999,11 +999,11 @@ "biome": "aether_ii:battleground_wastes", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -1029,11 +1029,11 @@ "biome": "aether_ii:contaminated_jungle", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ - -1.0, + -0.225, 1.5 ], "erosion": [ @@ -1059,21 +1059,291 @@ "biome": "aether_ii:battleground_wastes", "parameters": { "continentalness": [ + 0.1, + 1.0 + ], + "depth": [ + -0.225, + 1.5 + ], + "erosion": [ + 0.0, + 0.485 + ], + "humidity": [ + 0.2, + 1.0 + ], + "offset": 0.0, + "temperature": [ + 0.65, + 1.5 + ], + "weirdness": [ -1.5, 1.5 + ] + } + }, + { + "biome": "aether_ii:aercloud_sea", + "parameters": { + "continentalness": [ + 0.0, + 0.1 + ], + "depth": [ + -0.225, + 1.5 + ], + "erosion": [ + -1.5, + 1.5 + ], + "humidity": [ + -1.5, + 1.5 + ], + "offset": 0.0, + "temperature": [ + -1.5, + 1.5 + ], + "weirdness": [ + -1.5, + 1.5 + ] + } + }, + { + "biome": "aether_ii:highfields_expanse", + "parameters": { + "continentalness": [ + 1.0, + 2.0 + ], + "depth": [ + -0.225, + 1.5 + ], + "erosion": [ + 0.0, + 0.485 + ], + "humidity": [ + -1.5, + 1.5 + ], + "offset": 0.0, + "temperature": [ + -0.4, + 0.65 + ], + "weirdness": [ + -1.5, + 1.5 + ] + } + }, + { + "biome": "aether_ii:magnetic_expanse", + "parameters": { + "continentalness": [ + 1.0, + 2.0 + ], + "depth": [ + -0.225, + 1.5 + ], + "erosion": [ + 0.485, + 1.5 + ], + "humidity": [ + -1.5, + 1.5 + ], + "offset": 0.0, + "temperature": [ + -1.5, + 1.5 + ], + "weirdness": [ + -1.5, + 1.5 + ] + } + }, + { + "biome": "aether_ii:arctic_expanse", + "parameters": { + "continentalness": [ + 1.0, + 2.0 + ], + "depth": [ + -0.225, + 1.5 + ], + "erosion": [ + 0.0, + 0.485 + ], + "humidity": [ + -1.5, + 1.5 + ], + "offset": 0.0, + "temperature": [ + -1.5, + -0.4 + ], + "weirdness": [ + -1.5, + 1.5 + ] + } + }, + { + "biome": "aether_ii:irradiated_expanse", + "parameters": { + "continentalness": [ + 1.0, + 2.0 + ], + "depth": [ + -0.225, + 1.5 + ], + "erosion": [ + 0.0, + 0.485 + ], + "humidity": [ + -1.5, + 1.5 + ], + "offset": 0.0, + "temperature": [ + 0.65, + 1.5 + ], + "weirdness": [ + -1.5, + 1.5 + ] + } + }, + { + "biome": "aether_ii:highfields_undercloud", + "parameters": { + "continentalness": [ + 0.1, + 1.0 ], "depth": [ -1.0, + -0.225 + ], + "erosion": [ + 0.0, + 0.485 + ], + "humidity": [ + -1.5, + 2.0 + ], + "offset": 0.0, + "temperature": [ + -0.4, + 0.65 + ], + "weirdness": [ + -1.5, + 1.5 + ] + } + }, + { + "biome": "aether_ii:magnetic_undercloud", + "parameters": { + "continentalness": [ + 0.1, + 1.0 + ], + "depth": [ + -1.0, + -0.225 + ], + "erosion": [ + 0.485, + 1.5 + ], + "humidity": [ + -1.5, + 2.0 + ], + "offset": 0.0, + "temperature": [ + -1.5, 1.5 ], + "weirdness": [ + -1.5, + 1.5 + ] + } + }, + { + "biome": "aether_ii:arctic_undercloud", + "parameters": { + "continentalness": [ + 0.1, + 1.0 + ], + "depth": [ + -1.0, + -0.225 + ], "erosion": [ 0.0, 0.485 ], "humidity": [ - 0.2, + -1.5, + 2.0 + ], + "offset": 0.0, + "temperature": [ + -1.5, + -0.4 + ], + "weirdness": [ + -1.5, + 1.5 + ] + } + }, + { + "biome": "aether_ii:irradiated_undercloud", + "parameters": { + "continentalness": [ + 0.1, 1.0 ], + "depth": [ + -1.0, + -0.225 + ], + "erosion": [ + 0.0, + 0.485 + ], + "humidity": [ + -1.5, + 2.0 + ], "offset": 0.0, "temperature": [ 0.65, @@ -1089,8 +1359,8 @@ "biome": "aether_ii:hestveil_caverns", "parameters": { "continentalness": [ - -1.5, - 1.5 + 0.1, + 1.0 ], "depth": [ -2.0, @@ -1102,7 +1372,7 @@ ], "humidity": [ -1.5, - 1.5 + 2.0 ], "offset": 0.0, "temperature": [ diff --git a/src/generated/resources/data/aether_ii/loot_table/blocks/cirrus_succulent.json b/src/generated/resources/data/aether_ii/loot_table/blocks/cirrus_succulent.json new file mode 100644 index 0000000000..e945babe07 --- /dev/null +++ b/src/generated/resources/data/aether_ii/loot_table/blocks/cirrus_succulent.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "aether_ii:cirrus_succulent", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "aether_ii:cirrus_succulent" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "aether_ii:blocks/cirrus_succulent" +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/loot_table/blocks/cumulonimbus_bush.json b/src/generated/resources/data/aether_ii/loot_table/blocks/cumulonimbus_bush.json new file mode 100644 index 0000000000..7fac4f627c --- /dev/null +++ b/src/generated/resources/data/aether_ii/loot_table/blocks/cumulonimbus_bush.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "ability": "shears_dig", + "condition": "neoforge:can_item_perform_ability" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "aether_ii:cumulonimbus_bush" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "aether_ii:blocks/cumulonimbus_bush" +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/loot_table/blocks/cumulus_bush.json b/src/generated/resources/data/aether_ii/loot_table/blocks/cumulus_bush.json new file mode 100644 index 0000000000..116589e0cd --- /dev/null +++ b/src/generated/resources/data/aether_ii/loot_table/blocks/cumulus_bush.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "ability": "shears_dig", + "condition": "neoforge:can_item_perform_ability" + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "aether_ii:cumulus_bush" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "aether_ii:blocks/cumulus_bush" +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/loot_table/blocks/royal_stratus_fern.json b/src/generated/resources/data/aether_ii/loot_table/blocks/royal_stratus_fern.json new file mode 100644 index 0000000000..e3b8da6f66 --- /dev/null +++ b/src/generated/resources/data/aether_ii/loot_table/blocks/royal_stratus_fern.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "aether_ii:royal_stratus_fern" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "aether_ii:blocks/royal_stratus_fern" +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/recipe/cyan_dye_from_royal_stratus_fern.json b/src/generated/resources/data/aether_ii/recipe/cyan_dye_from_royal_stratus_fern.json new file mode 100644 index 0000000000..c6a5e93c26 --- /dev/null +++ b/src/generated/resources/data/aether_ii/recipe/cyan_dye_from_royal_stratus_fern.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "cyan_dye", + "ingredients": [ + "aether_ii:royal_stratus_fern" + ], + "result": { + "id": "minecraft:cyan_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/recipe/orange_dye_from_cirrus_succulent.json b/src/generated/resources/data/aether_ii/recipe/orange_dye_from_cirrus_succulent.json new file mode 100644 index 0000000000..6f0b1888bd --- /dev/null +++ b/src/generated/resources/data/aether_ii/recipe/orange_dye_from_cirrus_succulent.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "orange_dye", + "ingredients": [ + "aether_ii:cirrus_succulent" + ], + "result": { + "id": "minecraft:orange_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/aercloud_sea.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/aercloud_sea.json new file mode 100644 index 0000000000..1396db6da7 --- /dev/null +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/aercloud_sea.json @@ -0,0 +1,9 @@ +{ + "values": [ + "aether_ii:aercloud_sea", + "aether_ii:highfields_expanse", + "aether_ii:arctic_expanse", + "aether_ii:magnetic_expanse", + "aether_ii:irradiated_expanse" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/aether_music.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/aether_music.json index b6896107c1..726e4f9fc5 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/aether_music.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/aether_music.json @@ -14,7 +14,15 @@ "aether_ii:sheer_tundra", "aether_ii:contaminated_jungle", "aether_ii:battleground_wastes", - "aether_ii:expanse", + "aether_ii:aercloud_sea", + "aether_ii:highfields_expanse", + "aether_ii:arctic_expanse", + "aether_ii:magnetic_expanse", + "aether_ii:irradiated_expanse", + "aether_ii:highfields_undercloud", + "aether_ii:arctic_undercloud", + "aether_ii:magnetic_undercloud", + "aether_ii:irradiated_undercloud", "aether_ii:hestveil_caverns" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/arctic.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/arctic.json index 70c7dbc12a..d04a49110a 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/arctic.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/arctic.json @@ -3,6 +3,7 @@ "aether_ii:frigid_sierra", "aether_ii:enduring_woodland", "aether_ii:frozen_lakes", - "aether_ii:sheer_tundra" + "aether_ii:sheer_tundra", + "aether_ii:arctic_undercloud" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/arctic_ice.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/arctic_ice.json index b6896107c1..726e4f9fc5 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/arctic_ice.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/arctic_ice.json @@ -14,7 +14,15 @@ "aether_ii:sheer_tundra", "aether_ii:contaminated_jungle", "aether_ii:battleground_wastes", - "aether_ii:expanse", + "aether_ii:aercloud_sea", + "aether_ii:highfields_expanse", + "aether_ii:arctic_expanse", + "aether_ii:magnetic_expanse", + "aether_ii:irradiated_expanse", + "aether_ii:highfields_undercloud", + "aether_ii:arctic_undercloud", + "aether_ii:magnetic_undercloud", + "aether_ii:irradiated_undercloud", "aether_ii:hestveil_caverns" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/expanse.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/expanse.json deleted file mode 100644 index 53b4e94055..0000000000 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/expanse.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "aether_ii:expanse" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/brexallen_ruins.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/brexallen_ruins.json index 3b530de30e..51b52cc143 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/brexallen_ruins.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/brexallen_ruins.json @@ -12,6 +12,9 @@ "aether_ii:enduring_woodland", "aether_ii:sheer_tundra", "aether_ii:frozen_lakes", - "aether_ii:hestveil_caverns" + "aether_ii:hestveil_caverns", + "aether_ii:highfields_undercloud", + "aether_ii:arctic_undercloud", + "aether_ii:magnetic_undercloud" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/infected_guardian_tree.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/infected_guardian_tree.json index cc9bcb7f1a..2e541cf4e0 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/infected_guardian_tree.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/infected_guardian_tree.json @@ -6,6 +6,9 @@ "aether_ii:magnetic_scar", "aether_ii:violet_highwoods", "aether_ii:enduring_woodland", - "aether_ii:sheer_tundra" + "aether_ii:sheer_tundra", + "aether_ii:highfields_undercloud", + "aether_ii:arctic_undercloud", + "aether_ii:magnetic_undercloud" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/sentry_ruins.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/sentry_ruins.json index 597e9ac5ef..8dfd06c72d 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/sentry_ruins.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/sentry_ruins.json @@ -11,6 +11,7 @@ "aether_ii:enduring_woodland", "aether_ii:sheer_tundra", "aether_ii:contaminated_jungle", - "aether_ii:battleground_wastes" + "aether_ii:battleground_wastes", + "#aether_ii:undercloud" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/undercloud_mineshaft.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/undercloud_mineshaft.json index 7bee3b08c9..660fe4b618 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/undercloud_mineshaft.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/undercloud_mineshaft.json @@ -11,6 +11,9 @@ "aether_ii:frigid_sierra", "aether_ii:enduring_woodland", "aether_ii:sheer_tundra", - "aether_ii:frozen_lakes" + "aether_ii:frozen_lakes", + "aether_ii:highfields_undercloud", + "aether_ii:arctic_undercloud", + "aether_ii:magnetic_undercloud" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/highfields.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/highfields.json index 6bdeeeb6ae..bf78c93b2d 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/highfields.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/highfields.json @@ -3,6 +3,7 @@ "aether_ii:flourishing_field", "aether_ii:verdant_woods", "aether_ii:shrouded_forest", - "aether_ii:shimmering_basin" + "aether_ii:shimmering_basin", + "aether_ii:highfields_undercloud" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/holy_isles.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/holy_isles.json index 722104fe3b..04c1f44fb7 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/holy_isles.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/holy_isles.json @@ -4,6 +4,6 @@ "#aether_ii:magnetic", "#aether_ii:arctic", "#aether_ii:irradiated", - "#aether_ii:expanse" + "#aether_ii:aercloud_sea" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/irradiated.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/irradiated.json index f062f61fb1..614d718b4b 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/irradiated.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/irradiated.json @@ -1,6 +1,7 @@ { "values": [ "aether_ii:contaminated_jungle", - "aether_ii:battleground_wastes" + "aether_ii:battleground_wastes", + "aether_ii:irradiated_undercloud" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/magnetic.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/magnetic.json index 8084565fc6..af04404b46 100644 --- a/src/generated/resources/data/aether_ii/tags/worldgen/biome/magnetic.json +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/magnetic.json @@ -3,6 +3,7 @@ "aether_ii:magnetic_scar", "aether_ii:turquoise_forest", "aether_ii:glistening_swamp", - "aether_ii:violet_highwoods" + "aether_ii:violet_highwoods", + "aether_ii:magnetic_undercloud" ] } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/tags/worldgen/biome/undercloud.json b/src/generated/resources/data/aether_ii/tags/worldgen/biome/undercloud.json new file mode 100644 index 0000000000..93bafb4138 --- /dev/null +++ b/src/generated/resources/data/aether_ii/tags/worldgen/biome/undercloud.json @@ -0,0 +1,8 @@ +{ + "values": [ + "aether_ii:highfields_undercloud", + "aether_ii:arctic_undercloud", + "aether_ii:magnetic_undercloud", + "aether_ii:irradiated_undercloud" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/expanse.json b/src/generated/resources/data/aether_ii/worldgen/biome/aercloud_sea.json similarity index 78% rename from src/generated/resources/data/aether_ii/worldgen/biome/expanse.json rename to src/generated/resources/data/aether_ii/worldgen/biome/aercloud_sea.json index 25297c2768..d61acd9714 100644 --- a/src/generated/resources/data/aether_ii/worldgen/biome/expanse.json +++ b/src/generated/resources/data/aether_ii/worldgen/biome/aercloud_sea.json @@ -11,7 +11,7 @@ "minecraft:visual/sky_color": "#c9d1ff", "minecraft:visual/water_fog_color": "#55708a" }, - "carvers": [], + "carvers": "aether_ii:holy_isles_cave", "downfall": 0.5, "effects": { "water_color": "#a2d5f2" @@ -20,14 +20,38 @@ [ "aether_ii:cloudbed" ], + [ + "aether_ii:water_pond", + "aether_ii:water_pond_underground", + "aether_ii:alkahest_pool_rare" + ], + [ + "aether_ii:holystone_rocks" + ], [], [], [], + [ + "aether_ii:ore_scatterglass", + "aether_ii:ore_agiosite", + "aether_ii:ore_icestone_small", + "aether_ii:ore_ambrosium", + "aether_ii:ore_zanite", + "aether_ii:ore_zanite_mountain", + "aether_ii:ore_arkenium", + "aether_ii:ore_gravitite_buried", + "aether_ii:ore_gravitite", + "aether_ii:ore_holystone_quartz", + "aether_ii:ore_glint", + "aether_ii:ore_hestveil_open", + "aether_ii:ore_hestveil_buried", + "aether_ii:unstable_holystone", + "aether_ii:unstable_undershale" + ], [], - [], - [], - [], - [], + [ + "aether_ii:water_spring" + ], [], [ "aether_ii:high_storm_aercloud", diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/arctic_expanse.json b/src/generated/resources/data/aether_ii/worldgen/biome/arctic_expanse.json new file mode 100644 index 0000000000..dbf6ad0098 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/biome/arctic_expanse.json @@ -0,0 +1,160 @@ +{ + "attributes": { + "minecraft:audio/background_music": { + "default": { + "max_delay": 10800, + "min_delay": 3600, + "sound": "aether_ii:music.aether" + } + }, + "minecraft:visual/fog_color": "#ecebfc", + "minecraft:visual/sky_color": "#c9d1ff", + "minecraft:visual/water_fog_color": "#55708a" + }, + "carvers": "aether_ii:holy_isles_cave", + "downfall": 0.8, + "effects": { + "water_color": "#a2d5f2" + }, + "features": [ + [ + "aether_ii:cloudbed" + ], + [ + "aether_ii:water_pond", + "aether_ii:water_pond_underground", + "aether_ii:alkahest_pool_rare" + ], + [ + "aether_ii:holystone_rocks" + ], + [], + [], + [], + [ + "aether_ii:ore_scatterglass", + "aether_ii:ore_agiosite", + "aether_ii:ore_icestone_small", + "aether_ii:ore_ambrosium", + "aether_ii:ore_zanite", + "aether_ii:ore_zanite_mountain", + "aether_ii:ore_arkenium", + "aether_ii:ore_gravitite_buried", + "aether_ii:ore_gravitite", + "aether_ii:ore_holystone_quartz", + "aether_ii:ore_glint", + "aether_ii:ore_hestveil_open", + "aether_ii:ore_hestveil_buried", + "aether_ii:unstable_holystone", + "aether_ii:unstable_undershale" + ], + [], + [ + "aether_ii:water_spring" + ], + [], + [ + "aether_ii:high_storm_aercloud", + "aether_ii:high_green_aercloud", + "aether_ii:high_purple_aercloud", + "aether_ii:middle_cold_aercloud", + "aether_ii:middle_storm_aercloud", + "aether_ii:surface_cold_aercloud", + "aether_ii:surface_golden_aercloud", + "aether_ii:surface_blue_aercloud", + "aether_ii:surface_green_aercloud", + "aether_ii:surface_purple_aercloud", + "aether_ii:lower_storm_aercloud", + "aether_ii:lower_blue_aercloud", + "aether_ii:lower_green_aercloud", + "aether_ii:lower_purple_aercloud" + ] + ], + "has_precipitation": true, + "spawn_costs": { + "aether_ii:aerwhale": { + "charge": 0.5, + "energy_budget": 0.11 + }, + "aether_ii:cockatrice": { + "charge": 0.6, + "energy_budget": 0.12 + }, + "aether_ii:tempest": { + "charge": 0.65, + "energy_budget": 0.13 + }, + "aether_ii:zephyr": { + "charge": 0.8, + "energy_budget": 0.14 + } + }, + "spawners": { + "aether_ii:aether_aerwhale": [ + { + "type": "aether_ii:aerwhale", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_ambient": [], + "aether_ii:aether_blight_monster": [ + { + "type": "aether_ii:cockatrice", + "maxCount": 1, + "minCount": 1, + "weight": 4 + }, + { + "type": "aether_ii:tempest", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_hazard": [ + { + "type": "aether_ii:skephid", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_monster": [ + { + "type": "aether_ii:arkenium_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 3 + }, + { + "type": "aether_ii:gravitite_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 4 + } + ], + "aether_ii:aether_dungeon_monster": [], + "aether_ii:aether_moa": [], + "aether_ii:aether_plant_hazard": [], + "aether_ii:aether_sky_hazard": [ + { + "type": "aether_ii:zephyr", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_water_surface_creature": [], + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": -0.35 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/arctic_undercloud.json b/src/generated/resources/data/aether_ii/worldgen/biome/arctic_undercloud.json new file mode 100644 index 0000000000..639598ec66 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/biome/arctic_undercloud.json @@ -0,0 +1,212 @@ +{ + "attributes": { + "minecraft:audio/background_music": { + "default": { + "max_delay": 10800, + "min_delay": 3600, + "sound": "aether_ii:music.aether" + } + }, + "minecraft:visual/fog_color": "#f3f0ff", + "minecraft:visual/sky_color": "#e7e3fc", + "minecraft:visual/water_fog_color": "#3e5082" + }, + "carvers": "aether_ii:holy_isles_cave", + "downfall": 0.8, + "effects": { + "water_color": "#637aa8" + }, + "features": [ + [ + "aether_ii:coast_arctic_packed_ice", + "aether_ii:noise_lake_arctic", + "aether_ii:cloudbed", + "aether_ii:coastal_arctic_ice_spike", + "aether_ii:arctic_ice_spike_cluster" + ], + [ + "aether_ii:water_pond_tundra", + "aether_ii:water_spring", + "aether_ii:water_pond_underground", + "aether_ii:alkahest_pool_rare" + ], + [ + "aether_ii:holystone_rocks_tundra" + ], + [], + [], + [], + [ + "aether_ii:ore_scatterglass", + "aether_ii:ore_agiosite", + "aether_ii:ore_icestone", + "aether_ii:ore_ambrosium", + "aether_ii:ore_zanite", + "aether_ii:ore_zanite_mountain", + "aether_ii:ore_arkenium", + "aether_ii:ore_gravitite_buried", + "aether_ii:ore_gravitite", + "aether_ii:ore_holystone_quartz", + "aether_ii:ore_corrobonite", + "aether_ii:ore_glint", + "aether_ii:ore_hestveil_open", + "aether_ii:ore_hestveil_buried", + "aether_ii:unstable_holystone", + "aether_ii:unstable_undershale" + ], + [ + "aether_ii:pointed_holystone" + ], + [], + [ + "aether_ii:grass_and_dirt_floor", + "aether_ii:coarse_aether_dirt_floor", + "aether_ii:coarse_aether_dirt_frosted_ceiling", + "aether_ii:ice_overhang", + "aether_ii:holy_isles_flower_patch", + "aether_ii:arctic_flower_patch" + ], + [ + "aether_ii:high_storm_aercloud", + "aether_ii:high_green_aercloud", + "aether_ii:high_purple_aercloud", + "aether_ii:middle_cold_aercloud", + "aether_ii:middle_storm_aercloud", + "aether_ii:surface_cold_aercloud", + "aether_ii:surface_golden_aercloud", + "aether_ii:surface_blue_aercloud", + "aether_ii:surface_green_aercloud", + "aether_ii:surface_purple_aercloud", + "aether_ii:lower_storm_aercloud", + "aether_ii:lower_blue_aercloud", + "aether_ii:lower_green_aercloud", + "aether_ii:lower_purple_aercloud" + ] + ], + "has_precipitation": true, + "spawn_costs": { + "aether_ii:aerwhale": { + "charge": 0.5, + "energy_budget": 0.11 + }, + "aether_ii:cockatrice": { + "charge": 0.6, + "energy_budget": 0.12 + }, + "aether_ii:tempest": { + "charge": 0.65, + "energy_budget": 0.13 + }, + "aether_ii:zephyr": { + "charge": 0.8, + "energy_budget": 0.14 + } + }, + "spawners": { + "aether_ii:aether_aerwhale": [ + { + "type": "aether_ii:aerwhale", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_ambient": [ + { + "type": "aether_ii:glitterwing", + "maxCount": 2, + "minCount": 1, + "weight": 1 + }, + { + "type": "aether_ii:shroudwing", + "maxCount": 2, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_blight_monster": [ + { + "type": "aether_ii:cockatrice", + "maxCount": 1, + "minCount": 1, + "weight": 4 + }, + { + "type": "aether_ii:tempest", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_hazard": [ + { + "type": "aether_ii:blue_swet", + "maxCount": 2, + "minCount": 1, + "weight": 2 + }, + { + "type": "aether_ii:golden_swet", + "maxCount": 2, + "minCount": 1, + "weight": 1 + }, + { + "type": "aether_ii:skephid", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_monster": [ + { + "type": "aether_ii:arkenium_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 3 + }, + { + "type": "aether_ii:gravitite_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 4 + } + ], + "aether_ii:aether_dungeon_monster": [], + "aether_ii:aether_moa": [], + "aether_ii:aether_plant_hazard": [ + { + "type": "aether_ii:aechor_plant", + "maxCount": 1, + "minCount": 1, + "weight": 5 + }, + { + "type": "aether_ii:carrion_sprout", + "maxCount": 1, + "minCount": 1, + "weight": 3 + } + ], + "aether_ii:aether_sky_hazard": [ + { + "type": "aether_ii:zephyr", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_water_surface_creature": [], + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": -0.35, + "temperature_modifier": "frozen" +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/enduring_woodland.json b/src/generated/resources/data/aether_ii/worldgen/biome/enduring_woodland.json index d98a8ff546..6108c1cbfa 100644 --- a/src/generated/resources/data/aether_ii/worldgen/biome/enduring_woodland.json +++ b/src/generated/resources/data/aether_ii/worldgen/biome/enduring_woodland.json @@ -13,7 +13,7 @@ }, "carvers": "aether_ii:holy_isles_cave", "creature_spawn_probability": 0.212, - "downfall": 0.4, + "downfall": 0.8, "effects": { "water_color": "#637aa8" }, diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/frozen_lakes.json b/src/generated/resources/data/aether_ii/worldgen/biome/frozen_lakes.json index 235d8c69da..c1e71aba00 100644 --- a/src/generated/resources/data/aether_ii/worldgen/biome/frozen_lakes.json +++ b/src/generated/resources/data/aether_ii/worldgen/biome/frozen_lakes.json @@ -13,7 +13,7 @@ }, "carvers": [], "creature_spawn_probability": 0.212, - "downfall": 0.5, + "downfall": 0.7, "effects": { "water_color": "#637aa8" }, diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/highfields_expanse.json b/src/generated/resources/data/aether_ii/worldgen/biome/highfields_expanse.json new file mode 100644 index 0000000000..317e889446 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/biome/highfields_expanse.json @@ -0,0 +1,162 @@ +{ + "attributes": { + "minecraft:audio/background_music": { + "default": { + "max_delay": 10800, + "min_delay": 3600, + "sound": "aether_ii:music.aether" + } + }, + "minecraft:visual/fog_color": "#ecebfc", + "minecraft:visual/sky_color": "#c9d1ff", + "minecraft:visual/water_fog_color": "#55708a" + }, + "carvers": "aether_ii:holy_isles_cave", + "downfall": 0.6, + "effects": { + "water_color": "#a2d5f2" + }, + "features": [ + [ + "aether_ii:cloudbed" + ], + [ + "aether_ii:water_pond", + "aether_ii:water_pond_underground", + "aether_ii:alkahest_pool_rare" + ], + [ + "aether_ii:holystone_rocks" + ], + [], + [], + [], + [ + "aether_ii:ore_scatterglass", + "aether_ii:ore_agiosite", + "aether_ii:ore_icestone_small", + "aether_ii:ore_ambrosium", + "aether_ii:ore_zanite", + "aether_ii:ore_zanite_mountain", + "aether_ii:ore_arkenium", + "aether_ii:ore_gravitite_buried", + "aether_ii:ore_gravitite", + "aether_ii:ore_holystone_quartz", + "aether_ii:ore_glint", + "aether_ii:ore_hestveil_open", + "aether_ii:ore_hestveil_buried", + "aether_ii:unstable_holystone", + "aether_ii:unstable_undershale" + ], + [], + [ + "aether_ii:water_spring" + ], + [ + "aether_ii:expanse_bryalinn_moss_cover" + ], + [ + "aether_ii:high_storm_aercloud", + "aether_ii:high_green_aercloud", + "aether_ii:high_purple_aercloud", + "aether_ii:middle_cold_aercloud", + "aether_ii:middle_storm_aercloud", + "aether_ii:surface_cold_aercloud", + "aether_ii:surface_golden_aercloud", + "aether_ii:surface_blue_aercloud", + "aether_ii:surface_green_aercloud", + "aether_ii:surface_purple_aercloud", + "aether_ii:lower_storm_aercloud", + "aether_ii:lower_blue_aercloud", + "aether_ii:lower_green_aercloud", + "aether_ii:lower_purple_aercloud" + ] + ], + "has_precipitation": true, + "spawn_costs": { + "aether_ii:aerwhale": { + "charge": 0.5, + "energy_budget": 0.11 + }, + "aether_ii:cockatrice": { + "charge": 0.6, + "energy_budget": 0.12 + }, + "aether_ii:tempest": { + "charge": 0.65, + "energy_budget": 0.13 + }, + "aether_ii:zephyr": { + "charge": 0.8, + "energy_budget": 0.14 + } + }, + "spawners": { + "aether_ii:aether_aerwhale": [ + { + "type": "aether_ii:aerwhale", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_ambient": [], + "aether_ii:aether_blight_monster": [ + { + "type": "aether_ii:cockatrice", + "maxCount": 1, + "minCount": 1, + "weight": 4 + }, + { + "type": "aether_ii:tempest", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_hazard": [ + { + "type": "aether_ii:skephid", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_monster": [ + { + "type": "aether_ii:arkenium_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 3 + }, + { + "type": "aether_ii:gravitite_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 4 + } + ], + "aether_ii:aether_dungeon_monster": [], + "aether_ii:aether_moa": [], + "aether_ii:aether_plant_hazard": [], + "aether_ii:aether_sky_hazard": [ + { + "type": "aether_ii:zephyr", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_water_surface_creature": [], + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 0.7 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/highfields_undercloud.json b/src/generated/resources/data/aether_ii/worldgen/biome/highfields_undercloud.json new file mode 100644 index 0000000000..6904483ba4 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/biome/highfields_undercloud.json @@ -0,0 +1,232 @@ +{ + "attributes": { + "minecraft:audio/background_music": { + "default": { + "max_delay": 10800, + "min_delay": 3600, + "sound": "aether_ii:music.aether" + } + }, + "minecraft:visual/fog_color": "#ecebfc", + "minecraft:visual/sky_color": "#c9d1ff", + "minecraft:visual/water_fog_color": "#55708a" + }, + "carvers": "aether_ii:holy_isles_cave", + "downfall": 0.6, + "effects": { + "water_color": "#a2d5f2" + }, + "features": [ + [ + "aether_ii:noise_lake", + "aether_ii:cloudbed" + ], + [ + "aether_ii:water_pond", + "aether_ii:water_pond_underground", + "aether_ii:alkahest_pool_rare" + ], + [ + "aether_ii:holystone_rocks" + ], + [], + [], + [], + [ + "aether_ii:ore_scatterglass", + "aether_ii:ore_agiosite", + "aether_ii:ore_icestone_small", + "aether_ii:ore_ambrosium", + "aether_ii:ore_zanite", + "aether_ii:ore_zanite_mountain", + "aether_ii:ore_arkenium", + "aether_ii:ore_gravitite_buried", + "aether_ii:ore_gravitite", + "aether_ii:ore_holystone_quartz", + "aether_ii:ore_corrobonite", + "aether_ii:ore_glint", + "aether_ii:disk_bryalinn_moss", + "aether_ii:lake_disk_bryalinn_moss", + "aether_ii:ore_hestveil_open", + "aether_ii:ore_hestveil_buried", + "aether_ii:unstable_holystone", + "aether_ii:unstable_undershale" + ], + [ + "aether_ii:pointed_holystone" + ], + [ + "aether_ii:water_spring" + ], + [ + "aether_ii:small_grass_patch", + "aether_ii:medium_grass_patch", + "aether_ii:large_grass_patch", + "aether_ii:grass_and_dirt_floor", + "aether_ii:coarse_aether_dirt_floor", + "aether_ii:coarse_aether_dirt_ceiling", + "aether_ii:coarse_aether_dirt_overhang", + "aether_ii:exposed_bryalinn_moss_cover", + "aether_ii:holy_isles_flower_patch", + "aether_ii:blueberry_bush_patch_default", + "aether_ii:short_arilum", + "aether_ii:arilum", + "aether_ii:blooming_arilum", + "aether_ii:mixed_arilum", + "aether_ii:pond_arilum", + "aether_ii:verdant_woods_trees" + ], + [ + "aether_ii:high_storm_aercloud", + "aether_ii:high_green_aercloud", + "aether_ii:high_purple_aercloud", + "aether_ii:middle_cold_aercloud", + "aether_ii:middle_storm_aercloud", + "aether_ii:surface_cold_aercloud", + "aether_ii:surface_golden_aercloud", + "aether_ii:surface_blue_aercloud", + "aether_ii:surface_green_aercloud", + "aether_ii:surface_purple_aercloud", + "aether_ii:lower_storm_aercloud", + "aether_ii:lower_blue_aercloud", + "aether_ii:lower_green_aercloud", + "aether_ii:lower_purple_aercloud" + ] + ], + "has_precipitation": true, + "spawn_costs": { + "aether_ii:aerwhale": { + "charge": 0.5, + "energy_budget": 0.11 + }, + "aether_ii:cockatrice": { + "charge": 0.6, + "energy_budget": 0.12 + }, + "aether_ii:prismallard": { + "charge": 0.55, + "energy_budget": 0.12 + }, + "aether_ii:tempest": { + "charge": 0.65, + "energy_budget": 0.13 + }, + "aether_ii:zephyr": { + "charge": 0.8, + "energy_budget": 0.14 + } + }, + "spawners": { + "aether_ii:aether_aerwhale": [ + { + "type": "aether_ii:aerwhale", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_ambient": [ + { + "type": "aether_ii:glitterwing", + "maxCount": 2, + "minCount": 1, + "weight": 1 + }, + { + "type": "aether_ii:shroudwing", + "maxCount": 2, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_blight_monster": [ + { + "type": "aether_ii:cockatrice", + "maxCount": 1, + "minCount": 1, + "weight": 4 + }, + { + "type": "aether_ii:tempest", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_hazard": [ + { + "type": "aether_ii:blue_swet", + "maxCount": 2, + "minCount": 1, + "weight": 2 + }, + { + "type": "aether_ii:golden_swet", + "maxCount": 2, + "minCount": 1, + "weight": 1 + }, + { + "type": "aether_ii:skephid", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_monster": [ + { + "type": "aether_ii:arkenium_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 3 + }, + { + "type": "aether_ii:gravitite_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 4 + } + ], + "aether_ii:aether_dungeon_monster": [], + "aether_ii:aether_moa": [], + "aether_ii:aether_plant_hazard": [ + { + "type": "aether_ii:aechor_plant", + "maxCount": 1, + "minCount": 1, + "weight": 5 + }, + { + "type": "aether_ii:carrion_sprout", + "maxCount": 1, + "minCount": 1, + "weight": 3 + } + ], + "aether_ii:aether_sky_hazard": [ + { + "type": "aether_ii:zephyr", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_water_surface_creature": [ + { + "type": "aether_ii:prismallard", + "maxCount": 3, + "minCount": 1, + "weight": 1 + } + ], + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 0.7 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/irradiated_expanse.json b/src/generated/resources/data/aether_ii/worldgen/biome/irradiated_expanse.json new file mode 100644 index 0000000000..ffc6425ccd --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/biome/irradiated_expanse.json @@ -0,0 +1,160 @@ +{ + "attributes": { + "minecraft:audio/background_music": { + "default": { + "max_delay": 10800, + "min_delay": 3600, + "sound": "aether_ii:music.aether" + } + }, + "minecraft:visual/fog_color": "#ecebfc", + "minecraft:visual/sky_color": "#c9d1ff", + "minecraft:visual/water_fog_color": "#55708a" + }, + "carvers": "aether_ii:holy_isles_cave", + "downfall": 0.3, + "effects": { + "water_color": "#a2d5f2" + }, + "features": [ + [ + "aether_ii:cloudbed" + ], + [ + "aether_ii:water_pond", + "aether_ii:water_pond_underground", + "aether_ii:alkahest_pool_rare" + ], + [ + "aether_ii:holystone_rocks" + ], + [], + [], + [], + [ + "aether_ii:ore_scatterglass", + "aether_ii:ore_agiosite", + "aether_ii:ore_icestone_small", + "aether_ii:ore_ambrosium", + "aether_ii:ore_zanite", + "aether_ii:ore_zanite_mountain", + "aether_ii:ore_arkenium", + "aether_ii:ore_gravitite_buried", + "aether_ii:ore_gravitite", + "aether_ii:ore_holystone_quartz", + "aether_ii:ore_glint", + "aether_ii:ore_hestveil_open", + "aether_ii:ore_hestveil_buried", + "aether_ii:unstable_holystone", + "aether_ii:unstable_undershale" + ], + [], + [ + "aether_ii:water_spring" + ], + [], + [ + "aether_ii:high_storm_aercloud", + "aether_ii:high_green_aercloud", + "aether_ii:high_purple_aercloud", + "aether_ii:middle_cold_aercloud", + "aether_ii:middle_storm_aercloud", + "aether_ii:surface_cold_aercloud", + "aether_ii:surface_golden_aercloud", + "aether_ii:surface_blue_aercloud", + "aether_ii:surface_green_aercloud", + "aether_ii:surface_purple_aercloud", + "aether_ii:lower_storm_aercloud", + "aether_ii:lower_blue_aercloud", + "aether_ii:lower_green_aercloud", + "aether_ii:lower_purple_aercloud" + ] + ], + "has_precipitation": true, + "spawn_costs": { + "aether_ii:aerwhale": { + "charge": 0.5, + "energy_budget": 0.11 + }, + "aether_ii:cockatrice": { + "charge": 0.6, + "energy_budget": 0.12 + }, + "aether_ii:tempest": { + "charge": 0.65, + "energy_budget": 0.13 + }, + "aether_ii:zephyr": { + "charge": 0.8, + "energy_budget": 0.14 + } + }, + "spawners": { + "aether_ii:aether_aerwhale": [ + { + "type": "aether_ii:aerwhale", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_ambient": [], + "aether_ii:aether_blight_monster": [ + { + "type": "aether_ii:cockatrice", + "maxCount": 1, + "minCount": 1, + "weight": 4 + }, + { + "type": "aether_ii:tempest", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_hazard": [ + { + "type": "aether_ii:skephid", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_monster": [ + { + "type": "aether_ii:arkenium_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 3 + }, + { + "type": "aether_ii:gravitite_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 4 + } + ], + "aether_ii:aether_dungeon_monster": [], + "aether_ii:aether_moa": [], + "aether_ii:aether_plant_hazard": [], + "aether_ii:aether_sky_hazard": [ + { + "type": "aether_ii:zephyr", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_water_surface_creature": [], + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 1.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/irradiated_undercloud.json b/src/generated/resources/data/aether_ii/worldgen/biome/irradiated_undercloud.json new file mode 100644 index 0000000000..8f061a159e --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/biome/irradiated_undercloud.json @@ -0,0 +1,160 @@ +{ + "attributes": { + "minecraft:audio/background_music": { + "default": { + "max_delay": 10800, + "min_delay": 3600, + "sound": "aether_ii:music.aether" + } + }, + "minecraft:visual/ambient_particles": [ + { + "particle": { + "type": "aether_ii:ambrosium_torch" + }, + "probability": 0.00625 + } + ], + "minecraft:visual/fog_color": "#f0e8be", + "minecraft:visual/sky_color": "#fcebc5", + "minecraft:visual/water_fog_color": "#bccc81" + }, + "carvers": [ + "aether_ii:holy_isles_cave", + "aether_ii:holy_isles_cave" + ], + "downfall": 0.3, + "effects": { + "water_color": "#aed4bf" + }, + "features": [ + [ + "aether_ii:cloudbed" + ], + [ + "aether_ii:water_pond", + "aether_ii:water_pond_underground", + "aether_ii:alkahest_pool_rare" + ], + [ + "aether_ii:skyroot_twigs", + "aether_ii:holystone_rocks" + ], + [], + [], + [], + [ + "aether_ii:ore_scatterglass", + "aether_ii:ore_agiosite", + "aether_ii:ore_icestone_small", + "aether_ii:ore_ambrosium", + "aether_ii:ore_zanite", + "aether_ii:ore_zanite_mountain", + "aether_ii:ore_arkenium", + "aether_ii:ore_gravitite_buried", + "aether_ii:ore_gravitite", + "aether_ii:ore_holystone_quartz", + "aether_ii:ore_glint", + "aether_ii:ore_hestveil_open", + "aether_ii:ore_hestveil_buried", + "aether_ii:unstable_holystone", + "aether_ii:unstable_undershale" + ], + [ + "aether_ii:pointed_holystone" + ], + [ + "aether_ii:water_spring" + ], + [ + "aether_ii:grass_field", + "aether_ii:small_grass_patch", + "aether_ii:medium_grass_patch", + "aether_ii:large_grass_patch", + "aether_ii:irradiated_grass_patch", + "aether_ii:enchanted_grass_and_dirt_floor", + "aether_ii:coarse_aether_dirt_floor", + "aether_ii:blueberry_bush_patch_irradiated", + "aether_ii:brettl_patch_irradiated" + ], + [ + "aether_ii:high_storm_aercloud", + "aether_ii:high_green_aercloud", + "aether_ii:high_purple_aercloud", + "aether_ii:middle_cold_aercloud", + "aether_ii:middle_storm_aercloud", + "aether_ii:surface_cold_aercloud", + "aether_ii:surface_golden_aercloud", + "aether_ii:surface_blue_aercloud", + "aether_ii:surface_green_aercloud", + "aether_ii:surface_purple_aercloud", + "aether_ii:lower_storm_aercloud", + "aether_ii:lower_blue_aercloud", + "aether_ii:lower_green_aercloud", + "aether_ii:lower_purple_aercloud" + ] + ], + "has_precipitation": true, + "spawn_costs": { + "aether_ii:cockatrice": { + "charge": 0.6, + "energy_budget": 0.12 + }, + "aether_ii:tempest": { + "charge": 0.65, + "energy_budget": 0.13 + }, + "aether_ii:zephyr": { + "charge": 0.8, + "energy_budget": 0.14 + } + }, + "spawners": { + "aether_ii:aether_aerwhale": [], + "aether_ii:aether_ambient": [], + "aether_ii:aether_blight_monster": [ + { + "type": "aether_ii:tempest", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_hazard": [], + "aether_ii:aether_darkness_monster": [ + { + "type": "aether_ii:arkenium_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 3 + }, + { + "type": "aether_ii:gravitite_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 4 + } + ], + "aether_ii:aether_dungeon_monster": [], + "aether_ii:aether_moa": [], + "aether_ii:aether_plant_hazard": [], + "aether_ii:aether_sky_hazard": [ + { + "type": "aether_ii:zephyr", + "maxCount": 2, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_water_surface_creature": [], + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 1.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/magnetic_expanse.json b/src/generated/resources/data/aether_ii/worldgen/biome/magnetic_expanse.json new file mode 100644 index 0000000000..b24ed8804a --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/biome/magnetic_expanse.json @@ -0,0 +1,160 @@ +{ + "attributes": { + "minecraft:audio/background_music": { + "default": { + "max_delay": 10800, + "min_delay": 3600, + "sound": "aether_ii:music.aether" + } + }, + "minecraft:visual/fog_color": "#ecebfc", + "minecraft:visual/sky_color": "#c9d1ff", + "minecraft:visual/water_fog_color": "#55708a" + }, + "carvers": "aether_ii:holy_isles_cave", + "downfall": 0.6, + "effects": { + "water_color": "#a2d5f2" + }, + "features": [ + [ + "aether_ii:cloudbed" + ], + [ + "aether_ii:water_pond", + "aether_ii:water_pond_underground", + "aether_ii:alkahest_pool_rare" + ], + [ + "aether_ii:holystone_rocks" + ], + [], + [], + [], + [ + "aether_ii:ore_scatterglass", + "aether_ii:ore_agiosite", + "aether_ii:ore_icestone_small", + "aether_ii:ore_ambrosium", + "aether_ii:ore_zanite", + "aether_ii:ore_zanite_mountain", + "aether_ii:ore_arkenium", + "aether_ii:ore_gravitite_buried", + "aether_ii:ore_gravitite", + "aether_ii:ore_holystone_quartz", + "aether_ii:ore_glint", + "aether_ii:ore_hestveil_open", + "aether_ii:ore_hestveil_buried", + "aether_ii:unstable_holystone", + "aether_ii:unstable_undershale" + ], + [], + [ + "aether_ii:water_spring" + ], + [], + [ + "aether_ii:high_storm_aercloud", + "aether_ii:high_green_aercloud", + "aether_ii:high_purple_aercloud", + "aether_ii:middle_cold_aercloud", + "aether_ii:middle_storm_aercloud", + "aether_ii:surface_cold_aercloud", + "aether_ii:surface_golden_aercloud", + "aether_ii:surface_blue_aercloud", + "aether_ii:surface_green_aercloud", + "aether_ii:surface_purple_aercloud", + "aether_ii:lower_storm_aercloud", + "aether_ii:lower_blue_aercloud", + "aether_ii:lower_green_aercloud", + "aether_ii:lower_purple_aercloud" + ] + ], + "has_precipitation": true, + "spawn_costs": { + "aether_ii:aerwhale": { + "charge": 0.5, + "energy_budget": 0.11 + }, + "aether_ii:cockatrice": { + "charge": 0.6, + "energy_budget": 0.12 + }, + "aether_ii:tempest": { + "charge": 0.65, + "energy_budget": 0.13 + }, + "aether_ii:zephyr": { + "charge": 0.8, + "energy_budget": 0.14 + } + }, + "spawners": { + "aether_ii:aether_aerwhale": [ + { + "type": "aether_ii:aerwhale", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_ambient": [], + "aether_ii:aether_blight_monster": [ + { + "type": "aether_ii:cockatrice", + "maxCount": 1, + "minCount": 1, + "weight": 4 + }, + { + "type": "aether_ii:tempest", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_hazard": [ + { + "type": "aether_ii:skephid", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_monster": [ + { + "type": "aether_ii:arkenium_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 3 + }, + { + "type": "aether_ii:gravitite_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 4 + } + ], + "aether_ii:aether_dungeon_monster": [], + "aether_ii:aether_moa": [], + "aether_ii:aether_plant_hazard": [], + "aether_ii:aether_sky_hazard": [ + { + "type": "aether_ii:zephyr", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_water_surface_creature": [], + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 0.7 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/magnetic_undercloud.json b/src/generated/resources/data/aether_ii/worldgen/biome/magnetic_undercloud.json new file mode 100644 index 0000000000..582e191ca1 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/biome/magnetic_undercloud.json @@ -0,0 +1,217 @@ +{ + "attributes": { + "minecraft:audio/background_music": { + "default": { + "max_delay": 10800, + "min_delay": 3600, + "sound": "aether_ii:music.aether" + } + }, + "minecraft:visual/fog_color": "#edeef5", + "minecraft:visual/sky_color": "#c5cbeb", + "minecraft:visual/water_fog_color": "#607496" + }, + "carvers": "aether_ii:holy_isles_cave", + "downfall": 0.6, + "effects": { + "water_color": "#abbdd9" + }, + "features": [ + [ + "aether_ii:noise_lake_swamp", + "aether_ii:coast_ferrosite_sand", + "aether_ii:cloudbed" + ], + [ + "aether_ii:water_pond", + "aether_ii:water_pond_underground", + "aether_ii:alkahest_pool_rare" + ], + [ + "aether_ii:holystone_rocks" + ], + [], + [], + [], + [ + "aether_ii:ore_scatterglass", + "aether_ii:ore_agiosite", + "aether_ii:ore_icestone_small", + "aether_ii:ore_ambrosium", + "aether_ii:ore_zanite", + "aether_ii:ore_zanite_mountain", + "aether_ii:ore_arkenium", + "aether_ii:ore_gravitite_buried", + "aether_ii:ore_gravitite", + "aether_ii:ore_holystone_quartz", + "aether_ii:ore_corrobonite", + "aether_ii:ore_glint", + "aether_ii:ore_hestveil_open", + "aether_ii:ore_hestveil_buried", + "aether_ii:unstable_holystone", + "aether_ii:unstable_undershale" + ], + [ + "aether_ii:pointed_holystone" + ], + [ + "aether_ii:water_spring" + ], + [ + "aether_ii:grass_and_dirt_floor", + "aether_ii:small_mycelium_floor", + "aether_ii:big_mycelium_floor", + "aether_ii:coarse_aether_dirt_floor", + "aether_ii:coarse_aether_dirt_ceiling", + "aether_ii:coarse_aether_dirt_overhang", + "aether_ii:holy_isles_flower_patch", + "aether_ii:magnetic_flower_patch", + "aether_ii:blueberry_bush_patch_default", + "aether_ii:short_arilum", + "aether_ii:arilum", + "aether_ii:blooming_arilum", + "aether_ii:magnetic_shroom_patch" + ], + [ + "aether_ii:high_storm_aercloud", + "aether_ii:high_green_aercloud", + "aether_ii:high_purple_aercloud", + "aether_ii:middle_cold_aercloud", + "aether_ii:middle_storm_aercloud", + "aether_ii:surface_cold_aercloud", + "aether_ii:surface_golden_aercloud", + "aether_ii:surface_blue_aercloud", + "aether_ii:surface_green_aercloud", + "aether_ii:surface_purple_aercloud", + "aether_ii:lower_storm_aercloud", + "aether_ii:lower_blue_aercloud", + "aether_ii:lower_green_aercloud", + "aether_ii:lower_purple_aercloud" + ] + ], + "has_precipitation": true, + "spawn_costs": { + "aether_ii:aerwhale": { + "charge": 0.5, + "energy_budget": 0.11 + }, + "aether_ii:cockatrice": { + "charge": 0.6, + "energy_budget": 0.12 + }, + "aether_ii:tempest": { + "charge": 0.65, + "energy_budget": 0.13 + }, + "aether_ii:zephyr": { + "charge": 0.8, + "energy_budget": 0.14 + } + }, + "spawners": { + "aether_ii:aether_aerwhale": [ + { + "type": "aether_ii:aerwhale", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_ambient": [ + { + "type": "aether_ii:glitterwing", + "maxCount": 2, + "minCount": 1, + "weight": 1 + }, + { + "type": "aether_ii:shroudwing", + "maxCount": 2, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_blight_monster": [ + { + "type": "aether_ii:cockatrice", + "maxCount": 1, + "minCount": 1, + "weight": 4 + }, + { + "type": "aether_ii:tempest", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_hazard": [ + { + "type": "aether_ii:blue_swet", + "maxCount": 2, + "minCount": 1, + "weight": 2 + }, + { + "type": "aether_ii:golden_swet", + "maxCount": 2, + "minCount": 1, + "weight": 1 + }, + { + "type": "aether_ii:skephid", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_darkness_monster": [ + { + "type": "aether_ii:arkenium_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 3 + }, + { + "type": "aether_ii:gravitite_taluton", + "maxCount": 1, + "minCount": 1, + "weight": 4 + } + ], + "aether_ii:aether_dungeon_monster": [], + "aether_ii:aether_moa": [], + "aether_ii:aether_plant_hazard": [ + { + "type": "aether_ii:aechor_plant", + "maxCount": 1, + "minCount": 1, + "weight": 5 + }, + { + "type": "aether_ii:carrion_sprout", + "maxCount": 1, + "minCount": 1, + "weight": 3 + } + ], + "aether_ii:aether_sky_hazard": [ + { + "type": "aether_ii:zephyr", + "maxCount": 1, + "minCount": 1, + "weight": 1 + } + ], + "aether_ii:aether_water_surface_creature": [], + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 0.7 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/biome/sheer_tundra.json b/src/generated/resources/data/aether_ii/worldgen/biome/sheer_tundra.json index b01aa58c52..84e8c31043 100644 --- a/src/generated/resources/data/aether_ii/worldgen/biome/sheer_tundra.json +++ b/src/generated/resources/data/aether_ii/worldgen/biome/sheer_tundra.json @@ -13,7 +13,7 @@ }, "carvers": "aether_ii:holy_isles_cave", "creature_spawn_probability": 0.218, - "downfall": 0.5, + "downfall": 0.7, "effects": { "water_color": "#637aa8" }, diff --git a/src/generated/resources/data/aether_ii/worldgen/configured_feature/bryalinn_moss_floor_expanse.json b/src/generated/resources/data/aether_ii/worldgen/configured_feature/bryalinn_moss_floor_expanse.json new file mode 100644 index 0000000000..baf1c258e6 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/configured_feature/bryalinn_moss_floor_expanse.json @@ -0,0 +1,50 @@ +{ + "type": "minecraft:vegetation_patch", + "config": { + "depth": 1, + "extra_bottom_block_chance": 0.35, + "extra_edge_column_chance": 0.5, + "ground_state": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "aether_ii:bryalinn_moss_block" + } + }, + "replaceable": "#aether_ii:aether_underground_blocks", + "surface": "floor", + "vegetation_chance": 0.925, + "vegetation_feature": { + "feature": { + "type": "minecraft:random_selector", + "config": { + "default": "aether_ii:bryalinn_moss_carpet_patch", + "features": [ + { + "chance": 0.1, + "feature": "aether_ii:bush_ferns_patch" + }, + { + "chance": 0.4, + "feature": "aether_ii:cumulus_bush_patch" + }, + { + "chance": 0.125, + "feature": "aether_ii:cirrus_succulent_patch" + }, + { + "chance": 0.125, + "feature": "aether_ii:royal_stratus_fern_patch" + } + ] + } + }, + "placement": [] + }, + "vertical_range": 5, + "xz_radius": { + "type": "minecraft:uniform", + "max_inclusive": 4, + "min_inclusive": 1 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/configured_feature/cirrus_succulent_patch.json b/src/generated/resources/data/aether_ii/worldgen/configured_feature/cirrus_succulent_patch.json new file mode 100644 index 0000000000..f524ab620d --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/configured_feature/cirrus_succulent_patch.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "aether_ii:cirrus_succulent", + "Properties": { + "half": "lower" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/configured_feature/cumulus_bush_patch.json b/src/generated/resources/data/aether_ii/worldgen/configured_feature/cumulus_bush_patch.json new file mode 100644 index 0000000000..8a5a7d03d6 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/configured_feature/cumulus_bush_patch.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "aether_ii:cumulus_bush", + "Properties": { + "snowy": "false" + } + }, + "weight": 3 + }, + { + "data": { + "Name": "aether_ii:cumulonimbus_bush", + "Properties": { + "half": "lower" + } + }, + "weight": 1 + } + ] + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/configured_feature/royal_stratus_fern_patch.json b/src/generated/resources/data/aether_ii/worldgen/configured_feature/royal_stratus_fern_patch.json new file mode 100644 index 0000000000..6d7cade78c --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/configured_feature/royal_stratus_fern_patch.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "aether_ii:royal_stratus_fern", + "Properties": { + "snowy": "false" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/amplification.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/amplification.json index 3f81619f2a..a07bd255e2 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/amplification.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/amplification.json @@ -1,6 +1,9 @@ { - "type": "minecraft:weird_scaled_sampler", - "input": "aether_ii:holy_isles/base_3d_noise", - "noise": "aether_ii:amplification", - "rarity_value_mapper": "type_1" + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:weird_scaled_sampler", + "input": "aether_ii:holy_isles/base_3d_noise", + "noise": "aether_ii:amplification", + "rarity_value_mapper": "type_1" + } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/base_3d_noise.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/base_3d_noise.json index ad178ca1da..e1712016e9 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/base_3d_noise.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/base_3d_noise.json @@ -1,8 +1,11 @@ { - "type": "minecraft:old_blended_noise", - "smear_scale_multiplier": 1.0, - "xz_factor": 80.0, - "xz_scale": 0.1, - "y_factor": 160.0, - "y_scale": 0.02 + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:old_blended_noise", + "smear_scale_multiplier": 1.0, + "xz_factor": 80.0, + "xz_scale": 0.1, + "y_factor": 160.0, + "y_scale": 0.02 + } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/base_sunken_3d_noise.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/base_sunken_3d_noise.json new file mode 100644 index 0000000000..1abf1670ec --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/base_sunken_3d_noise.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:old_blended_noise", + "smear_scale_multiplier": 1.0, + "xz_factor": 80.0, + "xz_scale": 0.5, + "y_factor": 160.0, + "y_scale": 0.1 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents.json index dbc2db2614..f080f6ceff 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents.json @@ -1,18 +1,21 @@ { - "type": "minecraft:spline", - "spline": { - "coordinate": "aether_ii:holy_isles/continents_heightmap", - "points": [ - { - "derivative": 0.0, - "location": 96.0, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 160.0, - "value": 1.0 - } - ] + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "aether_ii:holy_isles/continents_heightmap", + "points": [ + { + "derivative": 0.0, + "location": 96.0, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 160.0, + "value": 1.0 + } + ] + } } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_base_heightmap.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_base_heightmap.json new file mode 100644 index 0000000000..8627720b33 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_base_heightmap.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:add", + "argument1": 0.1, + "argument2": { + "type": "minecraft:squeeze", + "argument": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:blend_density", + "argument": "aether_ii:holy_isles/terrain/base_islands" + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_heightmap.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_heightmap.json index 45d2fc43d0..733fb672bb 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_heightmap.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_heightmap.json @@ -1,20 +1,20 @@ { - "type": "minecraft:find_top_surface", - "cell_height": 24, - "density": { - "type": "minecraft:add", - "argument1": 0.165, - "argument2": { - "type": "minecraft:squeeze", - "argument": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:blend_density", - "argument": "aether_ii:holy_isles/terrain/base_islands" - } - } - } + "type": "minecraft:range_choice", + "input": "aether_ii:holy_isles/terrain/base/elevation_mapper", + "max_exclusive": 0.4, + "min_inclusive": 0.0, + "when_in_range": { + "type": "minecraft:find_top_surface", + "cell_height": 16, + "density": "aether_ii:holy_isles/continents_heightmap", + "lower_bound": 96, + "upper_bound": 160.0 }, - "lower_bound": 96, - "upper_bound": 160.0 + "when_out_of_range": { + "type": "minecraft:find_top_surface", + "cell_height": 16, + "density": "aether_ii:holy_isles/continents_heightmap", + "lower_bound": 128, + "upper_bound": 192.0 + } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_rare.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_rare.json new file mode 100644 index 0000000000..36497b47d3 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_rare.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "aether_ii:continentalness_rare", + "shift_x": "minecraft:shift_x", + "shift_y": 0.0, + "shift_z": "minecraft:shift_z", + "xz_scale": 0.3, + "y_scale": 0.0 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_rarity_mapper.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_rarity_mapper.json new file mode 100644 index 0000000000..c96f9574f5 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/continents_rarity_mapper.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:range_choice", + "input": "aether_ii:holy_isles/continents", + "max_exclusive": 0.1, + "min_inclusive": 0.0, + "when_in_range": { + "type": "minecraft:range_choice", + "input": "aether_ii:holy_isles/continents_rare", + "max_exclusive": 0.325, + "min_inclusive": 0.0, + "when_in_range": "aether_ii:holy_isles/continents", + "when_out_of_range": 2.0 + }, + "when_out_of_range": "aether_ii:holy_isles/continents" +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/erosion.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/erosion.json index 141d480009..871a716f22 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/erosion.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/erosion.json @@ -1,12 +1,15 @@ { - "type": "minecraft:abs", + "type": "minecraft:cache_once", "argument": { - "type": "minecraft:shifted_noise", - "noise": "aether_ii:erosion", - "shift_x": "minecraft:shift_x", - "shift_y": 0.0, - "shift_z": "minecraft:shift_z", - "xz_scale": 0.31, - "y_scale": 0.0 + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "aether_ii:erosion", + "shift_x": "minecraft:shift_x", + "shift_y": 0.0, + "shift_z": "minecraft:shift_z", + "xz_scale": 0.31, + "y_scale": 0.0 + } } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/lakes/noise_swamp.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/lakes/noise_swamp.json index fa7c2fd584..5f5b22bb4d 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/lakes/noise_swamp.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/lakes/noise_swamp.json @@ -1,26 +1,29 @@ { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": -1.0, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "aether_ii:perlin_noise", - "noise": { - "amplitudes": [ - 0.2, - 0.35, - 0.0, - 0.0 - ], - "firstOctave": -5 - }, - "seed": 99, - "xz_scale": 1.0, - "y_scale": 0.0 + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": -1.0, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "aether_ii:perlin_noise", + "noise": { + "amplitudes": [ + 0.2, + 0.35, + 0.0, + 0.0 + ], + "firstOctave": -5 + }, + "seed": 99, + "xz_scale": 1.0, + "y_scale": 0.0 + } } - } - }, - "argument2": "aether_ii:holy_isles/lakes/noise" + }, + "argument2": "aether_ii:holy_isles/lakes/noise" + } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/temperature.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/temperature.json index d5741b6abb..666b98bb56 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/temperature.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/temperature.json @@ -1,9 +1,12 @@ { - "type": "minecraft:shifted_noise", - "noise": "aether_ii:temperature", - "shift_x": "minecraft:shift_x", - "shift_y": 0.0, - "shift_z": "minecraft:shift_z", - "xz_scale": 0.375, - "y_scale": 0.0 + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "aether_ii:temperature", + "shift_x": "minecraft:shift_x", + "shift_y": 0.0, + "shift_z": "minecraft:shift_z", + "xz_scale": 0.375, + "y_scale": 0.0 + } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/elevation_mapper.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/elevation_mapper.json index 9d2d2511e6..0f53ab5231 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/elevation_mapper.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/elevation_mapper.json @@ -1,15 +1,18 @@ { - "type": "minecraft:range_choice", - "input": "aether_ii:holy_isles/erosion", - "max_exclusive": 0.48500001430511475, - "min_inclusive": -1.5, - "when_in_range": { + "type": "minecraft:cache_once", + "argument": { "type": "minecraft:range_choice", - "input": "aether_ii:holy_isles/temperature", - "max_exclusive": 1.5, - "min_inclusive": -0.4000000059604645, - "when_in_range": "aether_ii:holy_isles/terrain/base/elevation", + "input": "aether_ii:holy_isles/erosion", + "max_exclusive": 0.48500001430511475, + "min_inclusive": -1.5, + "when_in_range": { + "type": "minecraft:range_choice", + "input": "aether_ii:holy_isles/temperature", + "max_exclusive": 1.5, + "min_inclusive": -0.4000000059604645, + "when_in_range": "aether_ii:holy_isles/terrain/base/elevation", + "when_out_of_range": "aether_ii:holy_isles/terrain/base/elevation_dense" + }, "when_out_of_range": "aether_ii:holy_isles/terrain/base/elevation_dense" - }, - "when_out_of_range": "aether_ii:holy_isles/terrain/base/elevation_dense" + } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/sloper.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/sloper.json index 3587907175..e711fde8ea 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/sloper.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/sloper.json @@ -1,274 +1,277 @@ { - "type": "minecraft:spline", - "spline": { - "coordinate": "aether_ii:holy_isles/terrain/base/elevation_mapper", - "points": [ - { - "derivative": 0.0, - "location": 0.1, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 128.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 184.0, - "value": 2.0 - } - ] + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "aether_ii:holy_isles/terrain/base/elevation_mapper", + "points": [ + { + "derivative": 0.0, + "location": 0.1, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 128.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 184.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.15, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 136.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 192.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.2, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 144.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 200.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.25, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 152.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 208.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.3, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 160.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 216.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.35, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 168.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 224.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.4, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 176.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 232.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.45, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 184.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 240.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.5, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 192.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 248.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.55, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 200.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 256.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.6, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 208.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 264.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.65, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 216.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 272.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.7, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 224.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 280.0, + "value": 2.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.75, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 232.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 288.0, + "value": 2.0 + } + ] + } } - }, - { - "derivative": 0.0, - "location": 0.15, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 136.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 192.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.2, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 144.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 200.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.25, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 152.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 208.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.3, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 160.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 216.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.35, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 168.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 224.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.4, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 176.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 232.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.45, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 184.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 240.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.5, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 192.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 248.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.55, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 200.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 256.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.6, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 208.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 264.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.65, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 216.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 272.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.7, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 224.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 280.0, - "value": 2.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.75, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 232.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 288.0, - "value": 2.0 - } - ] - } - } - ] + ] + } } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/top_slide.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/top_slide.json index 62aa4f3bcd..75f03c31a9 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/top_slide.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base/top_slide.json @@ -1,274 +1,277 @@ { - "type": "minecraft:spline", - "spline": { - "coordinate": "aether_ii:holy_isles/terrain/base/elevation_mapper", - "points": [ - { - "derivative": 0.0, - "location": 0.1, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 128.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 184.0, - "value": 0.0 - } - ] + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "aether_ii:holy_isles/terrain/base/elevation_mapper", + "points": [ + { + "derivative": 0.0, + "location": 0.1, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 128.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 184.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.15, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 136.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 192.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.2, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 144.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 200.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.25, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 152.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 208.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.3, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 160.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 216.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.35, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 168.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 224.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.4, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 176.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 232.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.45, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 184.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 240.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.5, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 192.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 248.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.55, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 200.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 256.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.6, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 208.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 264.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.65, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 216.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 272.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.7, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 224.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 280.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.75, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 232.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 288.0, + "value": 0.0 + } + ] + } } - }, - { - "derivative": 0.0, - "location": 0.15, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 136.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 192.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.2, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 144.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 200.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.25, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 152.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 208.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.3, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 160.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 216.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.35, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 168.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 224.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.4, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 176.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 232.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.45, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 184.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 240.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.5, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 192.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 248.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.55, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 200.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 256.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.6, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 208.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 264.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.65, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 216.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 272.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.7, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 224.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 280.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.75, - "value": { - "coordinate": "minecraft:y", - "points": [ - { - "derivative": 0.0, - "location": 232.0, - "value": 1.0 - }, - { - "derivative": 0.0, - "location": 288.0, - "value": 0.0 - } - ] - } - } - ] + ] + } } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base_islands.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base_islands.json index 64016623aa..37eadd3ca1 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base_islands.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/base_islands.json @@ -1,62 +1,65 @@ { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:add", "argument1": { - "type": "minecraft:add", - "argument1": 0.1, - "argument2": { + "type": "minecraft:mul", + "argument1": { "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", + "argument1": 0.1, + "argument2": { + "type": "minecraft:add", "argument1": { - "type": "minecraft:add", - "argument1": 0.2, - "argument2": { + "type": "minecraft:mul", + "argument1": { "type": "minecraft:add", - "argument1": -0.03, - "argument2": "aether_ii:holy_isles/base_3d_noise" + "argument1": 0.2, + "argument2": { + "type": "minecraft:add", + "argument1": -0.03, + "argument2": "aether_ii:holy_isles/base_3d_noise" + } + }, + "argument2": { + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:range_choice", + "input": "aether_ii:holy_isles/erosion", + "max_exclusive": 0.48500001430511475, + "min_inclusive": 0.0, + "when_in_range": { + "type": "minecraft:range_choice", + "input": "aether_ii:holy_isles/temperature", + "max_exclusive": 1.5, + "min_inclusive": -0.4000000059604645, + "when_in_range": "aether_ii:holy_isles/terrain/base/top_slide", + "when_out_of_range": "aether_ii:holy_isles/terrain/arctic/top_slide_arctic" + }, + "when_out_of_range": "aether_ii:holy_isles/terrain/base/top_slide" + } } }, "argument2": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:range_choice", - "input": "aether_ii:holy_isles/erosion", - "max_exclusive": 0.48500001430511475, - "min_inclusive": 0.0, - "when_in_range": { - "type": "minecraft:range_choice", - "input": "aether_ii:holy_isles/temperature", - "max_exclusive": 1.5, - "min_inclusive": -0.4000000059604645, - "when_in_range": "aether_ii:holy_isles/terrain/base/top_slide", - "when_out_of_range": "aether_ii:holy_isles/terrain/arctic/top_slide_arctic" - }, - "when_out_of_range": "aether_ii:holy_isles/terrain/base/top_slide" - } - } - }, - "argument2": { - "type": "minecraft:mul", - "argument1": { "type": "minecraft:mul", - "argument1": -0.19, - "argument2": "aether_ii:holy_isles/terrain/base/factor" - }, - "argument2": "aether_ii:holy_isles/terrain/base/terrain_shaper" + "argument1": { + "type": "minecraft:mul", + "argument1": -0.19, + "argument2": "aether_ii:holy_isles/terrain/base/factor" + }, + "argument2": "aether_ii:holy_isles/terrain/base/terrain_shaper" + } } - } + }, + "argument2": "aether_ii:holy_isles/terrain/base/bottom_slide" }, - "argument2": "aether_ii:holy_isles/terrain/base/bottom_slide" - }, - "argument2": { - "type": "minecraft:mul", - "argument1": { + "argument2": { "type": "minecraft:mul", - "argument1": -0.19, - "argument2": "aether_ii:holy_isles/terrain/base/factor" - }, - "argument2": "aether_ii:holy_isles/terrain/base/terrain_shaper" + "argument1": { + "type": "minecraft:mul", + "argument1": -0.19, + "argument2": "aether_ii:holy_isles/terrain/base/factor" + }, + "argument2": "aether_ii:holy_isles/terrain/base/terrain_shaper" + } } } \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/final_islands.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/final_islands.json index 44145654e0..2c58960444 100644 --- a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/final_islands.json +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/final_islands.json @@ -7,18 +7,22 @@ "argument": { "type": "minecraft:max", "argument1": { - "type": "minecraft:min", - "argument1": "aether_ii:holy_isles/terrain/base_islands", - "argument2": "aether_ii:holy_isles/caves/noise_caves" + "type": "minecraft:max", + "argument1": { + "type": "minecraft:min", + "argument1": "aether_ii:holy_isles/terrain/base_islands", + "argument2": "aether_ii:holy_isles/caves/noise_caves" + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "max_exclusive": 130.0, + "min_inclusive": -4064.0, + "when_in_range": -1.0, + "when_out_of_range": "aether_ii:holy_isles/terrain/shattered_islands" + } }, - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "max_exclusive": 130.0, - "min_inclusive": -4064.0, - "when_in_range": -1.0, - "when_out_of_range": "aether_ii:holy_isles/terrain/shattered_islands" - } + "argument2": "aether_ii:holy_isles/terrain/sunken_islands" } } } diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/bottom_slide_sunken.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/bottom_slide_sunken.json new file mode 100644 index 0000000000..2c82d262e8 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/bottom_slide_sunken.json @@ -0,0 +1,122 @@ +{ + "type": "minecraft:spline", + "spline": { + "coordinate": "aether_ii:holy_isles/terrain/sunken/elevation_sunken", + "points": [ + { + "derivative": 0.0, + "location": 0.05, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 36.0, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 60.0, + "value": 1.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.15, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 40.0, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 64.0, + "value": 1.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.25, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 44.0, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 68.0, + "value": 1.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.35, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 48.0, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 72.0, + "value": 1.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.45, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 52.0, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 76.0, + "value": 1.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.55, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 56.0, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 80.0, + "value": 1.0 + } + ] + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/elevation_sunken.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/elevation_sunken.json new file mode 100644 index 0000000000..9e230d7d2c --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/elevation_sunken.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "aether_ii:elevation_sunken", + "shift_x": "minecraft:shift_x", + "shift_y": 0.0, + "shift_z": "minecraft:shift_z", + "xz_scale": 0.5, + "y_scale": 0.0 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/factor_sunken.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/factor_sunken.json new file mode 100644 index 0000000000..4c2062a86d --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/factor_sunken.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:spline", + "spline": { + "coordinate": "aether_ii:holy_isles/continents_rarity_mapper", + "points": [ + { + "derivative": 0.0, + "location": 1.0, + "value": 7.5 + }, + { + "derivative": 0.0, + "location": 2.0, + "value": 1.0 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/top_slide_sunken.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/top_slide_sunken.json new file mode 100644 index 0000000000..4e5a577706 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken/top_slide_sunken.json @@ -0,0 +1,122 @@ +{ + "type": "minecraft:spline", + "spline": { + "coordinate": "aether_ii:holy_isles/terrain/sunken/elevation_sunken", + "points": [ + { + "derivative": 0.0, + "location": 0.05, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 64.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 136.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.15, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 68.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 140.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.25, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 72.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 144.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.35, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 76.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 148.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.45, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 80.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 152.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.55, + "value": { + "coordinate": "minecraft:y", + "points": [ + { + "derivative": 0.0, + "location": 84.0, + "value": 1.0 + }, + { + "derivative": 0.0, + "location": 156.0, + "value": 0.0 + } + ] + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken_islands.json b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken_islands.json new file mode 100644 index 0000000000..7be4090ab9 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/density_function/holy_isles/terrain/sunken_islands.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": 0.1, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": 0.2, + "argument2": { + "type": "minecraft:add", + "argument1": -0.1, + "argument2": "aether_ii:holy_isles/base_sunken_3d_noise" + } + }, + "argument2": "aether_ii:holy_isles/terrain/sunken/top_slide_sunken" + }, + "argument2": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:mul", + "argument1": -0.25, + "argument2": "aether_ii:holy_isles/terrain/sunken/factor_sunken" + }, + "argument2": { + "type": "minecraft:add", + "argument1": 0.35, + "argument2": "aether_ii:holy_isles/amplification" + } + } + } + }, + "argument2": "aether_ii:holy_isles/terrain/sunken/bottom_slide_sunken" + }, + "argument2": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:mul", + "argument1": -0.25, + "argument2": "aether_ii:holy_isles/terrain/sunken/factor_sunken" + }, + "argument2": { + "type": "minecraft:add", + "argument1": 0.35, + "argument2": "aether_ii:holy_isles/amplification" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/noise/continentalness_rare.json b/src/generated/resources/data/aether_ii/worldgen/noise/continentalness_rare.json new file mode 100644 index 0000000000..bbd78ffbe2 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/noise/continentalness_rare.json @@ -0,0 +1,9 @@ +{ + "amplitudes": [ + 1.5, + 1.0, + 0.0, + 0.0 + ], + "firstOctave": -8 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/noise/elevation_sunken.json b/src/generated/resources/data/aether_ii/worldgen/noise/elevation_sunken.json new file mode 100644 index 0000000000..8c2927b8ca --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/noise/elevation_sunken.json @@ -0,0 +1,11 @@ +{ + "amplitudes": [ + 1.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0 + ], + "firstOctave": -7 +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/noise_settings/holy_isles.json b/src/generated/resources/data/aether_ii/worldgen/noise_settings/holy_isles.json index bca819476c..44918f73b2 100644 --- a/src/generated/resources/data/aether_ii/worldgen/noise_settings/holy_isles.json +++ b/src/generated/resources/data/aether_ii/worldgen/noise_settings/holy_isles.json @@ -19,7 +19,7 @@ }, "noise_router": { "barrier": 0.0, - "continents": "aether_ii:holy_isles/continents", + "continents": "aether_ii:holy_isles/continents_rarity_mapper", "depth": "aether_ii:holy_isles/cave_biomes_rarity_mapper", "erosion": "aether_ii:holy_isles/erosion", "final_density": "aether_ii:holy_isles/terrain/final_islands", @@ -176,89 +176,105 @@ "if_true": { "type": "minecraft:not", "invert": { - "type": "minecraft:vertical_gradient", - "false_at_and_above": { - "below_top": 272 - }, - "random_name": "minecraft:aether_grass_block", - "true_at_and_below": { - "below_top": 276 - } + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:aercloud_sea", + "aether_ii:highfields_expanse", + "aether_ii:magnetic_expanse", + "aether_ii:arctic_expanse", + "aether_ii:irradiated_expanse" + ] } }, "then_run": { "type": "minecraft:condition", "if_true": { - "type": "minecraft:stone_depth", - "add_surface_depth": false, - "offset": 0, - "secondary_depth_range": 0, - "surface_type": "floor" + "type": "minecraft:not", + "invert": { + "type": "minecraft:vertical_gradient", + "false_at_and_above": { + "below_top": 272 + }, + "random_name": "minecraft:aether_grass_block", + "true_at_and_below": { + "below_top": 276 + } + } }, "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "aether_ii:battleground_wastes" - ] + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "add_surface_depth": false, + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "floor" + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:battleground_wastes" + ] + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "aether_ii:enchanted_aether_grass_block", + "Properties": { + "snowy": "false" + } + } + } }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "aether_ii:enchanted_aether_grass_block", - "Properties": { - "snowy": "false" + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:contaminated_jungle" + ] + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "aether_ii:enchanted_aether_grass_block", + "Properties": { + "snowy": "false" + } } } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "aether_ii:contaminated_jungle" - ] }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "aether_ii:enchanted_aether_grass_block", - "Properties": { - "snowy": "false" + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:water", + "add_stone_depth": false, + "offset": -1, + "surface_depth_multiplier": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "aether_ii:aether_grass_block", + "Properties": { + "snowy": "false" + } } } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "add_stone_depth": false, - "offset": -1, - "surface_depth_multiplier": 0 }, - "then_run": { + { "type": "minecraft:block", "result_state": { - "Name": "aether_ii:aether_grass_block", - "Properties": { - "snowy": "false" - } + "Name": "aether_ii:aether_dirt" } } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "aether_ii:aether_dirt" - } - } - ] + ] + } } } }, @@ -267,29 +283,45 @@ "if_true": { "type": "minecraft:not", "invert": { - "type": "minecraft:vertical_gradient", - "false_at_and_above": { - "below_top": 272 - }, - "random_name": "minecraft:aether_dirt", - "true_at_and_below": { - "below_top": 272 - } + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:aercloud_sea", + "aether_ii:highfields_expanse", + "aether_ii:magnetic_expanse", + "aether_ii:arctic_expanse", + "aether_ii:irradiated_expanse" + ] } }, "then_run": { "type": "minecraft:condition", "if_true": { - "type": "minecraft:stone_depth", - "add_surface_depth": true, - "offset": 0, - "secondary_depth_range": 0, - "surface_type": "floor" + "type": "minecraft:not", + "invert": { + "type": "minecraft:vertical_gradient", + "false_at_and_above": { + "below_top": 272 + }, + "random_name": "minecraft:aether_dirt", + "true_at_and_below": { + "below_top": 272 + } + } }, "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "aether_ii:aether_dirt" + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "add_surface_depth": true, + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "floor" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "aether_ii:aether_dirt" + } } } } @@ -527,6 +559,50 @@ ] } }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:highfields_undercloud" + ] + }, + "then_run": { + "type": "aether_ii:density_function_rule", + "function": "aether_ii:holy_isles/strata/mossy_holystone", + "options": [ + { + "block": { + "Name": "aether_ii:mossy_holystone" + }, + "max": 0.0, + "min": -1.0 + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:highfields_expanse" + ] + }, + "then_run": { + "type": "aether_ii:density_function_rule", + "function": "aether_ii:holy_isles/strata/mossy_holystone", + "options": [ + { + "block": { + "Name": "aether_ii:mossy_holystone" + }, + "max": 0.0, + "min": -1.0 + } + ] + } + }, { "type": "minecraft:condition", "if_true": { @@ -615,6 +691,50 @@ ] } }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:arctic_undercloud" + ] + }, + "then_run": { + "type": "aether_ii:density_function_rule", + "function": "aether_ii:holy_isles/strata/arctic_packed_ice", + "options": [ + { + "block": { + "Name": "aether_ii:arctic_packed_ice" + }, + "max": 0.5, + "min": 0.0 + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:arctic_expanse" + ] + }, + "then_run": { + "type": "aether_ii:density_function_rule", + "function": "aether_ii:holy_isles/strata/arctic_packed_ice", + "options": [ + { + "block": { + "Name": "aether_ii:arctic_packed_ice" + }, + "max": 0.5, + "min": 0.0 + } + ] + } + }, { "type": "minecraft:condition", "if_true": { @@ -731,6 +851,64 @@ ] } }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:magnetic_undercloud" + ] + }, + "then_run": { + "type": "aether_ii:density_function_rule", + "function": "aether_ii:holy_isles/strata/ferrosite", + "options": [ + { + "block": { + "Name": "aether_ii:ferrosite" + }, + "max": 0.0, + "min": -0.2 + }, + { + "block": { + "Name": "aether_ii:rusted_ferrosite" + }, + "max": -0.2, + "min": -1.0 + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:magnetic_expanse" + ] + }, + "then_run": { + "type": "aether_ii:density_function_rule", + "function": "aether_ii:holy_isles/strata/ferrosite", + "options": [ + { + "block": { + "Name": "aether_ii:ferrosite" + }, + "max": 0.0, + "min": -0.2 + }, + { + "block": { + "Name": "aether_ii:rusted_ferrosite" + }, + "max": -0.2, + "min": -1.0 + } + ] + } + }, { "type": "minecraft:condition", "if_true": { @@ -774,6 +952,50 @@ } ] } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:irradiated_undercloud" + ] + }, + "then_run": { + "type": "aether_ii:density_function_rule", + "function": "aether_ii:holy_isles/strata/irradiated_holystone", + "options": [ + { + "block": { + "Name": "aether_ii:irradiated_holystone" + }, + "max": 0.25, + "min": -1.0 + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "aether_ii:irradiated_expanse" + ] + }, + "then_run": { + "type": "aether_ii:density_function_rule", + "function": "aether_ii:holy_isles/strata/irradiated_holystone", + "options": [ + { + "block": { + "Name": "aether_ii:irradiated_holystone" + }, + "max": 0.25, + "min": -1.0 + } + ] + } } ] } diff --git a/src/generated/resources/data/aether_ii/worldgen/placed_feature/cirrus_succulent_patch.json b/src/generated/resources/data/aether_ii/worldgen/placed_feature/cirrus_succulent_patch.json new file mode 100644 index 0000000000..f79e1b0a0a --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/placed_feature/cirrus_succulent_patch.json @@ -0,0 +1,24 @@ +{ + "feature": "aether_ii:cirrus_succulent_patch", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:random_offset", + "xz_spread": { + "type": "minecraft:trapezoid", + "max": 2, + "min": -2, + "plateau": 0 + }, + "y_spread": { + "type": "minecraft:trapezoid", + "max": 2, + "min": -2, + "plateau": 0 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/placed_feature/cumulus_bush_patch.json b/src/generated/resources/data/aether_ii/worldgen/placed_feature/cumulus_bush_patch.json new file mode 100644 index 0000000000..f3ce0b7d75 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/placed_feature/cumulus_bush_patch.json @@ -0,0 +1,24 @@ +{ + "feature": "aether_ii:cumulus_bush_patch", + "placement": [ + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:random_offset", + "xz_spread": { + "type": "minecraft:trapezoid", + "max": 3, + "min": -3, + "plateau": 0 + }, + "y_spread": { + "type": "minecraft:trapezoid", + "max": 2, + "min": -2, + "plateau": 0 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/placed_feature/expanse_bryalinn_moss_cover.json b/src/generated/resources/data/aether_ii/worldgen/placed_feature/expanse_bryalinn_moss_cover.json new file mode 100644 index 0000000000..0c1abfa816 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/placed_feature/expanse_bryalinn_moss_cover.json @@ -0,0 +1,47 @@ +{ + "feature": "aether_ii:bryalinn_moss_floor_expanse", + "placement": [ + { + "type": "minecraft:noise_based_count", + "noise_factor": 50.0, + "noise_offset": 0.0, + "noise_to_count_ratio": 30 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING_NO_LEAVES" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 12, + "target_condition": { + "type": "minecraft:solid" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "aether_ii:elevation_filter", + "max": { + "below_top": 0 + }, + "min": { + "above_bottom": 100 + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_ii/worldgen/placed_feature/royal_stratus_fern_patch.json b/src/generated/resources/data/aether_ii/worldgen/placed_feature/royal_stratus_fern_patch.json new file mode 100644 index 0000000000..0b1e697977 --- /dev/null +++ b/src/generated/resources/data/aether_ii/worldgen/placed_feature/royal_stratus_fern_patch.json @@ -0,0 +1,24 @@ +{ + "feature": "aether_ii:royal_stratus_fern_patch", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:random_offset", + "xz_spread": { + "type": "minecraft:trapezoid", + "max": 2, + "min": -2, + "plateau": 0 + }, + "y_spread": { + "type": "minecraft:trapezoid", + "max": 2, + "min": -2, + "plateau": 0 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/neoforge/data_maps/item/compostables.json b/src/generated/resources/data/neoforge/data_maps/item/compostables.json index c583624a69..62ae67673c 100644 --- a/src/generated/resources/data/neoforge/data_maps/item/compostables.json +++ b/src/generated/resources/data/neoforge/data_maps/item/compostables.json @@ -39,6 +39,15 @@ "aether_ii:carrion_cutting": { "chance": 0.65 }, + "aether_ii:cirrus_succulent": { + "chance": 0.65 + }, + "aether_ii:cumulonimbus_bush": { + "chance": 0.65 + }, + "aether_ii:cumulus_bush": { + "chance": 0.65 + }, "aether_ii:enchanted_blueberry": { "chance": 0.5 }, @@ -96,6 +105,9 @@ "aether_ii:poasprout": { "chance": 0.65 }, + "aether_ii:royal_stratus_fern": { + "chance": 0.65 + }, "aether_ii:satival_bulb": { "chance": 0.3 }, diff --git a/src/main/java/com/aetherteam/aetherii/AetherIITags.java b/src/main/java/com/aetherteam/aetherii/AetherIITags.java index 958507ee7c..13d041999c 100644 --- a/src/main/java/com/aetherteam/aetherii/AetherIITags.java +++ b/src/main/java/com/aetherteam/aetherii/AetherIITags.java @@ -333,7 +333,8 @@ public static class Biomes { public static final TagKey MAGNETIC_FOG = tag("magnetic_fog"); public static final TagKey ARCTIC = tag("arctic"); public static final TagKey IRRADIATED = tag("irradiated"); - public static final TagKey EXPANSE = tag("expanse"); + public static final TagKey AERCLOUD_SEA = tag("aercloud_sea"); + public static final TagKey UNDERCLOUD = tag("undercloud"); public static final TagKey LUSH = tag("lush"); public static final TagKey WET = tag("wet"); diff --git a/src/main/java/com/aetherteam/aetherii/block/AetherIIBlocks.java b/src/main/java/com/aetherteam/aetherii/block/AetherIIBlocks.java index cb7805f813..5e5936b92e 100644 --- a/src/main/java/com/aetherteam/aetherii/block/AetherIIBlocks.java +++ b/src/main/java/com/aetherteam/aetherii/block/AetherIIBlocks.java @@ -272,14 +272,14 @@ public class AetherIIBlocks extends AetherIIBlockBuilders { public static final DeferredBlock SHIELD_FERN = register("shield_fern", AetherTallGrassBlock::new, () -> Block.Properties.of().mapColor(MapColor.PLANT).replaceable().noCollision().instabreak().sound(SoundType.GRASS).offsetType(Block.OffsetType.XZ).ignitedByLava().pushReaction(PushReaction.DESTROY).postProcess(AetherIIBlocks::postProcessSelf)); // Flowers - public static final DeferredBlock HESPEROSE = register("hesperose", (properties) -> new AetherFlowerBlock(properties), () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); - public static final DeferredBlock TARABLOOM = register("tarabloom", (properties) -> new AetherFlowerBlock(properties), () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); - public static final DeferredBlock POASPROUT = register("poasprout", (properties) -> new AetherFlowerBlock(properties), () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); - public static final DeferredBlock LILICHIME = register("lilichime", (properties) -> new AetherFlowerBlock(properties), () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); - public static final DeferredBlock PLURACIAN = register("pluracian", (properties) -> new FacingFlowerBlock(properties), () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); - public static final DeferredBlock SATIVAL_SHOOT = register("satival_shoot", (properties) -> new AetherFlowerBlock(properties), () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); + public static final DeferredBlock HESPEROSE = register("hesperose", AetherFlowerBlock::new, () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); + public static final DeferredBlock TARABLOOM = register("tarabloom", AetherFlowerBlock::new, () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); + public static final DeferredBlock POASPROUT = register("poasprout", AetherFlowerBlock::new, () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); + public static final DeferredBlock LILICHIME = register("lilichime", AetherFlowerBlock::new, () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); + public static final DeferredBlock PLURACIAN = register("pluracian", FacingFlowerBlock::new, () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); + public static final DeferredBlock SATIVAL_SHOOT = register("satival_shoot", AetherFlowerBlock::new, () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); public static final DeferredBlock HOLPUPEA = register("holpupea", MossFlowersBlock::new, () -> Block.Properties.of().mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).pushReaction(PushReaction.DESTROY)); - public static final DeferredBlock BLADE_POA = register("blade_poa", (properties) -> new AetherFlowerBlock(properties), () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); + public static final DeferredBlock BLADE_POA = register("blade_poa", AetherFlowerBlock::new, () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); public static final DeferredBlock AECHOR_CUTTING = register("aechor_cutting", (properties) -> new PlantMobCuttingBlock(AetherIIEntityTypes.AECHOR_PLANT::get, properties), () -> Block.Properties.of().mapColor(MapColor.PLANT).randomTicks().noCollision().strength(0.65F).sound(SoundType.GRASS).offsetType(Block.OffsetType.XZ).pushReaction(PushReaction.DESTROY).requiresCorrectToolForDrops()); public static final DeferredBlock CARRION_CUTTING = register("carrion_cutting", (properties) -> new PlantMobCuttingBlock(AetherIIEntityTypes.CARRION_SPROUT::get, properties), () -> Block.Properties.of().mapColor(MapColor.PLANT).randomTicks().noCollision().strength(0.65F).sound(SoundType.GRASS).offsetType(Block.OffsetType.XZ).pushReaction(PushReaction.DESTROY).requiresCorrectToolForDrops()); @@ -328,6 +328,12 @@ public class AetherIIBlocks extends AetherIIBlockBuilders { public static final DeferredBlock BLOOMING_ARILUM = register("blooming_arilum", BloomingArilumBlock::new, () -> Block.Properties.of().mapColor(MapColor.WATER).noCollision().randomTicks().instabreak().sound(SoundType.WET_GRASS).pushReaction(PushReaction.DESTROY).lightLevel((block) -> 5)); public static final DeferredBlock BLOOMING_ARILUM_PLANT = register("blooming_arilum_plant", BloomingArilumPlantBlock::new, () -> Block.Properties.of().mapColor(MapColor.WATER).noCollision().randomTicks().instabreak().sound(SoundType.WET_GRASS).pushReaction(PushReaction.DESTROY).lightLevel((block) -> 5)); + // Expanse + public static final DeferredBlock CUMULUS_BUSH = register("cumulus_bush", AetherFlowerBlock::new, () -> Block.Properties.ofFullCopy(Blocks.BUSH)); + public static final DeferredBlock CUMULONIMBUS_BUSH = register("cumulonimbus_bush", DoublePlantBlock::new, () -> Block.Properties.ofFullCopy(Blocks.ROSE_BUSH)); + public static final DeferredBlock CIRRUS_SUCCULENT = register("cirrus_succulent", DoublePlantBlock::new, () -> Block.Properties.ofFullCopy(Blocks.ROSE_BUSH)); + public static final DeferredBlock ROYAL_STRATUS_FERN = register("royal_stratus_fern", AetherFlowerBlock::new, () -> Block.Properties.ofFullCopy(Blocks.DANDELION)); + // Ground Decoration public static final DeferredBlock SKYROOT_TWIG = register("skyroot_twig", TwigBlock::new, () -> Block.Properties.of().mapColor(MapColor.COLOR_BROWN).noOcclusion().noCollision().instabreak().sound(SoundType.WOOD).pushReaction(PushReaction.DESTROY)); public static final DeferredBlock HOLYSTONE_ROCK = register("holystone_rock", RockBlock::new, () -> Block.Properties.of().mapColor(MapColor.WOOL).noOcclusion().noCollision().instabreak().sound(SoundType.STONE).pushReaction(PushReaction.DESTROY), RockItem::new); diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIAdvancementData.java b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIAdvancementData.java index 1f4b01f00d..4d47889911 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIAdvancementData.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIAdvancementData.java @@ -405,8 +405,16 @@ public void generate(HolderLookup.Provider provider, Consumer .addCriterion("sheer_tundra", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.SHEER_TUNDRA)))) .addCriterion("contaminated_jungle", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.CONTAMINATED_JUNGLE)))) .addCriterion("battleground_wastes", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.BATTLEGROUND_WASTES)))) + .addCriterion("aercloud_sea", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.AERCLOUD_SEA)))) + .addCriterion("highfields_expanse", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.HIGHFIELDS_EXPANSE)))) + .addCriterion("magnetic_expanse", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_EXPANSE)))) + .addCriterion("arctic_expanse", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.ARCTIC_EXPANSE)))) + .addCriterion("irradiated_expanse", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.IRRADIATED_EXPANSE)))) + .addCriterion("highfields_undercloud", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD)))) + .addCriterion("magnetic_undercloud", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_UNDERCLOUD)))) + .addCriterion("arctic_undercloud", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.ARCTIC_UNDERCLOUD)))) + .addCriterion("irradiated_undercloud", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.IRRADIATED_UNDERCLOUD)))) .addCriterion("hestveil_caverns", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HolyIslesBiomes.HESTVEIL_CAVERNS)))) - //.addCriterion("expanse", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(biomes.getOrThrow(HighlandsBiomes.EXPANSE)))) .save(consumer, Identifier.fromNamespaceAndPath(AetherII.MODID, "explore_aether")); AdvancementHolder gravititePlate = Advancement.Builder.advancement() diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIDataMapData.java b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIDataMapData.java index 7ac8edc57b..735279396a 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIDataMapData.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIDataMapData.java @@ -87,6 +87,10 @@ protected void gather(HolderLookup.Provider provider) { this.addCompost(compostables, AetherIIItems.ENCHANTED_WYNDBERRY, 0.5F); this.addCompost(compostables, AetherIIItems.GOLDEN_WYNDBERRY, 0.65F); this.addCompost(compostables, AetherIIItems.SATIVAL_BULB, 0.3F); + this.addCompost(compostables, AetherIIBlocks.CUMULUS_BUSH, 0.65F); + this.addCompost(compostables, AetherIIBlocks.CUMULONIMBUS_BUSH, 0.65F); + this.addCompost(compostables, AetherIIBlocks.CIRRUS_SUCCULENT, 0.65F); + this.addCompost(compostables, AetherIIBlocks.ROYAL_STRATUS_FERN, 0.65F); var fuels = this.builder(NeoForgeDataMaps.FURNACE_FUELS); fuels.add(AetherIIItems.ARKENIUM_HESTVEIL_CANISTER, new FurnaceFuel(5000), false); @@ -143,7 +147,6 @@ protected void gather(HolderLookup.Provider provider) { colors.add(AetherIITags.Biomes.MAGNETIC, 0xc9ffd1, false); colors.add(AetherIITags.Biomes.ARCTIC, 0xbdf9ff, false); colors.add(AetherIITags.Biomes.IRRADIATED, 0xffdd99, false); - colors.add(HolyIslesBiomes.EXPANSE, 0xb5ffd0, false); } private void addCompost(DataMapProvider.Builder map, DeferredHolder item, float chance) { diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIILanguageData.java b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIILanguageData.java index 04f211e270..4d30e8a3b2 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIILanguageData.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIILanguageData.java @@ -341,6 +341,12 @@ private void addBlocks() { this.addBlock(AetherIIBlocks.BLOOMING_ARILUM, "Blooming Arilum"); this.addBlock(AetherIIBlocks.BLOOMING_ARILUM_PLANT, "Blooming Arilum"); + // Expanse + this.addBlock(AetherIIBlocks.CUMULUS_BUSH, "Cumulus Bush"); + this.addBlock(AetherIIBlocks.CUMULONIMBUS_BUSH, "Cumulonimbus Bush"); + this.addBlock(AetherIIBlocks.CIRRUS_SUCCULENT, "Cirrus Succulent"); + this.addBlock(AetherIIBlocks.ROYAL_STRATUS_FERN, "Royal Stratus Fern"); + // Ground Decoration this.addBlock(AetherIIBlocks.SKYROOT_TWIG, "Skyroot Twig"); this.addBlock(AetherIIBlocks.HOLYSTONE_ROCK, "Holystone Rock"); @@ -1502,7 +1508,19 @@ private void addBiomes() { this.addBiome(HolyIslesBiomes.BATTLEGROUND_WASTES, "Battleground Wastes"); // Aercloud Sea - this.addBiome(HolyIslesBiomes.EXPANSE, "Expanse"); + this.addBiome(HolyIslesBiomes.AERCLOUD_SEA, "Aercloud Sea"); + this.addBiome(HolyIslesBiomes.HIGHFIELDS_EXPANSE, "Highfields Expanse"); + this.addBiome(HolyIslesBiomes.MAGNETIC_EXPANSE, "Magnetic Expanse"); + this.addBiome(HolyIslesBiomes.ARCTIC_EXPANSE, "Arctic Expanse"); + this.addBiome(HolyIslesBiomes.IRRADIATED_EXPANSE, "Irradiated Expanse"); + + // Caves + this.addBiome(HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD, "Highfields Undercloud"); + this.addBiome(HolyIslesBiomes.MAGNETIC_UNDERCLOUD, "Magnetic Undercloud"); + this.addBiome(HolyIslesBiomes.ARCTIC_UNDERCLOUD, "Arctic Undercloud"); + this.addBiome(HolyIslesBiomes.IRRADIATED_UNDERCLOUD, "Irradiated Undercloud"); + + this.addBiome(HolyIslesBiomes.HESTVEIL_CAVERNS, "Hestveil Caverns"); } private void addStructures() { diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIRecipeData.java b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIRecipeData.java index e18690a33f..e2b82d25cc 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIRecipeData.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIIRecipeData.java @@ -2339,6 +2339,8 @@ protected void buildRecipes() { this.oneToOneConversionRecipe(Items.BROWN_DYE, AetherIIBlocks.SKY_ROOTS, "brown_dye"); this.oneToOneConversionRecipe(Items.PURPLE_DYE, AetherIIBlocks.AECHOR_CUTTING, "purple_dye"); this.oneToOneConversionRecipe(Items.LIGHT_BLUE_DYE, AetherIIBlocks.CARRION_CUTTING, "light_blue_dye"); + this.oneToOneConversionRecipe(Items.ORANGE_DYE, AetherIIBlocks.CIRRUS_SUCCULENT, "orange_dye"); + this.oneToOneConversionRecipe(Items.CYAN_DYE, AetherIIBlocks.ROYAL_STRATUS_FERN, "cyan_dye"); ShapelessRecipeBuilder.shapeless(getter, RecipeCategory.MISC, AetherIIItems.SWET_JELLY.get(), 1) .requires(AetherIIItems.SWET_GEL) diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/loot/AetherIIBlockLoot.java b/src/main/java/com/aetherteam/aetherii/data/generators/loot/AetherIIBlockLoot.java index b92698ca53..5a6d42225b 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/loot/AetherIIBlockLoot.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/loot/AetherIIBlockLoot.java @@ -5,6 +5,7 @@ import com.aetherteam.aetherii.item.AetherIIItems; import com.aetherteam.aetherii.item.components.AetherIIDataComponents; import com.aetherteam.aetherii.mixin.mixins.common.accessor.BlockLootAccessor; +import net.minecraft.advancements.criterion.StatePropertiesPredicate; import net.minecraft.core.HolderGetter; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; @@ -13,13 +14,17 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.block.BedBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.DoublePlantBlock; import net.minecraft.world.level.block.state.properties.BedPart; +import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.functions.CopyComponentsFunction; import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; +import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; @@ -293,6 +298,17 @@ public void generate() { this.add(AetherIIBlocks.BLOOMING_ARILUM.get(), (plant) -> this.droppingArilumBulbs(getter, plant, AetherIIItems.ARILUM_BULBS.get())); this.add(AetherIIBlocks.BLOOMING_ARILUM_PLANT.get(), (plant) -> this.droppingArilumBulbs(getter, AetherIIBlocks.BLOOMING_ARILUM.get(), AetherIIItems.ARILUM_BULBS.get())); + // Expanse + this.add(AetherIIBlocks.CUMULUS_BUSH.get(), (plant) -> this.createSilkTouchOrShearsTable(AetherIIBlocks.CUMULUS_BUSH.get())); + this.add(AetherIIBlocks.CUMULONIMBUS_BUSH.get(), this::createDoublePlantShearsDrop); + this.add(AetherIIBlocks.CIRRUS_SUCCULENT.get(), this.applyExplosionDecay(AetherIIBlocks.CIRRUS_SUCCULENT.get(), LootTable.lootTable() + .withPool(LootPool.lootPool() + .add(LootItem.lootTableItem(AetherIIBlocks.CIRRUS_SUCCULENT.get()) + .when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(AetherIIBlocks.CIRRUS_SUCCULENT.get()).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER) + )))) + )); + this.dropSelf(AetherIIBlocks.ROYAL_STRATUS_FERN.get()); + // Ground Decoration this.add(AetherIIBlocks.SKYROOT_TWIG.get(), this::dropTwigs); this.add(AetherIIBlocks.HOLYSTONE_ROCK.get(), this::dropRocks); @@ -767,11 +783,11 @@ public void generate() { // Furniture this.dropNone(AetherIIBlocks.OUTPOST_CAMPFIRE.get()); this.add(AetherIIBlocks.MURAL.get(), (mural) -> LootTable.lootTable() - .withPool(this.applyExplosionCondition(mural, LootPool.lootPool() - .setRolls(ConstantValue.exactly(1.0F)) - .add(LootItem.lootTableItem(mural))) - .apply(CopyComponentsFunction.copyComponentsFromBlockEntity(LootContextParams.BLOCK_ENTITY) - .include(AetherIIDataComponents.MURAL_SECTION.get()))) + .withPool(this.applyExplosionCondition(mural, LootPool.lootPool() + .setRolls(ConstantValue.exactly(1.0F)) + .add(LootItem.lootTableItem(mural))) + .apply(CopyComponentsFunction.copyComponentsFromBlockEntity(LootContextParams.BLOCK_ENTITY) + .include(AetherIIDataComponents.MURAL_SECTION.get()))) ); // Infected Guardian Tree diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/models/AetherIIBlockModels.java b/src/main/java/com/aetherteam/aetherii/data/generators/models/AetherIIBlockModels.java index 756ce64214..1134ba94ca 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/models/AetherIIBlockModels.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/models/AetherIIBlockModels.java @@ -221,6 +221,13 @@ public void run() { this.createCrossWithDefaultItem(AetherIIBlocks.BLOOMING_ARILUM.get(), PlantType.NOT_TINTED); this.createCrossWithDefaultItem(AetherIIBlocks.BLOOMING_ARILUM_PLANT.get(), PlantType.NOT_TINTED); + // Expanse + this.createCrossWithDefaultItem(AetherIIBlocks.CUMULUS_BUSH.get(), PlantType.NOT_TINTED); + this.createDoublePlant(AetherIIBlocks.CUMULONIMBUS_BUSH.get(), PlantType.NOT_TINTED); + this.registerSimpleFlatItemModel(AetherIIBlocks.CUMULONIMBUS_BUSH.asItem()); + this.createCirrusSucculent(AetherIIBlocks.CIRRUS_SUCCULENT.get()); + this.createRoyalStratusFern(AetherIIBlocks.ROYAL_STRATUS_FERN.get()); + // Ground Decoration this.createTwig(AetherIIBlocks.SKYROOT_TWIG.get(), AetherIIBlocks.SKYROOT_LOG.get()); this.createRock(AetherIIBlocks.HOLYSTONE_ROCK.get(), AetherIIBlocks.HOLYSTONE.get()); diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/tags/AetherIIBiomeTagData.java b/src/main/java/com/aetherteam/aetherii/data/generators/tags/AetherIIBiomeTagData.java index 9e7c0bc2fd..ebaf32c8af 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/tags/AetherIIBiomeTagData.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/tags/AetherIIBiomeTagData.java @@ -26,19 +26,21 @@ public void addTags(HolderLookup.Provider provider) { AetherIITags.Biomes.MAGNETIC, AetherIITags.Biomes.ARCTIC, AetherIITags.Biomes.IRRADIATED, - AetherIITags.Biomes.EXPANSE + AetherIITags.Biomes.AERCLOUD_SEA ); this.tag(AetherIITags.Biomes.HIGHFIELDS).add( HolyIslesBiomes.FLOURISHING_FIELD, HolyIslesBiomes.VERDANT_WOODS, HolyIslesBiomes.SHROUDED_FOREST, - HolyIslesBiomes.SHIMMERING_BASIN + HolyIslesBiomes.SHIMMERING_BASIN, + HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD ); this.tag(AetherIITags.Biomes.MAGNETIC).add( HolyIslesBiomes.MAGNETIC_SCAR, HolyIslesBiomes.TURQUOISE_FOREST, HolyIslesBiomes.GLISTENING_SWAMP, - HolyIslesBiomes.VIOLET_HIGHWOODS + HolyIslesBiomes.VIOLET_HIGHWOODS, + HolyIslesBiomes.MAGNETIC_UNDERCLOUD ); this.tag(AetherIITags.Biomes.MAGNETIC_FOG).add( HolyIslesBiomes.GLISTENING_SWAMP @@ -47,14 +49,26 @@ public void addTags(HolderLookup.Provider provider) { HolyIslesBiomes.FRIGID_SIERRA, HolyIslesBiomes.ENDURING_WOODLAND, HolyIslesBiomes.FROZEN_LAKES, - HolyIslesBiomes.SHEER_TUNDRA + HolyIslesBiomes.SHEER_TUNDRA, + HolyIslesBiomes.ARCTIC_UNDERCLOUD ); this.tag(AetherIITags.Biomes.IRRADIATED).add( HolyIslesBiomes.CONTAMINATED_JUNGLE, - HolyIslesBiomes.BATTLEGROUND_WASTES + HolyIslesBiomes.BATTLEGROUND_WASTES, + HolyIslesBiomes.IRRADIATED_UNDERCLOUD ); - this.tag(AetherIITags.Biomes.EXPANSE).add( - HolyIslesBiomes.EXPANSE + this.tag(AetherIITags.Biomes.AERCLOUD_SEA).add( + HolyIslesBiomes.AERCLOUD_SEA, + HolyIslesBiomes.HIGHFIELDS_EXPANSE, + HolyIslesBiomes.ARCTIC_EXPANSE, + HolyIslesBiomes.MAGNETIC_EXPANSE, + HolyIslesBiomes.IRRADIATED_EXPANSE + ); + this.tag(AetherIITags.Biomes.UNDERCLOUD).add( + HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD, + HolyIslesBiomes.ARCTIC_UNDERCLOUD, + HolyIslesBiomes.MAGNETIC_UNDERCLOUD, + HolyIslesBiomes.IRRADIATED_UNDERCLOUD ); this.tag(AetherIITags.Biomes.LUSH).add( @@ -100,7 +114,15 @@ public void addTags(HolderLookup.Provider provider) { HolyIslesBiomes.SHEER_TUNDRA, HolyIslesBiomes.CONTAMINATED_JUNGLE, HolyIslesBiomes.BATTLEGROUND_WASTES, - HolyIslesBiomes.EXPANSE, + HolyIslesBiomes.AERCLOUD_SEA, + HolyIslesBiomes.HIGHFIELDS_EXPANSE, + HolyIslesBiomes.ARCTIC_EXPANSE, + HolyIslesBiomes.MAGNETIC_EXPANSE, + HolyIslesBiomes.IRRADIATED_EXPANSE, + HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD, + HolyIslesBiomes.ARCTIC_UNDERCLOUD, + HolyIslesBiomes.MAGNETIC_UNDERCLOUD, + HolyIslesBiomes.IRRADIATED_UNDERCLOUD, HolyIslesBiomes.HESTVEIL_CAVERNS ); @@ -119,7 +141,15 @@ public void addTags(HolderLookup.Provider provider) { HolyIslesBiomes.SHEER_TUNDRA, HolyIslesBiomes.CONTAMINATED_JUNGLE, HolyIslesBiomes.BATTLEGROUND_WASTES, - HolyIslesBiomes.EXPANSE, + HolyIslesBiomes.AERCLOUD_SEA, + HolyIslesBiomes.HIGHFIELDS_EXPANSE, + HolyIslesBiomes.ARCTIC_EXPANSE, + HolyIslesBiomes.MAGNETIC_EXPANSE, + HolyIslesBiomes.IRRADIATED_EXPANSE, + HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD, + HolyIslesBiomes.ARCTIC_UNDERCLOUD, + HolyIslesBiomes.MAGNETIC_UNDERCLOUD, + HolyIslesBiomes.IRRADIATED_UNDERCLOUD, HolyIslesBiomes.HESTVEIL_CAVERNS ); @@ -206,7 +236,10 @@ public void addTags(HolderLookup.Provider provider) { HolyIslesBiomes.ENDURING_WOODLAND, HolyIslesBiomes.SHEER_TUNDRA, HolyIslesBiomes.FROZEN_LAKES, - HolyIslesBiomes.HESTVEIL_CAVERNS + HolyIslesBiomes.HESTVEIL_CAVERNS, + HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD, + HolyIslesBiomes.ARCTIC_UNDERCLOUD, + HolyIslesBiomes.MAGNETIC_UNDERCLOUD ); this.tag(AetherIITags.Biomes.HAS_STRUCTURE_UNDERCLOUD_MINESHAFT).add( HolyIslesBiomes.FLOURISHING_FIELD, @@ -220,7 +253,10 @@ public void addTags(HolderLookup.Provider provider) { HolyIslesBiomes.FRIGID_SIERRA, HolyIslesBiomes.ENDURING_WOODLAND, HolyIslesBiomes.SHEER_TUNDRA, - HolyIslesBiomes.FROZEN_LAKES + HolyIslesBiomes.FROZEN_LAKES, + HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD, + HolyIslesBiomes.ARCTIC_UNDERCLOUD, + HolyIslesBiomes.MAGNETIC_UNDERCLOUD ); this.tag(AetherIITags.Biomes.HAS_STRUCTURE_ANCIENT_HENGE).add( HolyIslesBiomes.MAGNETIC_SCAR, @@ -245,7 +281,7 @@ public void addTags(HolderLookup.Provider provider) { HolyIslesBiomes.SHEER_TUNDRA, HolyIslesBiomes.CONTAMINATED_JUNGLE, HolyIslesBiomes.BATTLEGROUND_WASTES - ); + ).addTag(AetherIITags.Biomes.UNDERCLOUD); this.tag(AetherIITags.Biomes.HAS_STRUCTURE_INFECTED_GUARDIAN_TREE).add( HolyIslesBiomes.FLOURISHING_FIELD, HolyIslesBiomes.VERDANT_WOODS, @@ -253,7 +289,10 @@ public void addTags(HolderLookup.Provider provider) { HolyIslesBiomes.MAGNETIC_SCAR, HolyIslesBiomes.VIOLET_HIGHWOODS, HolyIslesBiomes.ENDURING_WOODLAND, - HolyIslesBiomes.SHEER_TUNDRA + HolyIslesBiomes.SHEER_TUNDRA, + HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD, + HolyIslesBiomes.ARCTIC_UNDERCLOUD, + HolyIslesBiomes.MAGNETIC_UNDERCLOUD ); } } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/aetherii/data/providers/AetherIIBlockModelSubProvider.java b/src/main/java/com/aetherteam/aetherii/data/providers/AetherIIBlockModelSubProvider.java index 2c3b486d7c..98ac297285 100644 --- a/src/main/java/com/aetherteam/aetherii/data/providers/AetherIIBlockModelSubProvider.java +++ b/src/main/java/com/aetherteam/aetherii/data/providers/AetherIIBlockModelSubProvider.java @@ -957,6 +957,18 @@ public void createMagneticShroomBlocksInside() { AetherIIModelTemplates.TEMPLATE_EMISSIVE_SINGLE_FACE.create(ModelLocationUtils.getModelLocation(AetherIIBlocks.MAGNETIC_SHROOM_BLOCK.get(), "_inside"), textureMapping, this.modelOutput); } + public void createCirrusSucculent(Block block) { + MultiVariant topModel = plainVariant(this.createSuffixedVariant(block, "_top", AetherIIModelTemplates.CIRRUS_SUCCULENT, TextureMapping::cross)); + MultiVariant bottomModel = plainVariant(this.createSuffixedVariant(block, "_bottom", AetherIIModelTemplates.CIRRUS_SUCCULENT, TextureMapping::cross)); + this.createDoubleBlock(block, topModel, bottomModel); + this.registerSimpleFlatItemModel(block.asItem()); + } + + public void createRoyalStratusFern(Block block) { + MultiVariant location = plainVariant(AetherIIModelTemplates.ROYAL_STRATUS_FERN.create(block, AetherIITextureMappings.royalStratusFern(block).put(TextureSlot.PARTICLE, TextureMapping.getBlockTexture(block, "_base")), this.modelOutput)); + this.blockStateOutput.accept(MultiVariantGenerator.dispatch(block, location)); + } + public void createTwig(Block twig, Block base) { TextureMapping mapping = TextureMapping.logColumn(base); MultiVariant twigs1 = plainVariant(AetherIIModelTemplates.TWIG_1.create(twig, mapping, this.modelOutput)); diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIIModelTemplates.java b/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIIModelTemplates.java index f47b5f7635..fb797fc7ea 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIIModelTemplates.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIIModelTemplates.java @@ -280,6 +280,8 @@ public class AetherIIModelTemplates { public static final ModelTemplate TARAHESP_FLOWERS_3 = create("template_tarahesp_flowers_3", "_3", AetherIITextureSlots.TARAHESP_FLOWERS_PURPLE, AetherIITextureSlots.TARAHESP_FLOWERS_WHITE, TextureSlot.PARTICLE); public static final ModelTemplate TARAHESP_FLOWERS_4 = create("template_tarahesp_flowers_4", "_4", AetherIITextureSlots.TARAHESP_FLOWERS_PURPLE, AetherIITextureSlots.TARAHESP_FLOWERS_WHITE, TextureSlot.PARTICLE); public static final ModelTemplate AMBRELINN_MOSS_VINE = create("template_ambrelinn_moss_vine", AetherIITextureSlots.VINE, TextureSlot.PARTICLE); + public static final ModelTemplate CIRRUS_SUCCULENT = create("template_cirrus_succulent", TextureSlot.CROSS); + public static final ModelTemplate ROYAL_STRATUS_FERN = create("template_royal_stratus_fern", AetherIITextureSlots.LEAF, TextureSlot.TOP, TextureSlot.BOTTOM, AetherIITextureSlots.BASE, TextureSlot.PARTICLE); public static final ModelTemplate HANGING_UNDERGROWTH = create("template_hanging_undergrowth", AetherIITextureSlots.VINE, TextureSlot.PARTICLE); public static final ModelTemplate ROTSHROOM_CLUSTER = create("template_rotshroom_cluster", TextureSlot.ALL, TextureSlot.PARTICLE); public static final ModelTemplate CARPET_CUTOUT = ModelTemplates.create("carpet", TextureSlot.WOOL); diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIITextureMappings.java b/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIITextureMappings.java index 03f355c8ec..552f32993d 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIITextureMappings.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIITextureMappings.java @@ -193,6 +193,18 @@ public static TextureMapping lilichime(Block block, boolean potted) { .put(TextureSlot.PARTICLE, TextureMapping.getItemTexture(block.asItem())); } + public static TextureMapping royalStratusFern(Block block) { + return royalStratusFern(block, ""); + } + + public static TextureMapping royalStratusFern(Block block, String suffix) { + return new TextureMapping() + .put(AetherIITextureSlots.LEAF, TextureMapping.getBlockTexture(block, "_leaf" + suffix)) + .put(TextureSlot.TOP, TextureMapping.getBlockTexture(block, "_top" + suffix)) + .put(TextureSlot.BOTTOM, TextureMapping.getBlockTexture(block, "_bottom" + suffix)) + .put(AetherIITextureSlots.BASE, TextureMapping.getBlockTexture(block, "_base" + suffix)); + } + public static TextureMapping lockedBlockInventory(Block block) { return new TextureMapping() .put(AetherIITextureSlots.FACE, TextureMapping.getBlockTexture(block)) diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIITextureSlots.java b/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIITextureSlots.java index 4954f00524..9e7010241e 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIITextureSlots.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/builders/models/AetherIITextureSlots.java @@ -47,4 +47,6 @@ public class AetherIITextureSlots { public static final TextureSlot PETAL_BOTTOM = TextureSlot.create("petal_bottom"); public static final TextureSlot PETALS = TextureSlot.create("petals"); public static final TextureSlot INNER_BOTTOM = TextureSlot.create("inner_bottom"); + public static final TextureSlot LEAF = TextureSlot.create("leaf"); + public static final TextureSlot BASE = TextureSlot.create("base"); } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/AetherIIDensityFunctionBuilders.java b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/AetherIIDensityFunctionBuilders.java index d35d1155f9..0814332d21 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/AetherIIDensityFunctionBuilders.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/AetherIIDensityFunctionBuilders.java @@ -22,8 +22,11 @@ public class AetherIIDensityFunctionBuilders { public static final ResourceKey VEGETATION = createKey("holy_isles/vegetation"); public static final ResourceKey VEGETATION_RARE = createKey("holy_isles/vegetation_rare"); public static final ResourceKey VEGETATION_RARITY_MAPPER = createKey("holy_isles/vegetation_rarity_mapper"); + public static final ResourceKey CONTINENTS_BASE_HEIGHTMAP = createKey("holy_isles/continents_base_heightmap"); public static final ResourceKey CONTINENTS_HEIGHTMAP = createKey("holy_isles/continents_heightmap"); public static final ResourceKey CONTINENTS = createKey("holy_isles/continents"); + public static final ResourceKey CONTINENTS_RARE = createKey("holy_isles/continents_rare"); + public static final ResourceKey CONTINENTS_RARITY_MAPPER = createKey("holy_isles/continents_rarity_mapper"); public static final ResourceKey EROSION = createKey("holy_isles/erosion"); public static final ResourceKey DEPTH = createKey("holy_isles/depth"); public static final ResourceKey CAVE_BIOMES = createKey("holy_isles/cave_biomes"); @@ -31,8 +34,10 @@ public class AetherIIDensityFunctionBuilders { public static final ResourceKey AMPLIFICATION = createKey("holy_isles/amplification"); public static final ResourceKey RIDGES = createKey("holy_isles/ridges"); public static final ResourceKey BASE_3D_NOISE = createKey("holy_isles/base_3d_noise"); + public static final ResourceKey BASE_SUNKEN_3D_NOISE = createKey("holy_isles/base_sunken_3d_noise"); public static final ResourceKey SHATTERED_ISLANDS = createKey("holy_isles/terrain/shattered_islands"); + public static final ResourceKey SUNKEN_ISLANDS = createKey("holy_isles/terrain/sunken_islands"); public static final ResourceKey BASE_ISLANDS = createKey("holy_isles/terrain/base_islands"); public static final ResourceKey FINAL_ISLANDS = createKey("holy_isles/terrain/final_islands"); @@ -54,6 +59,11 @@ public class AetherIIDensityFunctionBuilders { public static final ResourceKey BOTTOM_SLIDE_SHATTERED = createKey("holy_isles/terrain/shattered/bottom_slide_shattered"); public static final ResourceKey TOP_SLIDE_SHATTERED = createKey("holy_isles/terrain/shattered/top_slide_shattered"); + public static final ResourceKey FACTOR_SUNKEN = createKey("holy_isles/terrain/sunken/factor_sunken"); + public static final ResourceKey ELEVATION_SUNKEN = createKey("holy_isles/terrain/sunken/elevation_sunken"); + public static final ResourceKey BOTTOM_SLIDE_SUNKEN = createKey("holy_isles/terrain/sunken/bottom_slide_sunken"); + public static final ResourceKey TOP_SLIDE_SUNKEN = createKey("holy_isles/terrain/sunken/top_slide_sunken"); + public static final ResourceKey NOISE_CAVES = createKey("holy_isles/caves/noise_caves"); public static final ResourceKey UNDERGROUND_SHAPER = createKey("holy_isles/caves/underground_shaper"); @@ -120,19 +130,25 @@ public static DensityFunction buildCaveBiomesRarityMapper(HolderGetter function) { + public static DensityFunction buildContinentsBaseHeightmap(HolderGetter function) { DensityFunction density = getFunction(function, BASE_ISLANDS); density = DensityFunctions.blendDensity(density); density = DensityFunctions.interpolated(density); density = density.squeeze(); - density = DensityFunctions.add(density, DensityFunctions.constant(0.165)); - density = DensityFunctions.findTopSurface(density, DensityFunctions.constant(160), 96, 24); + density = DensityFunctions.add(density, DensityFunctions.constant(0.1)); + return density; + } + + + public static DensityFunction buildContinentsHeightmap(HolderGetter function) { + DensityFunction density = getFunction(function, CONTINENTS_HEIGHTMAP); + density = DensityFunctions.rangeChoice(getFunction(function, ELEVATION_MAPPER), 0.0, 0.4, DensityFunctions.findTopSurface(density, DensityFunctions.constant(160), 96, 16), DensityFunctions.findTopSurface(density, DensityFunctions.constant(192), 128, 16)); return density; } public static DensityFunction buildContinents(HolderGetter function) { DensityFunctions.Spline.Coordinate heightmap = new DensityFunctions.Spline.Coordinate(function.getOrThrow(CONTINENTS_HEIGHTMAP)); - return DensityFunctions.spline(continents(heightmap)); + return DensityFunctions.cacheOnce(DensityFunctions.spline(continents(heightmap))); } public static > CubicSpline continents(I heightmap) { @@ -142,9 +158,16 @@ public static > CubicSpline continent .build(); } + public static DensityFunction buildContinentsRarityMapper(HolderGetter function) { + DensityFunction continents = getFunction(function, CONTINENTS); + DensityFunction density = DensityFunctions.rangeChoice(getFunction(function, CONTINENTS_RARE), 0, 0.325, continents, DensityFunctions.constant(2.0)); + density = DensityFunctions.rangeChoice(continents, 0.0, 0.1, density, continents); + return density; + } + public static DensityFunction buildElevationMapper(HolderGetter function) { - return DensityFunctions.rangeChoice(getFunction(function, EROSION), -1.5, MAGNETIC_START_VALUE, - DensityFunctions.rangeChoice(getFunction(function, TEMPERATURE), ARCTIC_START_VALUE, 1.5, getFunction(function, ELEVATION), getFunction(function, ELEVATION_DENSE)), getFunction(function, ELEVATION_DENSE)); + return DensityFunctions.cacheOnce(DensityFunctions.rangeChoice(getFunction(function, EROSION), -1.5, MAGNETIC_START_VALUE, + DensityFunctions.rangeChoice(getFunction(function, TEMPERATURE), ARCTIC_START_VALUE, 1.5, getFunction(function, ELEVATION), getFunction(function, ELEVATION_DENSE)), getFunction(function, ELEVATION_DENSE))); } // Terrain @@ -160,6 +183,18 @@ public static DensityFunction buildShatteredIslands(HolderGetter function) { + DensityFunction density = getFunction(function, BASE_SUNKEN_3D_NOISE); + density = DensityFunctions.add(density, DensityFunctions.constant(-0.1)); + density = DensityFunctions.add(density, DensityFunctions.constant(0.2)); + density = DensityFunctions.mul(density, getFunction(function, TOP_SLIDE_SUNKEN)); + density = DensityFunctions.add(density, factorizeSunken(function, -0.25)); + density = DensityFunctions.add(density, DensityFunctions.constant(0.1)); + density = DensityFunctions.mul(density, getFunction(function, BOTTOM_SLIDE_SUNKEN)); + density = DensityFunctions.add(density, factorizeSunken(function, -0.25)); + return density; + } + public static DensityFunction buildBaseIslands(HolderGetter function) { DensityFunction density = getFunction(function, BASE_3D_NOISE); density = DensityFunctions.add(density, DensityFunctions.constant(-0.03)); @@ -169,6 +204,7 @@ public static DensityFunction buildBaseIslands(HolderGetter fun density = DensityFunctions.add(density, DensityFunctions.constant(0.1)); density = DensityFunctions.mul(density, getFunction(function, BOTTOM_SLIDE)); density = DensityFunctions.add(density, factorize(function, -0.19)); + density = DensityFunctions.cacheOnce(density); return density; } @@ -176,6 +212,7 @@ public static DensityFunction buildFinalIslands(HolderGetter fu DensityFunction density = getFunction(function, BASE_ISLANDS); density = DensityFunctions.min(density, getFunction(function, NOISE_CAVES)); density = DensityFunctions.max(density, DensityFunctions.rangeChoice(getFunction(function, Y), DimensionType.MIN_Y * 2, 130, DensityFunctions.constant(-1), getFunction(function, AetherIIDensityFunctions.SHATTERED_ISLANDS))); + density = DensityFunctions.max(density, getFunction(function, SUNKEN_ISLANDS)); density = DensityFunctions.blendDensity(density); density = DensityFunctions.interpolated(density); density = density.squeeze(); @@ -224,7 +261,7 @@ public static DensityFunction factorize(HolderGetter function, public static DensityFunction buildTopSlide(HolderGetter function) { DensityFunctions.Spline.Coordinate y = new DensityFunctions.Spline.Coordinate(function.getOrThrow(Y)); DensityFunctions.Spline.Coordinate elevation = new DensityFunctions.Spline.Coordinate(function.getOrThrow(ELEVATION_MAPPER)); - return DensityFunctions.spline(topSlide(y, elevation, 0.0F)); + return DensityFunctions.cacheOnce(DensityFunctions.spline(topSlide(y, elevation, 0.0F))); } public static > CubicSpline topSlide(I y, I elevation, float value) { @@ -290,7 +327,7 @@ public static DensityFunction selectSlide(HolderGetter function public static DensityFunction buildSloper(HolderGetter function) { DensityFunctions.Spline.Coordinate y = new DensityFunctions.Spline.Coordinate(function.getOrThrow(Y)); DensityFunctions.Spline.Coordinate elevation = new DensityFunctions.Spline.Coordinate(function.getOrThrow(ELEVATION_MAPPER)); - return DensityFunctions.spline(topSlide(y, elevation, 2.0F)); + return DensityFunctions.cacheOnce(DensityFunctions.spline(topSlide(y, elevation, 2.0F))); } public static DensityFunction selectSloper(HolderGetter function) { @@ -430,6 +467,60 @@ public static > CubicSpline bottomSli .build(); } + // Shattered Islands + public static DensityFunction buildFactorSunken(HolderGetter function) { + DensityFunctions.Spline.Coordinate continents = new DensityFunctions.Spline.Coordinate(function.getOrThrow(CONTINENTS_RARITY_MAPPER)); + return DensityFunctions.spline(factorSunken(continents)); + } + + public static > CubicSpline factorSunken(I continents) { + return CubicSpline.builder(continents) + .addPoint(1.0F, 7.5F) + .addPoint(2.0F, 1.0F) + .build(); + } + + public static DensityFunction factorizeSunken(HolderGetter function, double value) { + DensityFunction density = getFunction(function, FACTOR_SUNKEN); + density = DensityFunctions.mul(density, DensityFunctions.constant(value)); + density = DensityFunctions.mul(density, DensityFunctions.add(DensityFunctions.constant(0.35D), getFunction(function, AMPLIFICATION))); + return density; + } + + public static DensityFunction buildTopSlideSunken(HolderGetter function) { + DensityFunctions.Spline.Coordinate y = new DensityFunctions.Spline.Coordinate(function.getOrThrow(Y)); + DensityFunctions.Spline.Coordinate elevation = new DensityFunctions.Spline.Coordinate(function.getOrThrow(ELEVATION_SUNKEN)); + return DensityFunctions.spline(topSlideSunken(y, elevation)); + } + + public static > CubicSpline topSlideSunken(I y, I elevation) { + return CubicSpline.builder(elevation) + .addPoint(0.05F, slidePiece(y, 64, 136, 1, 0.0F)) + .addPoint(0.15F, slidePiece(y, 68, 140, 1, 0.0F)) + .addPoint(0.25F, slidePiece(y, 72, 144, 1, 0.0F)) + .addPoint(0.35F, slidePiece(y, 76, 148, 1, 0.0F)) + .addPoint(0.45F, slidePiece(y, 80, 152, 1, 0.0F)) + .addPoint(0.55F, slidePiece(y, 84, 156, 1, 0.0F)) + .build(); + } + + public static DensityFunction buildBottomSlideSunken(HolderGetter function) { + DensityFunctions.Spline.Coordinate y = new DensityFunctions.Spline.Coordinate(function.getOrThrow(Y)); + DensityFunctions.Spline.Coordinate elevation = new DensityFunctions.Spline.Coordinate(function.getOrThrow(ELEVATION_SUNKEN)); + return DensityFunctions.spline(bottomSlideSunken(y, elevation)); + } + + public static > CubicSpline bottomSlideSunken(I y, I elevation) { + return CubicSpline.builder(elevation) + .addPoint(0.05F, slidePiece(y, 36, 60, 0, 1)) + .addPoint(0.15F, slidePiece(y, 40, 64, 0, 1)) + .addPoint(0.25F, slidePiece(y, 44, 68, 0, 1)) + .addPoint(0.35F, slidePiece(y, 48, 72, 0, 1)) + .addPoint(0.45F, slidePiece(y, 52, 76, 0, 1)) + .addPoint(0.55F, slidePiece(y, 56, 80, 0, 1)) + .build(); + } + // Underground public static > CubicSpline caveGradient(I y) { return CubicSpline.builder(y) diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesBiomeBuilders.java b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesBiomeBuilders.java index 62883999d6..088785f4c3 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesBiomeBuilders.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesBiomeBuilders.java @@ -147,6 +147,19 @@ public static Biome shimmeringBasinBiome(HolderGetter placedFeatu temperature, downfall); } + + public static Biome highfieldsUndercloudBiome(HolderGetter placedFeatures, HolderGetter> worldCarvers, float temperature, float downfall) { + return makeHighfieldsBiome(Optional.of(HolyIslesPlacedFeatures.VERDANT_WOODS_TREES), new BiomeGenerationSettings.Builder(placedFeatures, worldCarvers) + .addCarver(AetherIICarvers.HOLY_ISLES_CAVE) + .addFeature(GenerationStep.Decoration.LAKES, HolyIslesPlacedFeatures.WATER_POND) + .addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, HolyIslesPlacedFeatures.HOLYSTONE_ROCKS) + .addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, HolyIslesPlacedFeatures.SMALL_GRASS_PATCH) + .addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, HolyIslesPlacedFeatures.MEDIUM_GRASS_PATCH) + .addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, HolyIslesPlacedFeatures.LARGE_GRASS_PATCH), + new MobSpawnSettings.Builder(), + temperature, downfall); + } + public static Biome makeHighfieldsBiome(Optional> tree, BiomeGenerationSettings.Builder builder, MobSpawnSettings.Builder spawnSettingsBuilder, float temperature, float downfall) { builder = builder.addFeature(GenerationStep.Decoration.RAW_GENERATION, HolyIslesPlacedFeatures.NOISE_LAKE) .addFeature(GenerationStep.Decoration.RAW_GENERATION, HolyIslesPlacedFeatures.CLOUDBED) @@ -321,6 +334,16 @@ public static Biome violetHighwoodsBiome(HolderGetter placedFeatu temperature, downfall); } + + public static Biome magneticUndercloudBiome(HolderGetter placedFeatures, HolderGetter> worldCarvers, float temperature, float downfall) { + return makeMagneticBiome(Optional.empty(), new BiomeGenerationSettings.Builder(placedFeatures, worldCarvers) + .addCarver(AetherIICarvers.HOLY_ISLES_CAVE) + .addFeature(GenerationStep.Decoration.LAKES, HolyIslesPlacedFeatures.WATER_POND) + .addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, HolyIslesPlacedFeatures.HOLYSTONE_ROCKS), + new MobSpawnSettings.Builder(), + temperature, downfall); + } + public static Biome makeMagneticBiome(Optional> tree, BiomeGenerationSettings.Builder builder, MobSpawnSettings.Builder spawnSettingsBuilder, float temperature, float downfall) { builder = builder.addFeature(GenerationStep.Decoration.RAW_GENERATION, HolyIslesPlacedFeatures.NOISE_LAKE_SWAMP) .addFeature(GenerationStep.Decoration.RAW_GENERATION, HolyIslesPlacedFeatures.COAST_FERROSITE_SAND) @@ -482,6 +505,16 @@ public static Biome sheerTundraBiome(HolderGetter placedFeatures, temperature, downfall, true); } + public static Biome arcticUndercloudBiome(HolderGetter placedFeatures, HolderGetter> worldCarvers, float temperature, float downfall) { + return makeArcticBiome(Optional.empty(), new BiomeGenerationSettings.Builder(placedFeatures, worldCarvers) + .addCarver(AetherIICarvers.HOLY_ISLES_CAVE) + .addFeature(GenerationStep.Decoration.LAKES, HolyIslesPlacedFeatures.WATER_POND_TUNDRA) + .addFeature(GenerationStep.Decoration.LAKES, HolyIslesPlacedFeatures.WATER_SPRING) + .addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, HolyIslesPlacedFeatures.HOLYSTONE_ROCKS_TUNDRA), + new MobSpawnSettings.Builder(), + temperature, downfall, true); + } + public static Biome makeArcticBiome(Optional> tree, BiomeGenerationSettings.Builder builder, MobSpawnSettings.Builder spawnSettingsBuilder, float temperature, float downfall, boolean precipitation) { builder = builder.addFeature(GenerationStep.Decoration.RAW_GENERATION, HolyIslesPlacedFeatures.COAST_ARCTIC_PACKED_ICE) .addFeature(GenerationStep.Decoration.RAW_GENERATION, HolyIslesPlacedFeatures.NOISE_LAKE_ARCTIC) @@ -569,6 +602,10 @@ public static Biome battlegroundWastesBiome(HolderGetter placedFe temperature, downfall); } + public static Biome irradiatedUndercloudBiome(HolderGetter placedFeatures, HolderGetter> worldCarvers, float temperature, float downfall) { + return makeIrradiatedBiome(Optional.empty(), new BiomeGenerationSettings.Builder(placedFeatures, worldCarvers).addCarver(AetherIICarvers.HOLY_ISLES_CAVE), temperature, downfall); + } + public static Biome makeIrradiatedBiome(Optional> tree, BiomeGenerationSettings.Builder builder, float temperature, float downfall) { MobSpawnSettings.Builder spawnSettingsBuilder = new MobSpawnSettings.Builder(); builder = builder.addCarver(AetherIICarvers.HOLY_ISLES_CAVE).addFeature(GenerationStep.Decoration.RAW_GENERATION, HolyIslesPlacedFeatures.CLOUDBED) @@ -637,9 +674,16 @@ public static Biome makeIrradiatedBiome(Optional> tre ); } + public static Biome makeHighfieldsExpanseBiome(HolderGetter placedFeatures, HolderGetter> worldCarvers, float temperature, float downfall) { + return makeAercloudSeaBiome(new BiomeGenerationSettings.Builder(placedFeatures, worldCarvers).addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, HolyIslesPlacedFeatures.EXPANSE_BRYALINN_MOSS_COVER), temperature, downfall); + } + public static Biome makeAercloudSeaBiome(HolderGetter placedFeatures, HolderGetter> worldCarvers, float temperature, float downfall) { + return makeAercloudSeaBiome(new BiomeGenerationSettings.Builder(placedFeatures, worldCarvers), temperature, downfall); + } + + public static Biome makeAercloudSeaBiome(BiomeGenerationSettings.Builder builder, float temperature, float downfall) { MobSpawnSettings.Builder spawnSettingsBuilder = new MobSpawnSettings.Builder(); - BiomeGenerationSettings.Builder generationSettingsBuilder = new BiomeGenerationSettings.Builder(placedFeatures, worldCarvers); return highfieldsDefinition( true, temperature, @@ -658,8 +702,29 @@ public static Biome makeAercloudSeaBiome(HolderGetter placedFeatu .addSpawn(AetherIIMobCategory.AETHER_DARKNESS_MONSTER, 3, new MobSpawnSettings.SpawnerData(AetherIIEntityTypes.ARKENIUM_TALUTON.get(), 1, 1)) .addSpawn(AetherIIMobCategory.AETHER_DARKNESS_MONSTER, 4, new MobSpawnSettings.SpawnerData(AetherIIEntityTypes.GRAVITITE_TALUTON.get(), 1, 1)) .build(), - generationSettingsBuilder + builder + .addCarver(AetherIICarvers.HOLY_ISLES_CAVE) .addFeature(GenerationStep.Decoration.RAW_GENERATION, HolyIslesPlacedFeatures.CLOUDBED) + .addFeature(GenerationStep.Decoration.LAKES, HolyIslesPlacedFeatures.WATER_POND) + .addFeature(GenerationStep.Decoration.LAKES, HolyIslesPlacedFeatures.WATER_POND_UNDERGROUND) + .addFeature(GenerationStep.Decoration.LAKES, HolyIslesPlacedFeatures.ALKAHEST_POOL_RARE) + .addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, HolyIslesPlacedFeatures.HOLYSTONE_ROCKS) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_SCATTERGLASS) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_AGIOSITE) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_ICESTONE_SMALL) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_AMBROSIUM) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_ZANITE) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_ZANITE_MOUNTAIN) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_ARKENIUM) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_GRAVITITE_BURIED) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_GRAVITITE) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_HOLYSTONE_QUARTZ) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_GLINT) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_HESTVEIL_OPEN) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.ORE_HESTVEIL_BURIED) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.UNSTABLE_HOLYSTONE) + .addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, HolyIslesPlacedFeatures.UNSTABLE_UNDERSHALE) + .addFeature(GenerationStep.Decoration.FLUID_SPRINGS, HolyIslesPlacedFeatures.WATER_SPRING) .addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, HolyIslesPlacedFeatures.HIGH_STORM_AERCLOUD) .addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, HolyIslesPlacedFeatures.HIGH_GREEN_AERCLOUD) .addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, HolyIslesPlacedFeatures.HIGH_PURPLE_AERCLOUD) diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesBiomeSourceBuilders.java b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesBiomeSourceBuilders.java index 9bea84ec47..951c291964 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesBiomeSourceBuilders.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesBiomeSourceBuilders.java @@ -28,12 +28,18 @@ public static BiomeSource buildHolyIslesBiomeSource(HolderGetter biomes) Climate.Parameter tempMagnetic3 = Climate.Parameter.span(0.25F, IRRADIATED_START_VALUE); Climate.Parameter tempIrradiated = Climate.Parameter.span(IRRADIATED_START_VALUE, 1.5F); + Climate.Parameter continentsIsland = Climate.Parameter.span(0.1F, 1.0F); + Climate.Parameter continentsAercloudSea = Climate.Parameter.span(0.0F, 0.1F); + Climate.Parameter continentsExpanse = Climate.Parameter.span(1.0F, 2.0F); + Climate.Parameter erosionDefault = Climate.Parameter.span(0.0F, MAGNETIC_START_VALUE); Climate.Parameter erosionMagnetic = Climate.Parameter.span(MAGNETIC_START_VALUE, 1.5F); Climate.Parameter depthHestveilCaverns = Climate.Parameter.span(-2.0F, -1.0F); - Climate.Parameter depthDefault = Climate.Parameter.span(-1.0F, 1.5F); - Climate.Parameter depthArcticLayer1 = Climate.Parameter.span(-1.0F, 0.3F); + Climate.Parameter depthCaves = Climate.Parameter.span(-1.0F, -0.225F); + Climate.Parameter depthDefault = Climate.Parameter.span(-0.225F, 1.5F); + Climate.Parameter depthAercloudSea = Climate.Parameter.span(-0.225F, 1.5F); + Climate.Parameter depthArcticLayer1 = Climate.Parameter.span(-0.225F, 0.3F); Climate.Parameter depthArcticLayer2 = Climate.Parameter.span(0.3F, 0.65F); Climate.Parameter depthArcticLayer3 = Climate.Parameter.span(0.65F, 1.5F); @@ -43,61 +49,73 @@ public static BiomeSource buildHolyIslesBiomeSource(HolderGetter biomes) return MultiNoiseBiomeSource.createFromList(new Climate.ParameterList<>(List.of( // Arctic - Pair.of(new Climate.ParameterPoint(tempArctic, fullRange, fullRange, erosionDefault, fullRange, ridgeLake, 0), biomes.getOrThrow(HolyIslesBiomes.FROZEN_LAKES)), - Pair.of(new Climate.ParameterPoint(tempArctic, fullRange, fullRange, erosionDefault, depthHestveilCaverns, Climate.Parameter.span(0.2F, 0.3F), 0), biomes.getOrThrow(HolyIslesBiomes.FROZEN_LAKES)), + Pair.of(new Climate.ParameterPoint(tempArctic, fullRange, continentsIsland, erosionDefault, depthDefault, ridgeLake, 0), biomes.getOrThrow(HolyIslesBiomes.FROZEN_LAKES)), + Pair.of(new Climate.ParameterPoint(tempArctic, fullRange, continentsIsland, erosionDefault, depthHestveilCaverns, Climate.Parameter.span(0.2F, 0.3F), 0), biomes.getOrThrow(HolyIslesBiomes.FROZEN_LAKES)), - Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(-1.0F, -0.25F), fullRange, erosionDefault, depthArcticLayer1, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.ENDURING_WOODLAND)), - Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(-0.25F, 0.1F), fullRange, erosionDefault, depthArcticLayer1, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.SHEER_TUNDRA)), - Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(0.1F, 1.0F), fullRange, erosionDefault, depthArcticLayer1, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.ENDURING_WOODLAND)), + Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(-1.0F, -0.25F), continentsIsland, erosionDefault, depthArcticLayer1, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.ENDURING_WOODLAND)), + Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(-0.25F, 0.1F), continentsIsland, erosionDefault, depthArcticLayer1, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.SHEER_TUNDRA)), + Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(0.1F, 1.0F), continentsIsland, erosionDefault, depthArcticLayer1, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.ENDURING_WOODLAND)), - Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(-1.0F, -0.1F), fullRange, erosionDefault, depthArcticLayer2, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FRIGID_SIERRA)), - Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(-0.1F, 0.175F), fullRange, erosionDefault, depthArcticLayer2, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.SHEER_TUNDRA)), - Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(0.175F, 1.0F), fullRange, erosionDefault, depthArcticLayer2, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.ENDURING_WOODLAND)), + Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(-1.0F, -0.1F), continentsIsland, erosionDefault, depthArcticLayer2, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FRIGID_SIERRA)), + Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(-0.1F, 0.175F), continentsIsland, erosionDefault, depthArcticLayer2, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.SHEER_TUNDRA)), + Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(0.175F, 1.0F), continentsIsland, erosionDefault, depthArcticLayer2, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.ENDURING_WOODLAND)), - Pair.of(new Climate.ParameterPoint(tempArctic, fullRange, fullRange, erosionDefault, depthArcticLayer3, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FRIGID_SIERRA)), + Pair.of(new Climate.ParameterPoint(tempArctic, fullRange, continentsIsland, erosionDefault, depthArcticLayer3, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FRIGID_SIERRA)), // Highfields - Pair.of(new Climate.ParameterPoint(tempHighfields, Climate.Parameter.span(-1.5F, 2.0F), fullRange, erosionDefault, fullRange, ridgeLake, 0), biomes.getOrThrow(HolyIslesBiomes.SHIMMERING_BASIN)), - Pair.of(new Climate.ParameterPoint(tempHighfields, fullRange, fullRange, erosionDefault, depthHestveilCaverns, Climate.Parameter.span(0.2F, 0.3F), 0), biomes.getOrThrow(HolyIslesBiomes.SHIMMERING_BASIN)), + Pair.of(new Climate.ParameterPoint(tempHighfields, Climate.Parameter.span(-1.5F, 2.0F), continentsIsland, erosionDefault, depthDefault, ridgeLake, 0), biomes.getOrThrow(HolyIslesBiomes.SHIMMERING_BASIN)), + Pair.of(new Climate.ParameterPoint(tempHighfields, fullRange, continentsIsland, erosionDefault, depthHestveilCaverns, Climate.Parameter.span(0.2F, 0.3F), 0), biomes.getOrThrow(HolyIslesBiomes.SHIMMERING_BASIN)), - Pair.of(new Climate.ParameterPoint(tempHighfields1, Climate.Parameter.span(-1.0F, -0.1F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), - Pair.of(new Climate.ParameterPoint(tempHighfields1, Climate.Parameter.span(-0.1F, 0.2F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VERDANT_WOODS)), - Pair.of(new Climate.ParameterPoint(tempHighfields1, Climate.Parameter.span(0.2F, 1.0F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), - Pair.of(new Climate.ParameterPoint(tempHighfields1, Climate.Parameter.span(1.0F, 2.0F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.SHROUDED_FOREST)), + Pair.of(new Climate.ParameterPoint(tempHighfields1, Climate.Parameter.span(-1.0F, -0.1F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), + Pair.of(new Climate.ParameterPoint(tempHighfields1, Climate.Parameter.span(-0.1F, 0.2F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VERDANT_WOODS)), + Pair.of(new Climate.ParameterPoint(tempHighfields1, Climate.Parameter.span(0.2F, 1.0F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), + Pair.of(new Climate.ParameterPoint(tempHighfields1, Climate.Parameter.span(1.0F, 2.0F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.SHROUDED_FOREST)), - Pair.of(new Climate.ParameterPoint(tempHighfields2, Climate.Parameter.span(-1.0F, -0.15F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VERDANT_WOODS)), - Pair.of(new Climate.ParameterPoint(tempHighfields2, Climate.Parameter.span(-0.15F, 1.0F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), - Pair.of(new Climate.ParameterPoint(tempHighfields2, Climate.Parameter.span(1.0F, 2.0F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.SHROUDED_FOREST)), + Pair.of(new Climate.ParameterPoint(tempHighfields2, Climate.Parameter.span(-1.0F, -0.15F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VERDANT_WOODS)), + Pair.of(new Climate.ParameterPoint(tempHighfields2, Climate.Parameter.span(-0.15F, 1.0F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), + Pair.of(new Climate.ParameterPoint(tempHighfields2, Climate.Parameter.span(1.0F, 2.0F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.SHROUDED_FOREST)), - Pair.of(new Climate.ParameterPoint(tempHighfields3, Climate.Parameter.span(-1.0F, -0.25F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), - Pair.of(new Climate.ParameterPoint(tempHighfields3, Climate.Parameter.span(-0.25F, 0.1F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VERDANT_WOODS)), - Pair.of(new Climate.ParameterPoint(tempHighfields3, Climate.Parameter.span(0.1F, 0.25F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), - Pair.of(new Climate.ParameterPoint(tempHighfields3, Climate.Parameter.span(0.25F, 1.0F), fullRange, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VERDANT_WOODS)), + Pair.of(new Climate.ParameterPoint(tempHighfields3, Climate.Parameter.span(-1.0F, -0.25F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), + Pair.of(new Climate.ParameterPoint(tempHighfields3, Climate.Parameter.span(-0.25F, 0.1F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VERDANT_WOODS)), + Pair.of(new Climate.ParameterPoint(tempHighfields3, Climate.Parameter.span(0.1F, 0.25F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.FLOURISHING_FIELD)), + Pair.of(new Climate.ParameterPoint(tempHighfields3, Climate.Parameter.span(0.25F, 1.0F), continentsIsland, erosionDefault, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VERDANT_WOODS)), // Magnetic - Pair.of(new Climate.ParameterPoint(Climate.Parameter.span(-1.5F, 0.6F), fullRange, fullRange, erosionMagnetic, fullRange, ridgeLake, 0), biomes.getOrThrow(HolyIslesBiomes.GLISTENING_SWAMP)), - Pair.of(new Climate.ParameterPoint(Climate.Parameter.span(-1.5F, 0.6F), fullRange, fullRange, erosionMagnetic, depthHestveilCaverns, Climate.Parameter.span(0.2F, 0.3F), 0), biomes.getOrThrow(HolyIslesBiomes.GLISTENING_SWAMP)), + Pair.of(new Climate.ParameterPoint(Climate.Parameter.span(-1.5F, 0.6F), continentsIsland, fullRange, erosionMagnetic, depthDefault, ridgeLake, 0), biomes.getOrThrow(HolyIslesBiomes.GLISTENING_SWAMP)), + Pair.of(new Climate.ParameterPoint(Climate.Parameter.span(-1.5F, 0.6F), continentsIsland, fullRange, erosionMagnetic, depthHestveilCaverns, Climate.Parameter.span(0.2F, 0.3F), 0), biomes.getOrThrow(HolyIslesBiomes.GLISTENING_SWAMP)), - Pair.of(new Climate.ParameterPoint(tempMagnetic1, Climate.Parameter.span(-1.0F, -0.1F), fullRange, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VIOLET_HIGHWOODS)), - Pair.of(new Climate.ParameterPoint(tempMagnetic1, Climate.Parameter.span(-0.1F, 1.0F), fullRange, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), + Pair.of(new Climate.ParameterPoint(tempMagnetic1, Climate.Parameter.span(-1.0F, -0.1F), continentsIsland, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VIOLET_HIGHWOODS)), + Pair.of(new Climate.ParameterPoint(tempMagnetic1, Climate.Parameter.span(-0.1F, 1.0F), continentsIsland, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), - Pair.of(new Climate.ParameterPoint(tempMagnetic2, Climate.Parameter.span(-1.0F, -0.15F), fullRange, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.TURQUOISE_FOREST)), - Pair.of(new Climate.ParameterPoint(tempMagnetic2, Climate.Parameter.span(-0.15F, 0.2F), fullRange, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), - Pair.of(new Climate.ParameterPoint(tempMagnetic2, Climate.Parameter.span(0.2F, 1.0F), fullRange, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VIOLET_HIGHWOODS)), + Pair.of(new Climate.ParameterPoint(tempMagnetic2, Climate.Parameter.span(-1.0F, -0.15F), continentsIsland, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.TURQUOISE_FOREST)), + Pair.of(new Climate.ParameterPoint(tempMagnetic2, Climate.Parameter.span(-0.15F, 0.2F), continentsIsland, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), + Pair.of(new Climate.ParameterPoint(tempMagnetic2, Climate.Parameter.span(0.2F, 1.0F), continentsIsland, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.VIOLET_HIGHWOODS)), - Pair.of(new Climate.ParameterPoint(tempMagnetic3, Climate.Parameter.span(-1.0F, -0.1F), fullRange, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), - Pair.of(new Climate.ParameterPoint(tempMagnetic3, Climate.Parameter.span(-0.1F, 0.3F), fullRange, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.TURQUOISE_FOREST)), - Pair.of(new Climate.ParameterPoint(tempMagnetic3, Climate.Parameter.span(0.3F, 1.0F), fullRange, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), + Pair.of(new Climate.ParameterPoint(tempMagnetic3, Climate.Parameter.span(-1.0F, -0.1F), continentsIsland, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), + Pair.of(new Climate.ParameterPoint(tempMagnetic3, Climate.Parameter.span(-0.1F, 0.3F), continentsIsland, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.TURQUOISE_FOREST)), + Pair.of(new Climate.ParameterPoint(tempMagnetic3, Climate.Parameter.span(0.3F, 1.0F), continentsIsland, erosionMagnetic, depthDefault, ridgeLand, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), - Pair.of(new Climate.ParameterPoint(tempIrradiated, fullRange, fullRange, erosionMagnetic, depthDefault, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), + Pair.of(new Climate.ParameterPoint(tempIrradiated, fullRange, continentsIsland, erosionMagnetic, depthDefault, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_SCAR)), // Irradiated - Pair.of(new Climate.ParameterPoint(tempIrradiated, Climate.Parameter.span(-1.0F, -0.15F), fullRange, erosionDefault, depthDefault, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.BATTLEGROUND_WASTES)), - Pair.of(new Climate.ParameterPoint(tempIrradiated, Climate.Parameter.span(-0.15F, 0.2F), fullRange, erosionDefault, depthDefault, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.CONTAMINATED_JUNGLE)), - Pair.of(new Climate.ParameterPoint(tempIrradiated, Climate.Parameter.span(0.2F, 1.0F), fullRange, erosionDefault, depthDefault, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.BATTLEGROUND_WASTES)), + Pair.of(new Climate.ParameterPoint(tempIrradiated, Climate.Parameter.span(-1.0F, -0.15F), continentsIsland, erosionDefault, depthDefault, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.BATTLEGROUND_WASTES)), + Pair.of(new Climate.ParameterPoint(tempIrradiated, Climate.Parameter.span(-0.15F, 0.2F), continentsIsland, erosionDefault, depthDefault, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.CONTAMINATED_JUNGLE)), + Pair.of(new Climate.ParameterPoint(tempIrradiated, Climate.Parameter.span(0.2F, 1.0F), continentsIsland, erosionDefault, depthDefault, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.BATTLEGROUND_WASTES)), + + // Aercloud Sea + Pair.of(new Climate.ParameterPoint(fullRange, fullRange, continentsAercloudSea, fullRange, depthAercloudSea, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.AERCLOUD_SEA)), + Pair.of(new Climate.ParameterPoint(tempHighfields, fullRange, continentsExpanse, erosionDefault, depthAercloudSea, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.HIGHFIELDS_EXPANSE)), + Pair.of(new Climate.ParameterPoint(fullRange, fullRange, continentsExpanse, erosionMagnetic, depthAercloudSea, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_EXPANSE)), + Pair.of(new Climate.ParameterPoint(tempArctic, fullRange, continentsExpanse, erosionDefault, depthAercloudSea, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.ARCTIC_EXPANSE)), + Pair.of(new Climate.ParameterPoint(tempIrradiated, fullRange, continentsExpanse, erosionDefault, depthAercloudSea, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.IRRADIATED_EXPANSE)), //Caves - Pair.of(new Climate.ParameterPoint(fullRange, fullRange, fullRange, fullRange, depthHestveilCaverns, Climate.Parameter.span(-1.0F, 0.2F), 0), biomes.getOrThrow(HolyIslesBiomes.HESTVEIL_CAVERNS)) + Pair.of(new Climate.ParameterPoint(tempHighfields, Climate.Parameter.span(-1.5F, 2.0F), continentsIsland, erosionDefault, depthCaves, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD)), + Pair.of(new Climate.ParameterPoint(fullRange, Climate.Parameter.span(-1.5F, 2.0F), continentsIsland, erosionMagnetic, depthCaves, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.MAGNETIC_UNDERCLOUD)), + Pair.of(new Climate.ParameterPoint(tempArctic, Climate.Parameter.span(-1.5F, 2.0F), continentsIsland, erosionDefault, depthCaves, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.ARCTIC_UNDERCLOUD)), + Pair.of(new Climate.ParameterPoint(tempIrradiated, Climate.Parameter.span(-1.5F, 2.0F), continentsIsland, erosionDefault, depthCaves, fullRange, 0), biomes.getOrThrow(HolyIslesBiomes.IRRADIATED_UNDERCLOUD)), + + Pair.of(new Climate.ParameterPoint(fullRange, Climate.Parameter.span(-1.5F, 2.0F), continentsIsland, fullRange, depthHestveilCaverns, Climate.Parameter.span(-1.0F, 0.2F), 0), biomes.getOrThrow(HolyIslesBiomes.HESTVEIL_CAVERNS)) ))); } } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesNoiseBuilders.java b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesNoiseBuilders.java index 3cfc53d87a..ab3405e020 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesNoiseBuilders.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesNoiseBuilders.java @@ -35,7 +35,7 @@ private static NoiseRouter makeNoiseRouter(HolderGetter functio private static NoiseRouter createNoiseRouter(HolderGetter function, DensityFunction finalDensity) { DensityFunction temperature = getFunction(function, AetherIIDensityFunctions.TEMPERATURE); DensityFunction vegetation = getFunction(function, AetherIIDensityFunctions.VEGETATION_RARITY_MAPPER); - DensityFunction continentalness = getFunction(function, AetherIIDensityFunctions.CONTINENTS); + DensityFunction continentalness = getFunction(function, AetherIIDensityFunctions.CONTINENTS_RARITY_MAPPER); DensityFunction erosion = getFunction(function, AetherIIDensityFunctions.EROSION); DensityFunction depth = getFunction(function, AetherIIDensityFunctions.CAVE_BIOMES_RARITY_MAPPER); DensityFunction ridges = getFunction(function, AetherIIDensityFunctions.LAKES_NOISE); diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesSurfaceBuilders.java b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesSurfaceBuilders.java index 94e23d3c69..97992e8971 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesSurfaceBuilders.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/builders/worldgen/holyisles/HolyIslesSurfaceBuilders.java @@ -50,11 +50,13 @@ public static SurfaceRules.RuleSource surfaceRules(HolderGetter SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.steep()), SurfaceRules.ifTrue(SurfaceRules.stoneDepthCheck(0, false, 2, CaveSurface.FLOOR), QUICKSOIL))))), - SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.verticalGradient("aether_grass_block", VerticalAnchor.belowTop(276), VerticalAnchor.belowTop(272))), - SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, surface)), + SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.isBiome(HolyIslesBiomes.AERCLOUD_SEA, HolyIslesBiomes.HIGHFIELDS_EXPANSE, HolyIslesBiomes.MAGNETIC_EXPANSE, HolyIslesBiomes.ARCTIC_EXPANSE, HolyIslesBiomes.IRRADIATED_EXPANSE)), + SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.verticalGradient("aether_grass_block", VerticalAnchor.belowTop(276), VerticalAnchor.belowTop(272))), + SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, surface))), - SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.verticalGradient("aether_dirt", VerticalAnchor.belowTop(272), VerticalAnchor.belowTop(272))), - SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, AETHER_DIRT)), + SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.isBiome(HolyIslesBiomes.AERCLOUD_SEA, HolyIslesBiomes.HIGHFIELDS_EXPANSE, HolyIslesBiomes.MAGNETIC_EXPANSE, HolyIslesBiomes.ARCTIC_EXPANSE, HolyIslesBiomes.IRRADIATED_EXPANSE)), + SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.verticalGradient("aether_dirt", VerticalAnchor.belowTop(272), VerticalAnchor.belowTop(272))), + SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, AETHER_DIRT))), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.HESTVEIL_CAVERNS), ICHORITE.apply(function)), @@ -69,19 +71,27 @@ public static SurfaceRules.RuleSource surfaceRules(HolderGetter SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.VERDANT_WOODS), MOSSY_HOLYSTONE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.SHROUDED_FOREST), MOSSY_HOLYSTONE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.SHIMMERING_BASIN), MOSSY_HOLYSTONE.apply(function)), + SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.HIGHFIELDS_UNDERCLOUD), MOSSY_HOLYSTONE.apply(function)), + SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.HIGHFIELDS_EXPANSE), MOSSY_HOLYSTONE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.FRIGID_SIERRA), ARCTIC_PACKED_ICE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.ENDURING_WOODLAND), ARCTIC_PACKED_ICE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.FROZEN_LAKES), ARCTIC_PACKED_ICE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.SHEER_TUNDRA), ARCTIC_PACKED_ICE.apply(function)), + SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.ARCTIC_UNDERCLOUD), ARCTIC_PACKED_ICE.apply(function)), + SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.ARCTIC_EXPANSE), ARCTIC_PACKED_ICE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.MAGNETIC_SCAR), FERROSITE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.TURQUOISE_FOREST), FERROSITE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.GLISTENING_SWAMP), FERROSITE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.VIOLET_HIGHWOODS), FERROSITE.apply(function)), + SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.MAGNETIC_UNDERCLOUD), FERROSITE.apply(function)), + SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.MAGNETIC_EXPANSE), FERROSITE.apply(function)), SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.CONTAMINATED_JUNGLE), IRRADIATED_HOLYSTONE.apply(function)), - SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.BATTLEGROUND_WASTES), IRRADIATED_HOLYSTONE.apply(function)) + SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.BATTLEGROUND_WASTES), IRRADIATED_HOLYSTONE.apply(function)), + SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.IRRADIATED_UNDERCLOUD), IRRADIATED_HOLYSTONE.apply(function)), + SurfaceRules.ifTrue(SurfaceRules.isBiome(HolyIslesBiomes.IRRADIATED_EXPANSE), IRRADIATED_HOLYSTONE.apply(function)) ); } } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/registries/AetherIIDensityFunctions.java b/src/main/java/com/aetherteam/aetherii/data/resources/registries/AetherIIDensityFunctions.java index 16665cbea8..725f8270c3 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/registries/AetherIIDensityFunctions.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/registries/AetherIIDensityFunctions.java @@ -17,27 +17,38 @@ public static void bootstrap(BootstrapContext context) { DensityFunction shiftX = getFunction(function, SHIFT_X); DensityFunction shiftZ = getFunction(function, SHIFT_Z); - context.register(TEMPERATURE, DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.375, noise.getOrThrow(AetherIINoises.TEMPERATURE))); + context.register(TEMPERATURE, DensityFunctions.cacheOnce(DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.375, noise.getOrThrow(AetherIINoises.TEMPERATURE)))); context.register(VEGETATION, DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.5, noise.getOrThrow(AetherIINoises.VEGETATION))); context.register(VEGETATION_RARITY_MAPPER, buildVegetationRarityMapper(function)); context.register(VEGETATION_RARE, DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.25, noise.getOrThrow(AetherIINoises.VEGETATION_RARE)).abs()); + context.register(CONTINENTS_BASE_HEIGHTMAP, buildContinentsBaseHeightmap(function)); context.register(CONTINENTS_HEIGHTMAP, buildContinentsHeightmap(function)); context.register(CONTINENTS, buildContinents(function)); - context.register(EROSION, DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.31, noise.getOrThrow(AetherIINoises.EROSION)).abs()); + context.register(CONTINENTS_RARE, DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.3, noise.getOrThrow(AetherIINoises.CONTINENTALNESS_RARE)).abs()); + context.register(CONTINENTS_RARITY_MAPPER, buildContinentsRarityMapper(function)); + context.register(EROSION, DensityFunctions.cacheOnce(DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.31, noise.getOrThrow(AetherIINoises.EROSION)).abs())); context.register(DEPTH, DensityFunctions.yClampedGradient(0, 384, -0.75, 1.5)); context.register(CAVE_BIOMES, DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.375, noise.getOrThrow(AetherIINoises.CAVE_BIOMES)).abs()); context.register(CAVE_BIOMES_RARITY_MAPPER, buildCaveBiomesRarityMapper(function)); - context.register(AMPLIFICATION, DensityFunctions.weirdScaledSampler(getFunction(function, AetherIIDensityFunctions.BASE_3D_NOISE), noise.getOrThrow(AetherIINoises.AMPLIFICATION), DensityFunctions.WeirdScaledSampler.RarityValueMapper.TYPE1)); + context.register(AMPLIFICATION, DensityFunctions.cacheOnce(DensityFunctions.weirdScaledSampler(getFunction(function, AetherIIDensityFunctions.BASE_3D_NOISE), noise.getOrThrow(AetherIINoises.AMPLIFICATION), DensityFunctions.WeirdScaledSampler.RarityValueMapper.TYPE1))); context.register(RIDGES, DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.85, noise.getOrThrow(AetherIINoises.RIDGES)).abs()); - context.register(BASE_3D_NOISE, BlendedNoise.createUnseeded( + context.register(BASE_3D_NOISE, DensityFunctions.cacheOnce(BlendedNoise.createUnseeded( 0.1D, // xz scale 0.02D, // y scale 80D, // xz factor 160D, // y factor 1.0D // smear scale multiplier, capped at 8 + ))); + context.register(BASE_SUNKEN_3D_NOISE, BlendedNoise.createUnseeded( + 0.5D, // xz scale + 0.1D, // y scale + 80D, // xz factor + 160D, // y factor + 1.0D // smear scale multiplier, capped at 8 )); context.register(SHATTERED_ISLANDS, buildShatteredIslands(function)); + context.register(SUNKEN_ISLANDS, buildSunkenIslands(function)); context.register(BASE_ISLANDS, buildBaseIslands(function)); context.register(FINAL_ISLANDS, buildFinalIslands(function)); @@ -59,13 +70,18 @@ public static void bootstrap(BootstrapContext context) { context.register(TOP_SLIDE_SHATTERED, buildTopSlideShattered(function)); context.register(BOTTOM_SLIDE_SHATTERED, buildBottomSlideShattered(function)); + context.register(FACTOR_SUNKEN, buildFactorSunken(function)); + context.register(ELEVATION_SUNKEN, DensityFunctions.cacheOnce(DensityFunctions.shiftedNoise2d(shiftX, shiftZ, 0.5, noise.getOrThrow(AetherIINoises.ELEVATION_SUNKEN)).abs())); + context.register(TOP_SLIDE_SUNKEN, buildTopSlideSunken(function)); + context.register(BOTTOM_SLIDE_SUNKEN, buildBottomSlideSunken(function)); + context.register(NOISE_CAVES, buildNoiseCaves(function, noise)); context.register(UNDERGROUND_SHAPER, buildUndergroundShaper(function)); context.register(LAKES_NOISE, DensityFunctions.add(new PerlinNoiseFunction(new NormalNoise.NoiseParameters(-8, 1.0, 1.5, 0.0, 0.0, 0.0, 0.0), 0.75D, 0.0D, 64), DensityFunctions.constant(0.1D))); context.register(LAKES_NOISE_SWAMP, - DensityFunctions.add(DensityFunctions.mul(new PerlinNoiseFunction(new NormalNoise.NoiseParameters(-5, 0.2, 0.35, 0.0, 0.0), 1.0D, 0.0D, 99).abs(), DensityFunctions.constant(-1.0D)), - getFunction(function, LAKES_NOISE))); + DensityFunctions.cacheOnce(DensityFunctions.add(DensityFunctions.mul(new PerlinNoiseFunction(new NormalNoise.NoiseParameters(-5, 0.2, 0.35, 0.0, 0.0), 1.0D, 0.0D, 99).abs(), DensityFunctions.constant(-1.0D)), + getFunction(function, LAKES_NOISE)))); context.register(LAKES_FLOOR, new PerlinNoiseFunction(new NormalNoise.NoiseParameters(-6, 2.5, 1.5, 0.0, 0.0, 0.0, 0.0), 0.75D, 0.0D, 17).abs()); context.register(LAKES_BARRIER, DensityFunctions.add(new PerlinNoiseFunction(new NormalNoise.NoiseParameters(-5, 4.0, 2.0, 0.0, 0.0, 0.0), 0.5D, 0.0D, 38).abs(), DensityFunctions.constant(6.0D))); context.register(LAKES_SHORE, new PerlinNoiseFunction(new NormalNoise.NoiseParameters(-5, 0.15, 0.3, 0.0, 0.0, 0.0), 1.0D, 0.0D, 80).abs()); diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/registries/AetherIINoises.java b/src/main/java/com/aetherteam/aetherii/data/resources/registries/AetherIINoises.java index 9c1390f1c0..e7b7ea2f36 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/registries/AetherIINoises.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/registries/AetherIINoises.java @@ -12,12 +12,14 @@ public class AetherIINoises { public static final ResourceKey VEGETATION = createKey("vegetation"); public static final ResourceKey VEGETATION_RARE = createKey("vegetation_rare"); public static final ResourceKey CONTINENTALNESS = createKey("continentalness"); + public static final ResourceKey CONTINENTALNESS_RARE = createKey("continentalness_rare"); public static final ResourceKey EROSION = createKey("erosion"); public static final ResourceKey CAVE_BIOMES = createKey("cave_biomes"); public static final ResourceKey AMPLIFICATION = createKey("amplification"); public static final ResourceKey RIDGES = createKey("ridges"); public static final ResourceKey ELEVATION = createKey("elevation"); public static final ResourceKey ELEVATION_SHATTERED = createKey("elevation_shattered"); + public static final ResourceKey ELEVATION_SUNKEN = createKey("elevation_sunken"); public static final ResourceKey CAVES = createKey("caves"); public static final ResourceKey CAVE_THICKNESS = createKey("cave_thickness"); public static final ResourceKey ARCTIC_SNOW = createKey("arctic_snow"); @@ -32,12 +34,14 @@ public static void bootstrap(BootstrapContext conte register(context, VEGETATION, -8, 1.0D, 1.0D, 0.0D, 0.0D, 0.0D, 0.0D); register(context, VEGETATION_RARE, -8, 1.5D, 0.0D, 0.0D, 0.0D); register(context, CONTINENTALNESS, -9, 1.5D, 0.0D, 1.0D, 0.0D, 0.0D, 0.0D); + register(context, CONTINENTALNESS_RARE, -8, 1.5D, 1.0D, 0.0D, 0.0D); register(context, EROSION, -9, 1.5D, 1.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); register(context, CAVE_BIOMES, -8, 1.5D, 0.0D, 1.0D, 0.0D, 0.0D); register(context, AMPLIFICATION, -7, 1.0D, 2.0D, 1.0D, 0.0D, 0.0D, 0.0D, 0.0D); register(context, RIDGES, -9, 1.5D, 1.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); register(context, ELEVATION, -8, 1.0D, 0.2D, 0.0D, 0.0D, 0.0D); register(context, ELEVATION_SHATTERED, -7, 1.0D, 0.75D, 0.0D, 0.0D, 0.0D); + register(context, ELEVATION_SUNKEN, -7, 1.0D, 0.0D, 1.0D, 0.0D, 0.0D, 0.0D); register(context, CAVES, -6, 1.0, 2.0, 1.0, 0.0, 0.0, 0.0, 0.0); register(context, CAVE_THICKNESS, -7, 0.3, 0.0, 0.0); register(context, ARCTIC_SNOW, -5, 1.0, 0.0, 0.5, 0.5, 0.0, 0.0); diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesBiomes.java b/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesBiomes.java index 1c3dd17838..ade55b5a44 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesBiomes.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesBiomes.java @@ -35,9 +35,18 @@ public class HolyIslesBiomes { public static final ResourceKey BATTLEGROUND_WASTES = createKey("battleground_wastes"); // Aercloud Sea - public static final ResourceKey EXPANSE = createKey("expanse"); + public static final ResourceKey AERCLOUD_SEA = createKey("aercloud_sea"); + public static final ResourceKey HIGHFIELDS_EXPANSE = createKey("highfields_expanse"); + public static final ResourceKey MAGNETIC_EXPANSE = createKey("magnetic_expanse"); + public static final ResourceKey ARCTIC_EXPANSE = createKey("arctic_expanse"); + public static final ResourceKey IRRADIATED_EXPANSE = createKey("irradiated_expanse"); // Caves + public static final ResourceKey HIGHFIELDS_UNDERCLOUD = createKey("highfields_undercloud"); + public static final ResourceKey MAGNETIC_UNDERCLOUD = createKey("magnetic_undercloud"); + public static final ResourceKey ARCTIC_UNDERCLOUD = createKey("arctic_undercloud"); + public static final ResourceKey IRRADIATED_UNDERCLOUD = createKey("irradiated_undercloud"); + public static final ResourceKey HESTVEIL_CAVERNS = createKey("hestveil_caverns"); private static ResourceKey createKey(String name) { @@ -59,14 +68,23 @@ public static void bootstrap(BootstrapContext context) { context.register(VIOLET_HIGHWOODS, HolyIslesBiomeBuilders.violetHighwoodsBiome(placedFeatures, vanillaConfiguredCarvers, 0.7F, 0.8F)); context.register(FRIGID_SIERRA, HolyIslesBiomeBuilders.frigidSierraBiome(placedFeatures, vanillaConfiguredCarvers, -0.5F, 0.9F)); - context.register(ENDURING_WOODLAND, HolyIslesBiomeBuilders.enduringWoodlandBiome(placedFeatures, vanillaConfiguredCarvers, -0.3F, 0.4F)); - context.register(FROZEN_LAKES, HolyIslesBiomeBuilders.frozenLakesBiome(placedFeatures, vanillaConfiguredCarvers, -0.2F, 0.5F)); - context.register(SHEER_TUNDRA, HolyIslesBiomeBuilders.sheerTundraBiome(placedFeatures, vanillaConfiguredCarvers, -0.4F, 0.5F)); + context.register(ENDURING_WOODLAND, HolyIslesBiomeBuilders.enduringWoodlandBiome(placedFeatures, vanillaConfiguredCarvers, -0.3F, 0.8F)); + context.register(FROZEN_LAKES, HolyIslesBiomeBuilders.frozenLakesBiome(placedFeatures, vanillaConfiguredCarvers, -0.2F, 0.7F)); + context.register(SHEER_TUNDRA, HolyIslesBiomeBuilders.sheerTundraBiome(placedFeatures, vanillaConfiguredCarvers, -0.4F, 0.7F)); context.register(CONTAMINATED_JUNGLE, HolyIslesBiomeBuilders.contaminatedJungleBiome(placedFeatures, vanillaConfiguredCarvers, 1.0F, 0.3F)); context.register(BATTLEGROUND_WASTES, HolyIslesBiomeBuilders.battlegroundWastesBiome(placedFeatures, vanillaConfiguredCarvers, 1.0F, 0.3F)); - context.register(EXPANSE, HolyIslesBiomeBuilders.makeAercloudSeaBiome(placedFeatures, vanillaConfiguredCarvers, 0.5F, 0.5F)); + context.register(AERCLOUD_SEA, HolyIslesBiomeBuilders.makeAercloudSeaBiome(placedFeatures, vanillaConfiguredCarvers, 0.5F, 0.5F)); + context.register(HIGHFIELDS_EXPANSE, HolyIslesBiomeBuilders.makeHighfieldsExpanseBiome(placedFeatures, vanillaConfiguredCarvers, 0.7F, 0.6F)); + context.register(MAGNETIC_EXPANSE, HolyIslesBiomeBuilders.makeAercloudSeaBiome(placedFeatures, vanillaConfiguredCarvers, 0.7F, 0.6F)); + context.register(ARCTIC_EXPANSE, HolyIslesBiomeBuilders.makeAercloudSeaBiome(placedFeatures, vanillaConfiguredCarvers, -0.35F, 0.8F)); + context.register(IRRADIATED_EXPANSE, HolyIslesBiomeBuilders.makeAercloudSeaBiome(placedFeatures, vanillaConfiguredCarvers, 1.0F, 0.3F)); + + context.register(HIGHFIELDS_UNDERCLOUD, HolyIslesBiomeBuilders.highfieldsUndercloudBiome(placedFeatures, vanillaConfiguredCarvers, 0.7F, 0.6F)); + context.register(MAGNETIC_UNDERCLOUD, HolyIslesBiomeBuilders.magneticUndercloudBiome(placedFeatures, vanillaConfiguredCarvers, 0.7F, 0.6F)); + context.register(ARCTIC_UNDERCLOUD, HolyIslesBiomeBuilders.arcticUndercloudBiome(placedFeatures, vanillaConfiguredCarvers, -0.35F, 0.8F)); + context.register(IRRADIATED_UNDERCLOUD, HolyIslesBiomeBuilders.irradiatedUndercloudBiome(placedFeatures, vanillaConfiguredCarvers, 1.0F, 0.3F)); context.register(HESTVEIL_CAVERNS, HolyIslesBiomeBuilders.makeHeastveilCavernsBiome(placedFeatures, vanillaConfiguredCarvers, 0.5F, 0.5F)); } diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesConfiguredFeatures.java b/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesConfiguredFeatures.java index ba14224cbe..69e4d26307 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesConfiguredFeatures.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesConfiguredFeatures.java @@ -224,6 +224,7 @@ public class HolyIslesConfiguredFeatures { public static final ResourceKey> BRYALINN_MOSS_VINES = createKey("bryalinn_moss_vines"); public static final ResourceKey> BRYALINN_MOSS_FLOOR = createKey("bryalinn_moss_floor"); public static final ResourceKey> BRYALINN_MOSS_FLOOR_SWAMP = createKey("bryalinn_moss_floor_swamp"); + public static final ResourceKey> BRYALINN_MOSS_FLOOR_EXPANSE = createKey("bryalinn_moss_floor_expanse"); public static final ResourceKey> SHAYELINN_MOSS_CARPET = createKey("shayelinn_moss_carpet"); public static final ResourceKey> SHAYELINN_MOSS_VINES = createKey("shayelinn_moss_vines"); public static final ResourceKey> SHAYELINN_MOSS_FLOOR = createKey("shayelinn_moss_floor"); @@ -231,6 +232,10 @@ public class HolyIslesConfiguredFeatures { public static final ResourceKey> AMBRELINN_MOSS_VINES = createKey("ambrelinn_moss_vines"); public static final ResourceKey> AMBRELINN_MOSS_FLOOR = createKey("ambrelinn_moss_floor"); + public static final ResourceKey> CUMULUS_BUSH_PATCH = createKey("cumulus_bush_patch"); + public static final ResourceKey> CIRRUS_SUCCULENT_PATCH = createKey("cirrus_succulent_patch"); + public static final ResourceKey> ROYAL_STRATUS_FERN_PATCH = createKey("royal_stratus_fern_patch"); + public static final ResourceKey> UNSTABLE_HOLYSTONE = createKey("unstable_holystone"); public static final ResourceKey> UNSTABLE_UNDERSHALE = createKey("unstable_undershale"); @@ -1628,6 +1633,30 @@ private static void bootstrapUnderground(BootstrapContext().add(AetherIIBlocks.CUMULUS_BUSH.get().defaultBlockState(),3).add(AetherIIBlocks.CUMULONIMBUS_BUSH.get().defaultBlockState()).build()))); + register(context, CIRRUS_SUCCULENT_PATCH, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(AetherIIBlocks.CIRRUS_SUCCULENT.get().defaultBlockState()))); + register(context, ROYAL_STRATUS_FERN_PATCH, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(AetherIIBlocks.ROYAL_STRATUS_FERN.get().defaultBlockState()))); + register( context, UNSTABLE_HOLYSTONE, diff --git a/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesPlacedFeatures.java b/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesPlacedFeatures.java index f294b827fc..d7664dfe5e 100644 --- a/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesPlacedFeatures.java +++ b/src/main/java/com/aetherteam/aetherii/data/resources/registries/holyisles/HolyIslesPlacedFeatures.java @@ -138,8 +138,13 @@ public class HolyIslesPlacedFeatures { public static final ResourceKey AMBRELINN_MOSS_CARPET_PATCH = createKey("ambrelinn_moss_carpet_patch"); public static final ResourceKey EXPOSED_BRYALINN_MOSS_COVER = createKey("exposed_bryalinn_moss_cover"); public static final ResourceKey SWAMP_BRYALINN_MOSS_COVER = createKey("swamp_bryalinn_moss_cover"); + public static final ResourceKey EXPANSE_BRYALINN_MOSS_COVER = createKey("expanse_bryalinn_moss_cover"); public static final ResourceKey EXPOSED_SHAYELINN_MOSS_COVER = createKey("exposed_shayelinn_moss_cover"); + public static final ResourceKey CUMULUS_BUSH_PATCH = createKey("cumulus_bush_patch"); + public static final ResourceKey CIRRUS_SUCCULENT_PATCH = createKey("cirrus_succulent_patch"); + public static final ResourceKey ROYAL_STRATUS_FERN_PATCH = createKey("royal_stratus_fern_patch"); + public static final ResourceKey UNSTABLE_HOLYSTONE = createKey("unstable_holystone"); public static final ResourceKey UNSTABLE_UNDERSHALE = createKey("unstable_undershale"); @@ -861,6 +866,15 @@ public static void bootstrapUnderground(BootstrapContext context) new ElevationFilter(VerticalAnchor.bottom(), VerticalAnchor.top()), BiomeFilter.biome() ); + register(context, EXPANSE_BRYALINN_MOSS_COVER, configuredFeatures.getOrThrow(HolyIslesConfiguredFeatures.BRYALINN_MOSS_FLOOR_EXPANSE), + NoiseBasedCountPlacement.of(30, 50, 0.0), + InSquarePlacement.spread(), + HeightmapPlacement.onHeightmap(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES), + EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.solid(), BlockPredicate.ONLY_IN_AIR_PREDICATE, 12), + RandomOffsetPlacement.vertical(ConstantInt.of(1)), + new ElevationFilter(VerticalAnchor.aboveBottom(100), VerticalAnchor.top()), + BiomeFilter.biome() + ); register(context, EXPOSED_SHAYELINN_MOSS_COVER, configuredFeatures.getOrThrow(HolyIslesConfiguredFeatures.SHAYELINN_MOSS_FLOOR), NoiseBasedCountPlacement.of(8, 30, 0.0), RarityFilter.onAverageOnceEvery(2), @@ -872,6 +886,22 @@ public static void bootstrapUnderground(BootstrapContext context) BiomeFilter.biome() ); + register(context, CUMULUS_BUSH_PATCH, + configuredFeatures.getOrThrow(HolyIslesConfiguredFeatures.CUMULUS_BUSH_PATCH), + CountPlacement.of(3), + RandomOffsetPlacement.ofTriangle(3, 2) + ); + register(context, CIRRUS_SUCCULENT_PATCH, + configuredFeatures.getOrThrow(HolyIslesConfiguredFeatures.CIRRUS_SUCCULENT_PATCH), + CountPlacement.of(2), + RandomOffsetPlacement.ofTriangle(2, 2) + ); + register(context, ROYAL_STRATUS_FERN_PATCH, + configuredFeatures.getOrThrow(HolyIslesConfiguredFeatures.ROYAL_STRATUS_FERN_PATCH), + CountPlacement.of(2), + RandomOffsetPlacement.ofTriangle(2, 2) + ); + register(context, UNSTABLE_HOLYSTONE, configuredFeatures.getOrThrow(HolyIslesConfiguredFeatures.UNSTABLE_HOLYSTONE), RarityFilter.onAverageOnceEvery(1), InSquarePlacement.spread(), diff --git a/src/main/java/com/aetherteam/aetherii/item/AetherIICreativeTabs.java b/src/main/java/com/aetherteam/aetherii/item/AetherIICreativeTabs.java index 35e064904b..0945de0bfb 100644 --- a/src/main/java/com/aetherteam/aetherii/item/AetherIICreativeTabs.java +++ b/src/main/java/com/aetherteam/aetherii/item/AetherIICreativeTabs.java @@ -529,6 +529,10 @@ public class AetherIICreativeTabs { output.accept(AetherIIBlocks.BLUEBERRY_BUSH.get()); output.accept(AetherIIBlocks.ORANGE_TREE.get()); output.accept(AetherIIBlocks.VALKYRIE_SPROUT.get()); + output.accept(AetherIIBlocks.CUMULUS_BUSH.get()); + output.accept(AetherIIBlocks.CUMULONIMBUS_BUSH.get()); + output.accept(AetherIIBlocks.CIRRUS_SUCCULENT.get()); + output.accept(AetherIIBlocks.ROYAL_STRATUS_FERN.get()); output.accept(AetherIIItems.ARILUM_BULBS.get()); output.accept(AetherIIBlocks.ARILUM.get()); output.accept(AetherIIBlocks.BLOOMING_ARILUM.get()); diff --git a/src/main/resources/assets/aether_ii/models/block/template_cirrus_succulent.json b/src/main/resources/assets/aether_ii/models/block/template_cirrus_succulent.json new file mode 100644 index 0000000000..abaa7014c5 --- /dev/null +++ b/src/main/resources/assets/aether_ii/models/block/template_cirrus_succulent.json @@ -0,0 +1,66 @@ +{ + "format_version": "1.21.11", + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "particle": "#cross" + }, + "elements": [ + { + "from": [8, 0, 0], + "to": [8, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "shade": false, + "faces": { + "north": {"uv": [1, 0, 1, 16], "texture": "#cross"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#cross"}, + "south": {"uv": [1, 0, 1, 16], "texture": "#cross"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#cross"}, + "up": {"uv": [1, 0, 1, 16], "texture": "#cross"}, + "down": {"uv": [1, 0, 1, 16], "texture": "#cross"} + } + }, + { + "from": [0, 0, 8], + "to": [16, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "shade": false, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#cross"}, + "east": {"uv": [16, 0, 16, 16], "texture": "#cross"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#cross"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#cross"}, + "up": {"uv": [0, 0, 16, 0], "texture": "#cross"}, + "down": {"uv": [0, 16, 16, 16], "texture": "#cross"} + } + }, + { + "from": [0, 0, 8], + "to": [16, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "shade": false, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#cross"}, + "east": {"uv": [16, 0, 16, 16], "texture": "#cross"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#cross"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#cross"}, + "up": {"uv": [0, 0, 16, 0], "texture": "#cross"}, + "down": {"uv": [0, 16, 16, 16], "texture": "#cross"} + } + }, + { + "from": [8, 0, 0], + "to": [8, 16, 16], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "shade": false, + "faces": { + "north": {"uv": [1, 0, 1, 16], "texture": "#cross"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#cross"}, + "south": {"uv": [1, 0, 1, 16], "texture": "#cross"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#cross"}, + "up": {"uv": [1, 0, 1, 16], "texture": "#cross"}, + "down": {"uv": [1, 0, 1, 16], "texture": "#cross"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/aether_ii/models/block/template_royal_stratus_fern.json b/src/main/resources/assets/aether_ii/models/block/template_royal_stratus_fern.json new file mode 100644 index 0000000000..c2885eb724 --- /dev/null +++ b/src/main/resources/assets/aether_ii/models/block/template_royal_stratus_fern.json @@ -0,0 +1,308 @@ +{ + "format_version": "1.21.11", + "credit": "Made with Blockbench", + "ambientocclusion": false, + "render_type": "minecraft:cutout", + "elements": [ + { + "from": [7, -7.89949, -1.24264], + "to": [23, -7.89949, 3.75736], + "rotation": {"x": 0, "y": 90, "z": 135, "origin": [15, 2, 8]}, + "faces": { + "north": {"uv": [0, 2, 10, 2], "texture": "#missing"}, + "east": {"uv": [6, 2, 11, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 10, 2], "texture": "#missing"}, + "west": {"uv": [1, 2, 6, 2], "texture": "#missing"}, + "up": {"uv": [11.5, 0, 9, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [9, 16, 11.5, 0], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [4, 2, 4.65685], + "to": [20, 2, 13.65685], + "rotation": {"x": 0, "y": 90, "z": 45, "origin": [12, 2, 8]}, + "faces": { + "north": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "east": {"uv": [6, 2, 15, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "west": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 4.5, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [4.5, 0, 0, 16], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [4, 6, 12], + "to": [20, 6, 21], + "rotation": {"x": 0, "y": 90, "z": 0, "origin": [12, 2, 8]}, + "faces": { + "north": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "east": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "west": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "up": {"uv": [4.5, 0, 9, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [9, 0, 4.5, 16], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [-7, -7.89949, -1.24264], + "to": [9, -7.89949, 3.75736], + "rotation": {"x": 0, "y": -90, "z": -135, "origin": [1, 2, 8]}, + "faces": { + "north": {"uv": [0, 2, 10, 2], "texture": "#missing"}, + "east": {"uv": [6, 2, 11, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 10, 2], "texture": "#missing"}, + "west": {"uv": [1, 2, 6, 2], "texture": "#missing"}, + "up": {"uv": [11.5, 0, 9, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [9, 16, 11.5, 0], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [-4, 2, 4.65685], + "to": [12, 2, 13.65685], + "rotation": {"x": 0, "y": -90, "z": -45, "origin": [4, 2, 8]}, + "faces": { + "north": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "east": {"uv": [6, 2, 15, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "west": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 4.5, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [4.5, 0, 0, 16], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [-4, 6, 12], + "to": [12, 6, 21], + "rotation": {"x": 0, "y": -90, "z": 0, "origin": [4, 2, 8]}, + "faces": { + "north": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "east": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "west": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "up": {"uv": [4.5, 0, 9, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [9, 0, 4.5, 16], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [1, -7.89949, -8.24264], + "to": [17, -7.89949, -3.24264], + "rotation": {"x": 45, "y": 0, "z": 180, "origin": [9, 2, 1]}, + "faces": { + "north": {"uv": [0, 2, 10, 2], "texture": "#missing"}, + "east": {"uv": [6, 2, 11, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 10, 2], "texture": "#missing"}, + "west": {"uv": [1, 2, 6, 2], "texture": "#missing"}, + "up": {"uv": [11.5, 0, 9, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [9, 16, 11.5, 0], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [1, 2, 0.65685], + "to": [17, 2, 9.65685], + "rotation": {"x": 135, "y": 0, "z": 180, "origin": [9, 2, 4]}, + "faces": { + "north": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "east": {"uv": [6, 2, 15, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "west": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 4.5, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [4.5, 0, 0, 16], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [1, 6, 8], + "to": [17, 6, 17], + "rotation": {"x": 180, "y": 0, "z": 180, "origin": [9, 2, 4]}, + "faces": { + "north": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "east": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "west": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "up": {"uv": [4.5, 0, 9, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [9, 0, 4.5, 16], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [0, -7.89949, 5.75736], + "to": [16, -7.89949, 10.75736], + "rotation": {"x": -135, "y": 0, "z": 0, "origin": [8, 2, 15]}, + "faces": { + "north": {"uv": [0, 2, 10, 2], "texture": "#missing"}, + "east": {"uv": [6, 2, 11, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 10, 2], "texture": "#missing"}, + "west": {"uv": [1, 2, 6, 2], "texture": "#missing"}, + "up": {"uv": [11.5, 0, 9, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [9, 16, 11.5, 0], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [0, 2, 8.65685], + "to": [16, 2, 17.65685], + "rotation": {"x": -45, "y": 0, "z": 0, "origin": [8, 2, 12]}, + "faces": { + "north": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "east": {"uv": [6, 2, 15, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "west": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 4.5, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [4.5, 0, 0, 16], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [0, 6, 16], + "to": [16, 6, 25], + "rotation": {"x": 0, "y": 0, "z": 0, "origin": [8, 2, 12]}, + "faces": { + "north": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "east": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "west": {"uv": [0, 2, 9, 2], "texture": "#missing"}, + "up": {"uv": [4.5, 0, 9, 16], "rotation": 90, "texture": "#leaf"}, + "down": {"uv": [9, 0, 4.5, 16], "rotation": 90, "texture": "#leaf"} + } + }, + { + "from": [0, 0, 8], + "to": [16, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "east": {"uv": [2, 0, 2, 16], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "down": {"uv": [0, 2, 16, 2], "texture": "#missing"} + } + }, + { + "from": [0, 16, 8], + "to": [16, 32, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "east": {"uv": [2, 0, 2, 16], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "down": {"uv": [0, 2, 16, 2], "texture": "#missing"} + } + }, + { + "from": [0, 0, 8], + "to": [16, 16, 8], + "rotation": {"x": 0, "y": -135, "z": 0, "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "east": {"uv": [2, 0, 2, 16], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "down": {"uv": [0, 2, 16, 2], "texture": "#missing"} + } + }, + { + "from": [0, 16, 8], + "to": [16, 32, 8], + "rotation": {"x": 0, "y": -135, "z": 0, "origin": [8, 16, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "east": {"uv": [2, 0, 2, 16], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "down": {"uv": [0, 2, 16, 2], "texture": "#missing"} + } + }, + { + "from": [0, 1, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "east": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "south": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "west": {"uv": [0, 2, 16, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#base"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, -135, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + { + "name": "group", + "origin": [7, 4, 17], + "scope": 0, + "color": 0, + "children": [0, 1, 2] + }, + { + "name": "group", + "origin": [7, 4, 17], + "scope": 0, + "color": 0, + "children": [3, 4, 5] + }, + { + "name": "group", + "origin": [7, 4, 17], + "scope": 0, + "color": 0, + "children": [6, 7, 8] + }, + { + "name": "group", + "origin": [7, 4, 17], + "scope": 0, + "color": 0, + "children": [9, 10, 11] + } + ] + }, + { + "name": "group", + "origin": [8, 0, 8], + "scope": 0, + "color": 0, + "children": [12, 13, 14, 15] + }, + 16 + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/aether_ii/textures/block/cirrus_succulent_bottom.png b/src/main/resources/assets/aether_ii/textures/block/cirrus_succulent_bottom.png new file mode 100644 index 0000000000..f59fa39bb1 Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/block/cirrus_succulent_bottom.png differ diff --git a/src/main/resources/assets/aether_ii/textures/block/cirrus_succulent_top.png b/src/main/resources/assets/aether_ii/textures/block/cirrus_succulent_top.png new file mode 100644 index 0000000000..4b1d36f026 Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/block/cirrus_succulent_top.png differ diff --git a/src/main/resources/assets/aether_ii/textures/block/cumulonimbus_bush_bottom.png b/src/main/resources/assets/aether_ii/textures/block/cumulonimbus_bush_bottom.png new file mode 100644 index 0000000000..8066eb1b8a Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/block/cumulonimbus_bush_bottom.png differ diff --git a/src/main/resources/assets/aether_ii/textures/block/cumulonimbus_bush_top.png b/src/main/resources/assets/aether_ii/textures/block/cumulonimbus_bush_top.png new file mode 100644 index 0000000000..72b2779ba4 Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/block/cumulonimbus_bush_top.png differ diff --git a/src/main/resources/assets/aether_ii/textures/block/cumulus_bush.png b/src/main/resources/assets/aether_ii/textures/block/cumulus_bush.png new file mode 100644 index 0000000000..2623fdd237 Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/block/cumulus_bush.png differ diff --git a/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_base.png b/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_base.png new file mode 100644 index 0000000000..1bc0524351 Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_base.png differ diff --git a/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_bottom.png b/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_bottom.png new file mode 100644 index 0000000000..ec43eb46a5 Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_bottom.png differ diff --git a/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_leaf.png b/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_leaf.png new file mode 100644 index 0000000000..2c2cd66a8c Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_leaf.png differ diff --git a/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_top.png b/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_top.png new file mode 100644 index 0000000000..280915a841 Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/block/royal_stratus_fern_top.png differ diff --git a/src/main/resources/assets/aether_ii/textures/item/cirrus_succulent.png b/src/main/resources/assets/aether_ii/textures/item/cirrus_succulent.png new file mode 100644 index 0000000000..90da370214 Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/item/cirrus_succulent.png differ diff --git a/src/main/resources/assets/aether_ii/textures/item/cumulonimbus_bush.png b/src/main/resources/assets/aether_ii/textures/item/cumulonimbus_bush.png new file mode 100644 index 0000000000..f7035be258 Binary files /dev/null and b/src/main/resources/assets/aether_ii/textures/item/cumulonimbus_bush.png differ diff --git a/src/main/resources/data/c/worldgen/biome_colors.json b/src/main/resources/data/c/worldgen/biome_colors.json index a1c1db06e2..facdb1a0fb 100644 --- a/src/main/resources/data/c/worldgen/biome_colors.json +++ b/src/main/resources/data/c/worldgen/biome_colors.json @@ -69,11 +69,31 @@ "g": 231, "b": 101 }, - "aether_ii:expanse": { + "aether_ii:aercloud_sea": { "r": 255, "g": 255, "b": 255 }, + "aether_ii:highfields_expanse": { + "r": 197, + "g": 224, + "b": 206 + }, + "aether_ii:magnetic_expanse": { + "r": 234, + "g": 255, + "b": 236 + }, + "aether_ii:arctic_expanse": { + "r": 237, + "g": 252, + "b": 255 + }, + "aether_ii:irradiated_expanse": { + "r": 255, + "g": 251, + "b": 229 + }, "aether_ii:hestveil_caverns": { "r": 206, "g": 190,