feat: expanse and undercloud biome generation

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"
+    }
+  }
+}

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"
+    }
+  }
+}

src/generated/resources/assets/aether_ii/blockstates/cumulus_bush.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "aether_ii:block/cumulus_bush"
+    }
+  }
+}

src/generated/resources/assets/aether_ii/blockstates/royal_stratus_fern.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "aether_ii:block/royal_stratus_fern"
+    }
+  }
+}

src/generated/resources/assets/aether_ii/items/cirrus_succulent.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "aether_ii:item/cirrus_succulent"
+  }
+}

src/generated/resources/assets/aether_ii/items/cumulonimbus_bush.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "aether_ii:item/cumulonimbus_bush"
+  }
+}

src/generated/resources/assets/aether_ii/items/cumulus_bush.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "aether_ii:item/cumulus_bush"
+  }
+}

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"
+  }
+}

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",

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
     ]