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

Even more stuff

This commit is contained in:
Forstride 2019-01-11 12:47:31 -05:00
parent aa6a51a2f7
commit a67b28bbd2
49 changed files with 69 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/biomesoplenty/api/block/BOPBlocks.java
View File

@ -19,9 +19,9 @@ public class BOPBlocks
public static Block white_sand;
public static Block white_sandstone;
public static Block smooth_white_sandstone;
public static Block cut_white_sandstone;
public static Block chiseled_white_sandstone;
public static Block smooth_white_sandstone;
public static Block white_sandstone_slab;
public static Block white_sandstone_stairs;

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

@ -13,10 +13,11 @@ public class BOPItems
{
public static Item bop_icon;
public static Item fleshchunk;
public static Item mudball;
public static Item ash;
public static Item mud_brick;
public static Item pile_of_ashes;
public static Item chunk_of_flesh;
public static Item fir_boat;
public static Item redwood_boat;

2
src/main/java/biomesoplenty/common/block/BlockAsh.java
View File

@ -42,7 +42,7 @@ public class BlockAsh extends Block
@Override
public IItemProvider getItemDropped(IBlockState state, World worldIn, BlockPos pos, int fortune)
{
return BOPItems.ash;
return BOPItems.pile_of_ashes;
}
@Override

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

@ -44,9 +44,9 @@ public class ModBlocks
{
white_sand = registerBlock(new BlockSand(0xF3F1E4, Block.Builder.create(Material.SAND, MapColor.QUARTZ).hardnessAndResistance(0.5F).sound(SoundType.SAND)), "white_sand");
white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(0.8F)), "white_sandstone");
smooth_white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(2.0F, 6.0F)), "smooth_white_sandstone");
chiseled_white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(0.8F)), "chiseled_white_sandstone");
cut_white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(0.8F)), "cut_white_sandstone");
smooth_white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(2.0F, 6.0F)), "smooth_white_sandstone");
white_sandstone_slab = registerBlock(new BlockSlab(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(2.0F, 6.0F)), "white_sandstone_slab");
white_sandstone_stairs = registerBlock(new BlockStairs(white_sandstone.getDefaultState(), Block.Builder.from(white_sandstone)), "white_sandstone_stairs");
@ -68,7 +68,7 @@ public class ModBlocks
orange_autumn_leaves = registerBlock(new BlockLeavesBOP(Block.Builder.create(Material.LEAVES).hardnessAndResistance(0.2F).needsRandomTick().sound(SoundType.PLANT)), "orange_autumn_leaves");
//maple_sapling
maple_leaves = registerBlock(new BlockLeavesBOP(Block.Builder.create(Material.LEAVES).hardnessAndResistance(0.2F).needsRandomTick().sound(SoundType.PLANT)), "maple_leaves");
//fir_sapling
fir_leaves = registerBlock(new BlockLeavesBOP(Block.Builder.create(Material.LEAVES).hardnessAndResistance(0.2F).needsRandomTick().sound(SoundType.PLANT)), "fir_leaves");
fir_log = registerBlock(new BlockLog(MapColor.WOOD, Block.Builder.create(Material.WOOD, MapColor.OBSIDIAN).hardnessAndResistance(2.0F).sound(SoundType.WOOD)), "fir_log");

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

@ -22,8 +22,8 @@ public class ModItems
// TODO: This should be ItemMudball
mudball = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "mudball");
mud_brick = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "mud_brick");
ash = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "ash");
fleshchunk = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "fleshchunk");
pile_of_ashes = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "pile_of_ashes");
chunk_of_flesh = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "chunk_of_flesh");
record_wanderer = registerItem(new ItemBOPRecord(BOPSounds.records_wanderer), "record_wanderer");

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

