Continue porting some new content and bug fixes to 26.1 继续移植部分新内容和bug修复到26.1

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

@@ -7,6 +7,12 @@
   "advancements.anvilcraft.anvil_accelerator.title": "ɹoʇɐɹǝꞁǝɔɔɐ ꞁᴉʌuⱯ",
   "advancements.anvilcraft.anvilon.description": "uoꞁᴉʌuɐ pǝuᴉɟuoɔ ɟo ǝdʎʇ ʎuɐ ʇɟɐɹɔ oʇ uoᴉsᴉꞁꞁoɔ ꞁᴉʌuɐ ᵷuᴉs∩",
   "advancements.anvilcraft.anvilon.title": "uoꞁᴉʌuⱯ",
+  "advancements.anvilcraft.black_hole.description": "ǝꞁoɥ ʞɔɐꞁq ɐ oʇuᴉ ʇᴉ ǝsdɐꞁꞁoɔ puɐ puǝ ǝɥʇ oʇ uoᴉʇnꞁoʌǝ s,ɹɐʇs ɐ ǝʌᴉɹᗡ",
+  "advancements.anvilcraft.black_hole.title": "sǝdɐɔsƎ ʇɥᵷᴉꞀ uǝʌƎ ʇoN",
+  "advancements.anvilcraft.cannon_fodder.description": "ʇǝuɐꞁd ǝʞᴉꞀ-pꞁɹoʍɹǝʌO uɐ ǝpᴉsuᴉ ǝsdɐꞁꞁoɔ ʎɹɐʇǝuɐꞁd ɐ oʇ ǝᴉᗡ",
+  "advancements.anvilcraft.cannon_fodder.title": "ɹǝppoℲ uouuɐƆ",
+  "advancements.anvilcraft.come_at_night.description": "ɹɐʇs ɐ ʎq pǝꞁꞁᴉʞ ʇǝ⅁",
+  "advancements.anvilcraft.come_at_night.title": "ʇɥᵷᴉN ʇⱯ ǝɯoƆ pꞁnoɥS no⅄",
   "advancements.anvilcraft.crab_claw.description": "sʍɐꞁɔ qɐɹɔ uᴉɐʇqO",
   "advancements.anvilcraft.crab_claw.title": "ǝɔɐɹ uoᴉʇɔǝɹɹnsǝɹ ǝɥʇ ɟo ɟꞁɐɥ uᴉM",
   "advancements.anvilcraft.dang.description": "ᵷuᴉʇɟɐɹɔ ꞁᴉʌuɐ ʎuɐ ɯɹoɟɹǝԀ",
@@ -15,6 +21,8 @@
   "advancements.anvilcraft.devourer.title": "sɹǝʇsᴉʍʇ ǝnᵷuoʇ ʎuɐɯ oo⟘",
   "advancements.anvilcraft.durable_goods.description": "ǝpɐɹᵷ ꞁǝǝʇs ꞁɐʎoᴚ oʇ ꞁooʇ ʎuɐ ǝpɐɹᵷd∩",
   "advancements.anvilcraft.durable_goods.title": "spooᵷ ǝꞁqɐɹnᗡ",
+  "advancements.anvilcraft.efficiency.description": "ʇɹɐdɐ ʇǝuɐꞁd ǝɥʇ ʍoꞁq puɐ ɹoʇɐʌɐɔxǝ ʇǝuɐꞁd ǝɥʇ oʇuᴉ ɹǝsɐꞁ ɐɯɯɐᵷ ɐ pǝǝℲ",
+  "advancements.anvilcraft.efficiency.title": "ʎɔuǝᴉɔᴉɟɟǝ ˙˙˙ʇᴉ pǝꞁꞁɐɔ ǝM",
   "advancements.anvilcraft.electric_allergy.description": "ɯǝʇsʎs ɹǝʍod ʇnoɥʇᴉʍ ꞁᴉʌuɐ ᵷuᴉᵷɹoɟ ꞁɐᴉʇsǝꞁǝɔ uᴉɐʇqO",
   "advancements.anvilcraft.electric_allergy.title": "ʎᵷɹǝꞁꞁɐ ɔᴉɹʇɔǝꞁƎ",
   "advancements.anvilcraft.electric_filed_rhythm.description": "pᴉɹᵷ ɹǝʍod ǝɥʇ ɟo ǝdoɔs ǝɥʇ uᴉ dǝʇS",
