Skip to content

Commit e3aefab

Browse files
committed
Merge mahjong sounds into mahjongcraft assets
1 parent 9733780 commit e3aefab

32 files changed

Lines changed: 35 additions & 35 deletions

resourcepack/ATTRIBUTION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Dice textures, table textures, dice item models, and the table furniture model a
1010

1111
## Sound Effects
1212

13-
The sound effects under `assets/mahjong/sounds/` use low-risk redistributable sources:
13+
The sound effects under `assets/mahjongcraft/sounds/` use low-risk redistributable sources:
1414

1515
- Real tile/table sounds are from Freesound recordings marked Creative Commons 0 (CC0 1.0).
1616
- Action call voices are from Amitaro's Voice Material Studio. These are not CC0; use requires credit, terms-link/readme, and a post-release usage report when redistributed in a Minecraft/CraftEngine bundle.
Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,142 @@
11
{
22
"tile_draw": {
33
"sounds": [
4-
"mahjong:tile_draw"
4+
"mahjongcraft:tile_draw"
55
]
66
},
77
"tile_discard": {
88
"sounds": [
9-
"mahjong:tile_discard"
9+
"mahjongcraft:tile_discard"
1010
]
1111
},
1212
"tile_shuffle": {
1313
"sounds": [
14-
"mahjong:tile_shuffle"
14+
"mahjongcraft:tile_shuffle"
1515
]
1616
},
1717
"reaction_chi": {
1818
"sounds": [
19-
"mahjong:reaction_chi"
19+
"mahjongcraft:reaction_chi"
2020
]
2121
},
2222
"reaction_pon": {
2323
"sounds": [
24-
"mahjong:reaction_pon"
24+
"mahjongcraft:reaction_pon"
2525
]
2626
},
2727
"reaction_kan": {
2828
"sounds": [
29-
"mahjong:reaction_kan"
29+
"mahjongcraft:reaction_kan"
3030
]
3131
},
3232
"riichi": {
3333
"sounds": [
34-
"mahjong:riichi"
34+
"mahjongcraft:riichi"
3535
]
3636
},
3737
"round_win": {
3838
"sounds": [
39-
"mahjong:round_win"
39+
"mahjongcraft:round_win"
4040
]
4141
},
4242
"round_draw": {
4343
"sounds": [
44-
"mahjong:round_draw"
44+
"mahjongcraft:round_draw"
4545
]
4646
},
4747
"turn_change": {
4848
"sounds": [
49-
"mahjong:turn_change"
49+
"mahjongcraft:turn_change"
5050
]
5151
},
5252
"gb_tile_draw": {
5353
"sounds": [
54-
"mahjong:gb_tile_draw"
54+
"mahjongcraft:gb_tile_draw"
5555
]
5656
},
5757
"gb_tile_discard": {
5858
"sounds": [
59-
"mahjong:gb_tile_discard"
59+
"mahjongcraft:gb_tile_discard"
6060
]
6161
},
6262
"gb_tile_shuffle": {
6363
"sounds": [
64-
"mahjong:gb_tile_shuffle"
64+
"mahjongcraft:gb_tile_shuffle"
6565
]
6666
},
6767
"gb_turn_change": {
6868
"sounds": [
69-
"mahjong:gb_turn_change"
69+
"mahjongcraft:gb_turn_change"
7070
]
7171
},
7272
"gb_round_draw": {
7373
"sounds": [
74-
"mahjong:gb_round_draw"
74+
"mahjongcraft:gb_round_draw"
7575
]
7676
},
7777
"gb_reaction_chi": {
7878
"sounds": [
79-
"mahjong:gb_reaction_chi"
79+
"mahjongcraft:gb_reaction_chi"
8080
]
8181
},
8282
"gb_reaction_pon": {
8383
"sounds": [
84-
"mahjong:gb_reaction_pon"
84+
"mahjongcraft:gb_reaction_pon"
8585
]
8686
},
8787
"gb_reaction_kan": {
8888
"sounds": [
89-
"mahjong:gb_reaction_kan"
89+
"mahjongcraft:gb_reaction_kan"
9090
]
9191
},
9292
"gb_round_win": {
9393
"sounds": [
94-
"mahjong:gb_round_win"
94+
"mahjongcraft:gb_round_win"
9595
]
9696
},
9797
"sichuan_tile_draw": {
9898
"sounds": [
99-
"mahjong:sichuan_tile_draw"
99+
"mahjongcraft:sichuan_tile_draw"
100100
]
101101
},
102102
"sichuan_tile_discard": {
103103
"sounds": [
104-
"mahjong:sichuan_tile_discard"
104+
"mahjongcraft:sichuan_tile_discard"
105105
]
106106
},
107107
"sichuan_tile_shuffle": {
108108
"sounds": [
109-
"mahjong:sichuan_tile_shuffle"
109+
"mahjongcraft:sichuan_tile_shuffle"
110110
]
111111
},
112112
"sichuan_turn_change": {
113113
"sounds": [
114-
"mahjong:sichuan_turn_change"
114+
"mahjongcraft:sichuan_turn_change"
115115
]
116116
},
117117
"sichuan_round_draw": {
118118
"sounds": [
119-
"mahjong:sichuan_round_draw"
119+
"mahjongcraft:sichuan_round_draw"
120120
]
121121
},
122122
"sichuan_reaction_chi": {
123123
"sounds": [
124-
"mahjong:sichuan_reaction_chi"
124+
"mahjongcraft:sichuan_reaction_chi"
125125
]
126126
},
127127
"sichuan_reaction_pon": {
128128
"sounds": [
129-
"mahjong:sichuan_reaction_pon"
129+
"mahjongcraft:sichuan_reaction_pon"
130130
]
131131
},
132132
"sichuan_reaction_kan": {
133133
"sounds": [
134-
"mahjong:sichuan_reaction_kan"
134+
"mahjongcraft:sichuan_reaction_kan"
135135
]
136136
},
137137
"sichuan_round_win": {
138138
"sounds": [
139-
"mahjong:sichuan_round_win"
139+
"mahjongcraft:sichuan_round_win"
140140
]
141141
}
142142
}

