Refactor pipe logic and add Pump block with crafting recipe

src/generated/resources/assets/anvilcraft/blockstates/pump.json

@@ -0,0 +1,216 @@
+{
+  "variants": {
+    "orientation=down_east,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "x": -90,
+      "y": -90
+    },
+    "orientation=down_east,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "x": -90,
+      "y": -90
+    },
+    "orientation=down_east,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": -90,
+      "y": -90
+    },
+    "orientation=down_east,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": -90,
+      "y": -90
+    },
+    "orientation=down_north,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "x": -90,
+      "y": 180
+    },
+    "orientation=down_north,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "x": -90,
+      "y": 180
+    },
+    "orientation=down_north,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": -90,
+      "y": 180
+    },
+    "orientation=down_north,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": -90,
+      "y": 180
+    },
+    "orientation=down_south,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "x": -90
+    },
+    "orientation=down_south,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "x": -90
+    },
+    "orientation=down_south,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": -90
+    },
+    "orientation=down_south,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": -90
+    },
+    "orientation=down_west,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "x": -90,
+      "y": 90
+    },
+    "orientation=down_west,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "x": -90,
+      "y": 90
+    },
+    "orientation=down_west,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": -90,
+      "y": 90
+    },
+    "orientation=down_west,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": -90,
+      "y": 90
+    },
+    "orientation=east_up,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "y": -90
+    },
+    "orientation=east_up,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "y": -90
+    },
+    "orientation=east_up,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "y": -90
+    },
+    "orientation=east_up,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "y": -90
+    },
+    "orientation=north_up,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "y": 180
+    },
+    "orientation=north_up,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "y": 180
+    },
+    "orientation=north_up,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "y": 180
+    },
+    "orientation=north_up,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "y": 180
+    },
+    "orientation=south_up,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base"
+    },
+    "orientation=south_up,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off"
+    },
+    "orientation=south_up,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload"
+    },
+    "orientation=south_up,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload"
+    },
+    "orientation=up_east,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "x": 90,
+      "y": -90
+    },
+    "orientation=up_east,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "x": 90,
+      "y": -90
+    },
+    "orientation=up_east,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": 90,
+      "y": -90
+    },
+    "orientation=up_east,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": 90,
+      "y": -90
+    },
+    "orientation=up_north,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "x": 90,
+      "y": 180
+    },
+    "orientation=up_north,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "x": 90,
+      "y": 180
+    },
+    "orientation=up_north,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": 90,
+      "y": 180
+    },
+    "orientation=up_north,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": 90,
+      "y": 180
+    },
+    "orientation=up_south,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "x": 90
+    },
+    "orientation=up_south,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "x": 90
+    },
+    "orientation=up_south,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": 90
+    },
+    "orientation=up_south,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": 90
+    },
+    "orientation=up_west,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "x": 90,
+      "y": 90
+    },
+    "orientation=up_west,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "x": 90,
+      "y": 90
+    },
+    "orientation=up_west,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": 90,
+      "y": 90
+    },
+    "orientation=up_west,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "x": 90,
+      "y": 90
+    },
+    "orientation=west_up,overload=false,powered=false": {
+      "model": "anvilcraft:block/pump_base",
+      "y": 90
+    },
+    "orientation=west_up,overload=false,powered=true": {
+      "model": "anvilcraft:block/pump_off",
+      "y": 90
+    },
+    "orientation=west_up,overload=true,powered=false": {
+      "model": "anvilcraft:block/pump_overload",
+      "y": 90
+    },
+    "orientation=west_up,overload=true,powered=true": {
+      "model": "anvilcraft:block/pump_overload",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/anvilcraft/lang/en_ud.json

@@ -478,6 +478,7 @@
   "block.anvilcraft.powered_sliding_rail": "ꞁᴉɐᴚ ᵷuᴉpᴉꞁS pǝɹǝʍoԀ",
   "block.anvilcraft.propel_piston": "uoʇsᴉԀ ꞁǝdoɹԀ",
   "block.anvilcraft.pulse_generator": "ɹoʇɐɹǝuǝ⅁ ǝsꞁnԀ",
+  "block.anvilcraft.pump": "dɯnԀ",
   "block.anvilcraft.purple_cement": "ʇuǝɯǝƆ ǝꞁdɹnԀ",
   "block.anvilcraft.purple_cement_cauldron": "uoɹpꞁnɐƆ ʇuǝɯǝƆ ǝꞁdɹnԀ",
   "block.anvilcraft.quartz_sand": "puɐS zʇɹɐnꝹ",

src/generated/resources/assets/anvilcraft/lang/en_us.json

@@ -478,6 +478,7 @@
   "block.anvilcraft.powered_sliding_rail": "Powered Sliding Rail",
   "block.anvilcraft.propel_piston": "Propel Piston",
   "block.anvilcraft.pulse_generator": "Pulse Generator",
+  "block.anvilcraft.pump": "Pump",
   "block.anvilcraft.purple_cement": "Purple Cement",
   "block.anvilcraft.purple_cement_cauldron": "Purple Cement Cauldron",
   "block.anvilcraft.quartz_sand": "Quartz Sand",

src/generated/resources/assets/anvilcraft/models/item/pump.json

@@ -0,0 +1,3 @@
+{
+  "parent": "anvilcraft:block/pump"
+}

src/generated/resources/data/anvilcraft/advancement/recipes/misc/pump.json

@@ -0,0 +1,43 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_pipe": {
+      "conditions": {
+        "items": [
+          {
+            "items": "anvilcraft:pipe"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_piston": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:piston"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:pump"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_piston",
+      "has_pipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:pump"
+    ]
+  }
+}

src/generated/resources/data/anvilcraft/loot_table/blocks/pump.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "anvilcraft:pump"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "anvilcraft:blocks/pump"
+}

src/generated/resources/data/anvilcraft/recipe/pump.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "group": "anvilcraft:pump",
+  "key": {
+    "C": {
+      "item": "anvilcraft:pipe"
+    },
+    "P": {
+      "item": "minecraft:piston"
+    }
+  },
+  "pattern": [
+    "PCP",
+    "P P",
+    "   "
+  ],
+  "result": {
+    "count": 2,
+    "id": "anvilcraft:pump"
+  }
+}

src/generated/resources/data/anvilcraft/tags/block/collision_immune.json

@@ -1,6 +1,7 @@
 {
   "values": [
     "anvilcraft:transcendence_anvil",
+    "anvilcraft:infinite_collector",
     "anvilcraft:celestial_forging_anvil",
     "anvilcraft:celestial_forging_anvil_portal",
     "anvilcraft:transcendium_block",
@@ -10,7 +11,6 @@
     "anvilcraft:confined_energy_anvilon",
     "anvilcraft:confined_neutronium_ingot",
     "anvilcraft:confinement_chamber",
-    "anvilcraft:singularity_crystal",
-    "anvilcraft:infinite_collector"
+    "anvilcraft:singularity_crystal"
   ]
 }

src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -317,6 +317,7 @@
     "anvilcraft:creative_crate",
     "anvilcraft:pipe_straight",
     "anvilcraft:pipe_corner",
-    "anvilcraft:pipe_node"
+    "anvilcraft:pipe_node",
+    "anvilcraft:pump"
   ]
 }