完善马超武器

Author: Misakait

src/main/java/xyz/lisbammisakait/RelightTheThreePointStrategy.java

@@ -35,6 +35,10 @@ public void onInitialize() {
 					// 为玩家添加加速效果
 					player.addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 2, 1));
 				}
+				// 如果玩家的主手或副手拿着神威虎头湛金枪
+				if(mainHandStack.getItem() == ModItems.SHENWEIHUTOUZHANJINQIANG || offHandStack.getItem() == ModItems.SHENWEIHUTOUZHANJINQIANG){
+					player.addStatusEffect(new StatusEffectInstance(StatusEffects.SPEED, 2, 2));
+				}
 			}
 		});
 		LOGGER.info("Hello Fabric world!");

src/main/java/xyz/lisbammisakait/item/HutouzhanjinqiangItem.java

@@ -86,14 +86,24 @@ public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attack
 
     @Override
     public ActionResult use(World world, PlayerEntity user, Hand hand) {
-        ItemStack stack = user.getStackInHand(hand);
-        // Don't do anything on the client
+//        ItemStack stack = user.getStackInHand(hand);
+//        // Don't do anything on the client
         if (world.isClient()) {
             return ActionResult.SUCCESS;
         }
-        // Read the current count and increase it by one
-        int count = stack.getOrDefault(RtTPSComponents.COOLDOWN_TYPE, 0);
-        stack.set(RtTPSComponents.COOLDOWN_TYPE, ++count);
-        return ActionResult.SUCCESS;
+//
+//        // Read the current count and increase it by one
+//        int count = stack.getOrDefault(RtTPSComponents.COOLDOWN_TYPE, 0);
+//        stack.set(RtTPSComponents.COOLDOWN_TYPE, ++count);
+//        return ActionResult.SUCCESS;
+
+        if (user != null) {
+            // 创建一个新的物品栈，这里以钻石为例
+            ItemStack newItemStack = new ItemStack(ModItems.SHENWEIHUTOUZHANJINQIANG, 1);
+            // 将主手物品更换为新的物品栈
+            user.getInventory().main.set(user.getInventory().selectedSlot, newItemStack);
+            return ActionResult.SUCCESS;
+        }
+        return ActionResult.FAIL;
     }
 }

src/main/java/xyz/lisbammisakait/item/ModItems.java

@@ -39,10 +39,13 @@ public class ModItems {
 //    }
     //注册飞龙夺凤
     public static final RegistryKey<Item> FEILONGDUOFENG_KEY = RegistryKey.of(RegistryKeys.ITEM, Identifier.of(RelightTheThreePointStrategy.MOD_ID, "feilongduofeng"));
-    public static final Item FEILONGDUOFENG = register(new FeilongduofengItem(ToolMaterial.GOLD, 4f, 1f, new Item.Settings().registryKey(FEILONGDUOFENG_KEY)), FEILONGDUOFENG_KEY);
+    public static final Item FEILONGDUOFENG = register(new FeilongduofengItem(ToolMaterial.GOLD, 4f, 20f, new Item.Settings().registryKey(FEILONGDUOFENG_KEY)), FEILONGDUOFENG_KEY);
     //注册虎头湛金枪
     public static final RegistryKey<Item> HUTOUZHANJINQIANG_KEY = RegistryKey.of(RegistryKeys.ITEM, Identifier.of(RelightTheThreePointStrategy.MOD_ID, "hutouzhanjinqiang"));
-    public static final Item HUTOUZHANJINQIANG = register(new HutouzhanjinqiangItem(ToolMaterial.GOLD, 6f, 1f, new Item.Settings().registryKey(HUTOUZHANJINQIANG_KEY).component(RtTPSComponents.COOLDOWN_TYPE,HutouzhanjinqiangItem.COOLDOWN)), HUTOUZHANJINQIANG_KEY);
+    public static final Item HUTOUZHANJINQIANG = register(new HutouzhanjinqiangItem(ToolMaterial.GOLD, 6f, 20f, new Item.Settings().registryKey(HUTOUZHANJINQIANG_KEY).component(RtTPSComponents.COOLDOWN_TYPE,HutouzhanjinqiangItem.COOLDOWN)), HUTOUZHANJINQIANG_KEY);
+    //注册神威虎头湛金枪
+    public static final RegistryKey<Item> SHENWEIHUTOUZHANJINQIANG_KEY = RegistryKey.of(RegistryKeys.ITEM, Identifier.of(RelightTheThreePointStrategy.MOD_ID, "shenweihutouzhanjinqiang"));
+    public static final Item SHENWEIHUTOUZHANJINQIANG = register(new ShenweihutouzhanjianjinqiangItem(ToolMaterial.GOLD, 8f, 20f, new Item.Settings().registryKey(SHENWEIHUTOUZHANJINQIANG_KEY)), SHENWEIHUTOUZHANJINQIANG_KEY);
     //-----------------------------------------------------------------------------------------------
     //-----------------------------------------------------------------------------------------------
     //注册引凤来翔
@@ -80,6 +83,7 @@ public static void registerToRtTPSGroups() {
         ItemGroupEvents.modifyEntriesEvent(RTTPS_ITEM_GROUP_KEY).register(itemGroup -> {
             itemGroup.add(ModItems.FEILONGDUOFENG);
             itemGroup.add(ModItems.HUTOUZHANJINQIANG);
+            itemGroup.add(ModItems.SHENWEIHUTOUZHANJINQIANG);
         });
     }
     public static void initialize() {

src/main/java/xyz/lisbammisakait/item/ShenweihutouzhanjianjinqiangItem.java

@@ -0,0 +1,41 @@
+package xyz.lisbammisakait.item;
+
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ToolMaterial;
+import net.minecraft.item.tooltip.TooltipType;
+import net.minecraft.text.Text;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.Hand;
+import net.minecraft.world.World;
+
+import java.util.List;
+
+public class ShenweihutouzhanjianjinqiangItem extends HutouzhanjinqiangItem {
+    public ShenweihutouzhanjianjinqiangItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
+        super(material, attackDamage, attackSpeed, settings);
+    }
+    @Override
+    public ActionResult use(World world, PlayerEntity user, Hand hand) {
+        return ActionResult.SUCCESS;
+    }
+    @Override
+    public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) {
+        if (attacker.getWorld().isClient()) {
+            return true;
+        }
+        PlayerEntity user = (PlayerEntity) attacker;
+        // 创建一个新的物品栈，这里以钻石为例
+        ItemStack newItemStack = new ItemStack(ModItems.HUTOUZHANJINQIANG, 1);
+        // 将主手物品更换为新的物品栈
+        user.getInventory().main.set(user.getInventory().selectedSlot, newItemStack);
+
+        return super.postHit(stack, target, attacker);
+    }
+    @Override
+    public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
+        tooltip.add(Text.translatable("itemskill.relight-the-three-point-strategy.shenweihutouzhanjinqiang").formatted(Formatting.GOLD));
+    }
+}

