Skip to content

Commit 6cc5f93

Browse files
committed
6 new sounds!
- burp - block - wondering shrock - fire 🔥 - ball 🏀 - hat 🎩
1 parent a71459a commit 6cc5f93

10 files changed

Lines changed: 55 additions & 5 deletions

File tree

src/main/java/net/morceaudebois/apolloparrot/mixin/ParrotMixin.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,22 @@ private static void injected(CallbackInfoReturnable<SoundEvent> cir) {
5757

5858
ModSounds.ITS_A_BELL,
5959
ModSounds.BOWL,
60-
ModSounds.ITS_A_BUG
60+
ModSounds.ITS_A_BUG,
61+
62+
ModSounds.BALL,
63+
ModSounds.SHROCK_QUESTION,
64+
ModSounds.BALL,
65+
ModSounds.BURP,
66+
ModSounds.FIRE,
67+
ModSounds.HAT
6168
};
6269

6370
// Create a Random object
6471
Random random = new Random();
6572

6673
if (random.nextInt(3) < 1) {
6774
// Generate a random number from 0 to 2 (inclusive) to select one of three values
68-
int randomNumber = random.nextInt(40);
75+
int randomNumber = random.nextInt(46);
6976
cir.setReturnValue(ApolloSounds[randomNumber]);
7077
}
7178

src/main/java/net/morceaudebois/apolloparrot/sound/ModSounds.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ public class ModSounds {
5252
public static SoundEvent ITS_A_BELL = registerSound("its_a_bell");
5353
public static SoundEvent ITS_A_BUG = registerSound("its_a_bug");
5454

55+
public static SoundEvent BALL = registerSound("ball");
56+
public static SoundEvent BLOCK = registerSound("block");
57+
public static SoundEvent BURP = registerSound("burp");
58+
public static SoundEvent FIRE = registerSound("fire");
59+
public static SoundEvent HAT = registerSound("hat");
60+
public static SoundEvent SHROCK_QUESTION = registerSound("shrock_question");
61+
5562
// actual registration of all the custom SoundEvents
5663
static SoundEvent registerSound(String id) {
5764
SoundEvent sound = SoundEvent.of(new Identifier(ApolloParrot.MOD_ID, id));

src/main/resources/assets/apolloparrot/sounds.json

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,43 @@
240240
"sounds": [
241241
"apolloparrot:its_a_bug"
242242
]
243-
}
243+
},
244+
244245

246+
"block": {
247+
"subtitle": "Parrot says \"block\"",
248+
"sounds": [
249+
"apolloparrot:block"
250+
]
251+
},
252+
"burp": {
253+
"subtitle": "Parrot burps",
254+
"sounds": [
255+
"apolloparrot:burp"
256+
]
257+
},
258+
"shrock_question": {
259+
"subtitle": "Parrot asks \"shrock\"",
260+
"sounds": [
261+
"apolloparrot:shrock_question"
262+
]
263+
},
264+
"hat": {
265+
"subtitle": "Parrot says \"hat\"",
266+
"sounds": [
267+
"apolloparrot:hat"
268+
]
269+
},
270+
"fire": {
271+
"subtitle": "Parrot says \"fire\"",
272+
"sounds": [
273+
"apolloparrot:fire"
274+
]
275+
},
276+
"ball": {
277+
"subtitle": "Parrot says \"ball\"",
278+
"sounds": [
279+
"apolloparrot:ball"
280+
]
281+
}
245282
}
20.3 KB
Binary file not shown.
23.5 KB
Binary file not shown.
23.9 KB
Binary file not shown.
23.8 KB
Binary file not shown.
21.2 KB
Binary file not shown.
Binary file not shown.

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"fabricloader": ">=0.14.22",
3434
"minecraft": "~1.20.1",
3535
"java": ">=17",
36-
"fabric-api": "*",
37-
"entity_texture_features": ">=2.0"
36+
"fabric-api": "*"
3837
}
3938
}

0 commit comments

Comments
 (0)