修复方块破坏器bug并添加串联特性，添加门格海绵神杖和精密磁枢

.github/workflows/ci.yml

@@ -71,4 +71,4 @@ jobs:
         uses: Anvil-Dev/dedicated-server-launch-test@1.21.1-neoforge
         with:
           mod: build/libs/${{ steps.properties.outputs.mod_id }}-neoforge-${{ steps.version.outputs.version }}.jar
-          extra-mods: patchouli:1.21-87-neoforge anvilcraft:1.21.1-1.5.0
+          extra-mods: anvilcraft:1.6.0+snapshot.2068

.github/workflows/pull_request.yml

@@ -62,4 +62,4 @@ jobs:
         uses: Anvil-Dev/dedicated-server-launch-test@1.21.1-neoforge
         with:
           mod: build/libs/${{ steps.properties.outputs.mod_id }}-neoforge-${{ steps.version.outputs.version }}.jar
-          extra-mods: patchouli:1.21-87-neoforge anvilcraft:1.21.1-1.5.0
+          extra-mods: anvilcraft:1.6.0+snapshot.2068

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
 minecraft = "1.21.1"
 neoForge = "21.1.219"
-ageratum = "0.0.1+build.102"
-anvillib = "2.0.0+snapshot.473"
-anvilcraft = "1.6.0+snapshot.2000"
-jei = "19.21.0.247"
+ageratum = "0.0.1+build.106"
+anvillib = "2.0.0+snapshot.490"
+anvilcraft = "1.6.0+snapshot.2068"
+jei = "19.32.0.358"
 jade = "15.3.4+neoforge"
 modDevGradle = "2.0.140"
 lombok = "8.7.1"