@ -22,12 +22,11 @@
"effect.biomesoplenty.curse": "Curse",
"item.biomesoplenty.ash": "Pile of Ashes",
"item.biomesoplenty.bop_icon": "BOP Icon",
"item.biomesoplenty.cherry_boat": "Cherry Boat",
"item.biomesoplenty.chunk_of_flesh": "Chunk of Flesh",
"item.biomesoplenty.ethereal_boat": "Ethereal Boat",
"item.biomesoplenty.fir_boat": "Fir Boat",
"item.biomesoplenty.fleshchunk": "Chunk of Flesh",
"item.biomesoplenty.hellbark_boat": "Hellbark Boat",
"item.biomesoplenty.jacaranda_boat": "Jacaranda Boat",
"item.biomesoplenty.magic_boat": "Magic Boat",
@ -35,6 +34,7 @@
"item.biomesoplenty.mud_brick": "Mud Brick",
"item.biomesoplenty.mudball": "Mud Ball",
"item.biomesoplenty.palm_boat": "Palm Boat",
"item.biomesoplenty.pile_of_ashes": "Pile of Ashes",
"item.biomesoplenty.record_wanderer": "Music Disc",
"item.biomesoplenty.record_wanderer.desc": "Tim Rurkowski - Wanderer",
"item.biomesoplenty.redwood_boat": "Redwood Boat",

4
src/main/resources/assets/biomesoplenty/models/block/chiseled_white_sandstone.json
View File

@ -1,7 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "biomesoplenty:block/white_sandstone_top",
"side": "biomesoplenty:block/chiseled_white_sandstone"
"end": "biomesoplenty:blocks/white_sandstone_top",
"side": "biomesoplenty:blocks/chiseled_white_sandstone"
}
}

4
src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone.json
View File

@ -1,7 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "biomesoplenty:block/white_sandstone_top",
"side": "biomesoplenty:block/cut_white_sandstone"
"end": "biomesoplenty:blocks/white_sandstone_top",
"side": "biomesoplenty:blocks/cut_white_sandstone"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/slab",
"textures": {
"bottom": "biomesoplenty:block/mud_brick_bottom",
"top": "biomesoplenty:block/mud_brick_top",
"side": "biomesoplenty:block/mud_brick_block"
"bottom": "biomesoplenty:blocks/mud_brick_block",
"top": "biomesoplenty:blocks/mud_brick_block",
"side": "biomesoplenty:blocks/mud_brick_block"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab_top.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/slab_top",
"textures": {
"bottom": "biomesoplenty:block/mud_brick_bottom",
"top": "biomesoplenty:block/mud_brick_top",
"side": "biomesoplenty:block/mud_brick_block"
"bottom": "biomesoplenty:blocks/mud_brick_block",
"top": "biomesoplenty:blocks/mud_brick_block",
"side": "biomesoplenty:blocks/mud_brick_block"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "biomesoplenty:block/mud_brick_bottom",
"top": "biomesoplenty:block/mud_brick_top",
"side": "biomesoplenty:block/mud_brick_block"
"bottom": "biomesoplenty:blocks/mud_brick_block",
"top": "biomesoplenty:blocks/mud_brick_block",
"side": "biomesoplenty:blocks/mud_brick_block"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_inner.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "biomesoplenty:block/mud_brick_bottom",
"top": "biomesoplenty:block/mud_brick_top",
"side": "biomesoplenty:block/mud_brick_block"
"bottom": "biomesoplenty:blocks/mud_brick_block",
"top": "biomesoplenty:blocks/mud_brick_block",
"side": "biomesoplenty:blocks/mud_brick_block"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_outer.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "biomesoplenty:block/mud_brick_bottom",
"top": "biomesoplenty:block/mud_brick_top",
"side": "biomesoplenty:block/mud_brick_block"
"bottom": "biomesoplenty:blocks/mud_brick_block",
"top": "biomesoplenty:blocks/mud_brick_block",
"side": "biomesoplenty:blocks/mud_brick_block"
}
}

2
src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone.json
View File

