surprise beta 9 update!

common/src/main/resources/assets/antarchy/blockstates/potted_lotus.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "antarchy:block/potted_lotus"
+    }
+  }
+}

common/src/main/resources/assets/antarchy/blockstates/potted_ouranwood_acorn.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "antarchy:block/potted_ouranwood_acorn"
+    }
+  }
+}

common/src/main/resources/assets/antarchy/blockstates/potted_peach_sapling.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "antarchy:block/potted_peach_sapling"
+    }
+  }
+}

common/src/main/resources/assets/antarchy/blockstates/potted_spider_lily.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "antarchy:block/potted_spider_lily"
+    }
+  }
+}

common/src/main/resources/assets/antarchy/models/block/critter_cage_block.json

@@ -7,8 +7,8 @@
   },
   "elements": [
     {
-      "from": [1, 0, 1],
-      "to": [15, 16, 15],
+      "from": [1, 1, 1],
+      "to": [15, 15, 15],
       "faces": {
         "down": { "texture": "#cage", "cullface": "down" },
         "up": { "texture": "#cage", "cullface": "up" },

common/src/main/resources/assets/antarchy/models/block/potted_lotus.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/flower_pot_cross",
+  "textures": {
+    "plant": "antarchy:block/lotus"
+  }
+}

common/src/main/resources/assets/antarchy/models/block/potted_ouranwood_acorn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/flower_pot_cross",
+  "textures": {
+    "plant": "antarchy:block/ouranwood/ouranwood_sapling_2"
+  }
+}

common/src/main/resources/assets/antarchy/models/block/potted_peach_sapling.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/flower_pot_cross",
+  "textures": {
+    "plant": "antarchy:block/peach/peach_sapling"
+  }
+}

common/src/main/resources/assets/antarchy/models/block/potted_spider_lily.json

@@ -0,0 +1,104 @@
+{
+  "ambientocclusion": false,
+  "textures": {
+    "particle": "minecraft:block/flower_pot",
+    "flowerpot": "minecraft:block/flower_pot",
+    "dirt": "minecraft:block/dirt",
+    "stem": "antarchy:block/spider_lily_stem",
+    "flower": "antarchy:block/spider_lily_top"
+  },
+  "elements": [
+    {
+      "from": [5, 0, 5],
+      "to": [6, 6, 11],
+      "faces": {
+        "down": { "uv": [5, 5, 6, 11], "texture": "#flowerpot", "cullface": "down" },
+        "up": { "uv": [5, 5, 6, 11], "texture": "#flowerpot" },
+        "north": { "uv": [10, 10, 11, 16], "texture": "#flowerpot" },
+        "south": { "uv": [5, 10, 6, 16], "texture": "#flowerpot" },
+        "west": { "uv": [5, 10, 11, 16], "texture": "#flowerpot" },
+        "east": { "uv": [5, 10, 11, 16], "texture": "#flowerpot" }
+      }
+    },
+    {
+      "from": [10, 0, 5],
+      "to": [11, 6, 11],
+      "faces": {
+        "down": { "uv": [10, 5, 11, 11], "texture": "#flowerpot", "cullface": "down" },
+        "up": { "uv": [10, 5, 11, 11], "texture": "#flowerpot" },
+        "north": { "uv": [5, 10, 6, 16], "texture": "#flowerpot" },
+        "south": { "uv": [10, 10, 11, 16], "texture": "#flowerpot" },
+        "west": { "uv": [5, 10, 11, 16], "texture": "#flowerpot" },
+        "east": { "uv": [5, 10, 11, 16], "texture": "#flowerpot" }
+      }
+    },
+    {
+      "from": [6, 0, 5],
+      "to": [10, 6, 6],
+      "faces": {
+        "down": { "uv": [6, 10, 10, 11], "texture": "#flowerpot", "cullface": "down" },
+        "up": { "uv": [6, 5, 10, 6], "texture": "#flowerpot" },
+        "north": { "uv": [6, 10, 10, 16], "texture": "#flowerpot" },
+        "south": { "uv": [6, 10, 10, 16], "texture": "#flowerpot" }
+      }
+    },
+    {
+      "from": [6, 0, 10],
+      "to": [10, 6, 11],
+      "faces": {
+        "down": { "uv": [6, 5, 10, 6], "texture": "#flowerpot", "cullface": "down" },
+        "up": { "uv": [6, 10, 10, 11], "texture": "#flowerpot" },
+        "north": { "uv": [6, 10, 10, 16], "texture": "#flowerpot" },
+        "south": { "uv": [6, 10, 10, 16], "texture": "#flowerpot" }
+      }
+    },
+    {
+      "from": [6, 0, 6],
+      "to": [10, 4, 10],
+      "faces": {
+        "down": { "uv": [6, 12, 10, 16], "texture": "#flowerpot", "cullface": "down" },
+        "up": { "uv": [6, 6, 10, 10], "texture": "#dirt" }
+      }
+    },
+    {
+      "from": [2.6, 4, 8],
+      "to": [13.4, 16, 8],
+      "rotation": { "origin": [8, 8, 8], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [0, 0, 16, 16], "texture": "#stem", "tintindex": 0 },
+        "south": { "uv": [0, 0, 16, 16], "texture": "#stem", "tintindex": 0 }
+      }
+    },
+    {
+      "from": [8, 4, 2.6],
+      "to": [8, 16, 13.4],
+      "rotation": { "origin": [8, 8, 8], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [0, 0, 16, 16], "texture": "#stem", "tintindex": 0 },
+        "east": { "uv": [0, 0, 16, 16], "texture": "#stem", "tintindex": 0 }
+      }
+    },
+    {
+      "from": [2.6, 4, 8],
+      "to": [13.4, 16, 8],
+      "rotation": { "origin": [8, 8, 8], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "north": { "uv": [0, 0, 16, 16], "texture": "#flower" },
+        "south": { "uv": [0, 0, 16, 16], "texture": "#flower" }
+      }
+    },
+    {
+      "from": [8, 4, 2.6],
+      "to": [8, 16, 13.4],
+      "rotation": { "origin": [8, 8, 8], "axis": "y", "angle": 45, "rescale": true },
+      "shade": false,
+      "faces": {
+        "west": { "uv": [0, 0, 16, 16], "texture": "#flower" },
+        "east": { "uv": [0, 0, 16, 16], "texture": "#flower" }
+      }
+    }
+  ]
+}

