Add big flower petals
This commit is contained in:
parent
582606826e
commit
2afb01bccd
|
@ -15,8 +15,7 @@ public class BOPTreeEnums
|
||||||
|
|
||||||
public static enum AllTrees implements IStringSerializable {
|
public static enum AllTrees implements IStringSerializable {
|
||||||
|
|
||||||
// UNUSED_A and UNUSED_B are present to make the number up to 24 so that we can have 3 'pages' of 8 saplings without out-of-range index errors
|
YELLOW_AUTUMN, ORANGE_AUTUMN, BAMBOO, MAGIC, DARK, DEAD, FIR, ETHEREAL, ORIGIN, PINK_CHERRY, WHITE_CHERRY, MAPLE, HELLBARK, FLOWERING, JACARANDA, SACRED_OAK, MANGROVE, PALM, REDWOOD, WILLOW, PINE, MAHOGANY, REG_BIG_FLOWER, YELLOW_BIG_FLOWER;
|
||||||
YELLOW_AUTUMN, ORANGE_AUTUMN, BAMBOO, MAGIC, DARK, DEAD, FIR, ETHEREAL, ORIGIN, PINK_CHERRY, WHITE_CHERRY, MAPLE, HELLBARK, FLOWERING, JACARANDA, SACRED_OAK, MANGROVE, PALM, REDWOOD, WILLOW, PINE, MAHOGANY, UNUSED_A, UNUSED_B;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
|
|
|
@ -60,7 +60,14 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
|
||||||
@Override
|
@Override
|
||||||
public String getStateName(IBlockState state)
|
public String getStateName(IBlockState state)
|
||||||
{
|
{
|
||||||
return ((FourTrees) state.getValue(VARIANT)).map(this.pageNum).getName() + "_leaves";
|
AllTrees treeType = ((FourTrees) state.getValue(VARIANT)).map(this.pageNum);
|
||||||
|
switch (treeType)
|
||||||
|
{
|
||||||
|
case REG_BIG_FLOWER: case YELLOW_BIG_FLOWER:
|
||||||
|
return treeType.getName() + "_petal";
|
||||||
|
default:
|
||||||
|
return treeType.getName() + "_leaves";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlockBOPLeaves(int pageNum)
|
public BlockBOPLeaves(int pageNum)
|
||||||
|
@ -150,6 +157,8 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
|
||||||
case WILLOW:
|
case WILLOW:
|
||||||
case PINE:
|
case PINE:
|
||||||
case MAHOGANY:
|
case MAHOGANY:
|
||||||
|
case REG_BIG_FLOWER:
|
||||||
|
case YELLOW_BIG_FLOWER:
|
||||||
default:
|
default:
|
||||||
fruit = new ItemStack(Items.apple, 1, 0);
|
fruit = new ItemStack(Items.apple, 1, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
"check_decay=true,decayable=false,variant=b": { "model": "biomesoplenty:mahogany_leaves" },
|
"check_decay=true,decayable=false,variant=b": { "model": "biomesoplenty:mahogany_leaves" },
|
||||||
"check_decay=false,decayable=true,variant=b": { "model": "biomesoplenty:mahogany_leaves" },
|
"check_decay=false,decayable=true,variant=b": { "model": "biomesoplenty:mahogany_leaves" },
|
||||||
"check_decay=false,decayable=false,variant=b": { "model": "biomesoplenty:mahogany_leaves" },
|
"check_decay=false,decayable=false,variant=b": { "model": "biomesoplenty:mahogany_leaves" },
|
||||||
"check_decay=true,decayable=true,variant=c": { "model": "biomesoplenty:yellow_autumn_leaves" },
|
"check_decay=true,decayable=true,variant=c": { "model": "biomesoplenty:red_big_flower_petal" },
|
||||||
"check_decay=true,decayable=false,variant=c": { "model": "biomesoplenty:yellow_autumn_leaves" },
|
"check_decay=true,decayable=false,variant=c": { "model": "biomesoplenty:red_big_flower_petal" },
|
||||||
"check_decay=false,decayable=true,variant=c": { "model": "biomesoplenty:yellow_autumn_leaves" },
|
"check_decay=false,decayable=true,variant=c": { "model": "biomesoplenty:red_big_flower_petal" },
|
||||||
"check_decay=false,decayable=false,variant=c": { "model": "biomesoplenty:yellow_autumn_leaves" },
|
"check_decay=false,decayable=false,variant=c": { "model": "biomesoplenty:red_big_flower_petal" },
|
||||||
"check_decay=true,decayable=true,variant=d": { "model": "biomesoplenty:yellow_autumn_leaves" },
|
"check_decay=true,decayable=true,variant=d": { "model": "biomesoplenty:yellow_big_flower_petal" },
|
||||||
"check_decay=true,decayable=false,variant=d": { "model": "biomesoplenty:yellow_autumn_leaves" },
|
"check_decay=true,decayable=false,variant=d": { "model": "biomesoplenty:yellow_big_flower_petal" },
|
||||||
"check_decay=false,decayable=true,variant=d": { "model": "biomesoplenty:yellow_autumn_leaves" },
|
"check_decay=false,decayable=true,variant=d": { "model": "biomesoplenty:yellow_big_flower_petal" },
|
||||||
"check_decay=false,decayable=false,variant=d": { "model": "biomesoplenty:yellow_autumn_leaves" }
|
"check_decay=false,decayable=false,variant=d": { "model": "biomesoplenty:yellow_big_flower_petal" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
"stage=1,variant=e": { "model": "biomesoplenty:pine_sapling" },
|
"stage=1,variant=e": { "model": "biomesoplenty:pine_sapling" },
|
||||||
"stage=0,variant=f": { "model": "biomesoplenty:mahogany_sapling" },
|
"stage=0,variant=f": { "model": "biomesoplenty:mahogany_sapling" },
|
||||||
"stage=1,variant=f": { "model": "biomesoplenty:mahogany_sapling" },
|
"stage=1,variant=f": { "model": "biomesoplenty:mahogany_sapling" },
|
||||||
"stage=0,variant=g": { "model": "biomesoplenty:yellow_autumn_sapling" },
|
"stage=0,variant=g": { "model": "biomesoplenty:red_big_flower_sapling" },
|
||||||
"stage=1,variant=g": { "model": "biomesoplenty:yellow_autumn_sapling" },
|
"stage=1,variant=g": { "model": "biomesoplenty:red_big_flower_sapling" },
|
||||||
"stage=0,variant=h": { "model": "biomesoplenty:yellow_autumn_sapling" },
|
"stage=0,variant=h": { "model": "biomesoplenty:yellow_big_flower_sapling" },
|
||||||
"stage=1,variant=h": { "model": "biomesoplenty:yellow_autumn_sapling" }
|
"stage=1,variant=h": { "model": "biomesoplenty:yellow_big_flower_sapling" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "block/cube_all",
|
||||||
|
"textures": {
|
||||||
|
"all": "biomesoplenty:blocks/petal_red_big_flower"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "block/cross",
|
||||||
|
"textures": {
|
||||||
|
"cross": "biomesoplenty:blocks/sapling_red_big_flower"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "block/cube_all",
|
||||||
|
"textures": {
|
||||||
|
"all": "biomesoplenty:blocks/petal_yellow_big_flower"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "block/cross",
|
||||||
|
"textures": {
|
||||||
|
"cross": "biomesoplenty:blocks/sapling_yellow_big_flower"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"parent": "biomesoplenty:block/red_big_flower_petal",
|
||||||
|
"display": {
|
||||||
|
"thirdperson": {
|
||||||
|
"rotation": [ 10, -45, 170 ],
|
||||||
|
"translation": [ 0, 1.5, -2.75 ],
|
||||||
|
"scale": [ 0.375, 0.375, 0.375 ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"parent": "builtin/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "biomesoplenty:blocks/sapling_red_big_flower"
|
||||||
|
},
|
||||||
|
"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 ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"parent": "biomesoplenty:block/yellow_big_flower_petal",
|
||||||
|
"display": {
|
||||||
|
"thirdperson": {
|
||||||
|
"rotation": [ 10, -45, 170 ],
|
||||||
|
"translation": [ 0, 1.5, -2.75 ],
|
||||||
|
"scale": [ 0.375, 0.375, 0.375 ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"parent": "builtin/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "biomesoplenty:blocks/sapling_yellow_big_flower"
|
||||||
|
},
|
||||||
|
"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 ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 562 B |
Binary file not shown.
After Width: | Height: | Size: 586 B |
Loading…
Reference in New Issue