etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed fence data tags, renamed music disc stuff to match vanilla

This commit is contained in:
Forstride 2019-06-25 19:02:54 -04:00
parent 8d9cbadd83
commit 7d459d7cb9
16 changed files with 94 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/biomesoplenty/api/item/BOPItems.java
View File

@ -29,5 +29,5 @@ public class BOPItems
public static Item hellbark_boat;
public static Item ethereal_boat;
public static Item record_wanderer;
public static Item music_disc_wanderer;
}

2
src/main/java/biomesoplenty/api/sound/BOPSounds.java
View File

@ -11,5 +11,5 @@ import net.minecraft.util.SoundEvent;
public class BOPSounds
{
public static SoundEvent records_wanderer;
public static SoundEvent music_disc_wanderer;
}

7
src/main/java/biomesoplenty/common/item/ItemRecordBOP.java → src/main/java/biomesoplenty/common/item/ItemMusicDiscBOP.java
View File

@ -10,12 +10,13 @@ package biomesoplenty.common.item;
import biomesoplenty.common.util.inventory.ItemGroupBOP;
import net.minecraft.item.Item;
import net.minecraft.item.MusicDiscItem;
import net.minecraft.item.Rarity;
import net.minecraft.util.SoundEvent;
public class ItemRecordBOP extends MusicDiscItem
public class ItemMusicDiscBOP extends MusicDiscItem
{
public ItemRecordBOP(SoundEvent record)
public ItemMusicDiscBOP(SoundEvent record)
{
super(0, record, new Item.Properties().group(ItemGroupBOP.instance));
super(0, record, new Item.Properties().group(ItemGroupBOP.instance).rarity(Rarity.RARE));
}
}

4
src/main/java/biomesoplenty/init/ModItems.java
View File