src/main/resources/assets/relight-the-three-point-strategy/lang/en_us.json

@@ -1,8 +1,20 @@
 {
   "item.relight-the-three-point-strategy.feilongduofeng": "FeiLongDuoFeng",
   "item.relight-the-three-point-strategy.hutouzhanjinqiang": "HuTouZhanJinQiang",
+  "item.relight-the-three-point-strategy.tiejitachuan":"TieJiTachuan",
+  "item.relight-the-three-point-strategy.yinfenglaixiang": "YinFengLaiXiang",
+  "item.relight-the-three-point-strategy.shenweihutouzhanjinqiang": "ShenWeiHuTouZhanJinQiang",
   "key.RelightTheThreePointStrategy.SkillA": "SkillA",
   "key.RelightTheThreePointStrategy.SkillB": "SkillB",
   "category.RelightTheThreePointStrategy.SkillGroup": "Skill Group",
-  "item.relight-the-three-point-strategy.hutouzhanjinqiang.remaining-cooldown-time": "Remaining Cooldown Time: %1$s s"
+  "item.relight-the-three-point-strategy.hutouzhanjinqiang.remaining-cooldown-time": "Remaining Cooldown Time: %1$s s",
+  "itemskill.relight-the-three-point-strategy.shenweihutouzhanjinqiang": "ShenWeiHuTouZhanJinQiang",
+  "skillGroup.RelightTheThreePointStrategy": "Skill",
+  "rttpsGroup.RelightTheThreePointStrategy": "Weapon",
+  "key.RelightTheThreePointStrategy.SkillA": "SkillA",
+  "key.RelightTheThreePointStrategy.SkillB": "SkillB",
+  "category.RelightTheThreePointStrategy.SkillGroup": "Skill Group",
+  "skill.relight-the-three-point-strategy.tiejitachuan": "§a[Passive] §fWhen you hold a weapon, you gain a speed - up effect. When you perform a basic attack, you dash 3 blocks towards the target.",
+  "skill.relight-the-three-point-strategy.yinfenglaixiang": "§a[Passive] §fEach of your basic attacks has a %1$s%% chance to apply a knockback effect and a %2$s - second burn effect.",
+  "itemskill.relight-the-three-point-strategy.hutouzhanjinqiang": "§6[Active][%1$ss] §fRight - click to strengthen the weapon, increasing its damage and speed - up effect until the next basic attack."
 }