Merge pull request #3259 from QiuShui1012/fix2/1.21/1.5

Fix bug that cannot obtain some advs, Change some title/desc of adv 修复成就无法获取的问题，更改部分成就描述

Author: Gu-ZT

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

@@ -26,7 +26,7 @@
   "advancements.anvilcraft.four281.description": "ǝɔı ǝnןq ǝʞɐɯ oʇ ǝɔı pǝʞɔɐd ɟo sǝɔǝıd oʍʇ ssǝɹdɯoɔ oʇ ןıʌuɐ uɐ ǝsn uǝɥʇ puɐ 'ǝɔı pǝʞɔɐd ǝʞɐɯ oʇ ǝɔı ɟo sǝɔǝıd oʍʇ ssǝɹdɯoɔ oʇ ןıʌuɐ uɐ ǝs∩",
   "advancements.anvilcraft.four281.title": "Ɩ8 oʇ ㄣ",
   "advancements.anvilcraft.frost_metal.description": "ןɐʇǝɯ ʇsoɹɟ ʎuɐ uıɐʇqO",
-  "advancements.anvilcraft.frost_metal.title": "ʎɐp ɐ uı ʇןınq ʇou sɐʍ ǝɯoᴚ",
+  "advancements.anvilcraft.frost_metal.title": "pןoɔ s,ʎɐp ǝuo uı uǝzoɹɟ ʇou sɐʍ ɹǝʌıᴚ",
   "advancements.anvilcraft.gem_transform.description": "ʞɔoןq ɯǝb ǝʞɐɯ oʇ dɹɐʍ ǝɯıʇ buısn puɐ uoɹpןnɐɔ ɯǝb ʇןǝɯ oʇuı ɯǝb buıddoɹᗡ",
   "advancements.anvilcraft.gem_transform.title": "ɯɹoɟsuɐɹʇ ɯǝ⅁",
   "advancements.anvilcraft.geode.description": "ǝpoǝb ɥʇıʍ ǝpoǝb ʇsʎɥʇǝɯɐ buıɹoןdxǝ 'ǝpoǝb uıɐʇqO",
@@ -97,7 +97,7 @@
   "advancements.anvilcraft.tai_shang_wang_qing.title": "suoıʇoɯǝ puoʎǝq sןɐʇɹoɯɯI",
   "advancements.anvilcraft.topaz.description": "zɐdoʇ ɥʇıʍ poɹ buıuʇɥbıן ǝɥʇ uo buıuʇɥbıן uoɯɯnS",
   "advancements.anvilcraft.topaz.title": "buıuʇɥbıן ɟo ɹǝʍod ǝɥ⟘",
-  "advancements.anvilcraft.transcendence.description": "ʞɔoןq ɯnıpuǝɔsuɐɹʇ ʇɟɐɹɔ oʇ ʞɔoןq ןɐʇǝɯ ɹǝqɯǝ pǝʇɐǝɥɹǝʌo uɐ oʇuı ʇobuı ɯnıuoɹʇnǝu pǝbɹɐɥɔ uɐ buıʇɔǝظuI",
+  "advancements.anvilcraft.transcendence.description": "ɯnıpuǝɔsuɐɹʇ ʇɟɐɹɔ oʇ ʞɔoןq ןɐʇǝɯ ɹǝqɯǝ pǝʇɐǝɥɹǝʌo uɐ oʇuı ʇobuı ɯnıuoɹʇnǝu pǝbɹɐɥɔ uɐ buıʇɔǝظuI",
   "advancements.anvilcraft.transcendence.title": "ǝɔuǝpuǝɔsuɐɹ⟘",
   "advancements.anvilcraft.vanilla_iron_plate.description": "ǝʇɐןd ǝɹnssǝɹd pǝʇɥbıǝʍ ʎʌɐǝɥ uıɐʇqo oʇ ɯɹoɟʇɐןd buıdɯɐʇs ǝɥʇ uo sʇobuı uoɹı ɥsɐɯS",
   "advancements.anvilcraft.vanilla_iron_plate.title": "ǝʇɐןd uoɹı ɐןןıuɐΛ",

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

@@ -26,7 +26,7 @@
   "advancements.anvilcraft.four281.description": "Use an anvil to compress two pieces of ice to make packed ice, and then use an anvil to compress two pieces of packed ice to make blue ice",
   "advancements.anvilcraft.four281.title": "4 to 81",
   "advancements.anvilcraft.frost_metal.description": "Obtain any frost metal",
