From b6e4608ef2fcda83a4b7870916de2ab282a1b984 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Tue, 3 Aug 2021 03:18:12 +0300 Subject: [PATCH] Flammalix (WIP) --- .../ru/betterend/blocks/FlammalixBlock.java | 36 +++ .../ru/betterend/blocks/PallidiumBlock.java | 2 +- .../java/ru/betterend/registry/EndBlocks.java | 3 + .../betterend/blockstates/flammalix.json | 22 ++ .../betterend/models/block/flammalix_1.json | 262 ++++++++++++++++++ .../betterend/models/block/flammalix_2.json | 186 +++++++++++++ .../betterend/models/block/flammalix_3.json | 175 ++++++++++++ .../betterend/models/block/flammalix_4.json | 99 +++++++ .../models/block/flammalix_potted.json | 99 +++++++ .../betterend/textures/block/flammalix.png | Bin 0 -> 218 bytes .../betterend/textures/block/flammalix_e.png | Bin 0 -> 193 bytes 11 files changed, 883 insertions(+), 1 deletion(-) create mode 100644 src/main/java/ru/betterend/blocks/FlammalixBlock.java create mode 100644 src/main/resources/assets/betterend/blockstates/flammalix.json create mode 100644 src/main/resources/assets/betterend/models/block/flammalix_1.json create mode 100644 src/main/resources/assets/betterend/models/block/flammalix_2.json create mode 100644 src/main/resources/assets/betterend/models/block/flammalix_3.json create mode 100644 src/main/resources/assets/betterend/models/block/flammalix_4.json create mode 100644 src/main/resources/assets/betterend/models/block/flammalix_potted.json create mode 100644 src/main/resources/assets/betterend/textures/block/flammalix.png create mode 100644 src/main/resources/assets/betterend/textures/block/flammalix_e.png diff --git a/src/main/java/ru/betterend/blocks/FlammalixBlock.java b/src/main/java/ru/betterend/blocks/FlammalixBlock.java new file mode 100644 index 00000000..d9414d9d --- /dev/null +++ b/src/main/java/ru/betterend/blocks/FlammalixBlock.java @@ -0,0 +1,36 @@ +package ru.betterend.blocks; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; +import ru.betterend.blocks.basis.EndPlantBlock; +import ru.betterend.registry.EndBlocks; + +public class FlammalixBlock extends EndPlantBlock { + private static final VoxelShape SHAPE = Block.box(2, 0, 2, 14, 14, 14); + + public FlammalixBlock() { + super(false, 12); + } + + @Override + protected boolean isTerrain(BlockState state) { + return state.is(EndBlocks.PALLIDIUM_FULL) || + state.is(EndBlocks.PALLIDIUM_HEAVY) || + state.is(EndBlocks.PALLIDIUM_THIN) || + state.is(EndBlocks.PALLIDIUM_TINY); + } + + @Override + public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { + return SHAPE; + } + + @Override + public OffsetType getOffsetType() { + return OffsetType.NONE; + } +} diff --git a/src/main/java/ru/betterend/blocks/PallidiumBlock.java b/src/main/java/ru/betterend/blocks/PallidiumBlock.java index 42f17049..593f5f45 100644 --- a/src/main/java/ru/betterend/blocks/PallidiumBlock.java +++ b/src/main/java/ru/betterend/blocks/PallidiumBlock.java @@ -44,7 +44,7 @@ public class PallidiumBlock extends EndTerrainBlock { return InteractionResult.PASS; } else if (level.isClientSide) { - return InteractionResult.CONSUME; + return InteractionResult.PASS; } ItemStack itemStack = player.getItemInHand(hand); diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index a9374f66..d1c7ff36 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -66,6 +66,7 @@ import ru.betterend.blocks.FilaluxBlock; import ru.betterend.blocks.FilaluxLanternBlock; import ru.betterend.blocks.FilaluxWingsBlock; import ru.betterend.blocks.FlamaeaBlock; +import ru.betterend.blocks.FlammalixBlock; import ru.betterend.blocks.FlowerPotBlock; import ru.betterend.blocks.GlowingHymenophoreBlock; import ru.betterend.blocks.GlowingMossBlock; @@ -126,6 +127,7 @@ import ru.betterend.blocks.UmbrellaTreeClusterEmptyBlock; import ru.betterend.blocks.UmbrellaTreeMembraneBlock; import ru.betterend.blocks.UmbrellaTreeSaplingBlock; import ru.betterend.blocks.VentBubbleColumnBlock; +import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.blocks.basis.EndTerrainBlock; import ru.betterend.blocks.basis.EndTripleTerrain; import ru.betterend.blocks.basis.EndUnderwaterWallPlantBlock; @@ -332,6 +334,7 @@ public class EndBlocks extends BlockRegistry { public static final Block LUTEBUS = registerBlock("lutebus", new TerrainPlantBlock(RUTISCUS)); public static final Block LAMELLARIUM = registerBlock("lamellarium", new TerrainPlantBlock(RUTISCUS)); public static final Block INFLEXIA = registerBlock("inflexia", new TerrainPlantBlock(PALLIDIUM_FULL, PALLIDIUM_HEAVY, PALLIDIUM_THIN, PALLIDIUM_TINY)); + public static final Block FLAMMALIX = registerBlock("flammalix", new FlammalixBlock()); public static final Block BLUE_VINE_SEED = registerBlock("blue_vine_seed", new BlueVineSeedBlock()); public static final Block BLUE_VINE = registerEndBlockOnly("blue_vine", new BlueVineBlock()); diff --git a/src/main/resources/assets/betterend/blockstates/flammalix.json b/src/main/resources/assets/betterend/blockstates/flammalix.json new file mode 100644 index 00000000..9e6c8183 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/flammalix.json @@ -0,0 +1,22 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/flammalix_1" }, + { "model": "betterend:block/flammalix_1", "y": 90 }, + { "model": "betterend:block/flammalix_1", "y": 180 }, + { "model": "betterend:block/flammalix_1", "y": 270 }, + { "model": "betterend:block/flammalix_2" }, + { "model": "betterend:block/flammalix_2", "y": 90 }, + { "model": "betterend:block/flammalix_2", "y": 180 }, + { "model": "betterend:block/flammalix_2", "y": 270 }, + { "model": "betterend:block/flammalix_3" }, + { "model": "betterend:block/flammalix_3", "y": 90 }, + { "model": "betterend:block/flammalix_3", "y": 180 }, + { "model": "betterend:block/flammalix_3", "y": 270 }, + { "model": "betterend:block/flammalix_4" }, + { "model": "betterend:block/flammalix_4", "y": 90 }, + { "model": "betterend:block/flammalix_4", "y": 180 }, + { "model": "betterend:block/flammalix_4", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/models/block/flammalix_1.json b/src/main/resources/assets/betterend/models/block/flammalix_1.json new file mode 100644 index 00000000..c48b5237 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flammalix_1.json @@ -0,0 +1,262 @@ +{ + "credit": "Made with Blockbench", + "parent": "block", + "textures": { + "0": "betterend:block/flammalix", + "particle": "betterend:block/flammalix" + }, + "elements": [ + { + "name": "stem", + "from": [4, 0, 4], + "to": [5, 3, 5], + "faces": { + "north": {"uv": [14, 6, 15, 9], "texture": "#0"}, + "east": {"uv": [14, 6, 15, 9], "texture": "#0"}, + "south": {"uv": [14, 6, 15, 9], "texture": "#0"}, + "west": {"uv": [14, 6, 15, 9], "texture": "#0"} + } + }, + { + "name": "cap_outside", + "from": [2, 3, 2], + "to": [7, 7, 7], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "cap_inside", + "from": [7, 3, 2], + "to": [2, 7, 7], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [3, 4, 3], + "to": [6, 7, 6], + "shade": false, + "faces": { + "north": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "east": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "south": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 9], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [3, 2, 3], + "to": [6, 3, 6], + "shade": false, + "faces": { + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "stem_thick", + "from": [10.5, 0, 5.5], + "to": [12.5, 2, 7.5], + "faces": { + "north": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "east": {"uv": [7, 6, 9, 8], "texture": "#0"}, + "south": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "west": {"uv": [7, 6, 9, 8], "texture": "#0"} + } + }, + { + "name": "stem_upper", + "from": [11, 2, 6], + "to": [12, 5, 7], + "faces": { + "north": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "east": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "south": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "west": {"uv": [14, 4, 15, 7], "texture": "#0"} + } + }, + { + "name": "cap_outside", + "from": [9, 3, 4], + "to": [14, 7, 9], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "cap_inside", + "from": [14, 3, 4], + "to": [9, 7, 9], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [10, 5, 5], + "to": [13, 8, 8], + "shade": false, + "faces": { + "north": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "east": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "south": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 9], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [10, 2, 5], + "to": [13, 3, 8], + "shade": false, + "faces": { + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "stem_thick", + "from": [6, 0, 12], + "to": [8, 3, 14], + "faces": { + "north": {"uv": [6, 6, 8, 9], "texture": "#0"}, + "east": {"uv": [7, 6, 9, 9], "texture": "#0"}, + "south": {"uv": [6, 6, 8, 9], "texture": "#0"}, + "west": {"uv": [7, 6, 9, 9], "texture": "#0"} + } + }, + { + "name": "stem_upper", + "from": [6.5, 4, 12.5], + "to": [7.5, 9, 13.5], + "faces": { + "north": {"uv": [14, 4, 15, 9], "texture": "#0"}, + "east": {"uv": [14, 4, 15, 9], "texture": "#0"}, + "south": {"uv": [14, 4, 15, 9], "texture": "#0"}, + "west": {"uv": [14, 4, 15, 9], "texture": "#0"} + } + }, + { + "name": "cap_outside", + "from": [4, 4, 10], + "to": [10, 8, 16], + "shade": false, + "faces": { + "north": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [0, 10, 6, 16], "texture": "#0"} + } + }, + { + "name": "cap_inside", + "from": [10, 4, 10], + "to": [4, 8, 16], + "shade": false, + "faces": { + "north": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [0, 10, 6, 16], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [5.5, 8, 11.5], + "to": [8.5, 12, 14.5], + "shade": false, + "faces": { + "north": {"uv": [13, 0, 16, 4], "texture": "#0"}, + "east": {"uv": [13, 0, 16, 4], "texture": "#0"}, + "south": {"uv": [13, 0, 16, 4], "texture": "#0"}, + "west": {"uv": [13, 0, 16, 4], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 9], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "bottom", + "from": [5, 3, 11], + "to": [9, 4, 15], + "shade": false, + "faces": { + "north": {"uv": [7, 4, 11, 5], "texture": "#0"}, + "east": {"uv": [7, 4, 11, 5], "texture": "#0"}, + "south": {"uv": [7, 4, 11, 5], "texture": "#0"}, + "west": {"uv": [7, 4, 11, 5], "texture": "#0"}, + "down": {"uv": [1, 11, 5, 15], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "small", + "origin": [0, 0, 0], + "color": 0, + "children": [0, + { + "name": "cap", + "origin": [8, 8, 8], + "color": 0, + "children": [1, 2] + }, 3, 4] + }, + { + "name": "medium", + "origin": [0, 0, 0], + "color": 0, + "children": [5, 6, + { + "name": "cap", + "origin": [8, 8, 8], + "color": 0, + "children": [7, 8] + }, 9, 10] + }, + { + "name": "large", + "origin": [0, 0, 0], + "color": 0, + "children": [11, 12, + { + "name": "cap", + "origin": [8, 8, 8], + "color": 0, + "children": [13, 14] + }, 15, 16] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flammalix_2.json b/src/main/resources/assets/betterend/models/block/flammalix_2.json new file mode 100644 index 00000000..64834212 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flammalix_2.json @@ -0,0 +1,186 @@ +{ + "credit": "Made with Blockbench", + "parent": "block", + "textures": { + "0": "betterend:block/flammalix", + "particle": "betterend:block/flammalix" + }, + "elements": [ + { + "name": "stem_thick", + "from": [9.5, 0, 2.5], + "to": [11.5, 2, 4.5], + "faces": { + "north": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "east": {"uv": [7, 6, 9, 8], "texture": "#0"}, + "south": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "west": {"uv": [7, 6, 9, 8], "texture": "#0"} + } + }, + { + "name": "stem_upper", + "from": [10, 2, 3], + "to": [11, 5, 4], + "faces": { + "north": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "east": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "south": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "west": {"uv": [14, 4, 15, 7], "texture": "#0"} + } + }, + { + "name": "cap_outside", + "from": [8, 3, 1], + "to": [13, 7, 6], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "cap_inside", + "from": [13, 3, 1], + "to": [8, 7, 6], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [9, 5, 2], + "to": [12, 8, 5], + "shade": false, + "faces": { + "north": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "east": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "south": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 9], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [9, 2, 2], + "to": [12, 3, 5], + "shade": false, + "faces": { + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "stem_thick", + "from": [4, 0, 10], + "to": [6, 3, 12], + "faces": { + "north": {"uv": [6, 6, 8, 9], "texture": "#0"}, + "east": {"uv": [7, 6, 9, 9], "texture": "#0"}, + "south": {"uv": [6, 6, 8, 9], "texture": "#0"}, + "west": {"uv": [7, 6, 9, 9], "texture": "#0"} + } + }, + { + "name": "stem_upper", + "from": [4.5, 4, 10.5], + "to": [5.5, 9, 11.5], + "faces": { + "north": {"uv": [14, 4, 15, 9], "texture": "#0"}, + "east": {"uv": [14, 4, 15, 9], "texture": "#0"}, + "south": {"uv": [14, 4, 15, 9], "texture": "#0"}, + "west": {"uv": [14, 4, 15, 9], "texture": "#0"} + } + }, + { + "name": "cap_outside", + "from": [2, 4, 8], + "to": [8, 8, 14], + "shade": false, + "faces": { + "north": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [0, 10, 6, 16], "texture": "#0"} + } + }, + { + "name": "cap_inside", + "from": [8, 4, 8], + "to": [2, 8, 14], + "shade": false, + "faces": { + "north": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [0, 10, 6, 16], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [3.5, 8, 9.5], + "to": [6.5, 12, 12.5], + "shade": false, + "faces": { + "north": {"uv": [13, 0, 16, 4], "texture": "#0"}, + "east": {"uv": [13, 0, 16, 4], "texture": "#0"}, + "south": {"uv": [13, 0, 16, 4], "texture": "#0"}, + "west": {"uv": [13, 0, 16, 4], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 9], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "bottom", + "from": [3, 3, 9], + "to": [7, 4, 13], + "shade": false, + "faces": { + "north": {"uv": [7, 4, 11, 5], "texture": "#0"}, + "east": {"uv": [7, 4, 11, 5], "texture": "#0"}, + "south": {"uv": [7, 4, 11, 5], "texture": "#0"}, + "west": {"uv": [7, 4, 11, 5], "texture": "#0"}, + "down": {"uv": [1, 11, 5, 15], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "medium", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, + { + "name": "cap", + "origin": [8, 8, 8], + "color": 0, + "children": [2, 3] + }, 4, 5] + }, + { + "name": "large", + "origin": [0, 0, 0], + "color": 0, + "children": [6, 7, + { + "name": "cap", + "origin": [8, 8, 8], + "color": 0, + "children": [8, 9] + }, 10, 11] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flammalix_3.json b/src/main/resources/assets/betterend/models/block/flammalix_3.json new file mode 100644 index 00000000..e7fbc31b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flammalix_3.json @@ -0,0 +1,175 @@ +{ + "credit": "Made with Blockbench", + "parent": "block", + "textures": { + "0": "betterend:block/flammalix", + "particle": "betterend:block/flammalix" + }, + "elements": [ + { + "name": "stem", + "from": [4, 0, 4], + "to": [5, 3, 5], + "faces": { + "north": {"uv": [14, 6, 15, 9], "texture": "#0"}, + "east": {"uv": [14, 6, 15, 9], "texture": "#0"}, + "south": {"uv": [14, 6, 15, 9], "texture": "#0"}, + "west": {"uv": [14, 6, 15, 9], "texture": "#0"} + } + }, + { + "name": "cap_outside", + "from": [2, 3, 2], + "to": [7, 7, 7], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "cap_inside", + "from": [7, 3, 2], + "to": [2, 7, 7], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [3, 4, 3], + "to": [6, 7, 6], + "shade": false, + "faces": { + "north": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "east": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "south": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 9], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [3, 2, 3], + "to": [6, 3, 6], + "shade": false, + "faces": { + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "stem_thick", + "from": [10.5, 0, 10.5], + "to": [12.5, 2, 12.5], + "faces": { + "north": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "east": {"uv": [7, 6, 9, 8], "texture": "#0"}, + "south": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "west": {"uv": [7, 6, 9, 8], "texture": "#0"} + } + }, + { + "name": "stem_upper", + "from": [11, 2, 11], + "to": [12, 5, 12], + "faces": { + "north": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "east": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "south": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "west": {"uv": [14, 4, 15, 7], "texture": "#0"} + } + }, + { + "name": "cap_outside", + "from": [9, 3, 9], + "to": [14, 7, 14], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "cap_inside", + "from": [14, 3, 9], + "to": [9, 7, 14], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [10, 5, 10], + "to": [13, 8, 13], + "shade": false, + "faces": { + "north": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "east": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "south": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 9], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [10, 2, 10], + "to": [13, 3, 13], + "shade": false, + "faces": { + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "small", + "origin": [0, 0, 0], + "color": 0, + "children": [0, + { + "name": "cap", + "origin": [8, 8, 8], + "color": 0, + "children": [1, 2] + }, 3, 4] + }, + { + "name": "medium", + "origin": [0, 0, 0], + "color": 0, + "children": [5, 6, + { + "name": "cap", + "origin": [8, 8, 8], + "color": 0, + "children": [7, 8] + }, 9, 10] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flammalix_4.json b/src/main/resources/assets/betterend/models/block/flammalix_4.json new file mode 100644 index 00000000..12d6031e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flammalix_4.json @@ -0,0 +1,99 @@ +{ + "credit": "Made with Blockbench", + "parent": "block", + "textures": { + "0": "betterend:block/flammalix", + "particle": "betterend:block/flammalix" + }, + "elements": [ + { + "name": "stem_thick", + "from": [7.5, 0, 8.5], + "to": [9.5, 2, 10.5], + "faces": { + "north": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "east": {"uv": [7, 6, 9, 8], "texture": "#0"}, + "south": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "west": {"uv": [7, 6, 9, 8], "texture": "#0"} + } + }, + { + "name": "stem_upper", + "from": [8, 2, 9], + "to": [9, 5, 10], + "faces": { + "north": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "east": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "south": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "west": {"uv": [14, 4, 15, 7], "texture": "#0"} + } + }, + { + "name": "cap_outside", + "from": [6, 3, 7], + "to": [11, 7, 12], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "cap_inside", + "from": [11, 3, 7], + "to": [6, 7, 12], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [7, 5, 8], + "to": [10, 8, 11], + "shade": false, + "faces": { + "north": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "east": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "south": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 9], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [7, 2, 8], + "to": [10, 3, 11], + "shade": false, + "faces": { + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "medium", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, + { + "name": "cap", + "origin": [8, 8, 8], + "color": 0, + "children": [2, 3] + }, 4, 5] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flammalix_potted.json b/src/main/resources/assets/betterend/models/block/flammalix_potted.json new file mode 100644 index 00000000..11b0d48e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flammalix_potted.json @@ -0,0 +1,99 @@ +{ + "credit": "Made with Blockbench", + "parent": "block", + "textures": { + "0": "betterend:block/flammalix", + "particle": "betterend:block/flammalix" + }, + "elements": [ + { + "name": "stem_thick", + "from": [7, 0, 7], + "to": [9, 2, 9], + "faces": { + "north": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "east": {"uv": [7, 6, 9, 8], "texture": "#0"}, + "south": {"uv": [6, 6, 8, 8], "texture": "#0"}, + "west": {"uv": [7, 6, 9, 8], "texture": "#0"} + } + }, + { + "name": "stem_upper", + "from": [7.5, 2, 7.5], + "to": [8.5, 5, 8.5], + "faces": { + "north": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "east": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "south": {"uv": [14, 4, 15, 7], "texture": "#0"}, + "west": {"uv": [14, 4, 15, 7], "texture": "#0"} + } + }, + { + "name": "cap_outside", + "from": [5.5, 3, 5.5], + "to": [10.5, 7, 10.5], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "cap_inside", + "from": [10.5, 3, 5.5], + "to": [5.5, 7, 10.5], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 5, 4], "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [6.5, 5, 6.5], + "to": [9.5, 8, 9.5], + "shade": false, + "faces": { + "north": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "east": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "south": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "west": {"uv": [13, 0, 16, 3], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 9], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + }, + { + "name": "bulb", + "from": [6.5, 2, 6.5], + "to": [9.5, 3, 9.5], + "shade": false, + "faces": { + "north": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "east": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "south": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [1, 4, 4, 5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 9], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "medium", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, + { + "name": "cap", + "origin": [8, 8, 8], + "color": 0, + "children": [2, 3] + }, 4, 5] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/flammalix.png b/src/main/resources/assets/betterend/textures/block/flammalix.png new file mode 100644 index 0000000000000000000000000000000000000000..2757c7031460da23d17f73b898df2726f016d661 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0HW7 z%VjJoWGpBB(vjnLsObL`#s4+Ne?O~c0p&PKg8YIR{zJgkQz1q`u^3Mm#}J9BwLO7c z2Mjoz7n@f7m)76LbBphp`;~UPg!QL_5?sHhn2CgK5aKZt;akP3#57A(Dt+_4;=a`~ z3HuMeGC0RWjeOW>borbpJbfm|FP%JCHA5grWF1Nn`EFp44$rjF6*2U FngH=sNpk=I literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/flammalix_e.png b/src/main/resources/assets/betterend/textures/block/flammalix_e.png new file mode 100644 index 0000000000000000000000000000000000000000..d93c8b0cf19ea687f054907362ae31a83667d197 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~{s5m4S0Me; zk>hu$=>HVO|24)NX3g3G6k;t2@(X784+Jt7)IcWrd%8G=NKCEmapYq#