diff --git a/README.md b/README.md index 770e3ce..5985e89 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ The mod adds in various music discs with the Minecraft OST so that you can play
  • Wet Hands
  • Mice on Venus
  • Dog
  • +
  • Aria Math
  • To Modpack Developers

    diff --git a/changelog.txt b/changelog.txt index 1f86411..eb5b8bf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,10 @@ Soundtrack Discs Changelog https://github.com/thenamesnano/Soundtrack-Discs +3.4 +==== + - 3.4.0 Added aria math for Ross_2750 + 3.3 ==== - 3.3.0 Added dog for liraf1l diff --git a/gradle.properties b/gradle.properties index 32c708e..831db0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ forge_group=net.minecraftforge # Version version_major=3 -version_minor=3 +version_minor=4 version_patch=0 # JVM diff --git a/src/main/java/com/nanosplace/soundtrackdiscs/util/RegistryHandler.java b/src/main/java/com/nanosplace/soundtrackdiscs/util/RegistryHandler.java index cdcff9a..63f30c4 100644 --- a/src/main/java/com/nanosplace/soundtrackdiscs/util/RegistryHandler.java +++ b/src/main/java/com/nanosplace/soundtrackdiscs/util/RegistryHandler.java @@ -64,6 +64,8 @@ public static void registerCreativeTab(CreativeModeTabEvent.Register event) { () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(SoundtrackDiscs.MOD_ID, "music_disc.piano3"))); public static final RegistryObject MUSIC_DISC_DOG_SOUND = SOUNDS_EVENTS.register("music_disc.dog", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(SoundtrackDiscs.MOD_ID, "music_disc.dog"))); + public static final RegistryObject MUSIC_DISC_ARIA_MATH_SOUND = SOUNDS_EVENTS.register("music_disc.aria_math", + () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(SoundtrackDiscs.MOD_ID, "music_disc.aria_math"))); // Items ----------------------------------------------------------------------------------------------------------- public static final RegistryObject MUSIC_DISC_CALM1 = ITEMS.register("music_disc_calm1", @@ -92,5 +94,7 @@ public static void registerCreativeTab(CreativeModeTabEvent.Register event) { () -> new ModMusicDiscItem(12, MUSIC_DISC_PIANO3_SOUND, 280)); public static final RegistryObject MUSIC_DISC_DOG = ITEMS.register("music_disc_dog", () -> new ModMusicDiscItem(13, MUSIC_DISC_DOG_SOUND, 145)); + public static final RegistryObject MUSIC_DISC_ARIA_MATH = ITEMS.register("music_disc_aria_math", + () -> new ModMusicDiscItem(14, MUSIC_DISC_ARIA_MATH_SOUND, 309)); } diff --git a/src/main/resources/assets/soundtrackdiscs/lang/en_us.json b/src/main/resources/assets/soundtrackdiscs/lang/en_us.json index 1d56f98..2bfd722 100644 --- a/src/main/resources/assets/soundtrackdiscs/lang/en_us.json +++ b/src/main/resources/assets/soundtrackdiscs/lang/en_us.json @@ -26,5 +26,7 @@ "item.soundtrackdiscs.music_disc_piano3": "Music Disc", "item.soundtrackdiscs.music_disc_piano3.desc": "C418 - mice on venus", "item.soundtrackdiscs.music_disc_dog": "Music Disc", - "item.soundtrackdiscs.music_disc_dog.desc": "C418 - dog" + "item.soundtrackdiscs.music_disc_dog.desc": "C418 - dog", + "item.soundtrackdiscs.music_disc_aria_math": "Music Disc", + "item.soundtrackdiscs.music_disc_aria_math.desc": "C418 - aria math" } \ No newline at end of file diff --git a/src/main/resources/assets/soundtrackdiscs/models/item/music_disc_aria_math.json b/src/main/resources/assets/soundtrackdiscs/models/item/music_disc_aria_math.json new file mode 100644 index 0000000..e0b1093 --- /dev/null +++ b/src/main/resources/assets/soundtrackdiscs/models/item/music_disc_aria_math.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "soundtrackdiscs:item/music_disc_aria_math" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/soundtrackdiscs/sounds.json b/src/main/resources/assets/soundtrackdiscs/sounds.json index ec6e8a5..67e5766 100644 --- a/src/main/resources/assets/soundtrackdiscs/sounds.json +++ b/src/main/resources/assets/soundtrackdiscs/sounds.json @@ -115,5 +115,14 @@ "stream": true } ] + }, + "music_disc.aria_math": { + "category": "record", + "sounds": [ + { + "name": "soundtrackdiscs:records/aria_math", + "stream": true + } + ] } } diff --git a/src/main/resources/assets/soundtrackdiscs/sounds/records/aria_math.ogg b/src/main/resources/assets/soundtrackdiscs/sounds/records/aria_math.ogg new file mode 100644 index 0000000..c138181 Binary files /dev/null and b/src/main/resources/assets/soundtrackdiscs/sounds/records/aria_math.ogg differ diff --git a/src/main/resources/assets/soundtrackdiscs/textures/item/music_disc_aria_math.png b/src/main/resources/assets/soundtrackdiscs/textures/item/music_disc_aria_math.png new file mode 100644 index 0000000..09754f0 Binary files /dev/null and b/src/main/resources/assets/soundtrackdiscs/textures/item/music_disc_aria_math.png differ diff --git a/src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json b/src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json index d6e181d..b2bd1ed 100644 --- a/src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json +++ b/src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json @@ -13,6 +13,7 @@ "soundtrackdiscs:music_disc_piano1", "soundtrackdiscs:music_disc_piano2", "soundtrackdiscs:music_disc_piano3", - "soundtrackdiscs:music_disc_dog" + "soundtrackdiscs:music_disc_dog", + "soundtrackdiscs:music_disc_aria_math" ] } \ No newline at end of file