-  "advancements.anvilcraft.frost_metal.title": "Rome was not built in a day",
+  "advancements.anvilcraft.frost_metal.title": "River was not frozen in one day's cold",
   "advancements.anvilcraft.gem_transform.description": "Dropping gem into melt gem cauldron and using time warp to make gem block",
   "advancements.anvilcraft.gem_transform.title": "Gem transform",
   "advancements.anvilcraft.geode.description": "Obtain geode, exploring amethyst geode with geode",
@@ -97,7 +97,7 @@
   "advancements.anvilcraft.tai_shang_wang_qing.title": "Immortals beyond emotions",
   "advancements.anvilcraft.topaz.description": "Summon lightning on the lightning rod with topaz",
   "advancements.anvilcraft.topaz.title": "The power of lightning",
-  "advancements.anvilcraft.transcendence.description": "Injecting an charged neutronium ingot into an overheated ember metal block to craft transcendium block",
+  "advancements.anvilcraft.transcendence.description": "Injecting an charged neutronium ingot into an overheated ember metal block to craft transcendium",
   "advancements.anvilcraft.transcendence.title": "Transcendence",
   "advancements.anvilcraft.vanilla_iron_plate.description": "Smash iron ingots on the stamping platform to obtain heavy weighted pressure plate",
   "advancements.anvilcraft.vanilla_iron_plate.title": "Vanilla iron plate",

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