@@ -63,10 +71,14 @@
   "advancements.anvilcraft.mining_void.title": "pᴉoʌ ᵷuᴉuᴉW",
   "advancements.anvilcraft.networking.description": "ǝꞁod uoᴉssᴉɯsuɐɹʇ ǝɔɐꞁd puɐ ʇɟɐɹƆ",
   "advancements.anvilcraft.networking.title": "ᵷuᴉʞɹoʍʇǝN",
+  "advancements.anvilcraft.neutron_star.description": "puᴉɥǝq ɹɐʇs uoɹʇnǝu ɐ ǝʌɐǝꞁ puɐ puǝ ǝɥʇ oʇ uoᴉʇnꞁoʌǝ s,ɹɐʇs ɐ ǝʌᴉɹᗡ",
+  "advancements.anvilcraft.neutron_star.title": "uᴉɐʇunoW ɐ sɥᵷᴉǝM uoodsɐǝ⟘ Ɐ",
   "advancements.anvilcraft.new_cycle.description": "ꞁᴉʌuⱯ ᵷuᴉᵷɹoℲ ꞁɐᴉʇsǝꞁǝƆ ǝɥʇ ɯoɹɟ ɹɐǝddɐsᴉp uoᴉʇɐzᴉꞁᴉʌᴉɔ ɐ ssǝuʇᴉM",
   "advancements.anvilcraft.new_cycle.title": "ǝꞁɔʎƆ ʍǝN Ɐ",
   "advancements.anvilcraft.new_matter.description": "ɹǝʇʇɐɯ ǝʌᴉʇɐᵷǝu ɹo ɹǝʇʇɐɯ ǝsɐɥdᴉʇꞁnɯ 'ɯnᴉuɐɹn ʇɟɐɹɔ oʇ uoᴉsᴉꞁꞁoɔ ꞁᴉʌuɐ ᵷuᴉs∩",
   "advancements.anvilcraft.new_matter.title": "ɹǝʇʇɐW ʍǝN",
+  "advancements.anvilcraft.no_remnant.description": "ʇuɐuɯǝɹ ou ǝʌɐǝꞁ ʇᴉ ɥɔʇɐʍ puɐ puǝ ǝɥʇ oʇ sꞁᴉʌuɐ ssɐɯ ߈9 ɥʇᴉʍ pǝᵷɹoɟ ʎpoq ꞁɐᴉʇsǝꞁǝɔ ɐ ǝʌꞁoʌƎ",
+  "advancements.anvilcraft.no_remnant.title": "puᴉɥǝᗺ ʇɟǝꞀ ᵷuᴉɥʇoN",
   "advancements.anvilcraft.noble_metal.description": "ꞁǝǝʇs ꞁɐʎoɹ ᵷuᴉʇꞁǝɯS",
   "advancements.anvilcraft.noble_metal.title": "ꞁɐʇǝɯ ǝꞁqoN",
   "advancements.anvilcraft.not_beacon.description": "ɹoʇɔǝꞁꞁoɔ ǝᵷɹɐɥɔ ɐ ǝɔɐꞁd puɐ ʇɟɐɹƆ",
@@ -933,12 +945,15 @@
   "config.waila.plugin_anvilcraft.power_provider": "ɹǝʍoԀ ʇɟɐɹƆ ꞁᴉʌuⱯ",
   "config.waila.plugin_anvilcraft.warning_percent": "pꞁoɥsǝɹɥ⟘ ᵷuᴉuɹɐM",
   "curios.identifier.ionocraft_backpack": "ʞɔɐdʞɔɐᗺ ʇɟɐɹɔouoI",
+  "death.attack.anvilcraft.black_hole_contact": "ʇɥᵷᴉꞁ unɹʇno pꞁnoɔ ʎǝɥʇ ʇɥᵷnoɥʇ %1$s",
   "death.attack.anvilcraft.falling_giant_anvil": "suoᴉʇɐɹqᴉʌ punoɹᵷ ʎq pǝsnɐɔ ǝɔuɐuosǝɹ ɔᴉɯǝʇsʎs oʇ ǝnp pǝᴉp %1$s",
   "death.attack.anvilcraft.heater_burn": "ɹǝʇɐǝɥ ǝɥʇ ʎq ǝuop ꞁꞁǝʍ sɐʍ %1$s",
   "death.attack.anvilcraft.laser": "ɹǝsɐꞁ ʎq pǝɔɹǝᴉd sɐʍ %1$s",
   "death.attack.anvilcraft.lost_in_time": "ǝɯᴉʇ ɟo ɹǝʌᴉɹ ǝɥʇ uᴉ ʇsoꞁ sɐʍ %1$s",
