diff --git a/src/main/java/biomesoplenty/api/block/BOPTreeEnums.java b/src/main/java/biomesoplenty/api/block/BOPTreeEnums.java index b2bd076a1..409e02d6d 100644 --- a/src/main/java/biomesoplenty/api/block/BOPTreeEnums.java +++ b/src/main/java/biomesoplenty/api/block/BOPTreeEnums.java @@ -15,8 +15,7 @@ public class BOPTreeEnums 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, UNUSED_A, UNUSED_B; + 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; @Override public String getName() { diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java index 6cc41eb04..0645d4fec 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java @@ -60,7 +60,14 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock @Override 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) @@ -150,6 +157,8 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock case WILLOW: case PINE: case MAHOGANY: + case REG_BIG_FLOWER: + case YELLOW_BIG_FLOWER: default: fruit = new ItemStack(Items.apple, 1, 0); } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/leaves_5.json b/src/main/resources/assets/biomesoplenty/blockstates/leaves_5.json index 8d6678706..7595e46d8 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/leaves_5.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/leaves_5.json @@ -8,13 +8,13 @@ "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=false,variant=b": { "model": "biomesoplenty:mahogany_leaves" }, - "check_decay=true,decayable=true,variant=c": { "model": "biomesoplenty:yellow_autumn_leaves" }, - "check_decay=true,decayable=false,variant=c": { "model": "biomesoplenty:yellow_autumn_leaves" }, - "check_decay=false,decayable=true,variant=c": { "model": "biomesoplenty:yellow_autumn_leaves" }, - "check_decay=false,decayable=false,variant=c": { "model": "biomesoplenty:yellow_autumn_leaves" }, - "check_decay=true,decayable=true,variant=d": { "model": "biomesoplenty:yellow_autumn_leaves" }, - "check_decay=true,decayable=false,variant=d": { "model": "biomesoplenty:yellow_autumn_leaves" }, - "check_decay=false,decayable=true,variant=d": { "model": "biomesoplenty:yellow_autumn_leaves" }, - "check_decay=false,decayable=false,variant=d": { "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:red_big_flower_petal" }, + "check_decay=false,decayable=true,variant=c": { "model": "biomesoplenty:red_big_flower_petal" }, + "check_decay=false,decayable=false,variant=c": { "model": "biomesoplenty:red_big_flower_petal" }, + "check_decay=true,decayable=true,variant=d": { "model": "biomesoplenty:yellow_big_flower_petal" }, + "check_decay=true,decayable=false,variant=d": { "model": "biomesoplenty:yellow_big_flower_petal" }, + "check_decay=false,decayable=true,variant=d": { "model": "biomesoplenty:yellow_big_flower_petal" }, + "check_decay=false,decayable=false,variant=d": { "model": "biomesoplenty:yellow_big_flower_petal" } } } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/sapling_2.json b/src/main/resources/assets/biomesoplenty/blockstates/sapling_2.json index 8fa7ae912..adbcef66e 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/sapling_2.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/sapling_2.json @@ -12,9 +12,9 @@ "stage=1,variant=e": { "model": "biomesoplenty:pine_sapling" }, "stage=0,variant=f": { "model": "biomesoplenty:mahogany_sapling" }, "stage=1,variant=f": { "model": "biomesoplenty:mahogany_sapling" }, - "stage=0,variant=g": { "model": "biomesoplenty:yellow_autumn_sapling" }, - "stage=1,variant=g": { "model": "biomesoplenty:yellow_autumn_sapling" }, - "stage=0,variant=h": { "model": "biomesoplenty:yellow_autumn_sapling" }, - "stage=1,variant=h": { "model": "biomesoplenty:yellow_autumn_sapling" } + "stage=0,variant=g": { "model": "biomesoplenty:red_big_flower_sapling" }, + "stage=1,variant=g": { "model": "biomesoplenty:red_big_flower_sapling" }, + "stage=0,variant=h": { "model": "biomesoplenty:yellow_big_flower_sapling" }, + "stage=1,variant=h": { "model": "biomesoplenty:yellow_big_flower_sapling" } } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/red_big_flower_petal.json b/src/main/resources/assets/biomesoplenty/models/block/red_big_flower_petal.json new file mode 100644 index 000000000..fe70d5284 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/red_big_flower_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/petal_red_big_flower" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/red_big_flower_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/red_big_flower_sapling.json new file mode 100644 index 000000000..1ab18c976 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/red_big_flower_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/sapling_red_big_flower" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/yellow_big_flower_petal.json b/src/main/resources/assets/biomesoplenty/models/block/yellow_big_flower_petal.json new file mode 100644 index 000000000..6f5ae01d2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/yellow_big_flower_petal.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/petal_yellow_big_flower" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/yellow_big_flower_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/yellow_big_flower_sapling.json new file mode 100644 index 000000000..30dd8653d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/yellow_big_flower_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/sapling_yellow_big_flower" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/red_big_flower_petal.json b/src/main/resources/assets/biomesoplenty/models/item/red_big_flower_petal.json new file mode 100644 index 000000000..a48d2c4d2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/red_big_flower_petal.json @@ -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 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/red_big_flower_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/red_big_flower_sapling.json new file mode 100644 index 000000000..0721e5f7d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/red_big_flower_sapling.json @@ -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 ] + } + } +} + diff --git a/src/main/resources/assets/biomesoplenty/models/item/yellow_big_flower_petal.json b/src/main/resources/assets/biomesoplenty/models/item/yellow_big_flower_petal.json new file mode 100644 index 000000000..f3686a8bf --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/yellow_big_flower_petal.json @@ -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 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/yellow_big_flower_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/yellow_big_flower_sapling.json new file mode 100644 index 000000000..91a899d00 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/yellow_big_flower_sapling.json @@ -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 ] + } + } +} + diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/petal_red_big_flower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/petal_red_big_flower.png new file mode 100644 index 000000000..2aa1e5728 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/petal_red_big_flower.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/petal_yellow_big_flower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/petal_yellow_big_flower.png new file mode 100644 index 000000000..2c51e0f54 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/petal_yellow_big_flower.png differ