@@ -15,23 +15,11 @@ jeiCommonApi = { group = "mezz.jei", name = "jei-1.21.1-common-api", version.ref
 jeiForgeApi = { group = "mezz.jei", name = "jei-1.21.1-neoforge-api", version.ref = "jei" }
 jeiForgeImpl = { group = "mezz.jei", name = "jei-1.21.1-neoforge", version.ref = "jei" }
 jade = { group = "maven.modrinth", name = "jade", version.ref = "jade" }
-anvillib-codec = { group = "dev.anvilcraft.lib", name = "anvillib-codec-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-config = { group = "dev.anvilcraft.lib", name = "anvillib-config-neoforge-1.21.1", version.ref = "anvillib" }
 anvillib-recipe = { group = "dev.anvilcraft.lib", name = "anvillib-recipe-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-registrum = { group = "dev.anvilcraft.lib", name = "anvillib-registrum-neoforge-1.21.1", version.ref = "anvillib" }
 anvillib-moveableEntityBlock = { group = "dev.anvilcraft.lib", name = "anvillib-moveable-entity-block-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-multiblock = { group = "dev.anvilcraft.lib", name = "anvillib-multiblock-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-network = { group = "dev.anvilcraft.lib", name = "anvillib-network-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-integration = { group = "dev.anvilcraft.lib", name = "anvillib-integration-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-util = { group = "dev.anvilcraft.lib", name = "anvillib-util-neoforge-1.21.1", version.ref = "anvillib" }
-anvillib-wheel = { group = "dev.anvilcraft.lib", name = "anvillib-wheel-neoforge-1.21.1", version.ref = "anvillib" }
 anvillib = { group = "dev.anvilcraft.lib", name = "anvillib-neoforge-1.21.1", version.ref = "anvillib" }
 ageratum = { group = "dev.anvilcraft.resource", name = "ageratum-neoforge-1.21.1", version.ref = "ageratum" }
 
-[bundles]
-anvillib = [ "anvillib-codec", "anvillib-config", "anvillib-recipe", "anvillib-registrum", "anvillib-moveableEntityBlock", "anvillib-multiblock", "anvillib-network", "anvillib-integration", "anvillib-util", "anvillib-wheel" ]
-
-
 [plugins]
 modDevGradle = { id = "net.neoforged.moddev", version.ref = "modDevGradle" }
 lombok = { id = "io.freefair.lombok", version.ref = "lombok" }

gradle/scripts/dependencies.gradle

@@ -1,12 +1,11 @@
 dependencies {
     // Anvil Lib
-    runtimeOnly(libs.anvillib)
-    compileOnly(libs.bundles.anvillib)
+    api(libs.anvillib)
     interfaceInjectionData(libs.anvillib.recipe)
     interfaceInjectionData(libs.anvillib.moveableEntityBlock)
 
     // Ageratum 藿香
-    implementation(libs.ageratum)
+    api(libs.ageratum)
 
     // AnvilCraft
     implementation(libs.anvilcraft) { transitive = false }

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

@@ -42,17 +42,25 @@
   "block.anvilcraft_pigsplus.enchanted_generator": "ɹoʇɐɹǝuǝ⅁ ʇuǝɯʇuɐɥɔuƎ",
   "block.anvilcraft_pigsplus.enchanted_generator.placement_too_close_to_another": "ɹoʇɐɹǝuǝᵷ pǝʇuɐɥɔuǝ ɹǝɥʇouɐ oʇ ǝsoꞁɔ oo⟘",
   "block.anvilcraft_pigsplus.experience_interface": "ǝɔɐɟɹǝʇuI ǝɔuǝᴉɹǝdxƎ",
+  "block.anvilcraft_pigsplus.fake_menger_sponge": "ǝᵷuodS ɹǝᵷuǝW ǝʞɐℲ",
   "block.anvilcraft_pigsplus.pig_anvil": "ꞁᴉʌuⱯ ᵷᴉԀ",
+  "block.anvilcraft_pigsplus.precision_magnetic_pivot": "ʇoʌᴉԀ ɔᴉʇǝuᵷɐW uoᴉsᴉɔǝɹԀ",
   "block.anvilcraft_pigsplus.redstone_conduit_block": "ʞɔoꞁᗺ ʇᴉnpuoƆ ǝuoʇspǝᴚ",
   "block.anvilcraft_pigsplus.sculk_extractor": "ɹoʇɔɐɹʇxƎ ʞꞁnɔS",
   "block.anvilcraft_pigsplus.void_catalyst": "ʇsʎꞁɐʇɐƆ pᴉoɅ",
   "block.anvilcraft_pigsplus.weak_resin_block": "uᴉsǝᴚ ʞɐǝM ɟo ʞɔoꞁᗺ",
   "config.jade.plugin_anvilcraft_pigsplus.electric_enchanting_table": "ǝꞁqɐ⟘ ᵷuᴉʇuɐɥɔuƎ ɔᴉɹʇɔǝꞁƎ",
   "config.jade.plugin_anvilcraft_pigsplus.enchanted_generator": "ɹoʇɐɹǝuǝ⅁ pǝʇuɐɥɔuƎ",
+  "config.jade.plugin_anvilcraft_pigsplus.precision_magnetic_pivot": "ʇoʌᴉԀ ɔᴉʇǝuᵷɐW uoᴉsᴉɔǝɹԀ",
+  "gui.anvilcraft_pigsplus.category.precision_electromagnetic_processing": "ᵷuᴉssǝɔoɹԀ ɔᴉʇǝuᵷɐɯoɹʇɔǝꞁƎ uoᴉsᴉɔǝɹԀ",
+  "gui.anvilcraft_pigsplus.category.precision_electromagnetic_processing.consume_fluid": "%2$s ɟo ᗺɯ %1$d :ǝɯnsuoƆ",
+  "gui.anvilcraft_pigsplus.category.precision_electromagnetic_processing.need_activated": "pǝʇɐʌᴉʇɔɐ ǝq oʇ spǝǝN",
+  "gui.anvilcraft_pigsplus.category.precision_electromagnetic_processing.produce_fluid": "%2$s ɟo ᗺɯ %1$d :ǝɔnpoɹԀ",
   "item.anvilcraft_pigsplus.chaotic_raw_ore": "ǝɹO ʍɐᴚ ɔᴉʇoɐɥƆ",
   "item.anvilcraft_pigsplus.echo_geode": "ǝpoǝ⅁ oɥɔƎ",
   "item.anvilcraft_pigsplus.ender_component": "ʇuǝuodɯoƆ ɹǝpuƎ",
   "item.anvilcraft_pigsplus.karakuri_component": "ʇuǝuodɯoƆ ᴉɹnʞɐɹɐꞰ",
+  "item.anvilcraft_pigsplus.menger_sponge_holy_staff": "ɟɟɐʇS ʎꞁoH ǝᵷuodS ɹǝᵷuǝW",
   "item.anvilcraft_pigsplus.menger_sponge_staff": "ɟɟɐʇS ǝᵷuodS ɹǝᵷuǝW",
   "item.anvilcraft_pigsplus.portable_wireless_charger": "ɹǝᵷɹɐɥƆ ssǝꞁǝɹᴉM ǝꞁqɐʇɹoԀ",
   "item.anvilcraft_pigsplus.spiritual_component": "ʇuǝuodɯoƆ ꞁɐnʇᴉɹᴉdS",
@@ -61,5 +69,15 @@
   "jei.anvilcraft.pigsplus.info.spiritual_component": "˙ʇuǝuodɯoƆ ɯnᴉpǝW ǝuo ʇsoɯ ʇɐ ǝʇɐɹǝuǝᵷ oʇ ǝɔuɐɥɔ %%%.0f ɐ sǝpᴉʌoɹd ʇuǝɯʇuɐɥɔuǝ ɥɔɐǝ 'pǝʎoɹʇsǝp sᴉ ʇuǝuodɯoƆ ᴉɹnʞɐɹɐꞰ ɐ uǝɥM",
   "tooltip.anvilcraft_pigsplus.enchanted_generator.decrease_rate": "%s :ǝʇɐɹ ǝsɐǝɹɔǝp ԀX",
   "tooltip.anvilcraft_pigsplus.menger_sponge_staff": "pᴉnbᴉꞁ ɟo ʇunoɯɐ ǝᵷɹɐꞁ ɐ ǝʌoɯǝᴚ",
-  "tooltip.anvilcraft_pigsplus.portable_wireless_charger": "ʇ/ƎℲ %d sǝʇɐɹǝuǝᵷ puɐ Mʞ %d sǝɯnsuoɔ ʇᴉ 'ʞɔɐdʞɔɐq uǝɥM"
+  "tooltip.anvilcraft_pigsplus.portable_wireless_charger": "ʇ/ƎℲ %d sǝʇɐɹǝuǝᵷ puɐ Mʞ %d sǝɯnsuoɔ ʇᴉ 'ʞɔɐdʞɔɐq uǝɥM",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.clockwise": "%s :uoᴉʇɐʇoᴚ",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.clockwise.clockwise": "ǝsᴉʍʞɔoꞁƆ",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.clockwise.counter_clockwise": "ǝsᴉʍʞɔoꞁɔ-ɹǝʇunoƆ",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.clockwise.none": "ǝuoN",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.friction_count": "%s :ʇunoƆ uoᴉʇɔᴉɹℲ",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.pre_direction": "%s :uoᴉʇɔǝɹᴉᗡ snoᴉʌǝɹԀ",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.pre_direction.none": "ǝuoN",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.time": "%s :snʇɐʇS",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.time.stopped": "pǝddoʇS",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.time.working": "ᵷuᴉʞɹoM"
 }

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

@@ -42,17 +42,25 @@
   "block.anvilcraft_pigsplus.enchanted_generator": "Enchantment Generator",
   "block.anvilcraft_pigsplus.enchanted_generator.placement_too_close_to_another": "Too close to another enchanted generator",
   "block.anvilcraft_pigsplus.experience_interface": "Experience Interface",
+  "block.anvilcraft_pigsplus.fake_menger_sponge": "Fake Menger Sponge",
   "block.anvilcraft_pigsplus.pig_anvil": "Pig Anvil",
+  "block.anvilcraft_pigsplus.precision_magnetic_pivot": "Precision Magnetic Pivot",
   "block.anvilcraft_pigsplus.redstone_conduit_block": "Redstone Conduit Block",
   "block.anvilcraft_pigsplus.sculk_extractor": "Sculk Extractor",
   "block.anvilcraft_pigsplus.void_catalyst": "Void Catalyst",
   "block.anvilcraft_pigsplus.weak_resin_block": "Block of Weak Resin",
   "config.jade.plugin_anvilcraft_pigsplus.electric_enchanting_table": "Electric Enchanting Table",
   "config.jade.plugin_anvilcraft_pigsplus.enchanted_generator": "Enchanted Generator",
+  "config.jade.plugin_anvilcraft_pigsplus.precision_magnetic_pivot": "Precision Magnetic Pivot",
+  "gui.anvilcraft_pigsplus.category.precision_electromagnetic_processing": "Precision Electromagnetic Processing",
+  "gui.anvilcraft_pigsplus.category.precision_electromagnetic_processing.consume_fluid": "Consume: %1$d mB of %2$s",
+  "gui.anvilcraft_pigsplus.category.precision_electromagnetic_processing.need_activated": "Needs to be activated",
+  "gui.anvilcraft_pigsplus.category.precision_electromagnetic_processing.produce_fluid": "Produce: %1$d mB of %2$s",
   "item.anvilcraft_pigsplus.chaotic_raw_ore": "Chaotic Raw Ore",
   "item.anvilcraft_pigsplus.echo_geode": "Echo Geode",
   "item.anvilcraft_pigsplus.ender_component": "Ender Component",
   "item.anvilcraft_pigsplus.karakuri_component": "Karakuri Component",
+  "item.anvilcraft_pigsplus.menger_sponge_holy_staff": "Menger Sponge Holy Staff",
   "item.anvilcraft_pigsplus.menger_sponge_staff": "Menger Sponge Staff",
   "item.anvilcraft_pigsplus.portable_wireless_charger": "Portable Wireless Charger",
   "item.anvilcraft_pigsplus.spiritual_component": "Spiritual Component",
@@ -61,5 +69,15 @@
   "jei.anvilcraft.pigsplus.info.spiritual_component": "When a Karakuri Component is destroyed, each enchantment provides a %.0f%% chance to generate at most one Medium Component.",
   "tooltip.anvilcraft_pigsplus.enchanted_generator.decrease_rate": "XP decrease rate: %s",
   "tooltip.anvilcraft_pigsplus.menger_sponge_staff": "Remove a large amount of liquid",
-  "tooltip.anvilcraft_pigsplus.portable_wireless_charger": "When backpack, it consumes %d kW and generates %d FE/t"
+  "tooltip.anvilcraft_pigsplus.portable_wireless_charger": "When backpack, it consumes %d kW and generates %d FE/t",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.clockwise": "Rotation: %s",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.clockwise.clockwise": "Clockwise",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.clockwise.counter_clockwise": "Counter-clockwise",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.clockwise.none": "None",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.friction_count": "Friction Count: %s",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.pre_direction": "Previous Direction: %s",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.pre_direction.none": "None",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.time": "Status: %s",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.time.stopped": "Stopped",
+  "tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.time.working": "Working"
 }

src/generated/resources/assets/anvilcraft_pigsplus/models/item/precision_magnetic_pivot.json

@@ -0,0 +1,3 @@
+{
+  "parent": "anvilcraft_pigsplus:block/precision_magnetic_pivot"
+}

src/generated/resources/data/anvilcraft/advancement/recipes/precision_electromagnetic_processing/circuit_board.json

@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:precision_electromagnetic_processing/circuit_board"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:precision_electromagnetic_processing/circuit_board"
+    ]
+  }
+}

src/generated/resources/data/anvilcraft/advancement/recipes/precision_electromagnetic_processing/karakuri_component.json

@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:precision_electromagnetic_processing/karakuri_component"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:precision_electromagnetic_processing/karakuri_component"
+    ]
+  }
+}

