feat: fluid support for logistics system

gradle.properties

@@ -15,7 +15,7 @@ minecraft_version_range=[1.21,1.22)
 
 ## Neo
 # The neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.0.114-beta
+neo_version=21.0.135-beta
 # The neo version range can use any version of neo as bounds or match the loader version range
 neo_version_range=[21.0.110-beta,)
 # The loader version range can only use the major version of Neo/FML as bounds

src/generated/resources/.cache/3fa62e6e7a071b2d9f296990c67d7a2df0006913

@@ -1,4 +1,4 @@
-// 1.21	2024-07-24T15:14:11.8162045	Books: theurgy
+// 1.21	2024-07-26T10:42:29.0514339	Books: theurgy
 c473bf5aa94f847c736c37f1a9f85c86b8bce95d data/theurgy/modonomicon/books/the_hermetica/book.json
 74a2622bcd8dc6316c5977cbea5a026d81dcff87 data/theurgy/modonomicon/books/the_hermetica/categories/apparatus.json
 6f877a9734359091748cca949c8e6c569ad2d67e data/theurgy/modonomicon/books/the_hermetica/categories/getting_started.json
@@ -78,6 +78,9 @@ e1beb3a9b62ecf8e7caa3a64270a3c65633e3f0c data/theurgy/modonomicon/books/the_herm
 e64f9e374f40c8cbaec0dea1c22e9a653bd673df data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/target_pedestal.json
 0009b0e7d1d159fe4fc13da9aa3cc1c1dc39d56e data/theurgy/modonomicon/books/the_hermetica/entries/logistics/attribute_filter.json
 a4d4ee8172f7c14580d3a7759544aac51a44890e data/theurgy/modonomicon/books/the_hermetica/entries/logistics/connection_node.json
+0274d66ed16745ded77d250a1c56dbf39c5aaa1c data/theurgy/modonomicon/books/the_hermetica/entries/logistics/fluid_extractor.json
+6d62ce4e0096792528694237cbc82b33a60789d0 data/theurgy/modonomicon/books/the_hermetica/entries/logistics/fluid_inserter.json
+6adaef39802575c21adb85ba0da617db4f004e89 data/theurgy/modonomicon/books/the_hermetica/entries/logistics/fluid_list_filter.json
 76190f81026244531738ae77cda192c9d8db6201 data/theurgy/modonomicon/books/the_hermetica/entries/logistics/frequency.json
 2297ec1995a7c83573b45b91a2df7814767bc9ad data/theurgy/modonomicon/books/the_hermetica/entries/logistics/intro.json
 53a9b9e65867567ac0b8d413d0d0c47478b9cc2c data/theurgy/modonomicon/books/the_hermetica/entries/logistics/item_extractor.json

src/generated/resources/.cache/44e062bf203da5d734205f46ac5f2eb38d3b96a5

@@ -1,4 +1,4 @@
-// 1.21	2024-07-07T19:12:32.6955813	Block States: theurgy
+// 1.21	2024-07-26T09:31:55.8516594	Block States: theurgy
 ef875fc2604f4f19d7604536c66d3d2c26163879 assets/theurgy/blockstates/calcination_oven.json
 fa912507f89d2fe9ac05c8b057aed16d83f0d96c assets/theurgy/blockstates/caloric_flux_emitter.json
 92ebf87f417e3426f30d3e42eeafd933e446eb23 assets/theurgy/blockstates/deepslate_sal_ammoniac_ore.json
@@ -11,6 +11,8 @@ b3f309de2afb6022baaee6155becbd198f1e858b assets/theurgy/blockstates/fermentation
 08bfb53e16229544b84ea69caac5d11239d3c8b0 assets/theurgy/blockstates/incubator_sulfur_vessel.json
 05305f7086817341ef70a4df92bf81a24bb0b6da assets/theurgy/blockstates/liquefaction_cauldron.json
 502d977970aa2a320387c75413a4b2b9254bbe26 assets/theurgy/blockstates/logistics_connector_node.json
+7573ed417afb27fe90e3e750131450480ef5a499 assets/theurgy/blockstates/logistics_fluid_extractor.json
+efeda05aabded90a3efd10381b62c86f9c4c19a0 assets/theurgy/blockstates/logistics_fluid_inserter.json
 dfb1d02ba07a69c9d2d4c384dad3381439dcaa0d assets/theurgy/blockstates/logistics_item_extractor.json
 f53ebd2c393ab26ea9c23ab6ed3b0dd2762c0d8e assets/theurgy/blockstates/logistics_item_inserter.json
 f072de10fd9407a439ba626f1208b6707d0f20c9 assets/theurgy/blockstates/mercury_catalyst.json