@ -9,7 +9,7 @@ package biomesoplenty.init;
import biomesoplenty.api.sound.BOPSounds;
import biomesoplenty.common.item.ItemMudball;
import biomesoplenty.common.item.ItemRecordBOP;
import biomesoplenty.common.item.ItemMusicDiscBOP;
import biomesoplenty.common.util.inventory.ItemGroupBOP;
import net.minecraft.item.Item;
import net.minecraftforge.registries.ForgeRegistries;
@ -23,7 +23,7 @@ public class ModItems
mudball = registerItem(new ItemMudball(), "mudball");
mud_brick = registerItem(new Item(new Item.Properties().group(ItemGroupBOP.instance)), "mud_brick");
record_wanderer = registerItem(new ItemRecordBOP(BOPSounds.records_wanderer), "record_wanderer");
music_disc_wanderer = registerItem(new ItemMusicDiscBOP(BOPSounds.music_disc_wanderer), "music_disc_wanderer");
/*fir_boat = registerItem(new ItemBoatBOP(EntityBoatBOP.Type.FIR, (new Item.Properties()).maxStackSize(1).group(ItemGroupBOP.instance)), "fir_boat");
redwood_boat = registerItem(new ItemBoatBOP(EntityBoatBOP.Type.REDWOOD, (new Item.Properties()).maxStackSize(1).group(ItemGroupBOP.instance)), "redwood_boat");

4
src/main/java/biomesoplenty/init/ModSounds.java
View File

@ -12,13 +12,13 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
import net.minecraftforge.registries.ForgeRegistries;
import static biomesoplenty.api.sound.BOPSounds.records_wanderer;
import static biomesoplenty.api.sound.BOPSounds.music_disc_wanderer;
public class ModSounds
{
public static void init()
{
records_wanderer = registerSound("records.wanderer");
music_disc_wanderer = registerSound("music_disc.wanderer");
}
private static SoundEvent registerSound(String soundName)

4
src/main/resources/assets/biomesoplenty/lang/en_us.json
View File

@ -100,9 +100,9 @@
"item.biomesoplenty.mahogany_boat": "Mahogany Boat",
"item.biomesoplenty.mud_brick": "Mud Brick",
"item.biomesoplenty.mudball": "Mud Ball",
"item.biomesoplenty.music_disc_wanderer": "Music Disc",
"item.biomesoplenty.music_disc_wanderer.desc": "Tim Rurkowski - Wanderer",
"item.biomesoplenty.palm_boat": "Palm Boat",
"item.biomesoplenty.record_wanderer": "Music Disc",
"item.biomesoplenty.record_wanderer.desc": "Tim Rurkowski - Wanderer",
"item.biomesoplenty.redwood_boat": "Redwood Boat",
"item.biomesoplenty.umbran_boat": "Umbran Boat",
"item.biomesoplenty.willow_boat": "Willow Boat",

6
src/main/resources/assets/biomesoplenty/models/item/music_disc_wanderer.json Normal file
View File

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:items/music_disc_wanderer"
}
}

6
src/main/resources/assets/biomesoplenty/models/item/record_wanderer.json
View File

@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:items/record_wanderer"
}
}

4
src/main/resources/assets/biomesoplenty/sounds.json
View File

@ -1,8 +1,8 @@
{
"records.wanderer": {
"music_disc.wanderer": {
"sounds": [
{
"name": "biomesoplenty:records/wanderer",
"name": "biomesoplenty:music_disc/wanderer",
"stream": true
}
]

0
src/main/resources/assets/biomesoplenty/sounds/records/wanderer.ogg → src/main/resources/assets/biomesoplenty/sounds/music_disc/wanderer.ogg
View File

0
src/main/resources/assets/biomesoplenty/textures/items/record_wanderer.png → src/main/resources/assets/biomesoplenty/textures/items/music_disc_wanderer.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 294 B

After

Width:  |  Height:  |  Size: 294 B

17
src/main/resources/data/minecraft/tags/blocks/small_flowers.json Normal file
View File

@ -0,0 +1,17 @@
{
"replace": false,
"values": [
"biomesoplenty:rose",
"biomesoplenty:blue_hydrangea",
"biomesoplenty:violet",
"biomesoplenty:lavender",
"biomesoplenty:goldenrod",
"biomesoplenty:wildflower",
"biomesoplenty:orange_cosmos",
"biomesoplenty:pink_daffodil",
"biomesoplenty:pink_hibiscus",
"biomesoplenty:glowflower",
"biomesoplenty:wilted_lily",
"biomesoplenty:burning_blossom"
]
}

17
src/main/resources/data/minecraft/tags/blocks/wooden_fences.json Normal file
View File

@ -0,0 +1,17 @@
{
"replace": false,
"values": [
"biomesoplenty:fir_fence",
"biomesoplenty:redwood_fence",
"biomesoplenty:cherry_fence",
"biomesoplenty:mahogany_fence",
"biomesoplenty:jacaranda_fence",
"biomesoplenty:palm_fence",
"biomesoplenty:willow_fence",
"biomesoplenty:dead_fence",
"biomesoplenty:magic_fence",
"biomesoplenty:umbran_fence",
"biomesoplenty:hellbark_fence",
"biomesoplenty:ethereal_fence"
]
}

6
src/main/resources/data/minecraft/tags/items/music_discs.json Normal file
View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"biomesoplenty:music_disc_wanderer"
]
}

17
src/main/resources/data/minecraft/tags/items/small_flowers.json Normal file
View File

@ -0,0 +1,17 @@
{
"replace": false,
"values": [
"biomesoplenty:rose",
"biomesoplenty:blue_hydrangea",
"biomesoplenty:violet",
"biomesoplenty:lavender",
"biomesoplenty:goldenrod",
"biomesoplenty:wildflower",
"biomesoplenty:orange_cosmos",
"biomesoplenty:pink_daffodil",
"biomesoplenty:pink_hibiscus",
"biomesoplenty:glowflower",
"biomesoplenty:wilted_lily",
"biomesoplenty:burning_blossom"
]
}

17
src/main/resources/data/minecraft/tags/items/wooden_fences.json Normal file
View File

@ -0,0 +1,17 @@
{
"replace": false,
"values": [
"biomesoplenty:fir_fence",
"biomesoplenty:redwood_fence",
"biomesoplenty:cherry_fence",
"biomesoplenty:mahogany_fence",
"biomesoplenty:jacaranda_fence",
"biomesoplenty:palm_fence",
"biomesoplenty:willow_fence",
"biomesoplenty:dead_fence",
"biomesoplenty:magic_fence",
"biomesoplenty:umbran_fence",
"biomesoplenty:hellbark_fence",
"biomesoplenty:ethereal_fence"
]
}