diff --git a/src/main/java/com/minelittlepony/unicopia/init/UItems.java b/src/main/java/com/minelittlepony/unicopia/init/UItems.java index 266308e6..5227cacc 100644 --- a/src/main/java/com/minelittlepony/unicopia/init/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/init/UItems.java @@ -20,6 +20,7 @@ import com.minelittlepony.unicopia.item.ItemZapApple; import com.minelittlepony.unicopia.item.UItemBlock; import com.minelittlepony.unicopia.item.UItemDecoration; import com.minelittlepony.unicopia.item.UItemSlab; +import com.minelittlepony.unicopia.item.URecord; import com.minelittlepony.unicopia.spell.SpellRegistry; 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 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 chitin_shell = new Item() .setCreativeTab(CreativeTabs.MATERIALS) @@ -245,7 +251,9 @@ public class UItems { apple_seeds, apple_leaves, 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()) { ItemModels.registerAll( @@ -277,7 +285,9 @@ public class UItems { 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")); } diff --git a/src/main/java/com/minelittlepony/unicopia/init/USounds.java b/src/main/java/com/minelittlepony/unicopia/init/USounds.java index 1b563b7c..f674f5bc 100644 --- a/src/main/java/com/minelittlepony/unicopia/init/USounds.java +++ b/src/main/java/com/minelittlepony/unicopia/init/USounds.java @@ -15,8 +15,15 @@ public class USounds { 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 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 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 { diff --git a/src/main/java/com/minelittlepony/unicopia/item/URecord.java b/src/main/java/com/minelittlepony/unicopia/item/URecord.java new file mode 100644 index 00000000..7ec5420c --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/item/URecord.java @@ -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); + } + +} diff --git a/src/main/resources/assets/unicopia/lang/en_US.lang b/src/main/resources/assets/unicopia/lang/en_US.lang index 0e06d127..36140e53 100644 --- a/src/main/resources/assets/unicopia/lang/en_US.lang +++ b/src/main/resources/assets/unicopia/lang/en_US.lang @@ -154,6 +154,11 @@ item.mug.name=Mug item.juice.name=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.construction_cloud.name=Construction Cloud entity.cloud.name=Cloud diff --git a/src/main/resources/assets/unicopia/models/item/record_crusade.json b/src/main/resources/assets/unicopia/models/item/record_crusade.json new file mode 100644 index 00000000..d0acdde2 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/record_crusade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:items/record_crusade" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/record_funk.json b/src/main/resources/assets/unicopia/models/item/record_funk.json new file mode 100644 index 00000000..733e7c04 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/record_funk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:items/record_funk" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/record_pet.json b/src/main/resources/assets/unicopia/models/item/record_pet.json new file mode 100644 index 00000000..d3b467ed --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/record_pet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:items/record_pet" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/record_popular.json b/src/main/resources/assets/unicopia/models/item/record_popular.json new file mode 100644 index 00000000..c38eba0c --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/record_popular.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:items/record_popular" + } +} diff --git a/src/main/resources/assets/unicopia/sounds.json b/src/main/resources/assets/unicopia/sounds.json index 941813dd..5d3127c5 100644 --- a/src/main/resources/assets/unicopia/sounds.json +++ b/src/main/resources/assets/unicopia/sounds.json @@ -39,5 +39,34 @@ "sounds": [ "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} + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/sounds/record/crusade.ogg b/src/main/resources/assets/unicopia/sounds/record/crusade.ogg new file mode 100644 index 00000000..98e16571 Binary files /dev/null and b/src/main/resources/assets/unicopia/sounds/record/crusade.ogg differ diff --git a/src/main/resources/assets/unicopia/sounds/record/funk.ogg b/src/main/resources/assets/unicopia/sounds/record/funk.ogg new file mode 100644 index 00000000..7e61aceb Binary files /dev/null and b/src/main/resources/assets/unicopia/sounds/record/funk.ogg differ diff --git a/src/main/resources/assets/unicopia/sounds/record/pet.ogg b/src/main/resources/assets/unicopia/sounds/record/pet.ogg new file mode 100644 index 00000000..6af0ee54 Binary files /dev/null and b/src/main/resources/assets/unicopia/sounds/record/pet.ogg differ diff --git a/src/main/resources/assets/unicopia/sounds/record/popular.ogg b/src/main/resources/assets/unicopia/sounds/record/popular.ogg new file mode 100644 index 00000000..20ee2a96 Binary files /dev/null and b/src/main/resources/assets/unicopia/sounds/record/popular.ogg differ diff --git a/src/main/resources/assets/unicopia/textures/entity/cuccoon.png b/src/main/resources/assets/unicopia/textures/entity/cuccoon.png new file mode 100644 index 00000000..4e894f1f Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/entity/cuccoon.png differ diff --git a/src/main/resources/assets/unicopia/textures/items/record_crusade.png b/src/main/resources/assets/unicopia/textures/items/record_crusade.png new file mode 100644 index 00000000..c8cbfda7 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/items/record_crusade.png differ diff --git a/src/main/resources/assets/unicopia/textures/items/record_funk.png b/src/main/resources/assets/unicopia/textures/items/record_funk.png new file mode 100644 index 00000000..2f5412b8 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/items/record_funk.png differ diff --git a/src/main/resources/assets/unicopia/textures/items/record_pet.png b/src/main/resources/assets/unicopia/textures/items/record_pet.png new file mode 100644 index 00000000..37702f12 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/items/record_pet.png differ diff --git a/src/main/resources/assets/unicopia/textures/items/record_popular.png b/src/main/resources/assets/unicopia/textures/items/record_popular.png new file mode 100644 index 00000000..d4ac0247 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/items/record_popular.png differ