@@ -39,8 +41,10 @@ c79ce877fb80454b4c5ea666bcc5584c881e8c11 assets/theurgy/models/block/incubator_v
 c79ce877fb80454b4c5ea666bcc5584c881e8c11 assets/theurgy/models/block/liquefaction_cauldron_upper.json
 7ad3c0d9d3c704cb7208e0956cfcdb3e49d71df0 assets/theurgy/models/block/logistics_connection_node.json
 36b6952b32004b930dfee15529f223d985d064b1 assets/theurgy/models/block/logistics_connector_filter.json
-5621fe9d75475395410c06019a14ba77b6e97e14 assets/theurgy/models/block/logistics_item_extractor.json
-86e79ecfb261db3b4f75a62a62de33a29252f375 assets/theurgy/models/block/logistics_item_inserter.json
+1973215e644be679283fa4245c4762674b1d0524 assets/theurgy/models/block/logistics_fluid_extractor.json
+304e9afb92f1d37ecb26fa2d95cd242d229d6423 assets/theurgy/models/block/logistics_fluid_inserter.json
+d11af7f3997b3e86015297dd8c44ad220dd2a7a5 assets/theurgy/models/block/logistics_item_extractor.json
+b903f6b77e966f6dfe93df6d61cd9c1ae2226837 assets/theurgy/models/block/logistics_item_inserter.json
 b409c8a9f0cf680d9b409e9d9dcef1a73e9c0948 assets/theurgy/models/block/mercury_catalyst.json
 52afb4cf68605f9a482f6332b02f523a81b74168 assets/theurgy/models/block/pyromantic_brazier.json
 90588f4755497f3c8df737fd06b92d33ff4d0542 assets/theurgy/models/block/pyromantic_brazier_lit.json
@@ -63,6 +67,8 @@ e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/incubator_sa
 e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/incubator_sulfur_vessel.json
 7452e23d15a4905caefbd048ff18482ccaab75c2 assets/theurgy/models/item/liquefaction_cauldron.json
 d99e0febb52b282cab05da0d77aa66ad0ff7f2dc assets/theurgy/models/item/logistics_connector_node.json
+46fab0d2891ffe043301f6cc035d01b41d2e8f03 assets/theurgy/models/item/logistics_fluid_extractor.json
+a89f3b0803c63aae8dff1cea394750290a37ecdb assets/theurgy/models/item/logistics_fluid_inserter.json
 16a006ef1b6e6bb0681e57ae1870c13b8e4978b4 assets/theurgy/models/item/logistics_item_extractor.json
 74cf9047bf1f6b23a205a95f82e4ee6de943c869 assets/theurgy/models/item/logistics_item_inserter.json
 a3ce5b4c6144d76177427a7b1939fc3963811d05 assets/theurgy/models/item/mercury_catalyst.json

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -1,4 +1,4 @@
-// 1.21	2024-06-16T12:34:15.3169223	Loot Tables
+// 1.21	2024-07-26T09:52:01.2480071	Loot Tables
 72c4014c4a8e846f945380a01c02fc8516e774d7 data/theurgy/loot_table/blocks/calcination_oven.json
 fd7072af99912a91b8804e95b8c8f50f17d36b8c data/theurgy/loot_table/blocks/caloric_flux_emitter.json
 96c66600a0575d26b910a72037748797c8002a1f data/theurgy/loot_table/blocks/deepslate_sal_ammoniac_ore.json
@@ -11,6 +11,8 @@ affc4e07fa5ea6f2710ba2f12a1ed95ff1f9a400 data/theurgy/loot_table/blocks/incubato
 83df72953dd0ffbd8bb793f6c3003f011fe7b31c data/theurgy/loot_table/blocks/incubator_sulfur_vessel.json
 76df8364f6cb252e8cae7ad4f8586d87686843f4 data/theurgy/loot_table/blocks/liquefaction_cauldron.json
 befb1f76276418639b92a317bc135b73f385ef32 data/theurgy/loot_table/blocks/logistics_connector_node.json
+f77248eb5f8266a975fcf158945d2d600b93bf9e data/theurgy/loot_table/blocks/logistics_fluid_extractor.json
+5c36f6ac87d41df38c816d634ebf36a838abff7a data/theurgy/loot_table/blocks/logistics_fluid_inserter.json
 eab2938a4f87b5111215802411e190728c10cd73 data/theurgy/loot_table/blocks/logistics_item_extractor.json
 1615ae8d2662ddf052afdfdb2a9fa1530d54fd8a data/theurgy/loot_table/blocks/logistics_item_inserter.json
 960de84ff800d2114b057662400459d3f46ac300 data/theurgy/loot_table/blocks/mercury_catalyst.json