resourcepack/assets/mahjong/sounds/gb_reaction_chi.ogg renamed to resourcepack/assets/mahjongcraft/sounds/gb_reaction_chi.ogg

File renamed without changes.

resourcepack/assets/mahjong/sounds/gb_reaction_kan.ogg renamed to resourcepack/assets/mahjongcraft/sounds/gb_reaction_kan.ogg

File renamed without changes.

resourcepack/assets/mahjong/sounds/gb_reaction_pon.ogg renamed to resourcepack/assets/mahjongcraft/sounds/gb_reaction_pon.ogg

File renamed without changes.

resourcepack/assets/mahjong/sounds/gb_round_draw.ogg renamed to resourcepack/assets/mahjongcraft/sounds/gb_round_draw.ogg

File renamed without changes.

resourcepack/assets/mahjong/sounds/gb_round_win.ogg renamed to resourcepack/assets/mahjongcraft/sounds/gb_round_win.ogg

File renamed without changes.

resourcepack/assets/mahjong/sounds/gb_tile_discard.ogg renamed to resourcepack/assets/mahjongcraft/sounds/gb_tile_discard.ogg

File renamed without changes.

resourcepack/assets/mahjong/sounds/gb_tile_draw.ogg renamed to resourcepack/assets/mahjongcraft/sounds/gb_tile_draw.ogg

File renamed without changes.

resourcepack/assets/mahjong/sounds/gb_tile_shuffle.ogg renamed to resourcepack/assets/mahjongcraft/sounds/gb_tile_shuffle.ogg

File renamed without changes.

0 commit comments

Comments
 (0)