@@ -3,7 +3,7 @@
   "criteria": {
     "make_ice": {
       "conditions": {
-        "id": "anvilcraft:squeezing/power_snow_from_ice"
+        "id": "anvilcraft:squeezing/powder_snow_cauldron_from_snow_block"
       },
       "trigger": "anvilcraft:in_world_recipe"
     }

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

@@ -1,11 +1,35 @@
 {
   "parent": "anvilcraft:anvilcraft/industrial_grade_smelting",
   "criteria": {
-    "royal_metal": {
+    "has_royal_steel_block": {
       "conditions": {
-        "id": "anvilcraft:super_heating/royal_steel_ingot"
+        "items": [
+          {
+            "items": "anvilcraft:royal_steel_block"
+          }
+        ]
       },
-      "trigger": "anvilcraft:in_world_recipe"
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_royal_steel_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": "anvilcraft:royal_steel_ingot"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_royal_steel_nugget": {
+      "conditions": {
+        "items": [
+          {
+            "items": "anvilcraft:royal_steel_nugget"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
     }
   },
   "display": {
@@ -22,7 +46,9 @@
   },
   "requirements": [
     [
-      "royal_metal"
+      "has_royal_steel_block",
+      "has_royal_steel_ingot",
+      "has_royal_steel_nugget"
     ]
   ],
   "sends_telemetry_event": true

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

@@ -1,11 +1,35 @@
 {
   "parent": "anvilcraft:anvilcraft/overheated",
   "criteria": {
-    "transcendium_block": {
+    "has_transcendium_block": {
       "conditions": {
-        "id": "anvilcraft:item_inject/transcendium_block"
+        "items": [
+          {
+            "items": "anvilcraft:transcendium_block"
+          }
+        ]
       },
-      "trigger": "anvilcraft:in_world_recipe"
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_transcendium_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": "anvilcraft:transcendium_ingot"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_transcendium_nugget": {
+      "conditions": {
+        "items": [
+          {
+            "items": "anvilcraft:transcendium_nugget"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
     }
   },
   "display": {
@@ -23,7 +47,9 @@
   },
   "requirements": [
     [
-      "transcendium_block"
+      "has_transcendium_block",
+      "has_transcendium_ingot",
+      "has_transcendium_nugget"
     ]
   ],
   "sends_telemetry_event": true

src/main/java/dev/dubhe/anvilcraft/anvil/TranscendiumBehavior.java

@@ -4,6 +4,7 @@
 import dev.dubhe.anvilcraft.api.event.AnvilEvent;
 import dev.dubhe.anvilcraft.init.block.ModBlocks;
 import dev.dubhe.anvilcraft.init.item.ModItems;
+import dev.dubhe.anvilcraft.util.TriggerUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.util.RandomSource;

src/main/java/dev/dubhe/anvilcraft/api/advancement/AdvancementLineHelper.java

@@ -38,6 +38,7 @@
 import net.minecraft.advancements.critereon.PlayerTrigger;
 import net.minecraft.advancements.critereon.RecipeCraftedTrigger;
 import net.minecraft.advancements.critereon.SlotsPredicate;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -171,6 +172,16 @@ public AdvancementHelper hasItems(String key, ItemLike... items) {
             return this.addCriterion(key, InventoryChangeTrigger.TriggerInstance.hasItems(items));
         }
 
+        public AdvancementHelper hasItemAny(String keyPrefix, ItemLike... items) {
+            for (ItemLike item : items) {
+                this.addCriterion(
+                    keyPrefix + BuiltInRegistries.ITEM.getKey(item.asItem()).getPath(),
+                    InventoryChangeTrigger.TriggerInstance.hasItems(item)
+                );
+            }
+            return this;
+        }
+
         public AdvancementHelper useItem(String key, ItemLike item) {
             return this.addCriterion(key, UseItemTrigger.TriggerInstance.useItem(item.asItem()));
         }

src/main/java/dev/dubhe/anvilcraft/block/MineralFountainBlock.java

@@ -3,6 +3,7 @@
 import com.mojang.serialization.MapCodec;
 import dev.dubhe.anvilcraft.block.entity.MineralFountainBlockEntity;
 import dev.dubhe.anvilcraft.init.block.ModBlockEntities;
+import dev.dubhe.anvilcraft.util.TriggerUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.Level;
@@ -50,6 +51,7 @@ public RenderShape getRenderShape(BlockState state) {
     @Override
     protected void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean movedByPiston) {
         setTickCount(level, pos);
+        if (!oldState.is(state.getBlock())) TriggerUtil.mineralFountainCreate(level, pos);
         super.onPlace(state, level, pos, oldState, movedByPiston);
     }
 

src/main/java/dev/dubhe/anvilcraft/block/entity/MineralFountainBlockEntity.java

@@ -6,6 +6,7 @@
 import dev.dubhe.anvilcraft.init.block.ModBlocks;
 import dev.dubhe.anvilcraft.init.reicpe.ModRecipeTypes;
 import dev.dubhe.anvilcraft.recipe.mineral.MineralFountainRecipe;
+import dev.dubhe.anvilcraft.util.TriggerUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.HolderLookup;
@@ -31,7 +32,8 @@ private MineralFountainBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockS
     }
 
     public static MineralFountainBlockEntity createBlockEntity(
-        BlockEntityType<?> type, BlockPos pos, BlockState blockState) {
+        BlockEntityType<?> type, BlockPos pos, BlockState blockState
+    ) {
         return new MineralFountainBlockEntity(type, pos, blockState);
     }
 

src/main/java/dev/dubhe/anvilcraft/data/lang/AdvancementLang.java

@@ -105,7 +105,7 @@ public static void init(RegistrateLangProvider provider) {
         provider.add("advancements.anvilcraft.rip_van_winkle.title", "Rip Van Winkle");
         provider.add("advancements.anvilcraft.rip_van_winkle.description", "Perform any time warp operation");
 
-        provider.add("advancements.anvilcraft.frost_metal.title", "Rome was not built in a day");
+        provider.add("advancements.anvilcraft.frost_metal.title", "River was not frozen in one day's cold");
         provider.add("advancements.anvilcraft.frost_metal.description", "Obtain any frost metal");
 
         provider.add("advancements.anvilcraft.tai_shang_wang_qing.title", "Immortals beyond emotions");
@@ -136,7 +136,7 @@ public static void init(RegistrateLangProvider provider) {
         provider.add("advancements.anvilcraft.overheated.description", "Using anvil collision to make ember metal block overheated");
 
         provider.add("advancements.anvilcraft.transcendence.title", "Transcendence");
-        provider.add("advancements.anvilcraft.transcendence.description", "Injecting an charged neutronium ingot into an overheated ember metal block to craft transcendium block");
+        provider.add("advancements.anvilcraft.transcendence.description", "Injecting an charged neutronium ingot into an overheated ember metal block to craft transcendium");
 
         provider.add("advancements.anvilcraft.nuclear_power_10a.title", "Nuclear power, piece of cake!");
         provider.add("advancements.anvilcraft.nuclear_power_10a.description", "Using heat collector to collect overheated blocks' heat");