+  "death.attack.anvilcraft.planet_contact": "sǝɔǝᴉd uᴉ 'ʇᴉɯᴉꞁ ǝɥɔoᴚ ǝɥʇ pǝɹǝʌoɔsᴉp %1$s",
   "death.attack.anvilcraft.planetary_collapse": "ǝsdɐꞁꞁoɔ ʎɹɐʇǝuɐꞁd ʎq pǝɯnsuoɔ sɐʍ %1$s",
   "death.attack.anvilcraft.plasma_jet": "˙ʞɔɐq ǝʌᴉɟ-ɥᵷᴉɥ ʇou pᴉp ʎǝɥ⟘ ˙sʇǝɾ ɐɯsɐꞁd ǝɥʇ ǝʌᴉɟ-ɥᵷᴉɥ oʇ pǝᴉɹʇ %1$s",
+  "death.attack.anvilcraft.star_contact": "ɐuoɹoɔ ǝɥʇ ɟo ʇɹɐd ʍou sᴉ %1$s",
   "effect.anvilcraft.invulnerable": "ǝꞁqɐɹǝuꞁnʌuI",
   "effect.anvilcraft.rage": "ǝᵷɐᴚ",
   "enchantment.anvilcraft.beheading": "ᵷuᴉpɐǝɥǝᗺ",

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

@@ -7,6 +7,12 @@
   "advancements.anvilcraft.anvil_accelerator.title": "Anvil accelerator",
   "advancements.anvilcraft.anvilon.description": "Using anvil collision to craft any type of confined anvilon",
   "advancements.anvilcraft.anvilon.title": "Anvilon",
+  "advancements.anvilcraft.black_hole.description": "Drive a star's evolution to the end and collapse it into a black hole",
+  "advancements.anvilcraft.black_hole.title": "Not Even Light Escapes",
+  "advancements.anvilcraft.cannon_fodder.description": "Die to a planetary collapse inside an Overworld-Like planet",
+  "advancements.anvilcraft.cannon_fodder.title": "Cannon Fodder",
+  "advancements.anvilcraft.come_at_night.description": "Get killed by a star",
+  "advancements.anvilcraft.come_at_night.title": "You Should Come At Night",
   "advancements.anvilcraft.crab_claw.description": "Obtain crab claws",
   "advancements.anvilcraft.crab_claw.title": "Win half of the resurrection race",
   "advancements.anvilcraft.dang.description": "Perform any anvil crafting",
@@ -15,6 +21,8 @@
   "advancements.anvilcraft.devourer.title": "Too many tongue twisters",
   "advancements.anvilcraft.durable_goods.description": "Upgrade any tool to Royal steel grade",
   "advancements.anvilcraft.durable_goods.title": "Durable goods",
+  "advancements.anvilcraft.efficiency.description": "Feed a gamma laser into the planet excavator and blow the planet apart",
+  "advancements.anvilcraft.efficiency.title": "We called it... efficiency",
   "advancements.anvilcraft.electric_allergy.description": "Obtain celestial forging anvil without power system",
   "advancements.anvilcraft.electric_allergy.title": "Electric allergy",
   "advancements.anvilcraft.electric_filed_rhythm.description": "Step in the scope of the power grid",
@@ -63,10 +71,14 @@
   "advancements.anvilcraft.mining_void.title": "Mining void",
   "advancements.anvilcraft.networking.description": "Craft and place transmission pole",
   "advancements.anvilcraft.networking.title": "Networking",
+  "advancements.anvilcraft.neutron_star.description": "Drive a star's evolution to the end and leave a neutron star behind",
+  "advancements.anvilcraft.neutron_star.title": "A Teaspoon Weighs a Mountain",
   "advancements.anvilcraft.new_cycle.description": "Witness a civilization disappear from the Celestial Forging Anvil",
   "advancements.anvilcraft.new_cycle.title": "A New Cycle",
   "advancements.anvilcraft.new_matter.description": "Using anvil collision to craft uranium, multiphase matter or negative matter",
   "advancements.anvilcraft.new_matter.title": "New Matter",
+  "advancements.anvilcraft.no_remnant.description": "Evolve a celestial body forged with 64 mass anvils to the end and watch it leave no remnant",
+  "advancements.anvilcraft.no_remnant.title": "Nothing Left Behind",
   "advancements.anvilcraft.noble_metal.description": "Smelting royal steel",
   "advancements.anvilcraft.noble_metal.title": "Noble metal",
   "advancements.anvilcraft.not_beacon.description": "Craft and place a charge collector",
