Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: infected guardian tree #413

Draft
wants to merge 2 commits into
base: 1.21.1-develop
Choose a base branch
from
Draft

feat: infected guardian tree #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
150b451
feat: Initial Dungeon Generation (#409)
Builderdog841 Sep 22, 2024
35eb66d
Merge branch '1.21.0-develop' into feat/collaboration/dungeons
bconlon1 Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ dependencies {
// compileOnly "mezz.jei:jei-${project.mc_version}-common-api:${project.jei_version}"
// compileOnly "mezz.jei:jei-${project.mc_version}-neoforge-api:${project.jei_version}"
// runtimeOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}"))
implementation "curse.maven:worldedit-225608:5564371"

jarJar("com.aetherteam.nitrogen:nitrogen_internals:${project.nitrogen_version}") {
jarJar.ranged(it, "[${project.nitrogen_version},)")
Expand Down
2 changes: 2 additions & 0 deletions src/generated/resources/assets/aether_ii/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,8 @@
"menu.aether_ii.artisans_bench": "Artisan's Bench",
"menu.aether_ii.holystone_furnace": "Holystone Furnace",
"pack.aether_ii.mod.description": "Aether II Resources",
"structure.aether_ii.camp_highfields": "Camp Highfields",
"structure.aether_ii.infected_guardian_tree": "Infected Guardian Tree",
"structure.aether_ii.outpost": "Outpost",
"subtitles.aether_ii.block.aercloud.blue_aercloud_bounce": "Blue Aercloud bounces",
"subtitles.aether_ii.block.aether_portal.ambient": "Aether Portal whooshes",
Expand Down
7 changes: 7 additions & 0 deletions src/generated/resources/data/aether_ii/tags/block/infected_guardian_tree_replaceables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"aether_ii:red_cloudwool",
"aether_ii:blue_cloudwool",
"minecraft:spawner"
]
}
15 changes: 15 additions & 0 deletions ...ed/resources/data/aether_ii/tags/worldgen/biome/has_structure/infected_guardian_tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"values": [
"aether_ii:flourishing_field",
"aether_ii:verdant_woods",
"aether_ii:shrouded_forest",
"aether_ii:magnetic_scar",
"aether_ii:turquoise_forest",
"aether_ii:violet_highwoods",
"aether_ii:frigid_sierra",
"aether_ii:enduring_woodland",
"aether_ii:sheer_tundra",
"aether_ii:contaminated_jungle",
"aether_ii:battleground_wastes"
]
}
1 change: 0 additions & 1 deletion src/generated/resources/data/aether_ii/tags/worldgen/biome/has_structure/outpost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"aether_ii:shrouded_forest",
"aether_ii:magnetic_scar",
"aether_ii:turquoise_forest",
"aether_ii:glistening_swamp",
"aether_ii:violet_highwoods",
"aether_ii:frigid_sierra",
"aether_ii:enduring_woodland",
Expand Down
51 changes: 51 additions & 0 deletions src/generated/resources/data/aether_ii/worldgen/processor_list/infected_guardian_tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"processors": [
{
"processor_type": "minecraft:rule",
"rules": [
{
"input_predicate": {
"predicate_type": "minecraft:tag_match",
"tag": "aether_ii:infected_guardian_tree_replaceables"
},
"location_predicate": {
"block": "minecraft:air",
"predicate_type": "minecraft:block_match"
},
"output_state": {
"Name": "minecraft:air"
}
},
{
"input_predicate": {
"predicate_type": "minecraft:tag_match",
"tag": "aether_ii:infected_guardian_tree_replaceables"
},
"location_predicate": {
"block": "minecraft:water",
"predicate_type": "minecraft:block_match"
},
"output_state": {
"Name": "minecraft:water",
"Properties": {
"level": "0"
}
}
},
{
"input_predicate": {
"predicate_type": "minecraft:tag_match",
"tag": "aether_ii:infected_guardian_tree_replaceables"
},
"location_predicate": {
"block": "aether_ii:cold_aercloud",
"predicate_type": "minecraft:block_match"
},
"output_state": {
"Name": "aether_ii:cold_aercloud"
}
}
]
}
]
}
2 changes: 1 addition & 1 deletion src/generated/resources/data/aether_ii/worldgen/structure/camp_highfields.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"liquid_settings": "ignore_waterlogging",
"max_distance_from_center": 32,
"project_start_to_heightmap": "WORLD_SURFACE_WG",
"size": 20,
"size": 4,
"spawn_overrides": {},
"start_height": {
"absolute": 0
Expand Down
16 changes: 16 additions & 0 deletions src/generated/resources/data/aether_ii/worldgen/structure/infected_guardian_tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"type": "aether_ii:aether_jigsaw",
"biomes": "#aether_ii:has_structure/infected_guardian_tree",
"discard_above_y": 160,
"discard_below_y": 128,
"liquid_settings": "ignore_waterlogging",
"max_distance_from_center": 128,
"project_start_to_heightmap": "WORLD_SURFACE_WG",
"size": 12,
"spawn_overrides": {},
"start_height": {
"absolute": -16
},
"start_pool": "aether_ii:dungeon/infected_guardian_tree/entrance",
"step": "surface_structures"
}
2 changes: 1 addition & 1 deletion src/generated/resources/data/aether_ii/worldgen/structure/outpost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"liquid_settings": "ignore_waterlogging",
"max_distance_from_center": 32,
"project_start_to_heightmap": "WORLD_SURFACE_WG",
"size": 10,
"size": 4,
"spawn_overrides": {},
"start_height": {
"absolute": 0
Expand Down
19 changes: 19 additions & 0 deletions src/generated/resources/data/aether_ii/worldgen/structure_set/surface_dungeons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"placement": {
"type": "minecraft:random_spread",
"exclusion_zone": {
"chunk_count": 8,
"other_set": "aether_ii:outposts"
},
"frequency_reduction_method": "legacy_type_2",
"salt": 2209164,
"separation": 12,
"spacing": 32
},
"structures": [
{
"structure": "aether_ii:infected_guardian_tree",
"weight": 1
}
]
}
6 changes: 4 additions & 2 deletions ...ted/resources/data/aether_ii/worldgen/template_pool/camp/highfields/additional_paths.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/additional_paths/path_01",
"processors": "aether_ii:camp_highfields",
"projection": "terrain_matching"
"projection": "terrain_matching",
"replace_air": true
},
"weight": 1
},
Expand All @@ -14,7 +15,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/additional_paths/path_02",
"processors": "aether_ii:camp_highfields",
"projection": "terrain_matching"
"projection": "terrain_matching",
"replace_air": true
},
"weight": 1
}
Expand Down
18 changes: 12 additions & 6 deletions src/generated/resources/data/aether_ii/worldgen/template_pool/camp/highfields/center.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/center/small_center_01",
"processors": "aether_ii:camp_highfields",
"projection": "terrain_matching"
"projection": "terrain_matching",
"replace_air": true
},
"weight": 1
},
Expand All @@ -14,7 +15,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/center/small_center_02",
"processors": "aether_ii:camp_highfields",
"projection": "terrain_matching"
"projection": "terrain_matching",
"replace_air": true
},
"weight": 1
},
Expand All @@ -23,7 +25,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/center/medium_center_01",
"processors": "aether_ii:camp_highfields",
"projection": "terrain_matching"
"projection": "terrain_matching",
"replace_air": true
},
"weight": 1
},
Expand All @@ -32,7 +35,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/center/medium_center_02",
"processors": "aether_ii:camp_highfields",
"projection": "terrain_matching"
"projection": "terrain_matching",
"replace_air": true
},
"weight": 1
},
Expand All @@ -41,7 +45,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/center/large_center_01",
"processors": "aether_ii:camp_highfields",
"projection": "terrain_matching"
"projection": "terrain_matching",
"replace_air": true
},
"weight": 1
},
Expand All @@ -50,7 +55,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/center/large_center_02",
"processors": "aether_ii:camp_highfields",
"projection": "terrain_matching"
"projection": "terrain_matching",
"replace_air": true
},
"weight": 1
}
Expand Down
12 changes: 8 additions & 4 deletions ...enerated/resources/data/aether_ii/worldgen/template_pool/camp/highfields/decorations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/decorations/blueberry_farm",
"processors": "aether_ii:camp_highfields",
"projection": "rigid"
"projection": "rigid",
"replace_air": true
},
"weight": 1
},
Expand All @@ -14,7 +15,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/decorations/orange_farm",
"processors": "aether_ii:camp_highfields",
"projection": "rigid"
"projection": "rigid",
"replace_air": true
},
"weight": 1
},
Expand All @@ -23,7 +25,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/decorations/valkyrie_sprout_farm",
"processors": "aether_ii:camp_highfields",
"projection": "rigid"
"projection": "rigid",
"replace_air": true
},
"weight": 1
},
Expand All @@ -32,7 +35,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/decorations/well",
"processors": "aether_ii:camp_highfields",
"projection": "rigid"
"projection": "rigid",
"replace_air": true
},
"weight": 2
},
Expand Down
6 changes: 4 additions & 2 deletions ...erated/resources/data/aether_ii/worldgen/template_pool/camp/highfields/storage_areas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/storage_areas/storage_area_01",
"processors": "aether_ii:camp_highfields",
"projection": "rigid"
"projection": "rigid",
"replace_air": true
},
"weight": 2
},
Expand All @@ -14,7 +15,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/storage_areas/storage_area_02",
"processors": "aether_ii:camp_highfields",
"projection": "rigid"
"projection": "rigid",
"replace_air": true
},
"weight": 2
},
Expand Down
6 changes: 4 additions & 2 deletions src/generated/resources/data/aether_ii/worldgen/template_pool/camp/highfields/tents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/tents/small_tent",
"processors": "aether_ii:camp_highfields",
"projection": "rigid"
"projection": "rigid",
"replace_air": true
},
"weight": 1
},
Expand All @@ -14,7 +15,8 @@
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:camp/highfields/tents/tent",
"processors": "aether_ii:camp_highfields",
"projection": "rigid"
"projection": "rigid",
"replace_air": true
},
"weight": 2
}
Expand Down
17 changes: 17 additions & 0 deletions ...resources/data/aether_ii/worldgen/template_pool/dungeon/infected_guardian_tree/arena.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"elements": [
{
"element": {
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:dungeon/infected_guardian_tree/boss/arena",
"processors": {
"processors": []
},
"projection": "rigid",
"replace_air": false
},
"weight": 1
}
],
"fallback": "minecraft:empty"
}
17 changes: 17 additions & 0 deletions ...ources/data/aether_ii/worldgen/template_pool/dungeon/infected_guardian_tree/entrance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"elements": [
{
"element": {
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:dungeon/infected_guardian_tree/entrance",
"processors": {
"processors": []
},
"projection": "rigid",
"replace_air": false
},
"weight": 1
}
],
"fallback": "minecraft:empty"
}
17 changes: 17 additions & 0 deletions ...sources/data/aether_ii/worldgen/template_pool/dungeon/infected_guardian_tree/lobbies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"elements": [
{
"element": {
"element_type": "aether_ii:aether_pool_element",
"location": "aether_ii:dungeon/infected_guardian_tree/lobbies/lobby_01",
"processors": {
"processors": []
},
"projection": "rigid",
"replace_air": false
},
"weight": 1
}
],
"fallback": "minecraft:empty"
}
Loading