common/src/main/resources/data/antarchy/loot_table/blocks/potted_lotus.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ]
+    },
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "antarchy:lotus"
+        }
+      ]
+    }
+  ],
+  "random_sequence": "antarchy:blocks/potted_lotus"
+}

common/src/main/resources/data/antarchy/loot_table/blocks/potted_ouranwood_acorn.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ]
+    },
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "antarchy:ouranwood_acorn"
+        }
+      ]
+    }
+  ],
+  "random_sequence": "antarchy:blocks/potted_ouranwood_acorn"
+}

common/src/main/resources/data/antarchy/loot_table/blocks/potted_peach_sapling.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ]
+    },
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "antarchy:peach_sapling"
+        }
+      ]
+    }
+  ],
+  "random_sequence": "antarchy:blocks/potted_peach_sapling"
+}

common/src/main/resources/data/antarchy/loot_table/blocks/potted_spider_lily.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ]
+    },
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "antarchy:spider_lily"
+        }
+      ]
+    }
+  ],
+  "random_sequence": "antarchy:blocks/potted_spider_lily"
+}

common/src/main/resources/data/antarchy/loot_table/chests/seashell.json

@@ -4,19 +4,125 @@
     {
       "rolls": {
         "type": "minecraft:uniform",
-        "min": 2,
-        "max": 5
+        "min": 1,
+        "max": 3
       },
       "entries": [
-        { "type": "minecraft:item", "name": "minecraft:nautilus_shell", "weight": 8 },
-        { "type": "minecraft:item", "name": "minecraft:prismarine_shard", "weight": 10 },
-        { "type": "minecraft:item", "name": "minecraft:prismarine_crystals", "weight": 8 },
-        { "type": "minecraft:item", "name": "minecraft:kelp", "weight": 12 },
-        { "type": "minecraft:item", "name": "minecraft:seagrass", "weight": 10 },
-        { "type": "minecraft:item", "name": "minecraft:tropical_fish", "weight": 4 },
-        { "type": "minecraft:item", "name": "minecraft:bone_meal", "weight": 8 },
-        { "type": "minecraft:item", "name": "antarchy:star_coral", "weight": 3 },
-        { "type": "minecraft:item", "name": "antarchy:giant_lily_pad", "weight": 1 }
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:lapis_lazuli",
+          "weight": 14,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 2,
+                "max": 6
+              }
+            }
+          ]
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:redstone",
+          "weight": 14,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 2,
+                "max": 6
+              }
+            }
+          ]
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:quartz",
+          "weight": 14,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 2,
+                "max": 5
+              }
+            }
+          ]
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_iron",
+          "weight": 7,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 1,
+                "max": 3
+              }
+            }
+          ]
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:raw_gold",
+          "weight": 7,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 1,
+                "max": 3
+              }
+            }
+          ]
+        },
+        {
+          "type": "minecraft:item",
+          "name": "antarchy:uranium_nugget",
+          "weight": 2,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 1,
+                "max": 2
+              }
+            }
+          ]
+        },
+        {
+          "type": "minecraft:item",
+          "name": "antarchy:titanium_nugget",
+          "weight": 2,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 1,
+                "max": 2
+              }
+            }
+          ]
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:heart_of_the_sea",
+          "weight": 1
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:diamond",
+          "weight": 1
+        }
       ]
     }
   ]

