Skip to content

Commit 99313ca

Browse files
committed
🐺🔧
1 parent 72f82fc commit 99313ca

File tree

4 files changed

+89
-349
lines changed

4 files changed

+89
-349
lines changed

src/main/java/ctn/imaginarycraft/common/item/ego/weapon/remote/MagicBulletWeaponItem.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import net.minecraft.server.level.ServerPlayer;
1616
import net.minecraft.world.InteractionHand;
1717
import net.minecraft.world.InteractionResultHolder;
18-
import net.minecraft.world.entity.Entity;
1918
import net.minecraft.world.entity.player.Player;
2019
import net.minecraft.world.item.ItemStack;
2120
import net.minecraft.world.level.Level;
@@ -56,28 +55,6 @@ public MagicBulletWeaponItem(Properties itemProperties, Builder egoWeaponBuilder
5655
super(itemProperties, egoWeaponBuilder, modPath);
5756
}
5857

59-
@Override
60-
public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotId, boolean isSelected) {
61-
if (!(entity instanceof Player player)) {
62-
return;
63-
}
64-
65-
if (player.getMainHandItem() != stack) {
66-
PlayerAnimationUtil.stop(player, PlayerAnimationUtil.STANDBY_OR_WALK);
67-
return;
68-
}
69-
70-
if (player.isUsingItem()) {
71-
return;
72-
}
73-
74-
PlayerAnimationUtil.playAnimation(player, new PlayerAnimationPayload.Builder()
75-
.playSpeed(22f / gunShootExecuteTick(player, stack, InteractionHand.MAIN_HAND))
76-
.controllerId(PlayerAnimationUtil.STANDBY_OR_WALK)
77-
.animationId(STANDBY)
78-
.withFade(PlayerAnimationUtil.DEFAULT_FADE_IN));
79-
}
80-
8158
@Override
8259
public void registerControllers(AnimatableManager.ControllerRegistrar controllerRegistrar) {
8360

Lines changed: 85 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,87 @@
11
{
2-
"format_version": "1.12.0",
3-
"minecraft:geometry": [
4-
{
5-
"description": {
6-
"identifier": "geometry.magic_bullet",
7-
"texture_width": 32,
8-
"texture_height": 32,
9-
"visible_bounds_width": 7,
10-
"visible_bounds_height": 4,
11-
"visible_bounds_offset": [0, 1, 0]
12-
},
13-
"bones": [
14-
{
15-
"name": "bone",
16-
"pivot": [-5.5, 12.325, 0.75],
17-
"rotation": [90, 0, 90],
18-
"cubes": [
19-
{"origin": [-1.16667, -12, 3.91667], "size": [3, 4, 1.5], "uv": [6, 6]},
20-
{"origin": [-2.16667, -6, 3.91667], "size": [3, 5, 1.5], "uv": [6, 0]},
21-
{"origin": [-1.16667, -8, 3.91667], "size": [2, 2, 1.5], "uv": [6, 11]},
22-
{"origin": [0.83333, -7, 4.16667], "size": [1, 2, 1], "uv": [14, 0]},
23-
{"origin": [-1.16667, -1, 4.16667], "size": [2, 19, 1], "uv": [0, 0]},
24-
{"origin": [-1.16667, 18, 4.16667], "size": [1, 4, 1], "uv": [12, 11]}
25-
]
26-
}
27-
]
28-
}
29-
]
2+
"format_version": "1.12.0",
3+
"minecraft:geometry": [
4+
{
5+
"description": {
6+
"identifier": "geometry.magic_bullet",
7+
"texture_width": 32,
8+
"texture_height": 32,
9+
"visible_bounds_width": 7,
10+
"visible_bounds_height": 4,
11+
"visible_bounds_offset": [
12+
0,
13+
1,
14+
0
15+
]
16+
},
17+
"bones": [
18+
{
19+
"name": "bone",
20+
"pivot": [
21+
0.5,
22+
0.325,
23+
5
24+
],
25+
"rotation": [
26+
90,
27+
0,
28+
90
29+
],
30+
"cubes": [
31+
{
32+
"origin": [
33+
-1.16667,
34+
-12,
35+
3.91667
36+
],
37+
"size": [
38+
3,
39+
4,
40+
1.5
41+
],
42+
"uv": [
43+
6,
44+
6
45+
]
46+
},
47+
{
48+
"origin": [
49+
-2.16667,
50+
-6,
51+
3.91667
52+
],
53+
"size": [
54+
3,
55+
5,
56+
1.5
57+
],
58+
"uv": [
59+
6,
60+
0
61+
]
62+
},
63+
{
64+
"origin": [
65+
-1.16667,
66+
-8,
67+
3.91667
68+
],
69+
"size": [
70+
2,
71+
2,
72+
1.5
73+
],
74+
"uv": [
75+
6,
76+
11
77+
]
78+
},
79+
{"origin": [0.83333, -7, 4.16667], "size": [1, 2, 1], "uv": [14, 0]},
80+
{"origin": [-1.16667, -1, 4.16667], "size": [2, 19, 1], "uv": [0, 0]},
81+
{"origin": [-1.16667, 18, 4.16667], "size": [1, 4, 1], "uv": [12, 11]}
82+
]
83+
}
84+
]
85+
}
86+
]
3087
}

0 commit comments

Comments
 (0)