mirror of
https://github.com/Sollace/Unicopia.git
synced 2024-11-27 23:27:59 +01:00
Added some music discs
This commit is contained in:
parent
f365cec6fe
commit
a3995ece46
18 changed files with 92 additions and 3 deletions
|
@ -20,6 +20,7 @@ import com.minelittlepony.unicopia.item.ItemZapApple;
|
||||||
import com.minelittlepony.unicopia.item.UItemBlock;
|
import com.minelittlepony.unicopia.item.UItemBlock;
|
||||||
import com.minelittlepony.unicopia.item.UItemDecoration;
|
import com.minelittlepony.unicopia.item.UItemDecoration;
|
||||||
import com.minelittlepony.unicopia.item.UItemSlab;
|
import com.minelittlepony.unicopia.item.UItemSlab;
|
||||||
|
import com.minelittlepony.unicopia.item.URecord;
|
||||||
import com.minelittlepony.unicopia.spell.SpellRegistry;
|
import com.minelittlepony.unicopia.spell.SpellRegistry;
|
||||||
|
|
||||||
import net.minecraft.block.BlockDoublePlant;
|
import net.minecraft.block.BlockDoublePlant;
|
||||||
|
@ -95,6 +96,11 @@ public class UItems {
|
||||||
|
|
||||||
public static final Item anvil = new UItemBlock(UBlocks.anvil, INTERACT_WITH_CLOUDS).setTranslationKey("cloud_anvil");
|
public static final Item anvil = new UItemBlock(UBlocks.anvil, INTERACT_WITH_CLOUDS).setTranslationKey("cloud_anvil");
|
||||||
|
|
||||||
|
public static final Item record_crusade = new URecord(Unicopia.MODID, "crusade", USounds.RECORD_CRUSADE);
|
||||||
|
public static final Item record_pet = new URecord(Unicopia.MODID, "pet", USounds.RECORD_PET);
|
||||||
|
public static final Item record_popular = new URecord(Unicopia.MODID, "popular", USounds.RECORD_POPULAR);
|
||||||
|
public static final Item record_funk = new URecord(Unicopia.MODID, "funk", USounds.RECORD_FUNK);
|
||||||
|
|
||||||
public static final Item hive = new ItemBlock(UBlocks.hive).setRegistryName(Unicopia.MODID, "hive");
|
public static final Item hive = new ItemBlock(UBlocks.hive).setRegistryName(Unicopia.MODID, "hive");
|
||||||
public static final Item chitin_shell = new Item()
|
public static final Item chitin_shell = new Item()
|
||||||
.setCreativeTab(CreativeTabs.MATERIALS)
|
.setCreativeTab(CreativeTabs.MATERIALS)
|
||||||
|
@ -245,7 +251,9 @@ public class UItems {
|
||||||
apple_seeds, apple_leaves,
|
apple_seeds, apple_leaves,
|
||||||
|
|
||||||
daffodil_daisy_sandwich, hay_burger, hay_fries, salad, wheat_worms,
|
daffodil_daisy_sandwich, hay_burger, hay_fries, salad, wheat_worms,
|
||||||
apple_cider, juice, burned_juice);
|
apple_cider, juice, burned_juice,
|
||||||
|
|
||||||
|
record_crusade, record_pet, record_popular, record_funk);
|
||||||
|
|
||||||
if (UClient.isClientSide()) {
|
if (UClient.isClientSide()) {
|
||||||
ItemModels.registerAll(
|
ItemModels.registerAll(
|
||||||
|
@ -277,7 +285,9 @@ public class UItems {
|
||||||
|
|
||||||
daffodil_daisy_sandwich, hay_burger, hay_fries, salad, wheat_worms,
|
daffodil_daisy_sandwich, hay_burger, hay_fries, salad, wheat_worms,
|
||||||
|
|
||||||
apple_cider, juice, burned_juice);
|
apple_cider, juice, burned_juice,
|
||||||
|
|
||||||
|
record_crusade, record_pet, record_popular, record_funk);
|
||||||
|
|
||||||
BuildInTexturesBakery.getBuiltInTextures().add(new ResourceLocation(Unicopia.MODID, "items/empty_slot_gem"));
|
BuildInTexturesBakery.getBuiltInTextures().add(new ResourceLocation(Unicopia.MODID, "items/empty_slot_gem"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,8 +15,15 @@ public class USounds {
|
||||||
public static final SoundEvent SLIME_ADVANCE = new USound(Unicopia.MODID, "slime_advance");
|
public static final SoundEvent SLIME_ADVANCE = new USound(Unicopia.MODID, "slime_advance");
|
||||||
public static final SoundEvent SLIME_RETRACT = new USound(Unicopia.MODID, "slime_retract");
|
public static final SoundEvent SLIME_RETRACT = new USound(Unicopia.MODID, "slime_retract");
|
||||||
|
|
||||||
|
public static final SoundEvent RECORD_CRUSADE = new USound(Unicopia.MODID, "record.crusade");
|
||||||
|
public static final SoundEvent RECORD_PET = new USound(Unicopia.MODID, "record.pet");
|
||||||
|
public static final SoundEvent RECORD_POPULAR = new USound(Unicopia.MODID, "record.popular");
|
||||||
|
public static final SoundEvent RECORD_FUNK = new USound(Unicopia.MODID, "record.funk");
|
||||||
|
|
||||||
static void init(IForgeRegistry<SoundEvent> registry) {
|
static void init(IForgeRegistry<SoundEvent> registry) {
|
||||||
registry.registerAll(WING_FLAP, WIND_RUSH);
|
registry.registerAll(WING_FLAP, WIND_RUSH,
|
||||||
|
INSECT, SLIME_ADVANCE, SLIME_RETRACT,
|
||||||
|
RECORD_CRUSADE, RECORD_PET, RECORD_POPULAR, RECORD_FUNK);
|
||||||
}
|
}
|
||||||
|
|
||||||
static class USound extends SoundEvent {
|
static class USound extends SoundEvent {
|
||||||
|
|
14
src/main/java/com/minelittlepony/unicopia/item/URecord.java
Normal file
14
src/main/java/com/minelittlepony/unicopia/item/URecord.java
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
package com.minelittlepony.unicopia.item;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemRecord;
|
||||||
|
import net.minecraft.util.SoundEvent;
|
||||||
|
|
||||||
|
public class URecord extends ItemRecord {
|
||||||
|
|
||||||
|
public URecord(String domain, String name, SoundEvent sound) {
|
||||||
|
super(name, sound);
|
||||||
|
setTranslationKey("record");
|
||||||
|
setRegistryName(domain, "record_" + name);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -154,6 +154,11 @@ item.mug.name=Mug
|
||||||
item.juice.name=Juice
|
item.juice.name=Juice
|
||||||
item.burned_juice.name=Burned Juice
|
item.burned_juice.name=Burned Juice
|
||||||
|
|
||||||
|
item.record.pet.desc=Danial Ingram - pet
|
||||||
|
item.record.popular.desc=Danial Ingram - popular
|
||||||
|
item.record.crusade.desc=Danial Ingram - crusade
|
||||||
|
item.record.funk.desc=funk, just funk
|
||||||
|
|
||||||
entity.racing_cloud.name=Bucking Bronco
|
entity.racing_cloud.name=Bucking Bronco
|
||||||
entity.construction_cloud.name=Construction Cloud
|
entity.construction_cloud.name=Construction Cloud
|
||||||
entity.cloud.name=Cloud
|
entity.cloud.name=Cloud
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "unicopia:items/record_crusade"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "unicopia:items/record_funk"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "unicopia:items/record_pet"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "unicopia:items/record_popular"
|
||||||
|
}
|
||||||
|
}
|
|
@ -39,5 +39,34 @@
|
||||||
"sounds": [
|
"sounds": [
|
||||||
"unicopia:slime/retract"
|
"unicopia:slime/retract"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"record.crusade": {
|
||||||
|
"category": "blocks",
|
||||||
|
"subtitle": "unicopia.subtitle.record.crusade",
|
||||||
|
"sounds": [
|
||||||
|
{ "name": "unicopia:record/crusade", "stream": true}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"record.popular": {
|
||||||
|
"category": "blocks",
|
||||||
|
"subtitle": "unicopia.subtitle.record.popular",
|
||||||
|
"sounds": [
|
||||||
|
{ "name": "unicopia:record/popular", "stream": true}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"record.pet": {
|
||||||
|
"category": "blocks",
|
||||||
|
"subtitle": "unicopia.subtitle.record.pet",
|
||||||
|
"stream": true,
|
||||||
|
"sounds": [
|
||||||
|
{ "name": "unicopia:record/pet", "stream": true}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"record.funk": {
|
||||||
|
"category": "blocks",
|
||||||
|
"subtitle": "unicopia.subtitle.record.funk",
|
||||||
|
"sounds": [
|
||||||
|
{ "name": "unicopia:record/funk", "stream": true, "attenuation_distance": 21120}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
BIN
src/main/resources/assets/unicopia/sounds/record/crusade.ogg
Normal file
BIN
src/main/resources/assets/unicopia/sounds/record/crusade.ogg
Normal file
Binary file not shown.
BIN
src/main/resources/assets/unicopia/sounds/record/funk.ogg
Normal file
BIN
src/main/resources/assets/unicopia/sounds/record/funk.ogg
Normal file
Binary file not shown.
BIN
src/main/resources/assets/unicopia/sounds/record/pet.ogg
Normal file
BIN
src/main/resources/assets/unicopia/sounds/record/pet.ogg
Normal file
Binary file not shown.
BIN
src/main/resources/assets/unicopia/sounds/record/popular.ogg
Normal file
BIN
src/main/resources/assets/unicopia/sounds/record/popular.ogg
Normal file
Binary file not shown.
BIN
src/main/resources/assets/unicopia/textures/entity/cuccoon.png
Normal file
BIN
src/main/resources/assets/unicopia/textures/entity/cuccoon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
After Width: | Height: | Size: 264 B |
Binary file not shown.
After Width: | Height: | Size: 255 B |
BIN
src/main/resources/assets/unicopia/textures/items/record_pet.png
Normal file
BIN
src/main/resources/assets/unicopia/textures/items/record_pet.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 277 B |
Binary file not shown.
After Width: | Height: | Size: 261 B |
Loading…
Reference in a new issue