Music disc (Firel - Strange and Alien), updated description

This commit is contained in:
paulevsGitch 2021-03-21 20:55:49 +03:00
parent 22517da433
commit e6542130f0
9 changed files with 53 additions and 5 deletions

View file

@ -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);
}
}

View file

@ -19,6 +19,7 @@ import net.minecraft.item.FoodComponent;
import net.minecraft.item.FoodComponents; import net.minecraft.item.FoodComponents;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.Item.Settings; import net.minecraft.item.Item.Settings;
import net.minecraft.sound.SoundEvent;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items; import net.minecraft.item.Items;
import net.minecraft.item.ShovelItem; import net.minecraft.item.ShovelItem;
@ -45,6 +46,7 @@ import ru.betterend.item.EndShovelItem;
import ru.betterend.item.EndSpawnEggItem; import ru.betterend.item.EndSpawnEggItem;
import ru.betterend.item.EndSwordItem; import ru.betterend.item.EndSwordItem;
import ru.betterend.item.EternalCrystalItem; import ru.betterend.item.EternalCrystalItem;
import ru.betterend.item.PatternedDiscItem;
import ru.betterend.item.PatternedItem; import ru.betterend.item.PatternedItem;
import ru.betterend.item.material.EndArmorMaterial; import ru.betterend.item.material.EndArmorMaterial;
import ru.betterend.item.material.EndToolMaterial; 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 LUMECORN_ROD = registerItem("lumecorn_rod");
public final static Item SILK_MOTH_MATRIX = registerItem("silk_moth_matrix"); 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 // // Armor //
public static final Item AETERNIUM_HELMET = registerItem("aeternium_helmet", new EndArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.HEAD, makeItemSettings().fireproof())); 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())); 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 // // Drinks //
public final static Item UMBRELLA_CLUSTER_JUICE = registerDrink("umbrella_cluster_juice", 5, 0.7F); 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) { public static Item registerItem(String name) {
return registerItem(BetterEnd.makeID(name), new PatternedItem(makeItemSettings())); return registerItem(BetterEnd.makeID(name), new PatternedItem(makeItemSettings()));
} }

View file

@ -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_DAMAGE = register("entity", "shadow_walker_damage");
public static final SoundEvent ENTITY_SHADOW_WALKER_DEATH = register("entity", "shadow_walker_death"); 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() {} public static void register() {}
private static SoundEvent register(String type, String id) { private static SoundEvent register(String type, String id) {

View file

@ -815,5 +815,8 @@
"block.betterend.cave_pumpkin_seed": "Cave Pumpkin Seed", "block.betterend.cave_pumpkin_seed": "Cave Pumpkin Seed",
"block.betterend.magnula": "Magnula", "block.betterend.magnula": "Magnula",
"block.betterend.neon_cactus": "Neon Cactus", "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"
} }

View file

@ -835,5 +835,7 @@
"block.betterend.cave_pumpkin_seed": "Семена пещерной тыквы", "block.betterend.cave_pumpkin_seed": "Семена пещерной тыквы",
"block.betterend.magnula": "Магнула", "block.betterend.magnula": "Магнула",
"block.betterend.neon_cactus": "Неоновый кактус", "block.betterend.neon_cactus": "Неоновый кактус",
"item.betterend.cave_pumpkin_pie": "Пирог из пещерной тыквы" "item.betterend.cave_pumpkin_pie": "Пирог из пещерной тыквы",
"item.betterend.music_disc_strange_and_alien": "§bПластинка§r"
} }

View file

@ -232,5 +232,15 @@
"stream": false "stream": false
} }
] ]
},
"betterend.record.strange_and_alien": {
"category": "record",
"sounds": [
{
"name": "betterend:records/firel-strange_and_alien",
"stream": false
}
]
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 B

View file

@ -4,10 +4,14 @@
"version": "${version}", "version": "${version}",
"name": "Better End", "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": [ "authors": [
"paulevs", "paulevs (code & art)",
"Bulldog83" "Bulldog83 (code & art)",
"Edos (building)",
"Yuki (art)",
"Seaward (art)",
"Firel (music)"
], ],
"contact": { "contact": {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/betterend", "homepage": "https://www.curseforge.com/minecraft/mc-mods/betterend",