@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "biomesoplenty:block/white_sandstone_top"
"all": "biomesoplenty:blocks/white_sandstone_top"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/white_sandstone.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/cube_bottom_top",
"textures": {
"bottom": "biomesoplenty:block/white_sandstone_bottom",
"top": "biomesoplenty:block/white_sandstone_top",
"side": "biomesoplenty:block/white_sandstone"
"bottom": "biomesoplenty:blocks/white_sandstone_bottom",
"top": "biomesoplenty:blocks/white_sandstone_top",
"side": "biomesoplenty:blocks/white_sandstone"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/slab",
"textures": {
"bottom": "biomesoplenty:block/white_sandstone_bottom",
"top": "biomesoplenty:block/white_sandstone_top",
"side": "biomesoplenty:block/white_sandstone"
"bottom": "biomesoplenty:blocks/white_sandstone_bottom",
"top": "biomesoplenty:blocks/white_sandstone_top",
"side": "biomesoplenty:blocks/white_sandstone"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab_top.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/slab_top",
"textures": {
"bottom": "biomesoplenty:block/white_sandstone_bottom",
"top": "biomesoplenty:block/white_sandstone_top",
"side": "biomesoplenty:block/white_sandstone"
"bottom": "biomesoplenty:blocks/white_sandstone_bottom",
"top": "biomesoplenty:blocks/white_sandstone_top",
"side": "biomesoplenty:blocks/white_sandstone"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "biomesoplenty:block/white_sandstone_bottom",
"top": "biomesoplenty:block/white_sandstone_top",
"side": "biomesoplenty:block/white_sandstone"
"bottom": "biomesoplenty:blocks/white_sandstone_bottom",
"top": "biomesoplenty:blocks/white_sandstone_top",
"side": "biomesoplenty:blocks/white_sandstone"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_inner.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "biomesoplenty:block/white_sandstone_bottom",
"top": "biomesoplenty:block/white_sandstone_top",
"side": "biomesoplenty:block/white_sandstone"
"bottom": "biomesoplenty:blocks/white_sandstone_bottom",
"top": "biomesoplenty:blocks/white_sandstone_top",
"side": "biomesoplenty:blocks/white_sandstone"
}
}

6
src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_outer.json
View File

@ -1,8 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "biomesoplenty:block/white_sandstone_bottom",
"top": "biomesoplenty:block/white_sandstone_top",
"side": "biomesoplenty:block/white_sandstone"
"bottom": "biomesoplenty:blocks/white_sandstone_bottom",
"top": "biomesoplenty:blocks/white_sandstone_top",
"side": "biomesoplenty:blocks/white_sandstone"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/fleshchunk.json → src/main/resources/assets/biomesoplenty/models/item/chunk_of_flesh.json
View File

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

2
src/main/resources/assets/biomesoplenty/models/item/dead_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/dead_sapling"
"layer0": "biomesoplenty:blocks/dead_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/ethereal_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/ethereal_sapling"
"layer0": "biomesoplenty:blocks/ethereal_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/fir_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/fir_sapling"
"layer0": "biomesoplenty:blocks/fir_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/flowering_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/flowering_sapling"
"layer0": "biomesoplenty:blocks/flowering_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/hellbark_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/hellbark_sapling"
"layer0": "biomesoplenty:blocks/hellbark_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/jacaranda_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/jacaranda_sapling"
"layer0": "biomesoplenty:blocks/jacaranda_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/magic_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/magic_sapling"
"layer0": "biomesoplenty:blocks/magic_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/mahogany_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/mahogany_sapling"
"layer0": "biomesoplenty:blocks/mahogany_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/maple_sapling"
"layer0": "biomesoplenty:blocks/maple_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/orange_autumn_sapling"
"layer0": "biomesoplenty:blocks/orange_autumn_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/origin_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/origin_sapling"
"layer0": "biomesoplenty:blocks/origin_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/palm_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/palm_sapling"
"layer0": "biomesoplenty:blocks/palm_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/ash.json → src/main/resources/assets/biomesoplenty/models/item/pile_of_ashes.json
View File

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

2
src/main/resources/assets/biomesoplenty/models/item/pink_cherry_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/pink_cherry_sapling"
"layer0": "biomesoplenty:blocks/pink_cherry_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/redwood_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/redwood_sapling"
"layer0": "biomesoplenty:blocks/redwood_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/umbran_sapling"
"layer0": "biomesoplenty:blocks/umbran_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/white_cherry_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/white_cherry_sapling"
"layer0": "biomesoplenty:blocks/white_cherry_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/willow_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/willow_sapling"
"layer0": "biomesoplenty:blocks/willow_sapling"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/yellow_autumn_sapling"
"layer0": "biomesoplenty:blocks/yellow_autumn_sapling"
}
}

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 747 B

After

Width:  |  Height:  |  Size: 530 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 873 B

After

Width:  |  Height:  |  Size: 509 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_trapdoor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 425 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 446 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 459 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 424 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 407 B

0
src/main/resources/assets/biomesoplenty/textures/items/fleshchunk.png → src/main/resources/assets/biomesoplenty/textures/items/chunk_of_flesh.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 434 B

After

Width:  |  Height:  |  Size: 434 B

0
src/main/resources/assets/biomesoplenty/textures/items/ash.png → src/main/resources/assets/biomesoplenty/textures/items/pile_of_ashes.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B