From 063e3fe4658061069501f9936ab645d4d3a53f5f Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 1 Nov 2020 15:11:11 +0300 Subject: [PATCH] Dragon tree feature prototype --- .../java/ru/betterend/util/SplineHelper.java | 31 +++ .../world/biome/BiomeShadowForest.java | 7 +- .../world/features/DragonTreeFeature.java | 200 +++++++++++------- .../blockstates/dragon_tree_bark.json | 22 ++ .../blockstates/dragon_tree_log.json | 22 ++ .../models/block/dragon_tree_bark.json | 6 + .../models/block/dragon_tree_bark_2.json | 6 + .../models/block/dragon_tree_bark_3.json | 6 + .../models/block/dragon_tree_bark_4.json | 6 + .../models/block/dragon_tree_log.json | 12 ++ .../models/block/dragon_tree_log_2.json | 12 ++ .../models/block/dragon_tree_log_3.json | 12 ++ .../models/block/dragon_tree_log_4.json | 12 ++ .../textures/block/dragon_tree_log_side.png | Bin 338 -> 1581 bytes .../textures/block/dragon_tree_log_side_2.png | Bin 0 -> 2418 bytes .../textures/block/dragon_tree_log_side_3.png | Bin 0 -> 2556 bytes .../textures/block/dragon_tree_log_side_4.png | Bin 0 -> 2658 bytes .../textures/block/dragon_tree_log_top.png | Bin 2161 -> 2368 bytes 18 files changed, 273 insertions(+), 81 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/dragon_tree_bark.json create mode 100644 src/main/resources/assets/betterend/blockstates/dragon_tree_log.json create mode 100644 src/main/resources/assets/betterend/models/block/dragon_tree_bark.json create mode 100644 src/main/resources/assets/betterend/models/block/dragon_tree_bark_2.json create mode 100644 src/main/resources/assets/betterend/models/block/dragon_tree_bark_3.json create mode 100644 src/main/resources/assets/betterend/models/block/dragon_tree_bark_4.json create mode 100644 src/main/resources/assets/betterend/models/block/dragon_tree_log.json create mode 100644 src/main/resources/assets/betterend/models/block/dragon_tree_log_2.json create mode 100644 src/main/resources/assets/betterend/models/block/dragon_tree_log_3.json create mode 100644 src/main/resources/assets/betterend/models/block/dragon_tree_log_4.json create mode 100644 src/main/resources/assets/betterend/textures/block/dragon_tree_log_side_2.png create mode 100644 src/main/resources/assets/betterend/textures/block/dragon_tree_log_side_3.png create mode 100644 src/main/resources/assets/betterend/textures/block/dragon_tree_log_side_4.png diff --git a/src/main/java/ru/betterend/util/SplineHelper.java b/src/main/java/ru/betterend/util/SplineHelper.java index 6c675a3d..5c9a8143 100644 --- a/src/main/java/ru/betterend/util/SplineHelper.java +++ b/src/main/java/ru/betterend/util/SplineHelper.java @@ -1,5 +1,6 @@ package ru.betterend.util; +import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.function.Function; @@ -208,4 +209,34 @@ public class SplineHelper { float z = MathHelper.lerp(delta, p1.getZ(), p2.getZ()); return new Vector3f(x, y, z); } + + public static void rotateSpline(List spline, float angle) { + for (Vector3f v: spline) { + float sin = (float) Math.sin(angle); + float cos = (float) Math.cos(angle); + float x = v.getX() * cos + v.getZ() * sin; + float z = v.getX() * sin + v.getZ() * cos; + v.set(x, v.getY(), z); + } + } + + public static List copySpline(List spline) { + List result = new ArrayList(spline.size()); + for (Vector3f v: spline) { + result.add(v.copy()); + } + return result; + } + + public static void scale(List spline, float scale) { + for (Vector3f v: spline) { + v.set(v.getX() * scale, v.getY() * scale, v.getZ() * scale); + } + } + + public static void offset(List spline, Vector3f offset) { + for (Vector3f v: spline) { + v.add(offset); + } + } } diff --git a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java index 795d75af..b16a83ed 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java @@ -5,16 +5,17 @@ import net.minecraft.particle.ParticleTypes; import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; +import ru.betterend.registry.EndSounds; public class BiomeShadowForest extends EndBiome { public BiomeShadowForest() { super(new BiomeDefinition("shadow_forest") - .setFogColor(87, 26, 87) - .setFogDensity(1.5F) + .setFogColor(0, 0, 0) + .setFogDensity(2.5F) .setPlantsColor(122, 45, 122) .setSurface(EndBlocks.SHADOW_GRASS) .setParticles(ParticleTypes.MYCELIUM, 0.01F) - //.setLoop(EndSounds.AMBIENT_CHORUS_FOREST) + .setLoop(EndSounds.AMBIENT_CHORUS_FOREST) //.setMusic(EndSounds.MUSIC_CHORUS_FOREST) .addFeature(EndFeatures.END_LAKE_RARE) .addFeature(EndFeatures.DRAGON_TREE) diff --git a/src/main/java/ru/betterend/world/features/DragonTreeFeature.java b/src/main/java/ru/betterend/world/features/DragonTreeFeature.java index 663da872..30ce6cc9 100644 --- a/src/main/java/ru/betterend/world/features/DragonTreeFeature.java +++ b/src/main/java/ru/betterend/world/features/DragonTreeFeature.java @@ -4,39 +4,46 @@ 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.Blocks; 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.Direction; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; 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.PosInfo; import ru.betterend.util.sdf.SDF; -import ru.betterend.util.sdf.operator.SDFCoordModify; -import ru.betterend.util.sdf.operator.SDFFlatWave; +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.operator.SDFUnion; import ru.betterend.util.sdf.primitive.SDFSphere; public class DragonTreeFeature extends DefaultFeature { private static final Function REPLACE; + private static final Function IGNORE; private static final Function POST; + private static final List BRANCH; + private static final List SIDE1; + private static final List SIDE2; + 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(15, 35, random); + float size = MHelper.randRange(10, 25, random); List spline = SplineHelper.makeSpline(0, 0, 0, 0, size, 0, 6); SplineHelper.offsetParts(spline, random, 1F, 0, 1F); @@ -44,89 +51,95 @@ public class DragonTreeFeature extends DefaultFeature { return false; } - float radius = MHelper.randRange(6F, 8F, random); - radius *= (size - 15F) / 20F + 1F; - Vector3f top = spline.get(spline.size() - 1); + Vector3f last = SplineHelper.getPos(spline, 3.5F); + OpenSimplexNoise noise = new OpenSimplexNoise(random.nextLong()); + float radius = size * MHelper.randRange(0.5F, 0.7F, random); + makeCap(world, pos.add(last.getX(), last.getY(), last.getZ()), radius, random, noise); - radius = size * MHelper.randRange(0.08F, 0.12F, random); - float radius2 = size / 15F; - SDF function = SplineHelper.buildSDF(spline, radius, radius2, (bpos) -> { + last = spline.get(0); + makeRoots(world, pos.add(last.getX(), last.getY(), last.getZ()), radius, random); + + radius = MHelper.randRange(1.2F, 2.3F, random); + SDF function = SplineHelper.buildSDF(spline, radius, 1.2F, (bpos) -> { return EndBlocks.DRAGON_TREE.bark.getDefaultState(); }); - int branches = (int) ((size - 10) * 0.25F + 5); - radius = size * MHelper.randRange(0.4F, 0.6F, random); - /*for (int i = 0; i < branches; i++) { - float angle = (float) i / (float) branches * MHelper.PI2; - float x2 = top.getX() + (float) Math.sin(angle) * radius; - float z2 = top.getZ() + (float) Math.cos(angle) * radius; - spline = SplineHelper.makeSpline(top.getX(), top.getY(), top.getZ(), x2, top.getY(), z2, 7); - SplineHelper.powerOffset(spline, radius * 0.5F, 3); - SplineHelper.fillSpline(spline, world, EndBlocks.DRAGON_TREE.bark.getDefaultState(), pos, (state) -> { - return state.getMaterial().isReplaceable() || state.isOf(EndBlocks.DRAGON_TREE_LEAVES); - }); - }*/ - - BlockState leaves = EndBlocks.DRAGON_TREE_LEAVES.getDefaultState().with(LeavesBlock.DISTANCE, 1); - SDF leafCap = new SDFSphere().setRadius(radius + 3).setBlock(leaves); - leafCap = new SDFScale3D().setScale(1, 0.25F, 1).setSource(leafCap); - SDF sub = new SDFSphere().setRadius(radius * 2).setBlock(Blocks.AIR); - sub = new SDFTranslate().setTranslate(0, radius * 2 - 2F, 0).setSource(sub); - leafCap = new SDFSubtraction().setSourceA(leafCap).setSourceB(sub); - - SDF branch = new SDFSphere().setRadius(1).setBlock(EndBlocks.DRAGON_TREE.bark); - branch = new SDFScale3D().setScale(1, 2F / radius, 1).setSource(branch); - branch = new SDFTranslate().setTranslate(0, -radius * 0.25F - 1F, 0).setSource(branch); - branch = new SDFFlatWave().setRaysCount(branches).setIntensity(radius).setSource(branch); - branch = new SDFCoordModify().setFunction((bpos) -> { - float dist = MHelper.length(bpos.getX(), bpos.getZ()); - bpos.set(bpos.getX(), bpos.getY() - dist * 0.1F, bpos.getZ()); - }).setSource(branch); - SDF center = new SDFSphere().setRadius(3).setBlock(EndBlocks.DRAGON_TREE.bark); - center = new SDFFlatWave().setRaysCount(branches).setIntensity(3).setSource(center); - branch = new SDFUnion().setSourceA(branch).setSourceB(center); - sub = new SDFSphere().setRadius(radius + 1).setBlock(leaves); - sub = new SDFScale3D().setScale(1, 0.25F, 1).setSource(sub); - branch = new SDFSubtraction().setSourceA(branch).setSourceB(sub); - - leafCap = new SDFUnion().setSourceA(leafCap).setSourceB(branch); - - OpenSimplexNoise noise = new OpenSimplexNoise(1234); - leafCap = new SDFCoordModify().setFunction((bpos) -> { - float dist = MHelper.length(bpos.getX(), bpos.getZ()); - float y = bpos.getY() + (float) noise.eval(bpos.getX() * 0.1 + pos.getX(), bpos.getZ() * 0.1 + pos.getZ()) * dist * 0.3F + dist * 0.25F; - bpos.set(bpos.getX(), y, bpos.getZ()); - }).setSource(leafCap); - - SDF smallLeaf = leafCap; - leafCap = new SDFTranslate().setTranslate(top.getX(), top.getY() + radius * 0.25F + 1.5F, top.getZ()).setSource(leafCap); - function = new SDFUnion().setSourceA(function).setSourceB(leafCap); - - /*branches = Math.round((size - 15) * 0.1F); - if (branches > 0) { - SDF pie = new SDFPie().setRadius(50).setAngle((float) Math.toRadians(135)).setBlock(leaves); - smallLeaf = new SDFIntersection().setSourceA(leafCap).setSourceB(pie); - - for (int i = 0; i < branches; i++) { - float indexF = MHelper.randRange(3F, 5F, random); - Vector3f vec = SplineHelper.getPos(spline, indexF); - float scale = MHelper.randRange(0.3F, 0.6F, random); - SDF leaf = new SDFScale().setScale(scale).setSource(smallLeaf); - leaf = new SDFRotation().setRotation(Vector3f.POSITIVE_Y, MHelper.randRange(0, MHelper.PI2, random)).setSource(leaf); - leaf = new SDFTranslate().setTranslate(vec.getX(), vec.getY(), vec.getZ()).setSource(leaf); - function = new SDFUnion().setSourceA(function).setSourceB(leaf); - } - }*/ - function.setReplaceFunction(REPLACE); function.setPostProcess(POST); - function.fillRecursiveIgnore(world, pos, (state) -> { - return EndBlocks.DRAGON_TREE.isTreeLog(state) || state.isOf(EndBlocks.DRAGON_TREE_LEAVES); - }); + function.fillRecursiveIgnore(world, pos, IGNORE); return true; } + private void makeCap(StructureWorldAccess world, BlockPos pos, float radius, Random random, OpenSimplexNoise noise) { + int count = (int) radius; + int offset = (int) (BRANCH.get(BRANCH.size() - 1).getY() * radius); + 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(BRANCH); + SplineHelper.rotateSpline(branch, angle); + SplineHelper.scale(branch, scale); + SplineHelper.fillSpline(branch, world, EndBlocks.DRAGON_TREE.bark.getDefaultState(), pos, REPLACE); + + branch = SplineHelper.copySpline(SIDE1); + SplineHelper.rotateSpline(branch, angle); + SplineHelper.scale(branch, scale); + SplineHelper.fillSpline(branch, world, EndBlocks.DRAGON_TREE.bark.getDefaultState(), pos, REPLACE); + + branch = SplineHelper.copySpline(SIDE2); + SplineHelper.rotateSpline(branch, angle); + SplineHelper.scale(branch, scale); + SplineHelper.fillSpline(branch, world, EndBlocks.DRAGON_TREE.bark.getDefaultState(), pos, REPLACE); + } + leavesBall(world, pos.up(offset), radius * 1.15F + 2, random, noise); + } + + 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); + SplineHelper.fillSpline(branch, world, EndBlocks.DRAGON_TREE.bark.getDefaultState(), pos, REPLACE); + } + } + + private void leavesBall(StructureWorldAccess world, BlockPos pos, float radius, Random random, OpenSimplexNoise noise) { + SDF sphere = new SDFSphere().setRadius(radius).setBlock(EndBlocks.DRAGON_TREE_LEAVES.getDefaultState().with(LeavesBlock.DISTANCE, 1)); + 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.5F, 1).setSource(sphere); + sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 1.5F; }).setSource(sphere); + sphere = new SDFDisplacement().setFunction((vec) -> { return random.nextFloat() * 3F - 1.5F; }).setSource(sphere); + sphere.fillRecursiveIgnore(world, pos, IGNORE); + + if (radius > 5) { + int count = (int) (radius * 2.5F); + for (int i = 0; i < count; i++) { + BlockPos p = pos.add(random.nextGaussian() * 1, random.nextGaussian() * 1, random.nextGaussian() * 1); + boolean place = true; + for (Direction d: Direction.values()) { + BlockState state = world.getBlockState(p.offset(d)); + if (!EndBlocks.DRAGON_TREE.isTreeLog(state) && !state.isOf(EndBlocks.DRAGON_TREE_LEAVES)) { + place = false; + break; + } + } + if (place) { + BlocksHelper.setWithoutUpdate(world, p, EndBlocks.DRAGON_TREE.bark); + } + } + } + + BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.DRAGON_TREE.bark); + } + static { REPLACE = (state) -> { if (state.isIn(EndTags.END_GROUND)) { @@ -141,11 +154,42 @@ public class DragonTreeFeature extends DefaultFeature { return state.getMaterial().isReplaceable(); }; + IGNORE = (state) -> { + return EndBlocks.DRAGON_TREE.isTreeLog(state); + }; + POST = (info) -> { if (EndBlocks.DRAGON_TREE.isTreeLog(info.getStateUp()) && EndBlocks.DRAGON_TREE.isTreeLog(info.getStateDown())) { return EndBlocks.DRAGON_TREE.log.getDefaultState(); } return info.getState(); }; + + BRANCH = Lists.newArrayList(new Vector3f(0, 0, 0), + new Vector3f(0.1F, 0.3F, 0), + new Vector3f(0.4F, 0.6F, 0), + new Vector3f(0.8F, 0.8F, 0), + new Vector3f(1, 1, 0)); + SIDE1 = Lists.newArrayList(new Vector3f(0.4F, 0.6F, 0), + new Vector3f(0.8F, 0.8F, 0), + new Vector3f(1, 1, 0)); + SIDE2 = SplineHelper.copySpline(SIDE1); + + Vector3f offset1 = new Vector3f(-0.4F, -0.6F, 0); + Vector3f offset2 = new Vector3f(0.4F, 0.6F, 0); + + SplineHelper.offset(SIDE1, offset1); + SplineHelper.offset(SIDE2, offset1); + SplineHelper.rotateSpline(SIDE1, 0.5F); + SplineHelper.rotateSpline(SIDE2, -0.5F); + 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)); + SplineHelper.offset(ROOT, new Vector3f(0, -0.45F, 0)); } } diff --git a/src/main/resources/assets/betterend/blockstates/dragon_tree_bark.json b/src/main/resources/assets/betterend/blockstates/dragon_tree_bark.json new file mode 100644 index 00000000..70f9bb89 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/dragon_tree_bark.json @@ -0,0 +1,22 @@ +{ + "variants": { + "axis=x": [ + { "model": "betterend:block/dragon_tree_bark", "x": 90, "y": 90 }, + { "model": "betterend:block/dragon_tree_bark_2", "x": 90, "y": 90 }, + { "model": "betterend:block/dragon_tree_bark_3", "x": 90, "y": 90 }, + { "model": "betterend:block/dragon_tree_bark_4", "x": 90, "y": 90 } + ], + "axis=y": [ + { "model": "betterend:block/dragon_tree_bark" }, + { "model": "betterend:block/dragon_tree_bark_2" }, + { "model": "betterend:block/dragon_tree_bark_3" }, + { "model": "betterend:block/dragon_tree_bark_4" } + ], + "axis=z": [ + { "model": "betterend:block/dragon_tree_bark", "x": 90 }, + { "model": "betterend:block/dragon_tree_bark_2", "x": 90 }, + { "model": "betterend:block/dragon_tree_bark_3", "x": 90 }, + { "model": "betterend:block/dragon_tree_bark_4", "x": 90 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/dragon_tree_log.json b/src/main/resources/assets/betterend/blockstates/dragon_tree_log.json new file mode 100644 index 00000000..5426cc24 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/dragon_tree_log.json @@ -0,0 +1,22 @@ +{ + "variants": { + "axis=x": [ + { "model": "betterend:block/dragon_tree_log", "x": 90, "y": 90 }, + { "model": "betterend:block/dragon_tree_log_2", "x": 90, "y": 90 }, + { "model": "betterend:block/dragon_tree_log_3", "x": 90, "y": 90 }, + { "model": "betterend:block/dragon_tree_log_4", "x": 90, "y": 90 } + ], + "axis=y": [ + { "model": "betterend:block/dragon_tree_log" }, + { "model": "betterend:block/dragon_tree_log_2" }, + { "model": "betterend:block/dragon_tree_log_3" }, + { "model": "betterend:block/dragon_tree_log_4" } + ], + "axis=z": [ + { "model": "betterend:block/dragon_tree_log", "x": 90 }, + { "model": "betterend:block/dragon_tree_log_2", "x": 90 }, + { "model": "betterend:block/dragon_tree_log_3", "x": 90 }, + { "model": "betterend:block/dragon_tree_log_4", "x": 90 } + ] + } +} diff --git a/src/main/resources/assets/betterend/models/block/dragon_tree_bark.json b/src/main/resources/assets/betterend/models/block/dragon_tree_bark.json new file mode 100644 index 00000000..3a780e27 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/dragon_tree_bark.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/dragon_tree_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/dragon_tree_bark_2.json b/src/main/resources/assets/betterend/models/block/dragon_tree_bark_2.json new file mode 100644 index 00000000..4a76880b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/dragon_tree_bark_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/dragon_tree_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/dragon_tree_bark_3.json b/src/main/resources/assets/betterend/models/block/dragon_tree_bark_3.json new file mode 100644 index 00000000..20afbe66 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/dragon_tree_bark_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/dragon_tree_log_side_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/dragon_tree_bark_4.json b/src/main/resources/assets/betterend/models/block/dragon_tree_bark_4.json new file mode 100644 index 00000000..a934ef01 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/dragon_tree_bark_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/dragon_tree_log_side_4" + } +} diff --git a/src/main/resources/assets/betterend/models/block/dragon_tree_log.json b/src/main/resources/assets/betterend/models/block/dragon_tree_log.json new file mode 100644 index 00000000..de0adbd8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/dragon_tree_log.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/dragon_tree_log_top", + "east": "betterend:block/dragon_tree_log_side", + "north": "betterend:block/dragon_tree_log_side", + "particle": "betterend:block/dragon_tree_log_side", + "south": "betterend:block/dragon_tree_log_side", + "up": "betterend:block/dragon_tree_log_top", + "west": "betterend:block/dragon_tree_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/dragon_tree_log_2.json b/src/main/resources/assets/betterend/models/block/dragon_tree_log_2.json new file mode 100644 index 00000000..12c016bb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/dragon_tree_log_2.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/dragon_tree_log_top", + "east": "betterend:block/dragon_tree_log_side_2", + "north": "betterend:block/dragon_tree_log_side_2", + "particle": "betterend:block/dragon_tree_log_side_2", + "south": "betterend:block/dragon_tree_log_side_2", + "up": "betterend:block/dragon_tree_log_top", + "west": "betterend:block/dragon_tree_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/dragon_tree_log_3.json b/src/main/resources/assets/betterend/models/block/dragon_tree_log_3.json new file mode 100644 index 00000000..6ca4a28c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/dragon_tree_log_3.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/dragon_tree_log_top", + "east": "betterend:block/dragon_tree_log_side_3", + "north": "betterend:block/dragon_tree_log_side_3", + "particle": "betterend:block/dragon_tree_log_side_3", + "south": "betterend:block/dragon_tree_log_side_3", + "up": "betterend:block/dragon_tree_log_top", + "west": "betterend:block/dragon_tree_log_side_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/dragon_tree_log_4.json b/src/main/resources/assets/betterend/models/block/dragon_tree_log_4.json new file mode 100644 index 00000000..06771dab --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/dragon_tree_log_4.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/dragon_tree_log_top", + "east": "betterend:block/dragon_tree_log_side_4", + "north": "betterend:block/dragon_tree_log_side_4", + "particle": "betterend:block/dragon_tree_log_side_4", + "south": "betterend:block/dragon_tree_log_side_4", + "up": "betterend:block/dragon_tree_log_top", + "west": "betterend:block/dragon_tree_log_side_4" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side.png index a7ef25d70878bac8bcb248fdd8be53f0382fbd66..4cc5af6adc9e18f8b3c50ccf222c761655b727bc 100644 GIT binary patch literal 1581 zcmbVNTZr6L7|w3HI<~vAq7PMHLI&(bGdamzlWw-%&dj<4%{uPJb}eo(lbp;PXOfd9 z*`3*?h^#)erP^(=+ScObK`6-fp(wP7h%G2cy-*M@P^}>9ieSAw6x*UFa|v6iw}zbL zoRjZ-|NYPI;^_T-EACoBQB+@HBsWIh{lSQIljr>YN{YO0aYi2YC~D>H!RVrn99>0G z%YQ}cgg>EdmUL{zGy|7ltYJ9>O;H0I8jhw{p--1!8QC)P)0=NIG%{pnYf=G*8OVs$g(5sZKTXVNJLI}(Pn~ffHwHaCHb6B4Wg4;Q7{Lk|bxQG;& zR=Z)IpyYzAkVcS4;x*GQigCE3J*y$QnFx}m2MI1SdJtJ?Fzs!0!yahS)+>;Z{zJH1 zFb|u4U31}3nRx5JWE4mA=Ync%nZo_m%I3EvmD_=nb`VU%K13E_CxbR=UoPoW@8$hn zq{m$-Up~LjyD(=iR9DT<8-tTSUSW&Wo-+^PZ!>oPz`pO^s(zAxSrrZ}U-tOM zi4(u1BGJ7+fBns;N2hzXB$V>r;mqkBm$rO4K>zSWHGQeHxUlxsQwO=<4)w~BSB@>) zx!Qd3!-cc`-IM9x&+|8*l#ib}c;}{%QJ?zIRS&(pYv;vY+;i^P+YWab0J8=*auM=I86?ZFRkHMm~9E`?j-RZI4E;cG;gj+4Y9HG58r!h5Tsl_@+na{sh<5 B4yFJA delta 322 zcmV-I0logM4AKIS8Gi-<001BJ|6u?C0U1d|K~y-6&5%t?0#Ou(pBcY0s~JcN$wWvO zA{6-x`){qIU8@#t0$U7?<8-}q&zZ4BBnUUmMbNuDaNvF3Cpe3S>sIp+Czk1W#>3M+ z0Rg61FuJ(q>b0fT$x|riePa z(Ez7*^P8Cjrz)?Hq?fr$*lS^u09aTZp(WtixyU}2Sx~t7M zD^xB1sYG9Vvpd47Dlw~^Y?*Gg`EY%+ew66L-AkemcQ1)P+`T0FaQ{xCFTa)e31TJ` Ug#=(kKL7v#07*qoM6N<$f;dZ(aR2}S diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side_2.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side_2.png new file mode 100644 index 0000000000000000000000000000000000000000..3b571ced4cf2c7be56d30332df8343eed72d34f3 GIT binary patch literal 2418 zcmb_e4Qvxt9PbFi7z{x`$%Jqm3Ile%@3wbYfw2xZw$3?<3`k_}-o3V$wY}22(XNgq zEFuDa020CgBVtBGgUTEM;s-&dNCYJ&CTbud#*sybjtD}6$$Zy#W#B+UY}t!=jA`H3ii4ag)E6wo4W@{f;?lZ2+a$z`IK@kUEg zP%BTy(2``e4<;L+q>}UJ5yc4^1B8(Yh(tIPG311sOySCSY)#W7kuotG++>O6kf`(4 z5T$wy5u)8eK~~@hr(|axjKm2=1jn#WnsL%BPcf{_IAmTTG9MCqi>ZFO*0U(%3%|L^ zplL>BnvTcg_Be0XV*#3#B#CA?n&T*JK^aXE6C|jJF=GJ1gA5qcqNb)t2n!J?dZXzk zG1Ih!a5M`WF*0Go0izQjO0#yxl9V!3Vb(6%7z?GGtB^(^6h;x#z_x7GHX77T-3aP; zfzB@9<^YG*>&^NYl1n(8bzzugYp{$=K!&t7d`(eA*CIo2j6qbk2Gg8jsfo&^F$7FK z=F|1iK%!~}C=;cnR$^R4;W90v>TzTCpgqU~OynjxhGQs}p?KEEF*4(ld0{TY%M6n? z_3EnTZyIdM;spCxF=gty%@kLS3QX{y#wwKkdMpgEW-SZ?h>k`AB$17zT&jok7jw!({--u5M$i(>O>GI3J@qpz&Fk>s1%Syh7vfI1B?J6<4VT_vw1qE;Z_5o!KfB1 z6(h0^z_Nfr6zlRkDG>@TN`bhXf#8B7tGGnT!C3`;%kuzA3D#%eTpF2%SqK7|QAnFN zG-*LqT&f?6lmq!OUnoFIVSz#^qTh)rv&bO`#kAEc7$V(NoZ9xQpwD; zHbmy{E5@1q@gTyW_bBtUcSHA^aS%f#0bC{b(@FH*_#0r&z1a(Zcj8XrDUM?R#W--K zDIzWtKd&fw$|(Vte?a|U_UXIt^m82*ZutZSZkAv|Sb-WOLAS8pVjojDlHneNMdaqogT z)1TP9FBgU;FFN+&B{?z^&YqMw1Dj>uKkMM1??p!T*08JAjeO_O#^wYUY*v4VC`aL*H@Y^p2v%MR^Z#7rQ#%UfyHSTHCI1-#>fg*v{7Y z&7R&%e{EBH>d&tlcJ_t%PoMR*J-p-7*Jdp~-+yk)rf;HSr;ezfHaw@UW$pEP=`}R~FxVYo<@|<59k4)fuyhm1! z4%YY8MmV*M+sD696ozp%dbAOFQPBLDyZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side_3.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side_3.png new file mode 100644 index 0000000000000000000000000000000000000000..a6cd58b496cbba1950ed67623da8b6f852c0f44d GIT binary patch literal 2556 zcmb_e32YQq7~a+d3J5_2TEXBjEr`H$?%AE8TaLESMwX+jawx}}H*a=Fx;x9vlx`t` z*dR(EP*IB#gcL$0L4-i?2x(B{5K5qeVt^n)LlCr7K%;^I-|TLef`Ej$*}2~Q@B6>+ zKi-=q6UL3{+PP0>kH^!sthBfsU%R_URwh2zz8RMArBkeQs_pS~dD1;HJge8_csw1y zGlEl`DS@#HG$Z*yGgXuykHoOG$5Svo9s_VTatIZLjHsV%-L;z}49!nY76VKmR)oSv z={yTfnl~;8=go$)Mh-6|3gQX|h#&_L@km9~R^om#fvezqcbF!Lgo!iTPmXjQ5>o;b zh$7QMgqSZ;kQF$>E9bKkBXhz~f@4@O&3I{+rx;dYB!!oW)Q`m8EKOI+i$|w?;U_;C zcAS_((^XYf`Bi+rX@zK3mSvjZXpW<>1!Y%99T2CYc5WL&F|wg$#2mwn5-uW8%}U2l zVx~z6kysiwYNx`414hR|jArv0S5m@IgK4{1rB#t|u0a}Apa_aOHnwHcwz073n0DB_ z4|MwV9S(441A(-Udvb|H(k^VLWG~ zR?svn+7dOPjWSVGP44Q02HM7couH76|3>@SqIfi2>mZ5ky$T14zQ+Qzr!z&Dv zG!2-Vp;xyzWpRRote7wr?=ZzxqX7r}r?CbV-LxVAYc?Vvgy>i_L=x#pDn(|6X<^5h z9iLzk2qjtqAqcA+x%h^ zR=UY`=O^o2Ga<&f?Uhk|K3zr{C3DbA$&w&bJ`V7d$g85H@r+mGKpWb4%fPJ$D%zvE ztTc=WS)LI&OoKeF;6V)eR40f?QcEWmC>-77%IB1sSmXt!4|M6wOCNJnG^usMZ!-)w>ywVriP7sRMA7_D>c6=j4w-t)VF7!>|#M-1x4iB zy7&>Ae;|q<3o+#i6qBUcAAdz1`!{+vK?eGdEStLXG!mtzg*>-QB3kqc|>*4DMhPC8@W*pt)vVegvk zx0|PJnej{G;HHCC^|h7@7Y?4%Cx8A~^R)7;Wyeo_)nKg5>%VAh(}5q=H4X3CAFq5T zxOqh8fV}RR!<4BD7d;lX)(+V~#Aj8%G&5W6nR#gmxAKR_$IC1JxIF2|m~92}ylV>< zbZE+}pL%HL#AO@5AGR9RgfcT>ucKE7{yFUhdfhXs$X6{PlRl=%Je?H1vxaoip}#YpGo4j4}>!@y*iJn{|h-EHCSUo=j{4qezRC`>-Pbpa;vkNGjjJW%Dh+vx18Sb!SpZB zuDb9^mQ?Z$p1wyuz_cWw1Fw7{F+KHFDuzt74_ L#ua}wYF5oZN=$HE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side_4.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side_4.png new file mode 100644 index 0000000000000000000000000000000000000000..4f5d0b7e3828e2709d3114974073420a60ae0679 GIT binary patch literal 2658 zcmb_e32YQq7+wygt%9{G6f|_05~ZQDbI;BUEYOR##%;+`Z8;R*ym`|u?9Qw^(-Q+J zhNI9Z5JW``Y69^#F(POc5TxNM6|oXUBq7mCyojQh2>A#Z1aJfK1=;sv^;A#YP8img4K$y1x604_idp`qH4=_h~b*hvy0-A`7F0VWVFLUp0C zmKd7ZQc(q47C=QOr%oXzH>nsPf*e3JMZ%`7Hu=dou8Qy7VVWf3Ce8vsS>QS(Y63He zA}fXn(JN7q6*$7Dcv*>2I3b_l7}iHKKAPnzhE*9!Pf(Bk#3hwKS_J3e9jd$5GgVvYSl@G*PCV+lNq$Y#0kgoseY`E+WvZddE*< zril94lwGtw7LGgDA&tT)f=tK8wrt8aT4yxvI5Y)f`215ZP9J45E?-Of%PwCaM<25OAzm zm1Twd5;dcbGEr3ICPpSEREJF6YP9qE%|XS$L4J~BIEG>wif5}hMrCA`7bY^i$}kDj zfTf3w=KiKEPH+_~#!b1)OmWrdzybehtV7kXViAC24n;sMqN8RlNu-oii>$B}!;UdK zKF%T#P|Ho*0VYJ{#eNcp?G1%=75F5`N)S>$P5~4W1cj2JE>a@LGK|3}hA1h0^NTH5 z?%0gn+2~-GCw`Aw#DC6dOTW2ykU3yz?K*0br#`Pf(B1< zlHj9cM&l{m54s}rNQVsSi@rbm#EKxOcu^2ji^mPJPl^NUfLV+19!8Tl9?!tmhXm1o z$8*IB_rJyyuhB%Q(N|Vs{9V7D4yQ9dgtt%kHnnf#ht$rGOe|Fl@9W{}h08sjLEn}a z7gSB?js*9cRcz+jpSK-KTl?aQ7l*dW(G^5+{P;iru524TMrbn@t~!1dErc}mNw0|rTq6g)SBL!-5Y%6x#=Ib4%;wp{q~s^Z~i2Y zBA(2x-HL;QKom1Vo=Q!g)LKka#be`mwt?sM~YJashfzzNXt zbNAEhzWFQj!{Erd%AV#^J#9-)7mhq%IBVbFuJNbeEzP;Tck!p2j|}d7Df{u|d&aK& z;_Q!$hfQhyZnIVRM^{FAcSpoqa?kui{qT_^b3b^ae(B2D)WL(R7JNTxcxh>F^RS`w zXGhpUWz)WXcI5UFrDFf25tDKZr(yJPW68z!%hHyk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_log_top.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_log_top.png index 9952a7311b3935f446f01e10d511c25c1216c9e7..15641e8c13b4fd2d85a0d501a746438d35843511 100644 GIT binary patch delta 566 zcmew;a6o8+1rvMiMyoC+UPE02!w^GLD+3EFQ^Uy@nH11O{xJopB&S&zr5YtB>zb#f zrRf?an;7U?Bqy2a8d#(x8yH#`B$}IBY%XF}V4i%4)y$O`)k+G*C9Y*9R^=I~dA3SM z21W+DhNv#7XSJVP!Cu7=lu>j2prpfH#Iw3tLXy6$CM9@ zHb4IHKe)P>eeVi|wgnrfE?xca7N<7X>@+Lm-*3;D*Ds3OZg8vOeS7nx%6}`S+`6*v zx~z&>RC3$Z+wYT{}pZ|j0l^F}Qken9C-s zHf#xcwM^)jn3dozrxN9L1>1E?_MD%vG*ZK}xNOtJ6YlqlAKOSNzzK z6-6h_bY}PL%$c8{ll8TZtgXA9eDL(3l&b9eUe;^G&G&NtJQ+5lmH@Oi)>c8ceR|fr zR4b`%X>^QE;?}I3a)Rq`Z->`Bs(-QWMmOjr&d_OdrK`?Og06PBB6n z!c%++HY+C}xZ@M(dLA06ySv9pv=s!JwtOt0Ri=$>Ru;9bA{}v#2D(s6hkv16)FI7Q ze~IuB?G1(#GMY`a=Oe}VW)R&(x*-9il~OmA&^O-+-xZ>N4Z+{73e7hel9n|w`N4^s zP9c%}u)I*TOcP