common/src/main/resources/data/antarchy/recipe/critter_cage.json

@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "pattern": [
     "ISI",
     "SLS",
@@ -17,7 +18,7 @@
     }
   },
   "result": {
-    "item": "antarchy:critter_cage",
+    "id": "antarchy:critter_cage",
     "count": 1
   }
 }

common/src/main/resources/data/antarchy/tags/worldgen/biome/has_rare_seashell.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:warm_ocean"
+  ]
+}

common/src/main/resources/data/antarchy/tags/worldgen/biome/has_seashell.json

@@ -1,14 +1,6 @@
 {
   "replace": false,
   "values": [
-    "#minecraft:is_ocean",
-    {
-      "id": "#neoforge:is_ocean",
-      "required": false
-    },
-    {
-      "id": "#c:ocean",
-      "required": false
-    }
+    "antarchy:elythia_ocean"
   ]
 }

common/src/main/resources/data/antarchy/worldgen/biome/butterfly_fields.json

@@ -72,8 +72,8 @@
       {
         "type": "antarchy:caterpillar",
         "weight": 30,
-        "minCount": 6,
-        "maxCount": 12
+        "minCount": 1,
+        "maxCount": 3
       },
       {
         "type": "antarchy:golden_apple_cow",
@@ -92,8 +92,8 @@
       {
         "type": "antarchy:butterfly",
         "weight": 180,
-        "minCount": 4,
-        "maxCount": 12
+        "minCount": 2,
+        "maxCount": 5
       }
     ],
     "axolotls": [],

common/src/main/resources/data/antarchy/worldgen/biome/elythia_meadow.json

@@ -73,7 +73,7 @@
       "antarchy:elythia_brown_ant_nests",
       "antarchy:elythia_rainbow_ant_nests",
       "minecraft:patch_sugar_cane",
-      "antarchy:giant_lily_pad_patch_common"
+      "antarchy:giant_lily_pad_patch_meadow"
     ],
     []
   ],

common/src/main/resources/data/antarchy/worldgen/biome/elythia_ocean.json

@@ -54,6 +54,7 @@
     [
       "minecraft:sea_pickle",
       "minecraft:warm_ocean_vegetation",
+      "antarchy:star_coral_patch",
       "minecraft:kelp_warm",
       "antarchy:giant_lily_pad_patch_common"
     ],

common/src/main/resources/data/antarchy/worldgen/biome/glimmering_pools.json

@@ -27,7 +27,8 @@
     [
       "antarchy:lumen_pools",
       "antarchy:lumen_streams",
-      "antarchy:lumen_lily_pads"
+      "antarchy:lumen_lily_pads",
+      "antarchy:giant_lily_pad_patch_common"
     ],
     [],
     [],

common/src/main/resources/data/antarchy/worldgen/configured_feature/cornea_stalk_cluster.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:random_patch",
+  "config": {
+    "tries": 6,
+    "xz_spread": 3,
+    "y_spread": 1,
+    "feature": "antarchy:cornea_stalk_single"
+  }
+}

common/src/main/resources/data/antarchy/worldgen/configured_feature/patch_ceiling_cornea_stalk_cluster.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:random_patch",
+  "config": {
+    "tries": 6,
+    "xz_spread": 3,
+    "y_spread": 1,
+    "feature": "antarchy:patch_ceiling_cornea_stalk_single"
+  }
+}

common/src/main/resources/data/antarchy/worldgen/placed_feature/cornea_stalk_patch.json

