diff --git a/src/main/java/ru/betterend/item/PatternedDiscItem.java b/src/main/java/ru/betterend/item/PatternedDiscItem.java new file mode 100644 index 00000000..6f8b9d54 --- /dev/null +++ b/src/main/java/ru/betterend/item/PatternedDiscItem.java @@ -0,0 +1,17 @@ +package ru.betterend.item; + +import net.minecraft.item.MusicDiscItem; +import net.minecraft.sound.SoundEvent; +import ru.betterend.patterns.Patterned; +import ru.betterend.patterns.Patterns; + +public class PatternedDiscItem extends MusicDiscItem implements Patterned { + public PatternedDiscItem(int comparatorOutput, SoundEvent sound, Settings settings) { + super(comparatorOutput, sound, settings); + } + + @Override + public String getModelPattern(String name) { + return Patterns.createJson(Patterns.ITEM_GENERATED, name); + } +} diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index ab3ed31d..11df214c 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -19,6 +19,7 @@ import net.minecraft.item.FoodComponent; import net.minecraft.item.FoodComponents; import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; +import net.minecraft.sound.SoundEvent; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.ShovelItem; @@ -45,6 +46,7 @@ import ru.betterend.item.EndShovelItem; import ru.betterend.item.EndSpawnEggItem; import ru.betterend.item.EndSwordItem; import ru.betterend.item.EternalCrystalItem; +import ru.betterend.item.PatternedDiscItem; import ru.betterend.item.PatternedItem; import ru.betterend.item.material.EndArmorMaterial; import ru.betterend.item.material.EndToolMaterial; @@ -76,6 +78,9 @@ public class EndItems { public final static Item LUMECORN_ROD = registerItem("lumecorn_rod"); public final static Item SILK_MOTH_MATRIX = registerItem("silk_moth_matrix"); + // Music Discs + public final static Item MUSIC_DISC_STRANGE_AND_ALIEN = registerDisc("music_disc_strange_and_alien", 0, EndSounds.STRANGE_AND_ALIEN); + // Armor // public static final Item AETERNIUM_HELMET = registerItem("aeternium_helmet", new EndArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.HEAD, makeItemSettings().fireproof())); public static final Item AETERNIUM_CHESTPLATE = registerItem("aeternium_chestplate", new EndArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.CHEST, makeItemSettings().fireproof())); @@ -127,6 +132,10 @@ public class EndItems { // Drinks // public final static Item UMBRELLA_CLUSTER_JUICE = registerDrink("umbrella_cluster_juice", 5, 0.7F); + public static Item registerDisc(String name, int power, SoundEvent sound) { + return registerItem(BetterEnd.makeID(name), new PatternedDiscItem(power, sound, makeItemSettings())); + } + public static Item registerItem(String name) { return registerItem(BetterEnd.makeID(name), new PatternedItem(makeItemSettings())); } diff --git a/src/main/java/ru/betterend/registry/EndSounds.java b/src/main/java/ru/betterend/registry/EndSounds.java index 319df053..fe2e5c71 100644 --- a/src/main/java/ru/betterend/registry/EndSounds.java +++ b/src/main/java/ru/betterend/registry/EndSounds.java @@ -28,6 +28,9 @@ public class EndSounds { public static final SoundEvent ENTITY_SHADOW_WALKER_DAMAGE = register("entity", "shadow_walker_damage"); public static final SoundEvent ENTITY_SHADOW_WALKER_DEATH = register("entity", "shadow_walker_death"); + // Records + public static final SoundEvent STRANGE_AND_ALIEN = register("record", "strange_and_alien"); + public static void register() {} private static SoundEvent register(String type, String id) { diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 57f42540..5845f6b4 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -815,5 +815,8 @@ "block.betterend.cave_pumpkin_seed": "Cave Pumpkin Seed", "block.betterend.magnula": "Magnula", "block.betterend.neon_cactus": "Neon Cactus", - "item.betterend.cave_pumpkin_pie": "Cave Pumpkin Pie" + "item.betterend.cave_pumpkin_pie": "Cave Pumpkin Pie", + + "item.betterend.music_disc_strange_and_alien": "§bMusic Disc§r", + "item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fStrange And Alien§r" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 490148d2..71441920 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -835,5 +835,7 @@ "block.betterend.cave_pumpkin_seed": "Семена пещерной тыквы", "block.betterend.magnula": "Магнула", "block.betterend.neon_cactus": "Неоновый кактус", - "item.betterend.cave_pumpkin_pie": "Пирог из пещерной тыквы" + "item.betterend.cave_pumpkin_pie": "Пирог из пещерной тыквы", + + "item.betterend.music_disc_strange_and_alien": "§bПластинка§r" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/sounds.json b/src/main/resources/assets/betterend/sounds.json index 797e3d1b..03913530 100644 --- a/src/main/resources/assets/betterend/sounds.json +++ b/src/main/resources/assets/betterend/sounds.json @@ -232,5 +232,15 @@ "stream": false } ] + }, + + "betterend.record.strange_and_alien": { + "category": "record", + "sounds": [ + { + "name": "betterend:records/firel-strange_and_alien", + "stream": false + } + ] } } diff --git a/src/main/resources/assets/betterend/sounds/records/firel-strange_and_alien.ogg b/src/main/resources/assets/betterend/sounds/records/firel-strange_and_alien.ogg new file mode 100644 index 00000000..55898878 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/records/firel-strange_and_alien.ogg differ diff --git a/src/main/resources/assets/betterend/textures/item/music_disc_strange_and_alien.png b/src/main/resources/assets/betterend/textures/item/music_disc_strange_and_alien.png new file mode 100644 index 00000000..a6c84ad4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/music_disc_strange_and_alien.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1324e41a..315cf94c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -4,10 +4,14 @@ "version": "${version}", "name": "Better End", - "description": "More content for The End.", + "description": "More content for The End dimension, including new biomes, plants, mobs, mechanics, terrain generation and more.\nMade by:\n- paulevs (code & art)\n- Bulldog83 (code & art)\n- Edos (building)\n- Yuki (art)\n- Seaward (art)\n- Firel (music)\n", "authors": [ - "paulevs", - "Bulldog83" + "paulevs (code & art)", + "Bulldog83 (code & art)", + "Edos (building)", + "Yuki (art)", + "Seaward (art)", + "Firel (music)" ], "contact": { "homepage": "https://www.curseforge.com/minecraft/mc-mods/betterend",