Skip to content

Commit 1380e78

Browse files
MisakaitMisakait
committed
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # src/main/java/xyz/lisbammisakait/item/HutouzhanjinqiangItem.java # src/main/java/xyz/lisbammisakait/item/ModItems.java
2 parents 8a02719 + c2d2f1f commit 1380e78

File tree

11 files changed

+86
-7
lines changed

11 files changed

+86
-7
lines changed

‎src/main/java/xyz/lisbammisakait/Skill/TieJiTaChuanSkill.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package xyz.lisbammisakait.Skill;
2+
3+
import net.minecraft.item.Item;
4+
import net.minecraft.item.ItemStack;
5+
import net.minecraft.item.tooltip.TooltipType;
6+
import net.minecraft.text.Text;
7+
import net.minecraft.util.Formatting;
8+
9+
import java.util.List;
10+
11+
public class TieJiTaChuanSkill extends Item {
12+
public TieJiTaChuanSkill(Settings settings) {
13+
super(settings);
14+
}
15+
16+
@Override
17+
public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
18+
tooltip.add(Text.translatable("skill.relight-the-three-point-strategy.tiejitachuan").formatted(Formatting.GOLD));
19+
}
20+
}

‎src/main/java/xyz/lisbammisakait/item/FeilongduofengItem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public boolean postHit(net.minecraft.item.ItemStack stack, net.minecraft.entity.
1515
Random random = new Random();
1616
// 生成一个 0 到 9 之间的随机整数
1717
int randomNumber = random.nextInt(10);
18-
// 判断随机数是否为 0
19-
if (randomNumber<10) {
18+
// 判断随机数是否为 0或1
19+
if (randomNumber<2) {
2020
// 给目标添加火焰效果
2121
target.setFireTicks(60);
2222
double motionX = attacker.getRotationVector().x;

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
import net.minecraft.network.packet.s2c.play.PositionFlag;
1010
import net.minecraft.server.world.ServerWorld;
1111
import net.minecraft.text.Text;
12+
import net.minecraft.util.Formatting;
13+
import net.minecraft.util.math.BlockPos;
14+
import net.minecraft.text.Text;
1215
import net.minecraft.util.ActionResult;
1316
import net.minecraft.util.Formatting;
1417
import net.minecraft.util.Hand;
@@ -19,6 +22,8 @@
1922
import xyz.lisbammisakait.tools.SafeTp;
2023

2124
import java.util.Collections;
25+
import java.util.EnumSet;
26+
import java.util.List;
2227
import java.util.List;
2328
import java.util.Set;
2429

@@ -30,6 +35,10 @@ public HutouzhanjinqiangItem(ToolMaterial material, float attackDamage, float at
3035
super(material, attackDamage, attackSpeed, settings);
3136
}
3237
@Override
38+
public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
39+
tooltip.add(Text.translatable("itemskill.relight-the-three-point-strategy.hutouzhanjinqiang").formatted(Formatting.GOLD));
40+
}
41+
@Override
3342
public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) {
3443
// 计算从攻击者指向被攻击者的方向向量
3544
Vec3d direction = target.getPos().subtract(attacker.getPos());

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.minecraft.registry.RegistryKeys;
1313
import net.minecraft.text.Text;
1414
import net.minecraft.util.Identifier;
15+
import xyz.lisbammisakait.Skill.TieJiTaChuanSkill;
1516
import xyz.lisbammisakait.RelightTheThreePointStrategy;
1617
import xyz.lisbammisakait.Skill.YinFengLaiXiangSkill;
1718
import xyz.lisbammisakait.compoennt.RtTPSComponents;
@@ -43,9 +44,13 @@ public class ModItems {
4344
public static final RegistryKey<Item> HUTOUZHANJINQIANG_KEY = RegistryKey.of(RegistryKeys.ITEM, Identifier.of(RelightTheThreePointStrategy.MOD_ID, "hutouzhanjinqiang"));
4445
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);
4546
//-----------------------------------------------------------------------------------------------
47+
//-----------------------------------------------------------------------------------------------
4648
//注册引凤来翔
4749
public static final RegistryKey<Item> YINFENGLAIXIANG_KEY = RegistryKey.of(RegistryKeys.ITEM, Identifier.of(RelightTheThreePointStrategy.MOD_ID, "yinfenglaixiang"));
4850
public static final Item YINFENGLAIXIANG = register(new YinFengLaiXiangSkill( new Item.Settings().registryKey(YINFENGLAIXIANG_KEY)), YINFENGLAIXIANG_KEY);
51+
//注册铁骑踏川
52+
public static final RegistryKey<Item> TIEJITACHUAN_KEY = RegistryKey.of(RegistryKeys.ITEM, Identifier.of(RelightTheThreePointStrategy.MOD_ID, "tiejitachuan"));
53+
public static final Item TIEJITACHUAN = register(new TieJiTaChuanSkill( new Item.Settings().registryKey(TIEJITACHUAN_KEY)), TIEJITACHUAN_KEY);
4954

5055
public static Item register(Item item, RegistryKey<Item> registryKey) {
5156
// Register the item.
@@ -61,12 +66,15 @@ public static Item register(Item item, RegistryKey<Item> registryKey) {
6166
content.add(HUTOUZHANJINQIANG);
6267
});
6368
}*/
69+
//注册技能
6470
public static void registerToSkillGroups() {
6571
Registry.register(Registries.ITEM_GROUP, SKILL_GROUP_KEY, SKILL_GROUP);
6672
ItemGroupEvents.modifyEntriesEvent(SKILL_GROUP_KEY).register(itemGroup -> {
6773
itemGroup.add(ModItems.YINFENGLAIXIANG);
74+
itemGroup.add(ModItems.TIEJITACHUAN);
6875
});
6976
}
77+
//注册武器
7078
public static void registerToRtTPSGroups() {
7179
Registry.register(Registries.ITEM_GROUP, RTTPS_ITEM_GROUP_KEY, RTTPS_GROUP);
7280
ItemGroupEvents.modifyEntriesEvent(RTTPS_ITEM_GROUP_KEY).register(itemGroup -> {

‎src/main/resources/assets/relight-the-three-point-strategy/items/tiejitachuan.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "relight-the-three-point-strategy:item/tiejitachuan"
5+
}
6+
}

‎src/main/resources/assets/relight-the-three-point-strategy/items/yinfenglaixiang.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "relight-the-three-point-strategy:item/yinfenglaixiang"
5+
}
6+
}

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

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,29 @@
11
{
2-
"skillGroup.RelightTheThreePointStrategy": "重燃三分武器",
3-
"rttpsGroup.RelightTheThreePointStrategy": "重燃三分技能",
4-
"item.relight-the-three-point-strategy.feilongduofeng": "飞龙夺凤",
5-
"item.relight-the-three-point-strategy.hutouzhanjinqiang": "虎头湛金枪",
2+
"---------------------------------------": "-------------------------------",
3+
"-------------------------------------杂项": "------------------------------",
4+
"--------------------------------------": "--------------------------------",
5+
"skillGroup.RelightTheThreePointStrategy": "技能",
6+
"rttpsGroup.RelightTheThreePointStrategy": "武器",
67
"key.RelightTheThreePointStrategy.SkillA": "技能A",
78
"key.RelightTheThreePointStrategy.SkillB": "技能B",
89
"category.RelightTheThreePointStrategy.SkillGroup": "技能组",
10+
"-----------------------------------------": "---------------------------------",
11+
"-------------------------------------武器名": "--------------------------------",
12+
"------------------------------------------": "--------------------------------",
13+
"item.relight-the-three-point-strategy.feilongduofeng": "飞龙夺凤",
14+
"item.relight-the-three-point-strategy.hutouzhanjinqiang": "虎头湛金枪",
15+
"-------------------------------------------": "---------------------------------",
16+
"-------------------------------------技能名": "----------------------------------",
17+
"--------------------------------------------": "--------------------------------",
18+
"item.relight-the-three-point-strategy.tiejitachuan":"铁骑踏川",
919
"item.relight-the-three-point-strategy.yinfenglaixiang": "引凤来翔",
10-
"skill.relight-the-three-point-strategy.yinfenglaixiang": "§e[被动]\n§2你的每下普攻都有概率附带火焰与击退。"
20+
"---------------------------------------------": "---------------------------------",
21+
"-------------------------------------技能描述": "-----------------------------------",
22+
"----------------------------------------------": "--------------------------------",
23+
"skill.relight-the-three-point-strategy.tiejitachuan": "§a[被动] §f当你手持武器时，获得加速效果。当你打出普攻时，朝向目标突刺3格。",
24+
"skill.relight-the-three-point-strategy.yinfenglaixiang": "§a[被动] §f你的每下普攻都有概率附带火焰与击退。",
25+
"----------------------------------------": "--------------------------------------",
26+
"-------------------------------------武器描述": "-----------------------------------",
27+
"-------------------------------------": "-----------------------------------------",
28+
"itemskill.relight-the-three-point-strategy.hutouzhanjinqiang": "§6[主动][20s] §f右键强化武器，提高武器伤害与加速效果直到下次普攻。"
1129
}

‎src/main/resources/assets/relight-the-three-point-strategy/models/item/tiejitachuan.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/handheld",
3+
"textures": {
4+
"layer0": "relight-the-three-point-strategy:item/tiejitachuan"
5+
}
6+
}

‎src/main/resources/assets/relight-the-three-point-strategy/models/item/yinfenglaixiang.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/handheld",
3+
"textures": {
4+
"layer0": "relight-the-three-point-strategy:item/yinfenglaixiang"
5+
}
6+
}

‎src/main/resources/assets/relight-the-three-point-strategy/textures/item/tiejitachuan.png‎

1.21 MB
Loading

0 commit comments

Comments
 (0)