From 8533051aa16ba1958f48a171a769d4a90688c015 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Tue, 16 Mar 2021 05:52:24 +0300 Subject: [PATCH] Lantern woods biome prototype --- .../java/ru/betterend/registry/EndBiomes.java | 2 + .../java/ru/betterend/registry/EndBlocks.java | 1 + .../ru/betterend/registry/EndFeatures.java | 6 + .../world/biome/land/LanternWoodsBiome.java | 27 +++ .../world/features/FilaluxFeature.java | 39 ++++ .../world/features/SkyScatterFeature.java | 54 +++++ .../features/trees/DragonTreeFeature.java | 12 +- .../world/features/trees/LucerniaFeature.java | 219 ++++++++++++++++++ .../world/features/trees/TenaneaFeature.java | 2 +- .../blockstates/lucernia_leaves.json | 10 + .../blockstates/lucernia_outer_leaves.json | 56 +++++ .../materialmaps/block/lucernia_leaves.json | 2 +- .../block/lucernia_outer_leaves.json | 3 + .../models/block/lucernia_leaves_1.json | 6 + .../models/block/lucernia_leaves_2.json | 6 + .../models/block/lucernia_leaves_3.json | 6 + .../models/block/lucernia_leaves_4.json | 6 + .../models/block/lucernia_outer_leaves_1.json | 97 ++++++++ .../models/block/lucernia_outer_leaves_2.json | 64 +++++ .../models/block/lucernia_outer_leaves_3.json | 64 +++++ .../models/block/lucernia_outer_leaves_4.json | 97 ++++++++ .../models/block/lucernia_outer_leaves_5.json | 64 +++++ .../models/block/lucernia_outer_leaves_6.json | 64 +++++ .../models/block/lucernia_outer_leaves_7.json | 97 ++++++++ .../models/block/lucernia_outer_leaves_8.json | 64 +++++ .../models/block/lucernia_outer_leaves_9.json | 64 +++++ .../block/lucernia_outer_leaves_up_1.json | 120 ++++++++++ .../block/lucernia_outer_leaves_up_2.json | 120 ++++++++++ .../models/item/lucernia_leaves.json | 3 + .../models/item/lucernia_outer_leaves.json | 6 + .../textures/block/lucernia_leaves.png | Bin 258 -> 0 bytes .../textures/block/lucernia_leaves_1.png | Bin 0 -> 241 bytes .../textures/block/lucernia_leaves_2.png | Bin 0 -> 257 bytes .../textures/block/lucernia_leaves_3.png | Bin 0 -> 257 bytes .../textures/block/lucernia_leaves_4.png | Bin 0 -> 284 bytes .../textures/block/lucernia_log_side.png | Bin 265 -> 258 bytes .../block/lucernia_outer_leaves_1.png | Bin 0 -> 195 bytes .../block/lucernia_outer_leaves_2.png | Bin 0 -> 212 bytes .../block/lucernia_outer_leaves_3.png | Bin 0 -> 213 bytes 39 files changed, 1374 insertions(+), 7 deletions(-) create mode 100644 src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java create mode 100644 src/main/java/ru/betterend/world/features/FilaluxFeature.java create mode 100644 src/main/java/ru/betterend/world/features/SkyScatterFeature.java create mode 100644 src/main/java/ru/betterend/world/features/trees/LucerniaFeature.java create mode 100644 src/main/resources/assets/betterend/blockstates/lucernia_leaves.json create mode 100644 src/main/resources/assets/betterend/blockstates/lucernia_outer_leaves.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/lucernia_outer_leaves.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_leaves_1.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_leaves_2.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_leaves_3.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_leaves_4.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_1.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_2.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_3.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_4.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_5.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_6.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_7.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_8.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_9.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_up_1.json create mode 100644 src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_up_2.json create mode 100644 src/main/resources/assets/betterend/models/item/lucernia_leaves.json create mode 100644 src/main/resources/assets/betterend/models/item/lucernia_outer_leaves.json delete mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_leaves.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_leaves_1.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_leaves_2.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_leaves_3.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_leaves_4.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_outer_leaves_1.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_outer_leaves_2.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_outer_leaves_3.png diff --git a/src/main/java/ru/betterend/registry/EndBiomes.java b/src/main/java/ru/betterend/registry/EndBiomes.java index 328d2dfc..04f177d8 100644 --- a/src/main/java/ru/betterend/registry/EndBiomes.java +++ b/src/main/java/ru/betterend/registry/EndBiomes.java @@ -48,6 +48,7 @@ import ru.betterend.world.biome.land.DustWastelandsBiome; import ru.betterend.world.biome.land.EndBiome; import ru.betterend.world.biome.land.FoggyMushroomlandBiome; import ru.betterend.world.biome.land.GlowingGrasslandsBiome; +import ru.betterend.world.biome.land.LanternWoodsBiome; import ru.betterend.world.biome.land.MegalakeBiome; import ru.betterend.world.biome.land.MegalakeGroveBiome; import ru.betterend.world.biome.land.PaintedMountainsBiome; @@ -97,6 +98,7 @@ public class EndBiomes { public static final EndBiome GLOWING_GRASSLANDS = registerBiome(new GlowingGrasslandsBiome(), BiomeType.LAND); public static final EndBiome DRAGON_GRAVEYARDS = registerBiome(new DragonGraveyardsBiome(), BiomeType.LAND); public static final EndBiome DRY_SHRUBLAND = registerBiome(new DryShrublandBiome(), BiomeType.LAND); + public static final EndBiome LANTERN_WOODS = registerBiome(new LanternWoodsBiome(), BiomeType.LAND); // Better End Void public static final EndBiome ICE_STARFIELD = registerBiome(new BiomeIceStarfield(), BiomeType.VOID); diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 37c254c3..c310d53e 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -236,6 +236,7 @@ public class EndBlocks { public static final Block LUCERNIA_SAPLING = registerBlock("lucernia_sapling", new TenaneaSaplingBlock()); public static final Block LUCERNIA_LEAVES = registerBlock("lucernia_leaves", new EndLeavesBlock(LUCERNIA_SAPLING, MaterialColor.ORANGE)); + public static final Block LUCERNIA_OUTER_LEAVES = registerBlock("lucernia_outer_leaves", new FurBlock(LUCERNIA_SAPLING, 32)); public static final WoodenMaterial LUCERNIA = new WoodenMaterial("lucernia", MaterialColor.ORANGE, MaterialColor.ORANGE); // Small Plants // diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index e5d18f4f..6a443abd 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -22,6 +22,7 @@ import ru.betterend.world.features.EndFeature; import ru.betterend.world.features.EndLilyFeature; import ru.betterend.world.features.EndLotusFeature; import ru.betterend.world.features.EndLotusLeafFeature; +import ru.betterend.world.features.FilaluxFeature; import ru.betterend.world.features.GlowPillarFeature; import ru.betterend.world.features.HydraluxFeature; import ru.betterend.world.features.LanceleafFeature; @@ -60,6 +61,7 @@ import ru.betterend.world.features.trees.GiganticAmaranitaFeature; import ru.betterend.world.features.trees.HelixTreeFeature; import ru.betterend.world.features.trees.JellyshroomFeature; import ru.betterend.world.features.trees.LacugroveFeature; +import ru.betterend.world.features.trees.LucerniaFeature; import ru.betterend.world.features.trees.MossyGlowshroomFeature; import ru.betterend.world.features.trees.PythadendronTreeFeature; import ru.betterend.world.features.trees.TenaneaFeature; @@ -77,6 +79,7 @@ public class EndFeatures { public static final EndFeature UMBRELLA_TREE = new EndFeature("umbrella_tree", new UmbrellaTreeFeature(), 4); public static final EndFeature JELLYSHROOM = new EndFeature("jellyshroom", new JellyshroomFeature(), 3); public static final EndFeature GIGANTIC_AMARANITA = new EndFeature("gigantic_amaranita", new GiganticAmaranitaFeature(), 1); + public static final EndFeature LUCERNIA = new EndFeature("lucernia", new LucerniaFeature(), 3); // Bushes // public static final EndFeature PYTHADENDRON_BUSH = new EndFeature("pythadendron_bush", new BushFeature(EndBlocks.PYTHADENDRON_LEAVES, EndBlocks.PYTHADENDRON.bark), 4); @@ -142,6 +145,9 @@ public class EndFeatures { public static final EndFeature SMALL_JELLYSHROOM_WOOD = new EndFeature("small_jellyshroom_wood", new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 8); public static final EndFeature JUNGLE_FERN_WOOD = new EndFeature("jungle_fern_wood", new WallPlantOnLogFeature(EndBlocks.JUNGLE_FERN, 3), 12); + // Sky plants + public static final EndFeature FILALUX = new EndFeature("filalux", new FilaluxFeature(), 1); + // Water // public static final EndFeature BUBBLE_CORAL = new EndFeature("bubble_coral", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 6), 10); public static final EndFeature BUBBLE_CORAL_RARE = new EndFeature("bubble_coral_rare", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 3), 4); diff --git a/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java b/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java new file mode 100644 index 00000000..594b14d4 --- /dev/null +++ b/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java @@ -0,0 +1,27 @@ +package ru.betterend.world.biome.land; + +import net.minecraft.entity.EntityType; +import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; +import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndFeatures; +import ru.betterend.registry.EndSounds; + +public class LanternWoodsBiome extends EndBiome { + public LanternWoodsBiome() { + super(new BiomeDefinition("lantern_woods") + .setFogColor(132, 35, 13) + .setFogDensity(1.1F) + .setWaterAndFogColor(113, 88, 53) + .setPlantsColor(237, 122, 66) + .setSurface(EndBlocks.RUTISCUS) + .setMusic(EndSounds.MUSIC_FOREST) + .addFeature(EndFeatures.LUCERNIA) + .addFeature(EndFeatures.FILALUX) + .addFeature(EndFeatures.ORANGO) + .addFeature(EndFeatures.AERIDIUM) + .addFeature(EndFeatures.LUTEBUS) + .addFeature(EndFeatures.LAMELLARIUM) + .addStructureFeature(ConfiguredStructureFeatures.END_CITY) + .addMobSpawn(EntityType.ENDERMAN, 50, 1, 2)); + } +} diff --git a/src/main/java/ru/betterend/world/features/FilaluxFeature.java b/src/main/java/ru/betterend/world/features/FilaluxFeature.java new file mode 100644 index 00000000..394f0505 --- /dev/null +++ b/src/main/java/ru/betterend/world/features/FilaluxFeature.java @@ -0,0 +1,39 @@ +package ru.betterend.world.features; + +import java.util.Random; + +import net.minecraft.block.BlockState; +import net.minecraft.state.property.Properties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.StructureWorldAccess; +import ru.betterend.blocks.BlockProperties; +import ru.betterend.blocks.BlockProperties.TripleShape; +import ru.betterend.registry.EndBlocks; +import ru.betterend.util.BlocksHelper; +import ru.betterend.util.MHelper; + +public class FilaluxFeature extends SkyScatterFeature { + public FilaluxFeature() { + super(10); + } + + @Override + public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { + BlockState vine = EndBlocks.FILALUX.getDefaultState(); + BlockState wings = EndBlocks.FILALUX_WINGS.getDefaultState(); + BlocksHelper.setWithoutUpdate(world, blockPos, EndBlocks.FILALUX_LANTERN); + BlocksHelper.setWithoutUpdate(world, blockPos.up(), wings.with(Properties.FACING, Direction.UP)); + for (Direction dir: BlocksHelper.HORIZONTAL) { + BlocksHelper.setWithoutUpdate(world, blockPos.offset(dir), wings.with(Properties.FACING, dir)); + } + int length = MHelper.randRange(1, 3, random); + for (int i = 1; i <= length; i++) { + TripleShape shape = length > 1 ? TripleShape.TOP : TripleShape.BOTTOM; + if (i > 1) { + shape = i == length ? TripleShape.BOTTOM : TripleShape.MIDDLE; + } + BlocksHelper.setWithoutUpdate(world, blockPos.down(i), vine.with(BlockProperties.TRIPLE_SHAPE, shape)); + } + } +} diff --git a/src/main/java/ru/betterend/world/features/SkyScatterFeature.java b/src/main/java/ru/betterend/world/features/SkyScatterFeature.java new file mode 100644 index 00000000..97e5178a --- /dev/null +++ b/src/main/java/ru/betterend/world/features/SkyScatterFeature.java @@ -0,0 +1,54 @@ +package ru.betterend.world.features; + +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockPos.Mutable; +import net.minecraft.util.math.Direction; +import net.minecraft.world.StructureWorldAccess; +import ru.betterend.util.BlocksHelper; +import ru.betterend.util.MHelper; + +public abstract class SkyScatterFeature extends ScatterFeature { + public SkyScatterFeature(int radius) { + super(radius); + } + + @Override + protected int getChance() { + return 10; + } + + @Override + public boolean canGenerate(StructureWorldAccess world, Random random, BlockPos center, BlockPos blockPos, float radius) { + if (!world.isAir(blockPos)) { + return false; + } + + for (Direction dir: BlocksHelper.HORIZONTAL) { + if (!world.isAir(blockPos.offset(dir))) { + return false; + } + } + + int maxD = getYOffset() + 2; + int maxV = getYOffset() - 2; + + return BlocksHelper.upRay(world, blockPos, maxD) > maxV && BlocksHelper.downRay(world, blockPos, maxD) > maxV; + } + + @Override + protected boolean canSpawn(StructureWorldAccess world, BlockPos pos) { + return true; + } + + @Override + protected BlockPos getCenterGround(StructureWorldAccess world, BlockPos pos) { + return new BlockPos(pos.getX(), MHelper.randRange(32, 192, world.getRandom()), pos.getZ()); + } + + protected boolean getGroundPlant(StructureWorldAccess world, Mutable pos) { + pos.setY(pos.getY() + MHelper.randRange(-getYOffset(), getYOffset(), world.getRandom())); + return true; + } +} diff --git a/src/main/java/ru/betterend/world/features/trees/DragonTreeFeature.java b/src/main/java/ru/betterend/world/features/trees/DragonTreeFeature.java index 469c736b..ad8f0951 100644 --- a/src/main/java/ru/betterend/world/features/trees/DragonTreeFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/DragonTreeFeature.java @@ -227,11 +227,13 @@ public class DragonTreeFeature extends DefaultFeature { SplineHelper.offset(SIDE1, offset2); SplineHelper.offset(SIDE2, offset2); - ROOT = Lists.newArrayList(new Vector3f(0F, 1F, 0), - new Vector3f(0.1F, 0.7F, 0), - new Vector3f(0.3F, 0.3F, 0), - new Vector3f(0.7F, 0.05F, 0), - new Vector3f(0.8F, -0.2F, 0)); + ROOT = Lists.newArrayList( + new Vector3f(0F, 1F, 0), + new Vector3f(0.1F, 0.7F, 0), + new Vector3f(0.3F, 0.3F, 0), + new Vector3f(0.7F, 0.05F, 0), + new Vector3f(0.8F, -0.2F, 0) + ); SplineHelper.offset(ROOT, new Vector3f(0, -0.45F, 0)); } } diff --git a/src/main/java/ru/betterend/world/features/trees/LucerniaFeature.java b/src/main/java/ru/betterend/world/features/trees/LucerniaFeature.java new file mode 100644 index 00000000..8a452bd7 --- /dev/null +++ b/src/main/java/ru/betterend/world/features/trees/LucerniaFeature.java @@ -0,0 +1,219 @@ +package ru.betterend.world.features.trees; + +import java.util.List; +import java.util.Random; +import java.util.function.Function; + +import com.google.common.collect.Lists; + +import net.minecraft.block.BlockState; +import net.minecraft.block.LeavesBlock; +import net.minecraft.block.Material; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockPos.Mutable; +import net.minecraft.util.math.Direction; +import net.minecraft.world.StructureWorldAccess; +import net.minecraft.world.gen.chunk.ChunkGenerator; +import net.minecraft.world.gen.feature.DefaultFeatureConfig; +import ru.betterend.blocks.BlockProperties; +import ru.betterend.blocks.BlockProperties.TripleShape; +import ru.betterend.blocks.basis.FurBlock; +import ru.betterend.noise.OpenSimplexNoise; +import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndTags; +import ru.betterend.util.BlocksHelper; +import ru.betterend.util.MHelper; +import ru.betterend.util.SplineHelper; +import ru.betterend.util.sdf.SDF; +import ru.betterend.util.sdf.operator.SDFDisplacement; +import ru.betterend.util.sdf.operator.SDFScale; +import ru.betterend.util.sdf.operator.SDFScale3D; +import ru.betterend.util.sdf.operator.SDFSubtraction; +import ru.betterend.util.sdf.operator.SDFTranslate; +import ru.betterend.util.sdf.primitive.SDFSphere; +import ru.betterend.world.features.DefaultFeature; + +public class LucerniaFeature extends DefaultFeature { + private static final Direction[] DIRECTIONS = Direction.values(); + private static final Function REPLACE; + private static final Function IGNORE; + private static final List SPLINE; + private static final List ROOT; + + @Override + public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) { + if (!world.getBlockState(pos.down()).getBlock().isIn(EndTags.END_GROUND)) return false; + + float size = MHelper.randRange(12, 20, random); + int count = (int) (size * 0.3F); + float var = MHelper.PI2 / (float) (count * 3); + float start = MHelper.randRange(0, MHelper.PI2, random); + for (int i = 0; i < count; i++) { + float angle = (float) i / (float) count * MHelper.PI2 + MHelper.randRange(0, var, random) + start; + List spline = SplineHelper.copySpline(SPLINE); + SplineHelper.rotateSpline(spline, angle); + SplineHelper.scale(spline, size * MHelper.randRange(0.5F, 1F, random)); + SplineHelper.offsetParts(spline, random, 1F, 0, 1F); + SplineHelper.fillSpline(spline, world, EndBlocks.LUCERNIA.bark.getDefaultState(), pos, REPLACE); + Vector3f last = spline.get(spline.size() - 1); + float leavesRadius = (size * 0.13F + MHelper.randRange(0.8F, 1.5F, random)) * 1.4F; + OpenSimplexNoise noise = new OpenSimplexNoise(random.nextLong()); + leavesBall(world, pos.add(last.getX(), last.getY(), last.getZ()), leavesRadius, random, noise, config != null); + } + + makeRoots(world, pos.add(0, MHelper.randRange(3, 5, random), 0), size * 0.35F, random); + + return true; + } + + private void leavesBall(StructureWorldAccess world, BlockPos pos, float radius, Random random, OpenSimplexNoise noise, boolean natural) { + SDF sphere = new SDFSphere().setRadius(radius).setBlock(EndBlocks.LUCERNIA_LEAVES.getDefaultState().with(LeavesBlock.DISTANCE, 6)); + SDF sub = new SDFScale().setScale(5).setSource(sphere); + sub = new SDFTranslate().setTranslate(0, -radius * 5, 0).setSource(sub); + sphere = new SDFSubtraction().setSourceA(sphere).setSourceB(sub); + sphere = new SDFScale3D().setScale(1, 0.75F, 1).setSource(sphere); + sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 2F; }).setSource(sphere); + sphere = new SDFDisplacement().setFunction((vec) -> { return MHelper.randRange(-1.5F, 1.5F, random); }).setSource(sphere); + + Mutable mut = new Mutable(); + for (Direction d1: BlocksHelper.HORIZONTAL) { + BlockPos p = mut.set(pos).move(Direction.UP).move(d1).toImmutable(); + BlocksHelper.setWithoutUpdate(world, p, EndBlocks.LUCERNIA.bark.getDefaultState()); + for (Direction d2: BlocksHelper.HORIZONTAL) { + mut.set(p).move(Direction.UP).move(d2); + BlocksHelper.setWithoutUpdate(world, p, EndBlocks.LUCERNIA.bark.getDefaultState()); + } + } + + BlockState top = EndBlocks.FILALUX.getDefaultState().with(BlockProperties.TRIPLE_SHAPE, TripleShape.TOP); + BlockState middle = EndBlocks.FILALUX.getDefaultState().with(BlockProperties.TRIPLE_SHAPE, TripleShape.MIDDLE); + BlockState bottom = EndBlocks.FILALUX.getDefaultState().with(BlockProperties.TRIPLE_SHAPE, TripleShape.BOTTOM); + BlockState outer = EndBlocks.LUCERNIA_OUTER_LEAVES.getDefaultState(); + + List support = Lists.newArrayList(); + sphere.addPostProcess((info) -> { + if (natural && random.nextInt(6) == 0 && info.getStateDown().isAir()) { + BlockPos d = info.getPos().down(); + support.add(d); + } + if (random.nextInt(15) == 0) { + for (Direction dir: Direction.values()) { + BlockState state = info.getState(dir, 2); + if (state.isAir()) { + return info.getState(); + } + } + info.setState(EndBlocks.LUCERNIA.bark.getDefaultState()); + } + + MHelper.shuffle(DIRECTIONS, random); + for (Direction d: DIRECTIONS) { + if (info.getState(d).isAir()) { + info.setBlockPos(info.getPos().offset(d), outer.with(FurBlock.FACING, d)); + } + } + + if (EndBlocks.LUCERNIA.isTreeLog(info.getState())) { + for (int x = -6; x < 7; x++) { + int ax = Math.abs(x); + mut.setX(x + info.getPos().getX()); + for (int z = -6; z < 7; z++) { + int az = Math.abs(z); + mut.setZ(z + info.getPos().getZ()); + for (int y = -6; y < 7; y++) { + int ay = Math.abs(y); + int d = ax + ay + az; + if (d < 7) { + mut.setY(y + info.getPos().getY()); + BlockState state = info.getState(mut); + if (state.getBlock() instanceof LeavesBlock) { + int distance = state.get(LeavesBlock.DISTANCE); + if (d < distance) { + info.setState(mut, state.with(LeavesBlock.DISTANCE, d)); + } + } + } + } + } + } + } + return info.getState(); + }); + sphere.fillRecursiveIgnore(world, pos, IGNORE); + BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.LUCERNIA.bark); + + support.forEach((bpos) -> { + BlockState state = world.getBlockState(bpos); + if (state.isAir() || state.isOf(EndBlocks.LUCERNIA_OUTER_LEAVES)) { + int count = MHelper.randRange(3, 8, random); + mut.set(bpos); + if (world.getBlockState(mut.up()).isOf(EndBlocks.LUCERNIA_LEAVES)) { + BlocksHelper.setWithoutUpdate(world, mut, top); + for (int i = 1; i < count; i++) { + mut.setY(mut.getY() - 1); + if (world.isAir(mut.down())) { + BlocksHelper.setWithoutUpdate(world, mut, middle); + } + else { + break; + } + } + BlocksHelper.setWithoutUpdate(world, mut, bottom); + } + } + }); + } + + private void makeRoots(StructureWorldAccess world, BlockPos pos, float radius, Random random) { + int count = (int) (radius * 1.5F); + for (int i = 0; i < count; i++) { + float angle = (float) i / (float) count * MHelper.PI2; + float scale = radius * MHelper.randRange(0.85F, 1.15F, random); + + List branch = SplineHelper.copySpline(ROOT); + SplineHelper.rotateSpline(branch, angle); + SplineHelper.scale(branch, scale); + Vector3f last = branch.get(branch.size() - 1); + if (world.getBlockState(pos.add(last.getX(), last.getY(), last.getZ())).isIn(EndTags.GEN_TERRAIN)) { + SplineHelper.fillSplineForce(branch, world, EndBlocks.LUCERNIA.bark.getDefaultState(), pos, REPLACE); + } + } + } + + static { + REPLACE = (state) -> { + if (state.isIn(EndTags.END_GROUND)) { + return true; + } + if (state.getBlock() == EndBlocks.LUCERNIA_LEAVES) { + return true; + } + if (state.getMaterial().equals(Material.PLANT)) { + return true; + } + return state.getMaterial().isReplaceable(); + }; + + IGNORE = (state) -> { + return EndBlocks.LUCERNIA.isTreeLog(state); + }; + + SPLINE = Lists.newArrayList( + new Vector3f(0.00F, 0.00F, 0.00F), + new Vector3f(0.10F, 0.35F, 0.00F), + new Vector3f(0.20F, 0.50F, 0.00F), + new Vector3f(0.30F, 0.55F, 0.00F), + new Vector3f(0.42F, 0.70F, 0.00F), + new Vector3f(0.50F, 1.00F, 0.00F) + ); + + ROOT = Lists.newArrayList( + new Vector3f(0.1F, 0.70F, 0), + new Vector3f(0.3F, 0.30F, 0), + new Vector3f(0.7F, 0.05F, 0), + new Vector3f(0.8F, -0.20F, 0) + ); + SplineHelper.offset(ROOT, new Vector3f(0, -0.45F, 0)); + } +} diff --git a/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java b/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java index 34de3b30..5fba3b10 100644 --- a/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java @@ -35,10 +35,10 @@ import ru.betterend.util.sdf.primitive.SDFSphere; import ru.betterend.world.features.DefaultFeature; public class TenaneaFeature extends DefaultFeature { + private static final Direction[] DIRECTIONS = Direction.values(); private static final Function REPLACE; private static final Function IGNORE; private static final List SPLINE; - private static final Direction[] DIRECTIONS = Direction.values(); @Override public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) { diff --git a/src/main/resources/assets/betterend/blockstates/lucernia_leaves.json b/src/main/resources/assets/betterend/blockstates/lucernia_leaves.json new file mode 100644 index 00000000..677b54c1 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/lucernia_leaves.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lucernia_leaves_1" }, + { "model": "betterend:block/lucernia_leaves_2" }, + { "model": "betterend:block/lucernia_leaves_3" }, + { "model": "betterend:block/lucernia_leaves_4" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/lucernia_outer_leaves.json b/src/main/resources/assets/betterend/blockstates/lucernia_outer_leaves.json new file mode 100644 index 00000000..9bef26b8 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/lucernia_outer_leaves.json @@ -0,0 +1,56 @@ +{ + "variants": { + "facing=north": [ + { "model": "betterend:block/lucernia_outer_leaves_1", "y": 180 }, + { "model": "betterend:block/lucernia_outer_leaves_2", "y": 180 }, + { "model": "betterend:block/lucernia_outer_leaves_3", "y": 180 }, + { "model": "betterend:block/lucernia_outer_leaves_4", "y": 180 }, + { "model": "betterend:block/lucernia_outer_leaves_5", "y": 180 }, + { "model": "betterend:block/lucernia_outer_leaves_6", "y": 180 }, + { "model": "betterend:block/lucernia_outer_leaves_7", "y": 180 }, + { "model": "betterend:block/lucernia_outer_leaves_8", "y": 180 }, + { "model": "betterend:block/lucernia_outer_leaves_9", "y": 180 } + ], + "facing=south": [ + { "model": "betterend:block/lucernia_outer_leaves_1" }, + { "model": "betterend:block/lucernia_outer_leaves_2" }, + { "model": "betterend:block/lucernia_outer_leaves_3" }, + { "model": "betterend:block/lucernia_outer_leaves_4" }, + { "model": "betterend:block/lucernia_outer_leaves_5" }, + { "model": "betterend:block/lucernia_outer_leaves_6" }, + { "model": "betterend:block/lucernia_outer_leaves_7" }, + { "model": "betterend:block/lucernia_outer_leaves_8" }, + { "model": "betterend:block/lucernia_outer_leaves_9" } + ], + "facing=east": [ + { "model": "betterend:block/lucernia_outer_leaves_1", "y": 270 }, + { "model": "betterend:block/lucernia_outer_leaves_2", "y": 270 }, + { "model": "betterend:block/lucernia_outer_leaves_3", "y": 270 }, + { "model": "betterend:block/lucernia_outer_leaves_4", "y": 270 }, + { "model": "betterend:block/lucernia_outer_leaves_5", "y": 270 }, + { "model": "betterend:block/lucernia_outer_leaves_6", "y": 270 }, + { "model": "betterend:block/lucernia_outer_leaves_7", "y": 270 }, + { "model": "betterend:block/lucernia_outer_leaves_8", "y": 270 }, + { "model": "betterend:block/lucernia_outer_leaves_9", "y": 270 } + ], + "facing=west": [ + { "model": "betterend:block/lucernia_outer_leaves_1", "y": 90 }, + { "model": "betterend:block/lucernia_outer_leaves_2", "y": 90 }, + { "model": "betterend:block/lucernia_outer_leaves_3", "y": 90 }, + { "model": "betterend:block/lucernia_outer_leaves_4", "y": 90 }, + { "model": "betterend:block/lucernia_outer_leaves_5", "y": 90 }, + { "model": "betterend:block/lucernia_outer_leaves_6", "y": 90 }, + { "model": "betterend:block/lucernia_outer_leaves_7", "y": 90 }, + { "model": "betterend:block/lucernia_outer_leaves_8", "y": 90 }, + { "model": "betterend:block/lucernia_outer_leaves_9", "y": 90 } + ], + "facing=up": [ + { "model": "betterend:block/lucernia_outer_leaves_up_1" }, + { "model": "betterend:block/lucernia_outer_leaves_up_2" } + ], + "facing=down": [ + { "model": "betterend:block/lucernia_outer_leaves_up_1", "x": 180 }, + { "model": "betterend:block/lucernia_outer_leaves_up_2", "x": 180 } + ] + } +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/lucernia_leaves.json b/src/main/resources/assets/betterend/materialmaps/block/lucernia_leaves.json index e4224176..11eeb91f 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/lucernia_leaves.json +++ b/src/main/resources/assets/betterend/materialmaps/block/lucernia_leaves.json @@ -1,3 +1,3 @@ { - "defaultMaterial": "betterend:leaves" + "defaultMaterial": "betterend:leaves_noshade" } diff --git a/src/main/resources/assets/betterend/materialmaps/block/lucernia_outer_leaves.json b/src/main/resources/assets/betterend/materialmaps/block/lucernia_outer_leaves.json new file mode 100644 index 00000000..45210670 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/lucernia_outer_leaves.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_wall" +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_leaves_1.json b/src/main/resources/assets/betterend/models/block/lucernia_leaves_1.json new file mode 100644 index 00000000..ae34d194 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_leaves_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cube_noshade", + "textures": { + "texture": "betterend:block/lucernia_leaves_1" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_leaves_2.json b/src/main/resources/assets/betterend/models/block/lucernia_leaves_2.json new file mode 100644 index 00000000..db14b6cc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_leaves_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cube_noshade", + "textures": { + "texture": "betterend:block/lucernia_leaves_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_leaves_3.json b/src/main/resources/assets/betterend/models/block/lucernia_leaves_3.json new file mode 100644 index 00000000..b0add050 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_leaves_3.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cube_noshade", + "textures": { + "texture": "betterend:block/lucernia_leaves_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_leaves_4.json b/src/main/resources/assets/betterend/models/block/lucernia_leaves_4.json new file mode 100644 index 00000000..6d38ed9a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_leaves_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cube_noshade", + "textures": { + "texture": "betterend:block/lucernia_leaves_4" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_1.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_1.json new file mode 100644 index 00000000..28312355 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_1.json @@ -0,0 +1,97 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lucernia_outer_leaves_1", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 11, 0 ], + "to": [ 17, 11.001, 16 ], + "rotation": { "origin": [ 1, 11, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, -10, 0 ], + "to": [ 17, 6, 0.001 ], + "rotation": { "origin": [ 1, 6, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, 13.5, 0 ], + "to": [ 13, 13.501, 16 ], + "rotation": { "origin": [ -3, 13.5, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 1, 0 ], + "to": [ 17, 1.001, 16 ], + "rotation": { "origin": [ 1, 1, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1, -9, 0 ], + "to": [ 15, 7, 0.001 ], + "rotation": { "origin": [ -1, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1.5, 16, 0 ], + "to": [ 14.5, 16.001, 16 ], + "rotation": { "origin": [ -1.5, 16, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, 0.5, 0 ], + "to": [ 14, 0.501, 16 ], + "rotation": { "origin": [ -2, 0.5, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_2.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_2.json new file mode 100644 index 00000000..593da44e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_2.json @@ -0,0 +1,64 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lucernia_outer_leaves_1", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -15, 0 ], + "to": [ 16, 1, 0.001 ], + "rotation": { "origin": [ 0, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, -12, 0 ], + "to": [ 14, 4, 0.001 ], + "rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -9, 0 ], + "to": [ 16, 7, 0.001 ], + "rotation": { "origin": [ 0, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -3, 0 ], + "to": [ 16, 13, 0.001 ], + "rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_3.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_3.json new file mode 100644 index 00000000..30b89392 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_3.json @@ -0,0 +1,64 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lucernia_outer_leaves_1", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ -1, 0, 0 ], + "to": [ 15, 16, 0.001 ], + "rotation": { "origin": [ -1, 16, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 2, -3, 0 ], + "to": [ 18, 13, 0.001 ], + "rotation": { "origin": [ 2, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -8, 0 ], + "to": [ 16, 8, 0.001 ], + "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, -12, 0 ], + "to": [ 13, 4, 0.001 ], + "rotation": { "origin": [ -3, 4, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 3, -15, 0 ], + "to": [ 19, 1, 0.001 ], + "rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_4.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_4.json new file mode 100644 index 00000000..73575478 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_4.json @@ -0,0 +1,97 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lucernia_outer_leaves_2", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 11, 0 ], + "to": [ 17, 11.001, 16 ], + "rotation": { "origin": [ 1, 11, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, -10, 0 ], + "to": [ 17, 6, 0.001 ], + "rotation": { "origin": [ 1, 6, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, 13.5, 0 ], + "to": [ 13, 13.501, 16 ], + "rotation": { "origin": [ -3, 13.5, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 1, 0 ], + "to": [ 17, 1.001, 16 ], + "rotation": { "origin": [ 1, 1, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1, -9, 0 ], + "to": [ 15, 7, 0.001 ], + "rotation": { "origin": [ -1, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1.5, 16, 0 ], + "to": [ 14.5, 16.001, 16 ], + "rotation": { "origin": [ -1.5, 16, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, 0.5, 0 ], + "to": [ 14, 0.501, 16 ], + "rotation": { "origin": [ -2, 0.5, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_5.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_5.json new file mode 100644 index 00000000..e3117b51 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_5.json @@ -0,0 +1,64 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lucernia_outer_leaves_2", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -15, 0 ], + "to": [ 16, 1, 0.001 ], + "rotation": { "origin": [ 0, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, -12, 0 ], + "to": [ 14, 4, 0.001 ], + "rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -9, 0 ], + "to": [ 16, 7, 0.001 ], + "rotation": { "origin": [ 0, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -3, 0 ], + "to": [ 16, 13, 0.001 ], + "rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_6.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_6.json new file mode 100644 index 00000000..60fbeb92 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_6.json @@ -0,0 +1,64 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lucernia_outer_leaves_2", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ -1, 0, 0 ], + "to": [ 15, 16, 0.001 ], + "rotation": { "origin": [ -1, 16, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 2, -3, 0 ], + "to": [ 18, 13, 0.001 ], + "rotation": { "origin": [ 2, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -8, 0 ], + "to": [ 16, 8, 0.001 ], + "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, -12, 0 ], + "to": [ 13, 4, 0.001 ], + "rotation": { "origin": [ -3, 4, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 3, -15, 0 ], + "to": [ 19, 1, 0.001 ], + "rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_7.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_7.json new file mode 100644 index 00000000..c4690387 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_7.json @@ -0,0 +1,97 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lucernia_outer_leaves_3", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 11, 0 ], + "to": [ 17, 11.001, 16 ], + "rotation": { "origin": [ 1, 11, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, -10, 0 ], + "to": [ 17, 6, 0.001 ], + "rotation": { "origin": [ 1, 6, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, 13.5, 0 ], + "to": [ 13, 13.501, 16 ], + "rotation": { "origin": [ -3, 13.5, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 1, 0 ], + "to": [ 17, 1.001, 16 ], + "rotation": { "origin": [ 1, 1, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1, -9, 0 ], + "to": [ 15, 7, 0.001 ], + "rotation": { "origin": [ -1, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1.5, 16, 0 ], + "to": [ 14.5, 16.001, 16 ], + "rotation": { "origin": [ -1.5, 16, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, 0.5, 0 ], + "to": [ 14, 0.501, 16 ], + "rotation": { "origin": [ -2, 0.5, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_8.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_8.json new file mode 100644 index 00000000..f52731c9 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_8.json @@ -0,0 +1,64 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lucernia_outer_leaves_3", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -15, 0 ], + "to": [ 16, 1, 0.001 ], + "rotation": { "origin": [ 0, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, -12, 0 ], + "to": [ 14, 4, 0.001 ], + "rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -9, 0 ], + "to": [ 16, 7, 0.001 ], + "rotation": { "origin": [ 0, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -3, 0 ], + "to": [ 16, 13, 0.001 ], + "rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_9.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_9.json new file mode 100644 index 00000000..ebe38a54 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_9.json @@ -0,0 +1,64 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lucernia_outer_leaves_3", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ -1, 0, 0 ], + "to": [ 15, 16, 0.001 ], + "rotation": { "origin": [ -1, 16, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 2, -3, 0 ], + "to": [ 18, 13, 0.001 ], + "rotation": { "origin": [ 2, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -8, 0 ], + "to": [ 16, 8, 0.001 ], + "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, -12, 0 ], + "to": [ 13, 4, 0.001 ], + "rotation": { "origin": [ -3, 4, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 3, -15, 0 ], + "to": [ 19, 1, 0.001 ], + "rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_up_1.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_up_1.json new file mode 100644 index 00000000..3ed17feb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_up_1.json @@ -0,0 +1,120 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/lucernia_outer_leaves_1", + "texture": "betterend:block/lucernia_outer_leaves_1", + "spore": "betterend:block/lucernia_outer_leaves_1" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -10 ], + "to": [ 16, 0, 6 ], + "rotation": { "origin": [ 0, 0, 6 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 10 ], + "to": [ 16, 0.001, 26 ], + "rotation": { "origin": [ 0, 0, 10 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 10, -0.001, 0 ], + "to": [ 26, 0, 16 ], + "rotation": { "origin": [ 10, 0, 16 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -10, 0, 2 ], + "to": [ 6, 0.001, 18 ], + "rotation": { "origin": [ 6, 0, 18 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneX6", + "from": [ 0, 0, -6.5 ], + "to": [ 0.001, 16, 16 ], + "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX6", + "from": [ -6.5, 0, 15.999 ], + "to": [ 16, 16, 16 ], + "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -9 ], + "to": [ 16, 0, 7 ], + "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 9 ], + "to": [ 16, 0.001, 25 ], + "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 9, -0.001, 0 ], + "to": [ 25, 0, 16 ], + "rotation": { "origin": [ 9, 0, 16 ], "axis": "z", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -9, 0, 2 ], + "to": [ 7, 0.001, 18 ], + "rotation": { "origin": [ 7, 0, 18 ], "axis": "z", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_up_2.json b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_up_2.json new file mode 100644 index 00000000..83b3dbe1 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_outer_leaves_up_2.json @@ -0,0 +1,120 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/lucernia_outer_leaves_2", + "texture": "betterend:block/lucernia_outer_leaves_2", + "spore": "betterend:block/lucernia_outer_leaves_2" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -10 ], + "to": [ 16, 0, 6 ], + "rotation": { "origin": [ 0, 0, 6 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 10 ], + "to": [ 16, 0.001, 26 ], + "rotation": { "origin": [ 0, 0, 10 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 10, -0.001, 0 ], + "to": [ 26, 0, 16 ], + "rotation": { "origin": [ 10, 0, 16 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -10, 0, 2 ], + "to": [ 6, 0.001, 18 ], + "rotation": { "origin": [ 6, 0, 18 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneX6", + "from": [ 0, 0, -6.5 ], + "to": [ 0.001, 16, 16 ], + "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX6", + "from": [ -6.5, 0, 15.999 ], + "to": [ 16, 16, 16 ], + "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -9 ], + "to": [ 16, 0, 7 ], + "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 9 ], + "to": [ 16, 0.001, 25 ], + "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 9, -0.001, 0 ], + "to": [ 25, 0, 16 ], + "rotation": { "origin": [ 9, 0, 16 ], "axis": "z", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -9, 0, 2 ], + "to": [ 7, 0.001, 18 ], + "rotation": { "origin": [ 7, 0, 18 ], "axis": "z", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/lucernia_leaves.json b/src/main/resources/assets/betterend/models/item/lucernia_leaves.json new file mode 100644 index 00000000..7690b3aa --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/lucernia_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/lucernia_leaves_1" +} diff --git a/src/main/resources/assets/betterend/models/item/lucernia_outer_leaves.json b/src/main/resources/assets/betterend/models/item/lucernia_outer_leaves.json new file mode 100644 index 00000000..091108b2 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/lucernia_outer_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/lucernia_outer_leaves_2" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_leaves.png b/src/main/resources/assets/betterend/textures/block/lucernia_leaves.png deleted file mode 100644 index 4fdfc22c9ad0f86ef5763399afa498f3124ea08f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~#Q>iWS0G(& z@376&=W>A6ogA;{J@G#_b^JRxbJO~5t!Mx5IeyVWBisCoT*2iX^O9@Lp#+BNIYm6_Tai5(A?9se+;+mPc-!9B%VvGn_Qi+`8iav0{{I<@i6*WH;lS4FyKtCgK~vOo9o;)~Os3hcW5i{lp` we;lE(dT;S+<(|87+tZ(%-hJ`Rx39eR>>rpP=RQ1P19Ss}r>mdKI;Vst0RGx?U;qFB diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_leaves_1.png b/src/main/resources/assets/betterend/textures/block/lucernia_leaves_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c90c827acfbaae559e656fd83e74c83e72420177 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0G(& z@376&=W>A6ogA;{J@G#_b^JRxQzne}FHnx7B*-tA;XediJr!aE6f5?0aSV}|n%ie6 zbijdwsk7A6ogA;{J@G#_b^JRxQzne}FHnx7B*-tA;XediJr!aE6l?Z$aSV}|s_O5_ z#GuHb#Q6JvKl?1dq?|+BPB4}mRFVdQ&MBb@04Z~3GXMYp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_leaves_3.png b/src/main/resources/assets/betterend/textures/block/lucernia_leaves_3.png new file mode 100644 index 0000000000000000000000000000000000000000..d319dab6e5239aa481bd00db1e192bf3a3fdd469 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0G(& z@376&=W>A6ogA;{J@G#_b^JRxQzne}FHnx7B*-tA;XediJr!aE6l?Z$aSV}|s@w0$ z#G=TC+r%%e~H0Uq6)exu58<^LifL z_}KpXL*cByJM^mdKI;Vst0O`bO0{{R3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_leaves_4.png b/src/main/resources/assets/betterend/textures/block/lucernia_leaves_4.png new file mode 100644 index 0000000000000000000000000000000000000000..2a931f9767c0dbf44701ed3fbe1f0a6452e88d3d GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~#Q>iWS0G(& z@376&=W>A6ogA+N6Y8G##Q)gT@$cYFuQ_)z&;2*MdgmZe5qC+DUogXeIH)bFy$Teb zn)9%1pmecD*7MxRd-ja1c($&&% z#ks>#C+AAMd$zBC(jOD1N$*Yn|MwTqT4y@BVJ}mYjkEvL7ln(T`g}IJv^8f-F z=SA1vdbm#E{)wxJbH0dO-t=8NWNy!?<>#($Zr#eX?VZb{Sfk5_Z1yrW?t42?uIzw) YJP%8^yYC}Spz9bsUHx3vIVCg!03l3!?*IS* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_log_side.png b/src/main/resources/assets/betterend/textures/block/lucernia_log_side.png index b2f33147388326c3e50c4bc4404ae7ccba604273..50bdeba608a0c9e99f59f96330c04462eceec9ca 100644 GIT binary patch delta 217 zcmeBVYGRsTST7ym6XMFiz~H5>5U#77VWnH(VqNKF*AnP7DbjU*yn7>~%vPW@XGxG> zFvEW+FlU;51t{3y>Eak7G1av{P{>)4gIQjnVat~*^7qNN8=8X(a z2ImwUrA($4F#KwI)^laM`xU>*hOxIzjBkH_C%;0v=tW`j>{kZw^X)AzvRHO3esc`y O7zR&QKbLh*2~7ZYv|HeBe`_rV9$MmHod83Mz z%4qy}_*IA=tDhL_7JI@GhZn-@n zh@d%DqSKEi^2?NF0eI>q1DK$>6%{ltT=_ZhAL_`O?7rM6W$LTVtq9H=AY7b{3!ndr6RAFvEW^SX#gAH&Dpa)5S4FV(QtRgPaVG z9L&9)-{L>1>99v1`Y9lDY~`=B8rg9Nv}R>}XWDdek=y)Byg!~@-k^9cX4}Tx6MeTT kkGTc=oH%)-l1Ze3!8(|cYud>)ZlIwIp00i_>zopr03=UI4gdfE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_outer_leaves_2.png b/src/main/resources/assets/betterend/textures/block/lucernia_outer_leaves_2.png new file mode 100644 index 0000000000000000000000000000000000000000..d52d30d6338db4547377e78b563f9f2fb9a361c4 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~xd5LKS0KI3 z)8}%4)twx#=RNU1Hg)_vIMZv+o#-9!Gtd1$@%NwyPz6^>kY6yve;BCi6bS>0`gyuI zhDc03+jEfjfB^?{Z!XKt`iDZMYptCAIvl#g_($!vth(*#tOdWeT;-V-^Hm|GWzMfZ z9JfyGnR~TZ_RzVBjc=r^G`goT=2m$N-h0X#Y0sFpV%F>xK$96fUHx3vIVCg!0Mjf~ AW&i*H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_outer_leaves_3.png b/src/main/resources/assets/betterend/textures/block/lucernia_outer_leaves_3.png new file mode 100644 index 0000000000000000000000000000000000000000..68a3a16a20a3f03fe35a763415eb39954c7ac9d1 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~xd5LKS0KI3 z)8}%4)twx#=RNU1Hg)_vIMZv+o#-9!Gtd1$@%NwyPz6^>kY6yve;BCi6bS>0`g^)K zhDc03+jEikfCGn<=!WNS_ZMtDt17#&F5>{Z;C{)ox8j?xy{(R2@2IqK#U;lEpKQ6e z6;4T^w!XXnnkrt+atYDD%-JOndw8Mxl$D109&Z`#Hr~vc2Q-?&)78&qol`;+02Lfl Apa1{> literal 0 HcmV?d00001