@@ -1,12 +1,12 @@
 {
-  "feature": "antarchy:cornea_stalk_patch",
+  "feature": "antarchy:cornea_stalk_cluster",
   "placement": [
     {
       "type": "minecraft:count",
       "count": {
         "type": "minecraft:uniform",
-        "min_inclusive": 7,
-        "max_inclusive": 15
+        "min_inclusive": 3,
+        "max_inclusive": 6
       }
     },
     {
@@ -26,32 +26,6 @@
     },
     {
       "type": "minecraft:biome"
-    },
-    {
-      "type": "minecraft:random_offset",
-      "xz_spread": 2,
-      "y_spread": 1
-    },
-    {
-      "type": "minecraft:block_predicate_filter",
-      "predicate": {
-        "type": "minecraft:all_of",
-        "predicates": [
-          {
-            "type": "minecraft:matching_blocks",
-            "blocks": "minecraft:air"
-          },
-          {
-            "type": "minecraft:matching_block_tag",
-            "tag": "antarchy:cornea_stalk_plantable",
-            "offset": [
-              0,
-              -1,
-              0
-            ]
-          }
-        ]
-      }
     }
   ]
 }

common/src/main/resources/data/antarchy/worldgen/placed_feature/cornea_stalk_single.json

@@ -0,0 +1,26 @@
+{
+  "feature": "antarchy:cornea_stalk_patch",
+  "placement": [
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:all_of",
+        "predicates": [
+          {
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:air"
+          },
+          {
+            "type": "minecraft:matching_block_tag",
+            "tag": "antarchy:cornea_stalk_plantable",
+            "offset": [
+              0,
+              -1,
+              0
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}

common/src/main/resources/data/antarchy/worldgen/placed_feature/giant_lily_pad_patch_meadow.json

@@ -0,0 +1,9 @@
+{
+  "feature": "antarchy:giant_lily_pad_patch",
+  "placement": [
+    { "type": "minecraft:rarity_filter", "chance": 8 },
+    { "type": "minecraft:in_square" },
+    { "type": "minecraft:heightmap", "heightmap": "MOTION_BLOCKING_NO_LEAVES" },
+    { "type": "minecraft:biome" }
+  ]
+}

common/src/main/resources/data/antarchy/worldgen/placed_feature/patch_ceiling_cornea_stalk.json

@@ -1,12 +1,12 @@
 {
-  "feature": "antarchy:patch_ceiling_cornea_stalk",
+  "feature": "antarchy:patch_ceiling_cornea_stalk_cluster",
   "placement": [
     {
       "type": "minecraft:count",
       "count": {
         "type": "minecraft:uniform",
-        "min_inclusive": 7,
-        "max_inclusive": 15
+        "min_inclusive": 3,
+        "max_inclusive": 6
       }
     },
     {
@@ -26,32 +26,6 @@
     },
     {
       "type": "minecraft:biome"
-    },
-    {
-      "type": "minecraft:random_offset",
-      "xz_spread": 2,
-      "y_spread": 1
-    },
-    {
-      "type": "minecraft:block_predicate_filter",
-      "predicate": {
-        "type": "minecraft:all_of",
-        "predicates": [
-          {
-            "type": "minecraft:matching_blocks",
-            "blocks": "minecraft:air"
-          },
-          {
-            "type": "minecraft:matching_block_tag",
-            "tag": "antarchy:cornea_stalk_plantable",
-            "offset": [
-              0,
-              1,
-              0
-            ]
-          }
-        ]
-      }
     }
   ]
 }

common/src/main/resources/data/antarchy/worldgen/placed_feature/patch_ceiling_cornea_stalk_single.json

@@ -0,0 +1,26 @@
+{
+  "feature": "antarchy:patch_ceiling_cornea_stalk",
+  "placement": [
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:all_of",
+        "predicates": [
+          {
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:air"
+          },
+          {
+            "type": "minecraft:matching_block_tag",
+            "tag": "antarchy:cornea_stalk_plantable",
+            "offset": [
+              0,
+              1,
+              0
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}

common/src/main/resources/data/antarchy/worldgen/placed_feature/seashell_patch_rare.json

@@ -0,0 +1,19 @@
+{
+  "feature": "antarchy:seashell_patch",
+  "placement": [
+    {
+      "type": "minecraft:rarity_filter",
+      "chance": 100
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:heightmap",
+      "heightmap": "OCEAN_FLOOR_WG"
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}