Skip to content

Commit 13eeb58

Browse files
committed
feat: lazertag gungun
1 parent daa99c4 commit 13eeb58

11 files changed

Lines changed: 190 additions & 91 deletions

File tree

pack/assets/minecraft/items/phantom_membrane.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"when": "puncher",
3333
"model": {
3434
"type": "model",
35-
"model": "item/puncher"
35+
"model": "item/blocksumo/puncher"
3636
}
3737
},
3838
{
@@ -48,6 +48,13 @@
4848
"type": "model",
4949
"model": "item/emotes"
5050
}
51+
},
52+
{
53+
"when": "gungun",
54+
"model": {
55+
"type": "model",
56+
"model": "item/lazertag/gungun"
57+
}
5158
}
5259
]
5360
}

pack/assets/minecraft/models/item/birthdayhat.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"credit": "Made with Blockbench",
33
"textures": {
4-
"2": "item/birthdayhat"
4+
"2": "item/birthdayhat",
5+
"particle": "item/birthdayhat"
56
},
67
"elements": [
78
{
File renamed without changes.

pack/assets/minecraft/models/item/emortalbox.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"credit": "Made with Blockbench",
33
"textures": {
4-
"1": "item/emortalanim"
4+
"1": "item/emortalanim",
5+
"particle": "item/emortalanim"
56
},
67
"elements": [
78
{
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"credit": "Made with Blockbench",
3+
"textures": {
4+
"0": "item/gungun",
5+
"particle": "item/gungun"
6+
},
7+
"elements": [
8+
{
9+
"from": [7.05, 4.65381, 9.26641],
10+
"to": [8.95, 9.65381, 11.26641],
11+
"rotation": {"angle": -22.5, "axis": "x", "origin": [7, 4.65381, 9.26641]},
12+
"faces": {
13+
"north": {"uv": [4, 4, 6, 9], "texture": "#0"},
14+
"east": {"uv": [6, 4, 8, 9], "texture": "#0"},
15+
"south": {"uv": [8, 0, 10, 5], "texture": "#0"},
16+
"west": {"uv": [8, 5, 10, 10], "texture": "#0"},
17+
"up": {"uv": [6, 11, 4, 9], "texture": "#0"},
18+
"down": {"uv": [8, 9, 6, 11], "texture": "#0"}
19+
}
20+
},
21+
{
22+
"from": [7, 7.65381, 3.26641],
23+
"to": [9, 9.65381, 10.26641],
24+
"rotation": {"angle": 0, "axis": "y", "origin": [7, 7.65381, 3.26641]},
25+
"faces": {
26+
"north": {"uv": [10, 0, 12, 2], "texture": "#0"},
27+
"east": {"uv": [0, 0, 7, 2], "texture": "#0"},
28+
"south": {"uv": [10, 2, 12, 4], "texture": "#0"},
29+
"west": {"uv": [0, 2, 7, 4], "texture": "#0"},
30+
"up": {"uv": [2, 11, 0, 4], "texture": "#0"},
31+
"down": {"uv": [4, 4, 2, 11], "texture": "#0"}
32+
}
33+
}
34+
],
35+
"display": {
36+
"thirdperson_righthand": {
37+
"translation": [0, 1, 0.25]
38+
},
39+
"thirdperson_lefthand": {
40+
"translation": [0, 1, 0.25]
41+
},
42+
"firstperson_righthand": {
43+
"translation": [0, 4, 0.25]
44+
},
45+
"firstperson_lefthand": {
46+
"translation": [0, 4, 0.25]
47+
}
48+
}
49+
}

pack/assets/minecraft/models/item/streetsign.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"credit": "Made with Blockbench",
33
"texture_size": [64, 64],
44
"textures": {
5-
"1": "item/streetsign"
5+
"1": "item/streetsign",
6+
"particle": "item/streetsign"
67
},
78
"elements": [
89
{

pack/assets/minecraft/sounds.json

Lines changed: 127 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,129 @@
11
{
2-
"item.trumpet.doot": {
3-
"category": "master",
4-
"subtitle": "Trumpet doots",
5-
"sounds": ["custom/doot"]
6-
},
7-
"entity.roblox.death": {
8-
"category": "master",
9-
"subtitle": "oof",
10-
"sounds": ["custom/oof"]
11-
},
12-
"random.cube.zap": {
13-
"category": "master",
14-
"subtitle": "Cube zaps",
15-
"sounds": ["custom/electric-zap"]
16-
},
17-
"battle.countdown.begin": {
18-
"category": "master",
19-
"subtitle": "Countdown",
20-
"sounds": ["custom/battle/begincountdown"]
21-
},
22-
"battle.countdown.beginover": {
23-
"category": "master",
24-
"subtitle": "Game start",
25-
"sounds": ["custom/battle/beginover"]
26-
},
27-
"battle.countdown.invulover": {
28-
"category": "master",
29-
"subtitle": "Invulnerability ended",
30-
"sounds": ["custom/battle/invulover"]
31-
},
32-
"battle.death": {
33-
"category": "master",
34-
"subtitle": "Player died",
35-
"sounds": ["custom/battle/playerdeath1", "custom/battle/playerdeath2"]
36-
},
37-
"battle.refill.open": {
38-
"category": "master",
39-
"subtitle": "Chest refill",
40-
"sounds": ["custom/battle/refillopen1"]
41-
},
42-
"battle.refill.close": {
43-
"category": "master",
44-
"subtitle": "Chest refill",
45-
"sounds": ["custom/battle/refillclose1"]
46-
},
47-
"battle.showdown": {
48-
"category": "master",
49-
"subtitle": "Showdown",
50-
"sounds": ["custom/battle/showdown"]
51-
},
52-
"battle.showdown.count1": {
53-
"category": "master",
54-
"subtitle": "Showdown count",
55-
"sounds": ["custom/battle/showdowncountdown1"]
56-
},
57-
"battle.showdown.count2": {
58-
"category": "master",
59-
"subtitle": "Showdown count",
60-
"sounds": ["custom/battle/showdowncountdown2"]
61-
},
62-
63-
"song.abs.clear": {
64-
"category": "master",
65-
"subtitle": "",
66-
"sounds": ["custom/absclear"]
67-
},
68-
"song.abs.muffled": {
69-
"category": "master",
70-
"subtitle": "",
71-
"sounds": ["custom/absmuffled"]
72-
},
73-
"emote.song.boogiedown": {
74-
"category": "master",
75-
"subtitle": "Emote plays",
76-
"sounds": ["custom/boogiedown"]
77-
},
78-
"emote.song.gangnamstyle": {
79-
"category": "master",
80-
"subtitle": "Emote plays",
81-
"sounds": ["custom/gangnam"]
82-
},
83-
84-
"entity.roblox.reporter": {
85-
"category": "master",
86-
"subtitle": "Reporter reports",
87-
"sounds": ["custom/reporter-reporting"]
88-
}
2+
"item.trumpet.doot": {
3+
"category": "master",
4+
"subtitle": "Trumpet doots",
5+
"sounds": [
6+
"custom/doot"
7+
]
8+
},
9+
"entity.roblox.death": {
10+
"category": "master",
11+
"subtitle": "oof",
12+
"sounds": [
13+
"custom/oof"
14+
]
15+
},
16+
"random.cube.zap": {
17+
"category": "master",
18+
"subtitle": "Cube zaps",
19+
"sounds": [
20+
"custom/electric-zap"
21+
]
22+
},
23+
"battle.countdown.begin": {
24+
"category": "master",
25+
"subtitle": "Countdown",
26+
"sounds": [
27+
"custom/battle/begincountdown"
28+
]
29+
},
30+
"battle.countdown.beginover": {
31+
"category": "master",
32+
"subtitle": "Game start",
33+
"sounds": [
34+
"custom/battle/beginover"
35+
]
36+
},
37+
"battle.countdown.invulover": {
38+
"category": "master",
39+
"subtitle": "Invulnerability ended",
40+
"sounds": [
41+
"custom/battle/invulover"
42+
]
43+
},
44+
"battle.death": {
45+
"category": "master",
46+
"subtitle": "Player died",
47+
"sounds": [
48+
"custom/battle/playerdeath1",
49+
"custom/battle/playerdeath2"
50+
]
51+
},
52+
"battle.refill.open": {
53+
"category": "master",
54+
"subtitle": "Chest refill",
55+
"sounds": [
56+
"custom/battle/refillopen1"
57+
]
58+
},
59+
"battle.refill.close": {
60+
"category": "master",
61+
"subtitle": "Chest refill",
62+
"sounds": [
63+
"custom/battle/refillclose1"
64+
]
65+
},
66+
"battle.showdown": {
67+
"category": "master",
68+
"subtitle": "Showdown",
69+
"sounds": [
70+
"custom/battle/showdown"
71+
]
72+
},
73+
"battle.showdown.count1": {
74+
"category": "master",
75+
"subtitle": "Showdown count",
76+
"sounds": [
77+
"custom/battle/showdowncountdown1"
78+
]
79+
},
80+
"battle.showdown.count2": {
81+
"category": "master",
82+
"subtitle": "Showdown count",
83+
"sounds": [
84+
"custom/battle/showdowncountdown2"
85+
]
86+
},
87+
"lazertag.pew": {
88+
"category": "master",
89+
"subtitle": "pew",
90+
"sounds": [
91+
"custom/lazertag/pew1", "custom/lazertag/pew2", "custom/lazertag/pew3"
92+
]
93+
},
94+
"song.abs.clear": {
95+
"category": "master",
96+
"subtitle": "",
97+
"sounds": [
98+
"custom/absclear"
99+
]
100+
},
101+
"song.abs.muffled": {
102+
"category": "master",
103+
"subtitle": "",
104+
"sounds": [
105+
"custom/absmuffled"
106+
]
107+
},
108+
"emote.song.boogiedown": {
109+
"category": "master",
110+
"subtitle": "Emote plays",
111+
"sounds": [
112+
"custom/boogiedown"
113+
]
114+
},
115+
"emote.song.gangnamstyle": {
116+
"category": "master",
117+
"subtitle": "Emote plays",
118+
"sounds": [
119+
"custom/gangnam"
120+
]
121+
},
122+
"entity.roblox.reporter": {
123+
"category": "master",
124+
"subtitle": "Reporter reports",
125+
"sounds": [
126+
"custom/reporter-reporting"
127+
]
128+
}
89129
}
8.43 KB
Binary file not shown.
7.98 KB
Binary file not shown.
8.01 KB
Binary file not shown.

0 commit comments

Comments
 (0)