feat: impl proficiency

Co-authored-by: lainio24 <[email protected]>

Author: WakelessSloth56

src/main/java/org/auioc/mcmod/harmonicench/enchantment/HEEnchantments.java

@@ -69,7 +69,7 @@ public class HEEnchantments {
 
     public static final ResourceKey<Enchantment> AIM = register("aim", AimEnchantment::bootstrap); // TODO
     public static final ResourceKey<Enchantment> BANE_OF_CHAMPIONS = register("bane_of_champions", BaneOfChampionsEnchantment::bootstrap);
-    public static final ResourceKey<Enchantment> BLESSING = register("blessing", BlessingEnchantment::bootstrap); // TODO
+    public static final ResourceKey<Enchantment> BLESSING = register("blessing", BlessingEnchantment::bootstrap);
     public static final ResourceKey<Enchantment> BLUNT = register("blunt", BluntEnchantment::bootstrap); // TODO WIP
     public static final ResourceKey<Enchantment> DEEP_STUDY = register("deep_study", DeepStudyEnchantment::bootstrap);
     public static final ResourceKey<Enchantment> DINING = register("dining", DiningEnchantment::bootstrap);
@@ -84,7 +84,7 @@ public class HEEnchantments {
     public static final ResourceKey<Enchantment> LUCK_OF_THE_SNOW = register("luck_of_the_snow", LuckOfTheSnowEnchantment::bootstrap);
     public static final ResourceKey<Enchantment> MOB_AFFINITY = register("mob_affinity", MobAffinityEnchantment::bootstrap); // TODO
     public static final ResourceKey<Enchantment> OBSERVER = register("observer", ObserverEnchantment::bootstrap); // TODO
-    public static final ResourceKey<Enchantment> PROFICIENCY = register("proficiency", ProficiencyEnchantment::bootstrap); // TODO
+    public static final ResourceKey<Enchantment> PROFICIENCY = register("proficiency", ProficiencyEnchantment::bootstrap);
     public static final ResourceKey<Enchantment> RAPIER = register("rapier", RapierEnchantment::bootstrap);
     public static final ResourceKey<Enchantment> REBELLING_CURSE = register("rebelling_curse", RebellingCurseEnchantment::bootstrap);
     public static final ResourceKey<Enchantment> SACRIFICING_CURSE = register("sacrificing_curse", SacrificingCurseEnchantment::bootstrap); // TODO

src/main/java/org/auioc/mcmod/harmonicench/enchantment/impl/ProficiencyEnchantment.java

@@ -21,10 +21,19 @@
 
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.entity.EquipmentSlotGroup;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.neoforged.neoforge.common.Tags;
+import org.auioc.mcmod.harmonicench.api.HEEnchantedValue;
 import org.auioc.mcmod.harmonicench.api.HEEnchantment;
+import org.auioc.mcmod.harmonicench.component.HEEDataComponents;
+import org.auioc.mcmod.harmonicench.enchantment.HEEnchantmentEffectComponents;
 import org.auioc.mcmod.harmonicench.enchantment.HEEnchantments;
+import org.auioc.mcmod.harmonicench.enchantment.effect.HEAttributeEffect;
+import org.auioc.mcmod.harmonicench.enchantment.effect.SetItemProficiency;
+
+import java.util.List;
 
 /**
  * <b>TODO 熟练 Proficiency</b>
@@ -61,6 +70,17 @@ public class ProficiencyEnchantment extends HEEnchantment {
      */
     private static final Cost COST = dynamicCost(1, 10, 61, 10);
 
+
+    /**
+     * <code>[∑(lvl,k=1)(1/k)]/200</code>
+     */
+    private static final HEEnchantedValue PROBABILITY = HEEnchantedValue.fraction(
+        HEEnchantedValue.harmonic(HEEnchantedValue.level(), 1.0F, HEEnchantedValue.identity()),
+        HEEnchantedValue.constant(200)
+    );
+
+    private static final HEEnchantedValue BONUS = HEEnchantedValue.fromDataComponent(HEEDataComponents.PROFICIENCY.get());
+
     private static final BuilderFunction BUILDER = define(
         SUPPORTED_ITEMS,
         PRIMARY_ITEMS,
@@ -69,9 +89,24 @@ public class ProficiencyEnchantment extends HEEnchantment {
         5,
         COST,
         1,
-        EquipmentSlotGroup.HAND
+        EquipmentSlotGroup.MAINHAND
     ).andThen((key, ctx, builder) -> builder
-
+        .withEffect(
+            HEEnchantmentEffectComponents.BLOCK_DESTROYED.get(),
+            new SetItemProficiency(HEEnchantedValue.chance(
+                PROBABILITY,
+                HEEnchantedValue.sum(HEEnchantedValue.identity(), HEEnchantedValue.constant(1)),
+                HEEnchantedValue.identity()
+            ))
+        ).withSpecialEffect(
+            HEEnchantmentEffectComponents.ATTRIBUTES.get(),
+            List.of(new HEAttributeEffect(
+                HEEnchantments.PROFICIENCY,
+                Attributes.MINING_EFFICIENCY,
+                BONUS,
+                AttributeModifier.Operation.ADD_MULTIPLIED_BASE
+            ))
+        )
     );
 
     public static Bootstrap.Builder bootstrap() {

src/main/resources/assets/harmonicench/lang/en_us.json

@@ -20,7 +20,7 @@
     "enchantment.harmonicench.luck_of_the_snow": "Luck of the Snow",
     "enchantment.harmonicench.mob_affinity": "Mob Affinity (WIP)",
     "enchantment.harmonicench.observer": "Observer (WIP)",
-    "enchantment.harmonicench.proficiency": "Proficiency (WIP)",
+    "enchantment.harmonicench.proficiency": "Proficiency",
     "enchantment.harmonicench.rapier": "Rapier",
     "enchantment.harmonicench.rebelling_curse": "Curse of Rebelling",
     "enchantment.harmonicench.sacrificing_curse": "Curse of Sacrificing (WIP)",

src/main/resources/assets/harmonicench/lang/zh_cn.json

@@ -20,7 +20,7 @@
     "enchantment.harmonicench.luck_of_the_snow": "冰雪眷顾",
     "enchantment.harmonicench.mob_affinity": "亲善（未实现）",
     "enchantment.harmonicench.observer": "观测（未实现）",
-    "enchantment.harmonicench.proficiency": "熟练（未实现）",
+    "enchantment.harmonicench.proficiency": "熟练",
     "enchantment.harmonicench.rapier": "迅捷之刃",
     "enchantment.harmonicench.rebelling_curse": "叛逆诅咒",
     "enchantment.harmonicench.sacrificing_curse": "献祭诅咒（未实现）",