src/generated/resources/.cache/96e1c194aa2b8cdd63adb750d34ba507337ea835

@@ -1,4 +1,4 @@
-// 1.21	2024-07-06T18:53:49.9909335	Shaped Crafting Recipes
+// 1.21	2024-07-26T09:31:55.8496615	Shaped Crafting Recipes
 1a1455c9a7af01c27e142f6dbd30d87036d4d091 data/theurgy/recipe/crafting/shaped/amethyst_divination_rod.json
 42a5d6c467bfe9598f3ec75079b6da36b9862565 data/theurgy/recipe/crafting/shaped/attribute_filter.json
 5947320d23ddb2fea340162d3fa1f499ae60fe60 data/theurgy/recipe/crafting/shaped/calcination_oven.json
@@ -19,6 +19,8 @@ cd84d5636f07b867158c49eba4c340b7f47e6996 data/theurgy/recipe/crafting/shaped/inc
 473b7db592ed450f6be0785521593e0fc18e394d data/theurgy/recipe/crafting/shaped/liquefaction_cauldron.json
 666bb57d2446a04b5385b63d8940748ed3f16afd data/theurgy/recipe/crafting/shaped/list_filter.json
 5cf698be6496edd1070ed239a9b6fcdd80d4f05a data/theurgy/recipe/crafting/shaped/logistics_connector_node.json
+a7e51f062e755a7aeb39e0f641017fe29d6f63b7 data/theurgy/recipe/crafting/shaped/logistics_fluid_extractor.json
+588733dfa4d1af18901e266da1d7727ae2820525 data/theurgy/recipe/crafting/shaped/logistics_fluid_inserter.json
 34d5886f5d4f29e58249d2bb00eb29b926b8daab data/theurgy/recipe/crafting/shaped/logistics_item_extractor.json
 95fba052d90433b04781cc28b8f09ac1e9c2443b data/theurgy/recipe/crafting/shaped/logistics_item_inserter.json
 cafe50c44b5ff23044d230b5d93dbbb9b173c7d3 data/theurgy/recipe/crafting/shaped/mercurial_wand.json

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -1,2 +1,2 @@
-// 1.21	2024-07-25T11:49:24.3868645	Languages: en_us
-104ec251c98ef8a8927579e731389e2d3ba15dca assets/theurgy/lang/en_us.json
+// 1.21	2024-07-26T10:42:29.0554332	Languages: en_us
+fbd85e7f2dcb8355158e6919472eca24077dc04e assets/theurgy/lang/en_us.json

src/generated/resources/assets/theurgy/blockstates/logistics_fluid_extractor.json

@@ -0,0 +1,240 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 90
+      },
+      "when": {
+        "facing": "north",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 90
+      },
+      "when": {
+        "facing": "north"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 90
+      },
+      "when": {
+        "facing": "north",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 90
+      },
+      "when": {
+        "facing": "north"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 90,
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 90,
+        "y": 90
+      },
+      "when": {
+        "facing": "east"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 90,
+        "y": 90
+      },
+      "when": {
+        "facing": "east",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 90,
+        "y": 90
+      },
+      "when": {
+        "facing": "east"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 90,
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 90,
+        "y": 180
+      },
+      "when": {
+        "facing": "south"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 90,
+        "y": 180
+      },
+      "when": {
+        "facing": "south",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 90,
+        "y": 180
+      },
+      "when": {
+        "facing": "south"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 90,
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 90,
+        "y": 270
+      },
+      "when": {
+        "facing": "west"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 90,
+        "y": 270
+      },
+      "when": {
+        "facing": "west",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 90,
+        "y": 270
+      },
+      "when": {
+        "facing": "west"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter"
+      },
+      "when": {
+        "facing": "up",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor"
+      },
+      "when": {
+        "facing": "up"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter"
+      },
+      "when": {
+        "facing": "up",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor"
+      },
+      "when": {
+        "facing": "up"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 180
+      },
+      "when": {
+        "facing": "down",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 180
+      },
+      "when": {
+        "facing": "down"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_connector_filter",
+        "x": 180
+      },
+      "when": {
+        "facing": "down",
+        "has_filter": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "theurgy:block/logistics_fluid_extractor",
+        "x": 180
+      },
+      "when": {
+        "facing": "down"
+      }
+    }
+  ]
+}