From 09efb3d6dea9036351f232117061bde9d54e2685 Mon Sep 17 00:00:00 2001
From: Apollo <102649729+Apollounknowndev@users.noreply.github.com>
Date: Tue, 23 Jul 2024 23:41:09 -0400
Subject: [PATCH] Fix liquid settings being required

---
 java/1.21/src/schemas/worldgen/Structure.ts    | 2 +-
 java/1.21/src/schemas/worldgen/TemplatePool.ts | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/java/1.21/src/schemas/worldgen/Structure.ts b/java/1.21/src/schemas/worldgen/Structure.ts
index 819905d..3c0df49 100644
--- a/java/1.21/src/schemas/worldgen/Structure.ts
+++ b/java/1.21/src/schemas/worldgen/Structure.ts
@@ -45,7 +45,7 @@ export function initStructureSchemas(schemas: SchemaRegistry, collections: Colle
         max_distance_from_center: Mod(NumberNode({ integer: true, min: 1, max: 128 }), { default: () => 80 }),
         use_expansion_hack: BooleanNode(),
         dimension_padding: Opt(Reference('dimension_padding')),
-        liquid_settings: StringNode({ enum: ['apply_waterlogging', 'ignore_waterlogging'] }),
+        liquid_settings: Opt(StringNode({ enum: ['apply_waterlogging', 'ignore_waterlogging'] })),
         pool_aliases: Opt(ListNode(Reference('pool_alias_binding')))
       },
       'minecraft:mineshaft': {
diff --git a/java/1.21/src/schemas/worldgen/TemplatePool.ts b/java/1.21/src/schemas/worldgen/TemplatePool.ts
index c69b46c..e5de4b3 100644
--- a/java/1.21/src/schemas/worldgen/TemplatePool.ts
+++ b/java/1.21/src/schemas/worldgen/TemplatePool.ts
@@ -6,6 +6,7 @@ import {
   Mod,
   NumberNode,
   ObjectNode,
+  Opt,
   Reference as RawReference,
   Switch,
   SchemaRegistry,
@@ -64,7 +65,7 @@ export function initTemplatePoolSchemas(schemas: SchemaRegistry, collections: Co
       'minecraft:legacy_single_pool_element': {
         projection: StringNode({ enum: ['rigid', 'terrain_matching'] }),
         location: StringNode({ validator: 'resource', params: { pool: '$structure' }}),
-        override_liquid_settings: StringNode({ enum: ['apply_waterlogging', 'ignore_waterlogging'] }),
+        override_liquid_settings: Opt(StringNode({ enum: ['apply_waterlogging', 'ignore_waterlogging'] })),
         processors: Processors
       },
       'minecraft:list_pool_element': {
@@ -76,7 +77,7 @@ export function initTemplatePoolSchemas(schemas: SchemaRegistry, collections: Co
       'minecraft:single_pool_element': {
         projection: StringNode({ enum: ['rigid', 'terrain_matching'] }),
         location: StringNode({ validator: 'resource', params: { pool: '$structure' }}),
-        override_liquid_settings: StringNode({ enum: ['apply_waterlogging', 'ignore_waterlogging'] }),
+        override_liquid_settings: Opt(StringNode({ enum: ['apply_waterlogging', 'ignore_waterlogging'] })),
         processors: Processors
       }
     }
@@ -88,3 +89,4 @@ export function initTemplatePoolSchemas(schemas: SchemaRegistry, collections: Co
     })
   }))
 }
+