Skip to content

Commit 0a674de

Browse files
Merge pull request #194 from SocialMoods/feat/new-items
feat: new items
2 parents b43b22b + 0e1386d commit 0a674de

34 files changed

+483
-2
lines changed

src/main/java/cn/nukkit/item/Item.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,6 +1005,10 @@ public boolean isShovel() {
10051005
return false;
10061006
}
10071007

1008+
public boolean isSpear() {
1009+
return false;
1010+
}
1011+
10081012
public boolean isHoe() {
10091013
return false;
10101014
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package cn.nukkit.item;
2+
3+
public class ItemBlackBundle extends ItemBundle {
4+
5+
public ItemBlackBundle() {
6+
super(BLACK_BUNDLE, "Black Bundle");
7+
}
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package cn.nukkit.item;
2+
3+
public class ItemBlueBundle extends ItemBundle {
4+
5+
public ItemBlueBundle() {
6+
super(BLUE_BUNDLE, "Blue Bundle");
7+
}
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package cn.nukkit.item;
2+
3+
public class ItemBrownBundle extends ItemBundle {
4+
5+
public ItemBrownBundle() {
6+
super(BROWN_BUNDLE, "Brown Bundle");
7+
}
8+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package cn.nukkit.item;
2+
3+
import cn.nukkit.network.protocol.ProtocolInfo;
4+
5+
public class ItemBundle extends StringItemBase {
6+
7+
public ItemBundle() {
8+
this(BUNDLE, "Bundle");
9+
}
10+
11+
public ItemBundle(String id, String name) {
12+
super(id, name);
13+
}
14+
15+
@Override
16+
public boolean isSupportedOn(int protocolId) {
17+
return protocolId >= ProtocolInfo.v1_21_40;
18+
}
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package cn.nukkit.item;
2+
3+
public class ItemCopperNautilusArmor extends ItemNautilusArmor {
4+
5+
public ItemCopperNautilusArmor() {
6+
super(COPPER_NAUTILUS_ARMOR, "Copper Nautilus Armor");
7+
}
8+
9+
@Override
10+
public int getMaxDurability() {
11+
return ItemTool.DURABILITY_COPPER;
12+
}
13+
14+
@Override
15+
public int getTier() {
16+
return ItemTool.TIER_COPPER;
17+
}
18+
19+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package cn.nukkit.item;
2+
3+
public class ItemCopperSpear extends ItemSpear {
4+
5+
public ItemCopperSpear() {
6+
super(COPPER_SPEAR, "Copper Spear");
7+
}
8+
9+
@Override
10+
public int getMaxDurability() {
11+
return ItemTool.DURABILITY_COPPER;
12+
}
13+
14+
@Override
15+
public int getTier() {
16+
return ItemTool.TIER_COPPER;
17+
}
18+
19+
@Override
20+
public int getAttackDamage() {
21+
return 3;
22+
}
23+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package cn.nukkit.item;
2+
3+
4+
public class ItemDiamondNautilusArmor extends ItemNautilusArmor {
5+
6+
public ItemDiamondNautilusArmor() {
7+
super(DIAMOND_NAUTILUS_ARMOR, "Diamond Nautilus Armor");
8+
}
9+
10+
@Override
11+
public int getMaxDurability() {
12+
return ItemTool.DURABILITY_DIAMOND;
13+
}
14+
15+
@Override
16+
public int getTier() {
17+
return ItemTool.TIER_DIAMOND;
18+
}
19+
20+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package cn.nukkit.item;
2+
3+
public class ItemDiamondSpear extends ItemSpear {
4+
5+
public ItemDiamondSpear() {
6+
super(DIAMOND_SPEAR, "Diamond Spear");
7+
}
8+
9+
@Override
10+
public int getMaxDurability() {
11+
return ItemTool.DURABILITY_DIAMOND;
12+
}
13+
14+
@Override
15+
public int getTier() {
16+
return ItemTool.TIER_DIAMOND;
17+
}
18+
19+
@Override
20+
public int getAttackDamage() {
21+
return 5;
22+
}
23+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package cn.nukkit.item;
2+
3+
public class ItemGoldenNautilusArmor extends ItemNautilusArmor {
4+
5+
public ItemGoldenNautilusArmor() {
6+
super(GOLDEN_NAUTILUS_ARMOR, "Golden Nautilus Armor");
7+
}
8+
9+
@Override
10+
public int getMaxDurability() {
11+
return ItemTool.DURABILITY_GOLD;
12+
}
13+
14+
@Override
15+
public int getTier() {
16+
return ItemTool.TIER_GOLD;
17+
}
18+
19+
}

0 commit comments

Comments
 (0)