@@ -933,12 +945,15 @@
   "config.waila.plugin_anvilcraft.power_provider": "Anvil Craft Power",
   "config.waila.plugin_anvilcraft.warning_percent": "Warning Threshold",
   "curios.identifier.ionocraft_backpack": "Ionocraft Backpack",
+  "death.attack.anvilcraft.black_hole_contact": "%1$s thought they could outrun light",
   "death.attack.anvilcraft.falling_giant_anvil": "%1$s died due to systemic resonance caused by ground vibrations",
   "death.attack.anvilcraft.heater_burn": "%1$s was well done by the heater",
   "death.attack.anvilcraft.laser": "%1$s was pierced by laser",
   "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time",
+  "death.attack.anvilcraft.planet_contact": "%1$s discovered the Roche limit, in pieces",
   "death.attack.anvilcraft.planetary_collapse": "%1$s was consumed by planetary collapse",
   "death.attack.anvilcraft.plasma_jet": "%1$s tried to high-five the plasma jets. They did not high-five back.",
+  "death.attack.anvilcraft.star_contact": "%1$s is now part of the corona",
   "effect.anvilcraft.invulnerable": "Invulnerable",
   "effect.anvilcraft.rage": "Rage",
   "enchantment.anvilcraft.beheading": "Beheading",

src/generated/resources/assets/anvilcraft/sounds.json

@@ -99,7 +99,10 @@
   },
   "quenched_out": {
     "sounds": [
-      "anvilcraft:quenched_out"
+      {
+        "attenuation_distance": 64,
+        "name": "anvilcraft:quenched_out"
+      }
     ],
     "subtitle": "subtitles.anvilcraft.quenched_out"
   },

src/generated/resources/data/anvilcraft/advancement/anvilcraft/black_hole.json

