diff --git a/package-lock.json b/package-lock.json
index b22e58e1..464ba2c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,12 +9,12 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@mcschema/core": "^0.12.9",
+        "@mcschema/core": "^0.12.10",
         "@mcschema/java-1.15": "^0.2.0",
         "@mcschema/java-1.16": "^0.6.3",
         "@mcschema/java-1.17": "^0.2.23",
-        "@mcschema/java-1.18": "^0.1.2",
-        "@mcschema/locales": "^0.1.24",
+        "@mcschema/java-1.18": "^0.1.4",
+        "@mcschema/locales": "^0.1.28",
         "deepslate": "^0.9.0-beta.2",
         "rfdc": "^1.3.0"
       },
@@ -315,9 +315,9 @@
       }
     },
     "node_modules/@mcschema/core": {
-      "version": "0.12.9",
-      "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.9.tgz",
-      "integrity": "sha512-oPmfg2NRSzy4+xIbERPPYQ8yfuQVlmznGbqnob0Cww6AeNzmEZm5c9+wVIqHSRlFS1ZsvCpBtUfXL1t83AUDgQ=="
+      "version": "0.12.10",
+      "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.10.tgz",
+      "integrity": "sha512-uPP6iiVaml5MUBbcu5tnl3atadAwdQOpXBZdpoDMjLX+7nUUUAjiynHpbwXVeqTgO473j4QI2EQv2NqPH+wCSw=="
     },
     "node_modules/@mcschema/java-1.15": {
       "version": "0.2.1",
@@ -344,17 +344,17 @@
       }
     },
     "node_modules/@mcschema/java-1.18": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.2.tgz",
-      "integrity": "sha512-VNz2ZO2M/1D/gtXvX1CIIHQT57YKq1X5bGvKobE8tLp1pQxeQEQwxvgFGVrZdWYpTJDJBOO6np2T9y2pfOP2bg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.4.tgz",
+      "integrity": "sha512-SCDKE9LrYLfjsMNx9q6wNNtdKidVkt3EbW9rVwMVpi/N1ATUJQPV6+g52JWCU+TMOeZ5VJO6mukg94xzBs1/Bg==",
       "dependencies": {
-        "@mcschema/core": "^0.12.4"
+        "@mcschema/core": "^0.12.10"
       }
     },
     "node_modules/@mcschema/locales": {
-      "version": "0.1.24",
-      "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.24.tgz",
-      "integrity": "sha512-J87Xk7mmbcSP4zM5SJ1UX28+09RrOO3m27FbEIkI3WIFEv6Mpbph9se5VEYRL8jh7uEVT/ALw//BnC4YYbB3nA=="
+      "version": "0.1.28",
+      "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.28.tgz",
+      "integrity": "sha512-lab3mg/WyImBt2M8DBhBlPz0+URKEZg26HcD7v9Gu+ZaXBSQptJfKLE4dzqotos6C0SR9lrNjhwgIyS2U9n6rg=="
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -2790,9 +2790,9 @@
       }
     },
     "@mcschema/core": {
-      "version": "0.12.9",
-      "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.9.tgz",
-      "integrity": "sha512-oPmfg2NRSzy4+xIbERPPYQ8yfuQVlmznGbqnob0Cww6AeNzmEZm5c9+wVIqHSRlFS1ZsvCpBtUfXL1t83AUDgQ=="
+      "version": "0.12.10",
+      "resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.10.tgz",
+      "integrity": "sha512-uPP6iiVaml5MUBbcu5tnl3atadAwdQOpXBZdpoDMjLX+7nUUUAjiynHpbwXVeqTgO473j4QI2EQv2NqPH+wCSw=="
     },
     "@mcschema/java-1.15": {
       "version": "0.2.1",
@@ -2819,17 +2819,17 @@
       }
     },
     "@mcschema/java-1.18": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.2.tgz",
