diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFruit.java b/src/main/java/biomesoplenty/common/block/BlockBOPFruit.java index 5f75f5075..623441c12 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFruit.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFruit.java @@ -31,7 +31,7 @@ public class BlockBOPFruit extends BlockBOPDecoration // add properties public static enum FruitType implements IStringSerializable { - APPLE, PERSIMMON, PEACH, PEAR; + APPLE, PERSIMMON, PEACH, PEAR, PINECONE; @Override public String getName() { @@ -100,6 +100,8 @@ public class BlockBOPFruit extends BlockBOPDecoration return BOPItems.peach; case PEAR: return BOPItems.pear; + case PINECONE: + return BOPItems.pinecone; case APPLE: default: return Items.apple; } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/fruit_block.json b/src/main/resources/assets/biomesoplenty/blockstates/fruit_block.json index 031c122f1..ef000c2aa 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/fruit_block.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/fruit_block.json @@ -3,6 +3,7 @@ "variant=apple": { "model": "biomesoplenty:apple_block" }, "variant=persimmon": { "model": "biomesoplenty:persimmon_block" }, "variant=peach": { "model": "biomesoplenty:peach_block" }, - "variant=pear": { "model": "biomesoplenty:pear_block" } + "variant=pear": { "model": "biomesoplenty:pear_block" }, + "variant=pinecone": { "model" : "biomesoplenty:pinecone_block" } } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/pinecone_block.json b/src/main/resources/assets/biomesoplenty/models/block/pinecone_block.json new file mode 100644 index 000000000..d20753063 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/pinecone_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/pinecone_block" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/pinecone_block.json b/src/main/resources/assets/biomesoplenty/models/item/pinecone_block.json new file mode 100644 index 000000000..b73a28adc --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/pinecone_block.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/pinecone_block" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pinecone_block.png b/src/main/resources/assets/biomesoplenty/textures/blocks/pinecone_block.png new file mode 100644 index 000000000..b2c17451c Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/pinecone_block.png differ