src/generated/resources/data/anvilcraft/advancement/recipes/precision_electromagnetic_processing/magnet.json

@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:precision_electromagnetic_processing/magnet"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:precision_electromagnetic_processing/magnet"
+    ]
+  }
+}

src/generated/resources/data/anvilcraft/advancement/recipes/precision_electromagnetic_processing/magnetoelectric_core.json

@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:precision_electromagnetic_processing/magnetoelectric_core"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:precision_electromagnetic_processing/magnetoelectric_core"
+    ]
+  }
+}

src/generated/resources/data/anvilcraft/advancement/recipes/precision_electromagnetic_processing/precision_magnetic_pivot.json

@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:precision_electromagnetic_processing/precision_magnetic_pivot"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:precision_electromagnetic_processing/precision_magnetic_pivot"
+    ]
+  }
+}

src/generated/resources/data/anvilcraft/advancement/recipes/precision_electromagnetic_processing/processor.json

@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:precision_electromagnetic_processing/processor"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:precision_electromagnetic_processing/processor"
+    ]
+  }
+}

src/generated/resources/data/anvilcraft/advancement/recipes/procedural_process/spacetime_supercomputer_from_advanced_comparator_with_precision_magnetic_pivot.json

@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:procedural_process/spacetime_supercomputer_from_advanced_comparator_with_precision_magnetic_pivot"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:procedural_process/spacetime_supercomputer_from_advanced_comparator_with_precision_magnetic_pivot"
+    ]
+  }
+}