-      "integrity": "sha512-VNz2ZO2M/1D/gtXvX1CIIHQT57YKq1X5bGvKobE8tLp1pQxeQEQwxvgFGVrZdWYpTJDJBOO6np2T9y2pfOP2bg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.1.4.tgz",
+      "integrity": "sha512-SCDKE9LrYLfjsMNx9q6wNNtdKidVkt3EbW9rVwMVpi/N1ATUJQPV6+g52JWCU+TMOeZ5VJO6mukg94xzBs1/Bg==",
       "requires": {
-        "@mcschema/core": "^0.12.4"
+        "@mcschema/core": "^0.12.10"
       }
     },
     "@mcschema/locales": {
-      "version": "0.1.24",
-      "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.24.tgz",
-      "integrity": "sha512-J87Xk7mmbcSP4zM5SJ1UX28+09RrOO3m27FbEIkI3WIFEv6Mpbph9se5VEYRL8jh7uEVT/ALw//BnC4YYbB3nA=="
+      "version": "0.1.28",
+      "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.28.tgz",
+      "integrity": "sha512-lab3mg/WyImBt2M8DBhBlPz0+URKEZg26HcD7v9Gu+ZaXBSQptJfKLE4dzqotos6C0SR9lrNjhwgIyS2U9n6rg=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
diff --git a/package.json b/package.json
index 786f7218..194321ca 100644
--- a/package.json
+++ b/package.json
@@ -14,12 +14,12 @@
   "author": "Misode",
   "license": "MIT",
   "dependencies": {
-    "@mcschema/core": "^0.12.9",
+    "@mcschema/core": "^0.12.10",
     "@mcschema/java-1.15": "^0.2.0",
     "@mcschema/java-1.16": "^0.6.3",
     "@mcschema/java-1.17": "^0.2.23",
-    "@mcschema/java-1.18": "^0.1.2",
-    "@mcschema/locales": "^0.1.24",
+    "@mcschema/java-1.18": "^0.1.4",
+    "@mcschema/locales": "^0.1.28",
     "deepslate": "^0.9.0-beta.2",
     "rfdc": "^1.3.0"
   },
diff --git a/src/app/schema/renderHtml.tsx b/src/app/schema/renderHtml.tsx
index 1162f4c3..27a70cbc 100644
--- a/src/app/schema/renderHtml.tsx
+++ b/src/app/schema/renderHtml.tsx
@@ -12,12 +12,12 @@ import { CachedDecorator, CachedFeature } from '../Schemas'
 import { deepClone, deepEqual, hexId, isObject, newSeed } from '../Utils'
 import { ModelWrapper } from './ModelWrapper'
 
-const selectRegistries = ['loot_table.type', 'loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'dimension.generator.biome_source.preset', 'carver.type', 'feature.type', 'decorator.type', 'feature.tree.minimum_size.type', 'block_state_provider.type', 'trunk_placer.type', 'foliage_placer.type', 'tree_decorator.type', 'int_provider.type', 'float_provider.type', 'height_provider.type', 'structure_feature.type', 'surface_builder.type', 'processor.processor_type', 'rule_test.predicate_type', 'pos_rule_test.predicate_type', 'template_element.element_type', 'block_placer.type']
+const selectRegistries = ['loot_table.type', 'loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'dimension.generator.biome_source.preset', 'carver.type', 'feature.type', 'decorator.type', 'feature.tree.minimum_size.type', 'block_state_provider.type', 'trunk_placer.type', 'foliage_placer.type', 'tree_decorator.type', 'int_provider.type', 'float_provider.type', 'height_provider.type', 'structure_feature.type', 'surface_builder.type', 'processor.processor_type', 'rule_test.predicate_type', 'pos_rule_test.predicate_type', 'template_element.element_type', 'block_placer.type', 'block_predicate.type']
 const hiddenFields = ['number_provider.type', 'score_provider.type', 'nbt_provider.type', 'int_provider.type', 'float_provider.type', 'height_provider.type']
 const flattenedFields = ['feature.config', 'decorator.config', 'int_provider.value', 'float_provider.value', 'block_state_provider.simple_state_provider.state', 'block_state_provider.rotated_block_provider.state', 'block_state_provider.weighted_state_provider.entries.entry.data', 'rule_test.block_state', 'structure_feature.config', 'surface_builder.config', 'template_pool.elements.entry.element', 'decorator.block_survives_filter.state']
 const inlineFields = ['loot_entry.type', 'function.function', 'condition.condition', 'criterion.trigger', 'dimension.generator.type', 'dimension.generator.biome_source.type', 'feature.type', 'decorator.type', 'block_state_provider.type', 'feature.tree.minimum_size.type', 'trunk_placer.type', 'foliage_placer.type', 'tree_decorator.type', 'block_placer.type', 'rule_test.predicate_type', 'processor.processor_type', 'template_element.element_type', 'nbt_operation.op', 'number_provider.value', 'score_provider.name', 'score_provider.target', 'nbt_provider.source', 'nbt_provider.target', 'generator_biome.biome']
 const nbtFields = ['function.set_nbt.tag', 'advancement.display.icon.nbt', 'text_component_object.nbt', 'entity.nbt', 'block.nbt', 'item.nbt']
-const fixedLists = ['generator_biome.parameters.temperature', 'generator_biome.parameters.humidity', 'generator_biome.parameters.continentalness', 'generator_biome.parameters.erosion', 'generator_biome.parameters.depth', 'generator_biome.parameters.weirdness', 'feature.end_spike.crystal_beam_target', 'feature.end_gateway.exit', 'decorator.block_filter.offset']
+const fixedLists = ['generator_biome.parameters.temperature', 'generator_biome.parameters.humidity', 'generator_biome.parameters.continentalness', 'generator_biome.parameters.erosion', 'generator_biome.parameters.depth', 'generator_biome.parameters.weirdness', 'feature.end_spike.crystal_beam_target', 'feature.end_gateway.exit', 'decorator.block_filter.offset', 'block_predicate.matching_blocks.offset', 'block_predicate.matching_fluids.offset']
 
 /**
  * Secondary model used to remember the keys of a map
diff --git a/src/config.json b/src/config.json
index d45efe12..220ba02a 100644
--- a/src/config.json
+++ b/src/config.json
@@ -188,6 +188,7 @@
     { "id": "advancement", "dynamic": true },
     { "id": "attribute", "minVersion": "1.16" },
     { "id": "block" },
+    { "id": "block_predicate_type", "minVersion": "1.18" },
     { "id": "dimension", "dynamic": true },
     { "id": "dimension_type", "dynamic": true },
     { "id": "enchantment" },