@@ -0,0 +1,29 @@
+{
+  "parent": "anvilcraft:anvilcraft/the_start",
+  "criteria": {
+    "black_hole": {
+      "conditions": {
+        "terminal": "black_hole"
+      },
+      "trigger": "anvilcraft:celestial_evolution"
+    }
+  },
+  "display": {
+    "description": {
+      "translate": "advancements.anvilcraft.black_hole.description"
+    },
+    "frame": "challenge",
+    "icon": {
+      "id": "anvilcraft:black_hole"
+    },
+    "title": {
+      "translate": "advancements.anvilcraft.black_hole.title"
+    }
+  },
+  "requirements": [
+    [
+      "black_hole"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/anvilcraft/advancement/anvilcraft/cannon_fodder.json

@@ -0,0 +1,27 @@
+{
+  "parent": "anvilcraft:anvilcraft/the_start",
+  "criteria": {
+    "cannon_fodder": {
+      "trigger": "anvilcraft:planetary_collapse_death"
+    }
+  },
+  "display": {
+    "description": {
+      "translate": "advancements.anvilcraft.cannon_fodder.description"
+    },
+    "frame": "challenge",
+    "hidden": true,
+    "icon": {
+      "id": "minecraft:player_head"
+    },
+    "title": {
+      "translate": "advancements.anvilcraft.cannon_fodder.title"
+    }
+  },
+  "requirements": [
+    [
+      "cannon_fodder"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/anvilcraft/advancement/anvilcraft/come_at_night.json

@@ -0,0 +1,26 @@
+{
+  "parent": "anvilcraft:anvilcraft/the_start",
+  "criteria": {
+    "come_at_night": {
+      "trigger": "anvilcraft:star_contact_death"
+    }
+  },
+  "display": {
+    "description": {
+      "translate": "advancements.anvilcraft.come_at_night.description"
+    },
+    "hidden": true,
+    "icon": {
+      "id": "anvilcraft:celestial_forging_anvil"
+    },
+    "title": {
+      "translate": "advancements.anvilcraft.come_at_night.title"
+    }
+  },
+  "requirements": [
+    [
+      "come_at_night"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/anvilcraft/advancement/anvilcraft/efficiency.json

@@ -0,0 +1,27 @@
+{
+  "parent": "anvilcraft:anvilcraft/the_start",
+  "criteria": {
+    "efficiency": {
+      "trigger": "anvilcraft:planet_detonation"
+    }
+  },
+  "display": {
+    "description": {
+      "translate": "advancements.anvilcraft.efficiency.description"
+    },
+    "frame": "challenge",
+    "hidden": true,
+    "icon": {
+      "id": "anvilcraft:earth_core_shard"
+    },
+    "title": {
+      "translate": "advancements.anvilcraft.efficiency.title"
+    }
+  },
+  "requirements": [
+    [
+      "efficiency"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/anvilcraft/advancement/anvilcraft/neutron_star.json

@@ -0,0 +1,29 @@
+{
+  "parent": "anvilcraft:anvilcraft/the_start",
+  "criteria": {
+    "neutron_star": {
+      "conditions": {
+        "terminal": "neutron_star"
+      },
+      "trigger": "anvilcraft:celestial_evolution"
+    }
+  },
+  "display": {
+    "description": {
+      "translate": "advancements.anvilcraft.neutron_star.description"
+    },
+    "frame": "challenge",
+    "icon": {
+      "id": "anvilcraft:magnetar_coil_component"
+    },
+    "title": {
+      "translate": "advancements.anvilcraft.neutron_star.title"
+    }
+  },
+  "requirements": [
+    [
+      "neutron_star"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/anvilcraft/advancement/anvilcraft/new_cycle.json

@@ -1,5 +1,5 @@
 {
-  "parent": "anvilcraft:anvilcraft/the_start",
+  "parent": "anvilcraft:anvilcraft/no_remnant",
   "criteria": {
     "new_cycle": {
       "trigger": "minecraft:impossible"

src/generated/resources/data/anvilcraft/advancement/anvilcraft/no_remnant.json

@@ -0,0 +1,30 @@
+{
+  "parent": "anvilcraft:anvilcraft/the_start",
+  "criteria": {
+    "no_remnant": {
+      "conditions": {
+        "mass_anvils": 64
+      },
+      "trigger": "anvilcraft:celestial_evolution"
+    }
+  },
+  "display": {
+    "description": {
+      "translate": "advancements.anvilcraft.no_remnant.description"
+    },
+    "frame": "challenge",
+    "hidden": true,
+    "icon": {
+      "id": "anvilcraft:stellar_evolution_accelerator_component"
+    },
+    "title": {
+      "translate": "advancements.anvilcraft.no_remnant.title"
+    }
+  },
+  "requirements": [
+    [
+      "no_remnant"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/anvilcraft/damage_type/black_hole_contact.json

@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "anvilcraft.black_hole_contact",
+  "scaling": "when_caused_by_living_non_player"
+}

src/generated/resources/data/anvilcraft/damage_type/planet_contact.json

@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.0,
+  "message_id": "anvilcraft.planet_contact",
+  "scaling": "when_caused_by_living_non_player"
+}

src/generated/resources/data/anvilcraft/damage_type/star_contact.json

@@ -0,0 +1,6 @@
+{
+  "effects": "burning",
+  "exhaustion": 0.1,
+  "message_id": "anvilcraft.star_contact",
+  "scaling": "when_caused_by_living_non_player"
+}

src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json

@@ -4,6 +4,10 @@
       "id": "anvilcraft:planetary_collapse",
       "required": false
     },
+    {
+      "id": "anvilcraft:black_hole_contact",
+      "required": false
+    },
     {
       "id": "anvilcraft:lost_in_time",
       "required": false

src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json

@@ -4,6 +4,10 @@
       "id": "anvilcraft:planetary_collapse",
       "required": false
     },
+    {
+      "id": "anvilcraft:black_hole_contact",
+      "required": false
+    },
     {
       "id": "anvilcraft:lost_in_time",
       "required": false

src/generated/resources/data/minecraft/tags/damage_type/is_fall.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "anvilcraft:planet_contact",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/minecraft/tags/damage_type/is_fire.json

@@ -4,6 +4,10 @@
       "id": "anvilcraft:heater_burn",
       "required": false
     },
+    {
+      "id": "anvilcraft:star_contact",
+      "required": false
+    },
     {
       "id": "anvilcraft:plasma_jet",
       "required": false

src/generated/resources/data/minecraft/tags/damage_type/no_knockback.json

@@ -4,6 +4,10 @@
       "id": "anvilcraft:planetary_collapse",
       "required": false
     },
+    {
+      "id": "anvilcraft:black_hole_contact",
+      "required": false
+    },
     {
       "id": "anvilcraft:lost_in_time",
       "required": false

src/generated/resources/data/neoforge/tags/damage_type/is_magic.json

@@ -1,5 +1,9 @@
 {
   "values": [
+    {
+      "id": "anvilcraft:black_hole_contact",
+      "required": false
+    },
     {
       "id": "anvilcraft:lost_in_time",
       "required": false