src/generated/resources/data/anvilcraft/recipe/precision_electromagnetic_processing/circuit_board.json

@@ -0,0 +1,21 @@
+{
+  "type": "anvilcraft_pigsplus:precision_electromagnetic_processing",
+  "ingredients": [
+    {
+      "count": 2,
+      "items": "anvilcraft:copper_nugget"
+    },
+    {
+      "items": "minecraft:redstone"
+    },
+    {
+      "items": "anvilcraft:hardend_resin"
+    }
+  ],
+  "results": [
+    {
+      "count": 8,
+      "id": "anvilcraft:circuit_board"
+    }
+  ]
+}

src/generated/resources/data/anvilcraft/recipe/precision_electromagnetic_processing/karakuri_component.json

@@ -0,0 +1,17 @@
+{
+  "type": "anvilcraft_pigsplus:precision_electromagnetic_processing",
+  "ingredients": [
+    {
+      "items": "#c:ingots/brass"
+    },
+    {
+      "count": 3,
+      "items": "minecraft:redstone"
+    }
+  ],
+  "results": [
+    {
+      "id": "anvilcraft_pigsplus:karakuri_component"
+    }
+  ]
+}

src/generated/resources/data/anvilcraft/recipe/precision_electromagnetic_processing/magnet.json

@@ -0,0 +1,18 @@
+{
+  "type": "anvilcraft_pigsplus:precision_electromagnetic_processing",
+  "ingredients": [
+    {
+      "items": "minecraft:ender_pearl"
+    },
+    {
+      "count": 2,
+      "items": "#c:ingots/magnet"
+    }
+  ],
+  "results": [
+    {
+      "count": 2,
+      "id": "anvilcraft:magnet"
+    }
+  ]
+}