diff --git a/src/main/java/ru/betterend/blocks/BlockBubbleCoral.java b/src/main/java/ru/betterend/blocks/BlockBubbleCoral.java index f20dd4a4..f2bff154 100644 --- a/src/main/java/ru/betterend/blocks/BlockBubbleCoral.java +++ b/src/main/java/ru/betterend/blocks/BlockBubbleCoral.java @@ -47,4 +47,14 @@ public class BlockBubbleCoral extends BlockUnderwaterPlant { public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { return SHAPE; } + + @Override + public boolean isFertilizable(BlockView world, BlockPos pos, BlockState state, boolean isClient) { + return false; + } + + @Override + public boolean canGrow(World world, Random random, BlockPos pos, BlockState state) { + return false; + } } diff --git a/src/main/java/ru/betterend/blocks/BlockEndLily.java b/src/main/java/ru/betterend/blocks/BlockEndLily.java index d930b267..5b78d7ef 100644 --- a/src/main/java/ru/betterend/blocks/BlockEndLily.java +++ b/src/main/java/ru/betterend/blocks/BlockEndLily.java @@ -2,6 +2,7 @@ package ru.betterend.blocks; import java.util.Collections; import java.util.List; +import java.util.Random; import com.google.common.collect.Lists; @@ -26,6 +27,7 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; +import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.TripleShape; @@ -103,4 +105,14 @@ public class BlockEndLily extends BlockUnderwaterPlant { public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) { return new ItemStack(EndBlocks.END_LILY_SEED); } + + @Override + public boolean isFertilizable(BlockView world, BlockPos pos, BlockState state, boolean isClient) { + return false; + } + + @Override + public boolean canGrow(World world, Random random, BlockPos pos, BlockState state) { + return false; + } } diff --git a/src/main/java/ru/betterend/blocks/BlockHydralux.java b/src/main/java/ru/betterend/blocks/BlockHydralux.java new file mode 100644 index 00000000..cbba5ddb --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockHydralux.java @@ -0,0 +1,90 @@ +package ru.betterend.blocks; + +import java.util.Collections; +import java.util.List; +import java.util.Random; + +import com.google.common.collect.Lists; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.EnumProperty; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldView; +import ru.betterend.blocks.BlockProperties.HydraluxShape; +import ru.betterend.blocks.basis.BlockUnderwaterPlant; +import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndItems; +import ru.betterend.util.MHelper; + +public class BlockHydralux extends BlockUnderwaterPlant { + public static final EnumProperty SHAPE = BlockProperties.HYDRALUX_SHAPE; + + public BlockHydralux() { + super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) + .breakByTool(FabricToolTags.SHEARS) + .sounds(BlockSoundGroup.WET_GRASS) + .breakByHand(true) + .luminance((state) -> { return state.get(SHAPE).hasGlow() ? 15 : 0; }) + .noCollision()); + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(SHAPE); + } + + @Override + public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + BlockState down = world.getBlockState(pos.down()); + HydraluxShape shape = state.get(SHAPE); + if (shape == HydraluxShape.FLOWER_BIG_TOP || shape == HydraluxShape.FLOWER_SMALL_TOP) { + return down.isOf(this); + } + else if (shape == HydraluxShape.ROOTS) { + return down.isOf(EndBlocks.SULPHURIC_ROCK.stone) && world.getBlockState(pos.up()).isOf(this); + } + else { + return down.isOf(this) && world.getBlockState(pos.up()).isOf(this); + } + } + + @Override + public boolean isFertilizable(BlockView world, BlockPos pos, BlockState state, boolean isClient) { + return false; + } + + @Override + public boolean canGrow(World world, Random random, BlockPos pos, BlockState state) { + return false; + } + + @Override + @Environment(EnvType.CLIENT) + public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) { + return new ItemStack(EndBlocks.HYDRALUX_SAPLING); + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + HydraluxShape shape = state.get(SHAPE); + if (shape == HydraluxShape.FLOWER_BIG_BOTTOM || shape == HydraluxShape.FLOWER_SMALL_BOTTOM) { + return Lists.newArrayList(new ItemStack(EndItems.HYDRALUX_PETAL, MHelper.randRange(1, 4, MHelper.RANDOM))); + } + else if (shape == HydraluxShape.ROOTS) { + return Lists.newArrayList(new ItemStack(EndBlocks.HYDRALUX_SAPLING, MHelper.randRange(1, 2, MHelper.RANDOM))); + } + return Collections.emptyList(); + } +} diff --git a/src/main/java/ru/betterend/blocks/BlockHydraluxSapling.java b/src/main/java/ru/betterend/blocks/BlockHydraluxSapling.java new file mode 100644 index 00000000..b3615fe3 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockHydraluxSapling.java @@ -0,0 +1,49 @@ +package ru.betterend.blocks; + +import java.util.Random; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockPos.Mutable; +import net.minecraft.world.StructureWorldAccess; +import ru.betterend.blocks.BlockProperties.HydraluxShape; +import ru.betterend.blocks.basis.BlockUnderwaterPlantWithAge; +import ru.betterend.registry.EndBlocks; +import ru.betterend.util.BlocksHelper; +import ru.betterend.util.MHelper; + +public class BlockHydraluxSapling extends BlockUnderwaterPlantWithAge { + @Override + public void grow(StructureWorldAccess world, Random random, BlockPos pos) { + int h = MHelper.randRange(4, 8, random); + Mutable mut = new Mutable().set(pos); + + for (int i = 1; i < h; i++) { + mut.setY(pos.getY() + i); + if (!world.getBlockState(mut).isOf(Blocks.WATER)) { + return; + } + } + + mut.setY(pos.getY()); + BlockState state = EndBlocks.HYDRALUX.getDefaultState(); + BlocksHelper.setWithoutUpdate(world, pos, state.with(BlockProperties.HYDRALUX_SHAPE, HydraluxShape.ROOTS)); + for (int i = 1; i < h - 2; i++) { + mut.setY(pos.getY() + i); + BlocksHelper.setWithoutUpdate(world, mut, state.with(BlockProperties.HYDRALUX_SHAPE, HydraluxShape.VINE)); + } + + mut.setY(mut.getY() + 1); + boolean big = random.nextBoolean(); + BlocksHelper.setWithoutUpdate(world, mut, state.with(BlockProperties.HYDRALUX_SHAPE, big ? HydraluxShape.FLOWER_BIG_BOTTOM : HydraluxShape.FLOWER_SMALL_BOTTOM)); + + mut.setY(mut.getY() + 1); + BlocksHelper.setWithoutUpdate(world, mut, state.with(BlockProperties.HYDRALUX_SHAPE, big ? HydraluxShape.FLOWER_BIG_TOP : HydraluxShape.FLOWER_SMALL_TOP)); + } + + @Override + protected boolean isTerrain(BlockState state) { + return state.isOf(EndBlocks.SULPHURIC_ROCK.stone); + } +} diff --git a/src/main/java/ru/betterend/blocks/BlockHydrothermalVent.java b/src/main/java/ru/betterend/blocks/BlockHydrothermalVent.java index 1af7533b..8f418e90 100644 --- a/src/main/java/ru/betterend/blocks/BlockHydrothermalVent.java +++ b/src/main/java/ru/betterend/blocks/BlockHydrothermalVent.java @@ -4,6 +4,8 @@ import java.util.Random; import org.jetbrains.annotations.Nullable; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; @@ -22,6 +24,7 @@ import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; +import net.minecraft.particle.ParticleTypes; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; @@ -37,9 +40,11 @@ import net.minecraft.world.WorldView; import ru.betterend.blocks.basis.BlockBaseNotFull; import ru.betterend.blocks.entities.BlockEntityHydrothermalVent; import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndParticles; public class BlockHydrothermalVent extends BlockBaseNotFull implements BlockEntityProvider, FluidFillable, Waterloggable { public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; + public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVATED; private static final VoxelShape SHAPE = Block.createCuboidShape(1, 1, 1, 15, 16, 15); public BlockHydrothermalVent() { @@ -48,12 +53,12 @@ public class BlockHydrothermalVent extends BlockBaseNotFull implements BlockEnti .sounds(BlockSoundGroup.STONE) .noCollision() .requiresTool()); - this.setDefaultState(getDefaultState().with(WATERLOGGED, true)); + this.setDefaultState(getDefaultState().with(WATERLOGGED, true).with(ACTIVATED, false)); } @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(WATERLOGGED); + builder.add(WATERLOGGED, ACTIVATED); } @Override @@ -116,4 +121,20 @@ public class BlockHydrothermalVent extends BlockBaseNotFull implements BlockEnti scheduledTick(state,(ServerWorld) world, pos, world.random); } } + + @Environment(EnvType.CLIENT) + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + if (!state.get(ACTIVATED) && random.nextBoolean()) { + super.randomDisplayTick(state, world, pos, random); + double x = pos.getX() + random.nextDouble(); + double y = pos.getY() + 0.9 + random.nextDouble() * 0.3; + double z = pos.getZ() + random.nextDouble(); + if (state.get(WATERLOGGED)) { + world.addParticle(EndParticles.GEYSER_PARTICLE, x, y, z, 0, 0, 0); + } + else { + world.addParticle(ParticleTypes.BUBBLE, x, y, z, 0, 0, 0); + } + } + } } diff --git a/src/main/java/ru/betterend/blocks/BlockProperties.java b/src/main/java/ru/betterend/blocks/BlockProperties.java index 5c9af96b..29b92634 100644 --- a/src/main/java/ru/betterend/blocks/BlockProperties.java +++ b/src/main/java/ru/betterend/blocks/BlockProperties.java @@ -7,6 +7,7 @@ import net.minecraft.util.StringIdentifiable; public class BlockProperties { public static final EnumProperty TRIPLE_SHAPE = EnumProperty.of("shape", TripleShape.class); public final static EnumProperty PEDESTAL_STATE = EnumProperty.of("state", PedestalState.class); + public static final EnumProperty HYDRALUX_SHAPE = EnumProperty.of("shape", HydraluxShape.class); public static final BooleanProperty HAS_ITEM = BooleanProperty.of("has_item"); public static final BooleanProperty HAS_LIGHT = BooleanProperty.of("has_light"); public static final BooleanProperty ACTIVATED = BooleanProperty.of("active"); @@ -57,4 +58,35 @@ public class BlockProperties { return this.name; } } + + public static enum HydraluxShape implements StringIdentifiable { + FLOWER_BIG_BOTTOM("flower_big_bottom", true), + FLOWER_BIG_TOP("flower_big_top", true), + FLOWER_SMALL_BOTTOM("flower_small_bottom", true), + FLOWER_SMALL_TOP("flower_small_top", true), + VINE("vine", false), + ROOTS("roots", false); + + private final String name; + private final boolean glow; + + HydraluxShape(String name, boolean glow) { + this.name = name; + this.glow = glow; + } + + @Override + public String asString() { + return name; + } + + @Override + public String toString() { + return name; + } + + public boolean hasGlow() { + return glow; + } + } } diff --git a/src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java b/src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java new file mode 100644 index 00000000..3c939594 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java @@ -0,0 +1,17 @@ +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Material; +import net.minecraft.entity.Entity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import ru.betterend.blocks.basis.BlockBase; + +public class HydraluxPetalBlock extends BlockBase { + public HydraluxPetalBlock() { + super(FabricBlockSettings.of(Material.PLANT).hardness(1).resistance(1).breakByHand(true)); + } + + @Override + public void onLandedUpon(World world, BlockPos pos, Entity entity, float distance) {} +} diff --git a/src/main/java/ru/betterend/blocks/entities/BlockEntityHydrothermalVent.java b/src/main/java/ru/betterend/blocks/entities/BlockEntityHydrothermalVent.java index b2210495..6508ad28 100644 --- a/src/main/java/ru/betterend/blocks/entities/BlockEntityHydrothermalVent.java +++ b/src/main/java/ru/betterend/blocks/entities/BlockEntityHydrothermalVent.java @@ -16,13 +16,13 @@ public class BlockEntityHydrothermalVent extends BlockEntity implements Tickable @Override public void tick() { - if (world.random.nextInt(32) == 0) { + if (world.random.nextInt(20) == 0) { double x = pos.getX() + world.random.nextDouble(); double y = pos.getY() + 0.9 + world.random.nextDouble() * 0.3; double z = pos.getZ() + world.random.nextDouble(); BlockState state = getCachedState(); - if (state.isOf(EndBlocks.HYDROTHERMAL_VENT)) { - if (getCachedState().get(BlockHydrothermalVent.WATERLOGGED)) { + if (state.isOf(EndBlocks.HYDROTHERMAL_VENT) && state.get(BlockHydrothermalVent.ACTIVATED)) { + if (state.get(BlockHydrothermalVent.WATERLOGGED)) { world.addParticle(EndParticles.GEYSER_PARTICLE, x, y, z, 0, 0, 0); } else { diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 9842b6d1..31b62b47 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -28,6 +28,8 @@ import ru.betterend.blocks.BlockEndLotusSeed; import ru.betterend.blocks.BlockEndLotusStem; import ru.betterend.blocks.BlockEndstoneDust; import ru.betterend.blocks.BlockGlowingMoss; +import ru.betterend.blocks.BlockHydralux; +import ru.betterend.blocks.BlockHydraluxSapling; import ru.betterend.blocks.BlockHydrothermalVent; import ru.betterend.blocks.BlockLacugroveSapling; import ru.betterend.blocks.BlockMossyGlowshroomCap; @@ -51,6 +53,7 @@ import ru.betterend.blocks.EndStoneSmelter; import ru.betterend.blocks.EnderBlock; import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.EternalRunedFlavolite; +import ru.betterend.blocks.HydraluxPetalBlock; import ru.betterend.blocks.InfusionPedestal; import ru.betterend.blocks.PedestalVanilla; import ru.betterend.blocks.RunedFlavolite; @@ -163,6 +166,10 @@ public class EndBlocks { public static final Block END_LILY = registerBlockNI("end_lily", new BlockEndLily()); public static final Block END_LILY_SEED = registerBlock("end_lily_seed", new BlockEndLilySeed()); + public static final Block HYDRALUX_SAPLING = registerBlock("hydralux_sapling", new BlockHydraluxSapling()); + public static final Block HYDRALUX = registerBlockNI("hydralux", new BlockHydralux()); + public static final Block HYDRALUX_PETAL_BLOCK = registerBlock("hydralux_petal_block", new HydraluxPetalBlock()); + public static final Block CAVE_BUSH = registerBlock("cave_bush", new BlockSimpleLeaves(MaterialColor.MAGENTA)); public static final Block MURKWEED = registerBlock("murkweed", new BlockMurkweed()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index e081cf7a..87d88e83 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -18,6 +18,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.HydraluxFeature; import ru.betterend.world.features.SinglePlantFeature; import ru.betterend.world.features.UnderwaterPlantFeature; import ru.betterend.world.features.VineFeature; @@ -87,6 +88,7 @@ public class EndFeatures { public static final EndFeature END_LILY_RARE = new EndFeature("end_lily_rare", new EndLilyFeature(3), 4); public static final EndFeature END_LOTUS = new EndFeature("end_lotus", new EndLotusFeature(7), 5); public static final EndFeature END_LOTUS_LEAF = new EndFeature("end_lotus_leaf", new EndLotusLeafFeature(20), 25); + public static final EndFeature HYDRALUX = new EndFeature("hydralux", new HydraluxFeature(5), 5); // Terrain // public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 4); diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 2f01e100..070e8baf 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -63,6 +63,7 @@ public class EndItems { public final static Item AMBER_GEM = registerItem("amber_gem"); public final static Item GLOWING_BULB = registerItem("glowing_bulb"); public final static Item CRYSTALLINE_SULPHUR = registerItem("crystalline_sulphur"); + public final static Item HYDRALUX_PETAL = registerItem("hydralux_petal"); // Armor // public static final Item TERMINITE_HELMET = registerItem("terminite_helmet", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.HEAD, makeItemSettings())); diff --git a/src/main/java/ru/betterend/world/biome/BiomeSulfurSprings.java b/src/main/java/ru/betterend/world/biome/BiomeSulfurSprings.java index 934e8828..776409df 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeSulfurSprings.java +++ b/src/main/java/ru/betterend/world/biome/BiomeSulfurSprings.java @@ -1,8 +1,6 @@ package ru.betterend.world.biome; import net.minecraft.entity.EntityType; -import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.carver.ConfiguredCarvers; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndParticles; import ru.betterend.world.surface.SurfaceBuilders; @@ -11,7 +9,8 @@ public class BiomeSulfurSprings extends EndBiome { public BiomeSulfurSprings() { super(new BiomeDefinition("sulfur_springs") .setSurface(SurfaceBuilders.SULPHURIC_SURFACE) - .setWaterAndFogColor(25, 90, 157) + .setWaterColor(25, 90, 157) + .setWaterFogColor(30, 65, 61) .setFogColor(207, 194, 62) .setFogDensity(1.5F) .setCaves(false) @@ -19,7 +18,7 @@ public class BiomeSulfurSprings extends EndBiome { .addFeature(EndFeatures.GEYSER) .addFeature(EndFeatures.SULPHURIC_LAKE) .addFeature(EndFeatures.SULPHURIC_CAVE) - .addCarver(GenerationStep.Carver.AIR, ConfiguredCarvers.CAVE) + .addFeature(EndFeatures.HYDRALUX) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); } } diff --git a/src/main/java/ru/betterend/world/features/HydraluxFeature.java b/src/main/java/ru/betterend/world/features/HydraluxFeature.java new file mode 100644 index 00000000..48f4e46f --- /dev/null +++ b/src/main/java/ru/betterend/world/features/HydraluxFeature.java @@ -0,0 +1,25 @@ +package ru.betterend.world.features; + +import java.util.Random; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.StructureWorldAccess; +import ru.betterend.blocks.BlockHydraluxSapling; +import ru.betterend.registry.EndBlocks; + +public class HydraluxFeature extends UnderwaterPlantScatter { + public HydraluxFeature(int radius) { + super(radius); + } + + @Override + public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { + BlockHydraluxSapling seed = (BlockHydraluxSapling) EndBlocks.HYDRALUX_SAPLING; + seed.grow(world, random, blockPos); + } + + @Override + protected int getChance() { + return 15; + } +} diff --git a/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java b/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java index 630ca1a0..99115bd0 100644 --- a/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java @@ -15,6 +15,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; +import ru.betterend.blocks.BlockHydrothermalVent; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; @@ -140,7 +141,7 @@ public class GeyserFeature extends DefaultFeature { BlocksHelper.setWithoutUpdate(world, pos, WATER); Mutable mut = new Mutable().set(pos); count = getYOnSurface(world, pos.getX(), pos.getZ()) - pos.getY(); - for (int i = 0; i <= count; i++) { + for (int i = 0; i < count; i++) { BlocksHelper.setWithoutUpdate(world, mut, WATER); for (Direction dir: BlocksHelper.HORIZONTAL) { BlocksHelper.setWithoutUpdate(world, mut.offset(dir), WATER); @@ -150,25 +151,58 @@ public class GeyserFeature extends DefaultFeature { for (int i = 0; i < 150; i++) { mut.set(pos).move(MHelper.floor(random.nextGaussian() * 4 + 0.5), -halfHeight - 10, MHelper.floor(random.nextGaussian() * 4 + 0.5)); - int dist = MHelper.floor(6 - MHelper.length(mut.getX() - pos.getX(), mut.getZ() - pos.getZ())) + random.nextInt(2); - BlockState state = world.getBlockState(mut); - while (state.isOf(Blocks.WATER)) { - mut.setY(mut.getY() - 1); - state = world.getBlockState(mut); - } - if (state.isIn(EndTags.GEN_TERRAIN)) { - for (int j = 0; j < dist; j++) { - BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.SULPHURIC_ROCK.stone); - mut.setY(mut.getY() + 1); - } - BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.HYDROTHERMAL_VENT); - mut.setY(mut.getY() + 1); - state = world.getBlockState(mut); + float distRaw = MHelper.length(mut.getX() - pos.getX(), mut.getZ() - pos.getZ()); + int dist = MHelper.floor(6 - distRaw) + random.nextInt(2); + if (dist >= 0) { + BlockState state = world.getBlockState(mut); while (state.isOf(Blocks.WATER)) { - BlocksHelper.setWithoutUpdate(world, mut, Blocks.BUBBLE_COLUMN.getDefaultState().with(BubbleColumnBlock.DRAG, false)); - world.getBlockTickScheduler().schedule(mut, Blocks.BUBBLE_COLUMN, MHelper.randRange(8, 32, random)); + mut.setY(mut.getY() - 1); + state = world.getBlockState(mut); + } + if (state.isIn(EndTags.GEN_TERRAIN)) { + for (int j = 0; j <= dist; j++) { + BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.SULPHURIC_ROCK.stone); + mut.setY(mut.getY() + 1); + } + state = EndBlocks.HYDROTHERMAL_VENT.getDefaultState().with(BlockHydrothermalVent.ACTIVATED, distRaw < 2); + BlocksHelper.setWithoutUpdate(world, mut, state); mut.setY(mut.getY() + 1); state = world.getBlockState(mut); + while (state.isOf(Blocks.WATER)) { + BlocksHelper.setWithoutUpdate(world, mut, Blocks.BUBBLE_COLUMN.getDefaultState().with(BubbleColumnBlock.DRAG, false)); + world.getBlockTickScheduler().schedule(mut, Blocks.BUBBLE_COLUMN, MHelper.randRange(8, 32, random)); + mut.setY(mut.getY() + 1); + state = world.getBlockState(mut); + } + } + } + } + + for (int i = 0; i < 10; i++) { + mut.set(pos).move(MHelper.floor(random.nextGaussian() * 0.7 + 0.5), -halfHeight - 10, MHelper.floor(random.nextGaussian() * 0.7 + 0.5)); + float distRaw = MHelper.length(mut.getX() - pos.getX(), mut.getZ() - pos.getZ()); + int dist = MHelper.floor(6 - distRaw) + random.nextInt(2); + if (dist >= 0) { + BlockState state = world.getBlockState(mut); + while (state.isOf(Blocks.WATER)) { + mut.setY(mut.getY() - 1); + state = world.getBlockState(mut); + } + if (state.isIn(EndTags.GEN_TERRAIN)) { + for (int j = 0; j <= dist; j++) { + BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.SULPHURIC_ROCK.stone); + mut.setY(mut.getY() + 1); + } + state = EndBlocks.HYDROTHERMAL_VENT.getDefaultState().with(BlockHydrothermalVent.ACTIVATED, distRaw < 2); + BlocksHelper.setWithoutUpdate(world, mut, state); + mut.setY(mut.getY() + 1); + state = world.getBlockState(mut); + while (state.isOf(Blocks.WATER)) { + BlocksHelper.setWithoutUpdate(world, mut, Blocks.BUBBLE_COLUMN.getDefaultState().with(BubbleColumnBlock.DRAG, false)); + world.getBlockTickScheduler().schedule(mut, Blocks.BUBBLE_COLUMN, MHelper.randRange(8, 32, random)); + mut.setY(mut.getY() + 1); + state = world.getBlockState(mut); + } } } } diff --git a/src/main/java/ru/betterend/world/features/terrain/SulphuricCaveFeature.java b/src/main/java/ru/betterend/world/features/terrain/SulphuricCaveFeature.java index c08cb175..8880120a 100644 --- a/src/main/java/ru/betterend/world/features/terrain/SulphuricCaveFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/SulphuricCaveFeature.java @@ -54,6 +54,7 @@ public class SulphuricCaveFeature extends DefaultFeature { double hr = radius * 0.75; double nr = radius * 0.25; + BlockState state; Set brimstone = Sets.newHashSet(); BlockState rock = EndBlocks.SULPHURIC_ROCK.stone.getDefaultState(); int waterLevel = pos.getY() + MHelper.randRange(MHelper.floor(radius * 0.8), radius, random); @@ -74,13 +75,14 @@ public class SulphuricCaveFeature extends DefaultFeature { double r2 = r + 5; double dist = xsq + ysq + zsq; if (dist < r * r) { - BlockState state = world.getBlockState(mut); + state = world.getBlockState(mut); if (isReplaceable(state)) { BlocksHelper.setWithoutUpdate(world, mut, y < waterLevel ? WATER : CAVE_AIR); } } else if (dist < r2 * r2) { - if (world.getBlockState(mut).isIn(EndTags.GEN_TERRAIN)) { + state = world.getBlockState(mut); + if (state.isIn(EndTags.GEN_TERRAIN) || state.isOf(Blocks.AIR)) { double v = noise.eval(x * 0.1, y * 0.1, z * 0.1) + noise.eval(x * 0.03, y * 0.03, z * 0.03) * 0.5; if (v > 0.4) { brimstone.add(mut.toImmutable()); @@ -101,25 +103,27 @@ public class SulphuricCaveFeature extends DefaultFeature { int count = MHelper.randRange(5, 20, random); for (int i = 0; i < count; i++) { mut.set(pos).move(MHelper.floor(random.nextGaussian() * 2 + 0.5), 0, MHelper.floor(random.nextGaussian() * 2 + 0.5)); - int dist = MHelper.floor(6 - MHelper.length(mut.getX() - pos.getX(), mut.getZ() - pos.getZ())) + random.nextInt(2); - BlockState state = world.getBlockState(mut); - while (state.isOf(Blocks.WATER)) { - mut.setY(mut.getY() - 1); - state = world.getBlockState(mut); - } - if (state.isIn(EndTags.GEN_TERRAIN) || state.isOf(Blocks.AIR)) { - for (int j = 0; j <= dist; j++) { - BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.SULPHURIC_ROCK.stone); - mut.setY(mut.getY() + 1); - } - BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.HYDROTHERMAL_VENT); - mut.setY(mut.getY() + 1); + int dist = MHelper.floor(3 - MHelper.length(mut.getX() - pos.getX(), mut.getZ() - pos.getZ())) + random.nextInt(2); + if (dist > 0) { state = world.getBlockState(mut); while (state.isOf(Blocks.WATER)) { - BlocksHelper.setWithoutUpdate(world, mut, Blocks.BUBBLE_COLUMN.getDefaultState().with(BubbleColumnBlock.DRAG, false)); - world.getBlockTickScheduler().schedule(mut, Blocks.BUBBLE_COLUMN, MHelper.randRange(8, 32, random)); + mut.setY(mut.getY() - 1); + state = world.getBlockState(mut); + } + if (state.isIn(EndTags.GEN_TERRAIN)) { + for (int j = 0; j <= dist; j++) { + BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.SULPHURIC_ROCK.stone); + mut.setY(mut.getY() + 1); + } + BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.HYDROTHERMAL_VENT); mut.setY(mut.getY() + 1); state = world.getBlockState(mut); + while (state.isOf(Blocks.WATER)) { + BlocksHelper.setWithoutUpdate(world, mut, Blocks.BUBBLE_COLUMN.getDefaultState().with(BubbleColumnBlock.DRAG, false)); + world.getBlockTickScheduler().schedule(mut, Blocks.BUBBLE_COLUMN, MHelper.randRange(8, 32, random)); + mut.setY(mut.getY() + 1); + state = world.getBlockState(mut); + } } } } diff --git a/src/main/resources/assets/betterend/blockstates/hydralux.json b/src/main/resources/assets/betterend/blockstates/hydralux.json new file mode 100644 index 00000000..bf8eb1ce --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/hydralux.json @@ -0,0 +1,14 @@ +{ + "variants": { + "shape=flower_big_bottom": [ + { "model": "betterend:block/hydralux_flower_big_1_bottom" }, + { "model": "betterend:block/hydralux_flower_big_2_bottom" }, + { "model": "betterend:block/hydralux_flower_big_3_bottom" } + ], + "shape=flower_big_top": { "model": "betterend:block/hydralux_flower_big_top" }, + "shape=flower_small_bottom": { "model": "betterend:block/hydralux_flower_small_bottom" }, + "shape=flower_small_top": { "model": "betterend:block/hydralux_flower_small_top" }, + "shape=vine": { "model": "betterend:block/hydralux_vine" }, + "shape=roots": { "model": "betterend:block/hydralux_roots" } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/hydralux_sapling.json b/src/main/resources/assets/betterend/blockstates/hydralux_sapling.json new file mode 100644 index 00000000..0db9745c --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/hydralux_sapling.json @@ -0,0 +1,8 @@ +{ + "variants": { + "age=0": { "model": "betterend:block/hydralux_sapling_1" }, + "age=1": { "model": "betterend:block/hydralux_sapling_2" }, + "age=2": { "model": "betterend:block/hydralux_sapling_3" }, + "age=3": { "model": "betterend:block/hydralux_sapling_4" } + } +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/hydralux.json b/src/main/resources/assets/betterend/materialmaps/block/hydralux.json new file mode 100644 index 00000000..d5bae077 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/hydralux.json @@ -0,0 +1,42 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/hydralux_flower_petal", + "material": "betterend:waving_glow_inc" + }, + { + "sprite": "betterend:block/hydralux_flower_bud_petal_side", + "material": "betterend:waving_glow_inc" + }, + { + "sprite": "betterend:block/hydralux_flower_bud_petal_top", + "material": "betterend:waving_glow_inc" + }, + { + "sprite": "betterend:block/hydralux_bloom_bottom", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/hydralux_bloom_top", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/hydralux_vine", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/hydralux_flower_bottom", + "material": "betterend:waving_glow_inc" + }, + { + "sprite": "betterend:block/hydralux_flower_bud", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/hydralux_vine_bottom", + "material": "betterend:waving_floor" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_1_bottom.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_1_bottom.json new file mode 100644 index 00000000..992b96ac --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_1_bottom.json @@ -0,0 +1,105 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_flower_bottom", + "texture": "betterend:block/hydralux_flower_bottom", + "petal_bottom": "betterend:block/hydralux_bloom_bottom", + "petal_side": "betterend:block/hydralux_flower_bud_petal_side", + "petal": "betterend:block/hydralux_flower_petal", + "top": "betterend:block/hydralux_bloom_top" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 6, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 6, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box3", + "from": [ 4, 6, 4 ], + "to": [ 12, 8, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#petal_bottom" }, + "north": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "south": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "west": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "east": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box4", + "from": [ 3, 8, 3 ], + "to": [ 13, 16, 13 ], + "shade": false, + "faces": { + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#petal_bottom" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "west": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "east": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY5", + "from": [ 0, 16, 13 ], + "to": [ 16, 16.001, 29 ], + "rotation": { "origin": [ 0, 16, 13 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 } + } + }, + { + "__comment": "PlaneY5", + "from": [ 0, 0, 3 ], + "to": [ 16, 16, 3.001 ], + "rotation": { "origin": [ 0, 16, 3 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#petal" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 } + } + }, + { + "__comment": "PlaneY7", + "from": [ 13, 16, 0 ], + "to": [ 29, 16.001, 16 ], + "rotation": { "origin": [ 13, 16, 0 ], "axis": "z", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 90 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 90 } + } + }, + { + "__comment": "PlaneY7", + "from": [ 3, 0, 0 ], + "to": [ 3.001, 16, 16 ], + "rotation": { "origin": [ 3, 16, 0 ], "axis": "z", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 16, 0, 0 ], "texture": "#petal" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_2_bottom.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_2_bottom.json new file mode 100644 index 00000000..3fdfdafe --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_2_bottom.json @@ -0,0 +1,101 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_flower_bottom", + "texture": "betterend:block/hydralux_flower_bottom", + "petal_bottom": "betterend:block/hydralux_bloom_bottom", + "petal_side": "betterend:block/hydralux_flower_bud_petal_side", + "petal": "betterend:block/hydralux_flower_petal", + "top": "betterend:block/hydralux_bloom_top" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 6, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 6, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box3", + "from": [ 4, 6, 4 ], + "to": [ 12, 8, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#petal_bottom" }, + "north": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "south": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "west": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "east": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box4", + "from": [ 3, 8, 3 ], + "to": [ 13, 16, 13 ], + "shade": false, + "faces": { + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#petal_bottom" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "west": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "east": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY5", + "from": [ 0, 16, 13 ], + "to": [ 16, 16.001, 29 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 } + } + }, + { + "__comment": "PlaneY5", + "from": [ 0, 15.9989, -13 ], + "to": [ 16, 15.9999, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal" } + } + }, + { + "__comment": "PlaneY7", + "from": [ 13, 16, 0 ], + "to": [ 29, 16.001, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 90 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 90 } + } + }, + { + "__comment": "PlaneY7", + "from": [ -13, 15.9989, 0 ], + "to": [ 3, 15.9999, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 270 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_3_bottom.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_3_bottom.json new file mode 100644 index 00000000..d7b1b2f3 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_3_bottom.json @@ -0,0 +1,105 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_flower_bottom", + "texture": "betterend:block/hydralux_flower_bottom", + "petal_bottom": "betterend:block/hydralux_bloom_bottom", + "petal_side": "betterend:block/hydralux_flower_bud_petal_side", + "petal": "betterend:block/hydralux_flower_petal", + "top": "betterend:block/hydralux_bloom_top" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 6, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 6, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box3", + "from": [ 4, 6, 4 ], + "to": [ 12, 8, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#petal_bottom" }, + "north": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "south": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "west": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "east": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box4", + "from": [ 3, 8, 3 ], + "to": [ 13, 16, 13 ], + "shade": false, + "faces": { + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#petal_bottom" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "west": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "east": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY5", + "from": [ 0, 16, 13 ], + "to": [ 16, 16.001, 29 ], + "rotation": { "origin": [ 0, 16, 13 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 } + } + }, + { + "__comment": "PlaneY5", + "from": [ 0, 15.9989, -13 ], + "to": [ 16, 15.9999, 3 ], + "rotation": { "origin": [ 0, 16, 3 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal" } + } + }, + { + "__comment": "PlaneY7", + "from": [ 13, 16, 0 ], + "to": [ 29, 16.001, 16 ], + "rotation": { "origin": [ 13, 16, 0 ], "axis": "z", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 90 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 90 } + } + }, + { + "__comment": "PlaneY7", + "from": [ -13, 15.9989, 0 ], + "to": [ 3, 15.9999, 16 ], + "rotation": { "origin": [ 3, 16, 0 ], "axis": "z", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 270 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json new file mode 100644 index 00000000..4e15b836 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json @@ -0,0 +1,43 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_flower_bud", + "texture": "betterend:block/hydralux_flower_bud" + }, + "elements": [ + { + "__comment": "Box3", + "from": [ 5, 0, 5 ], + "to": [ 11, 2, 11 ], + "faces": { + "up": { "uv": [ 1, 1, 7, 7 ], "texture": "#texture" }, + "north": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, + "west": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, + "east": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX9", + "from": [ 5.5, 2, 5.5 ], + "to": [ 5.501, 10, 13.5 ], + "rotation": { "origin": [ 5.5, 3, 5.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX9", + "from": [ 10.5, 2, 5.5 ], + "to": [ 10.501, 10, 13.5 ], + "rotation": { "origin": [ 10.5, 3, 5.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_small_bottom.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_small_bottom.json new file mode 100644 index 00000000..55a894c4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_small_bottom.json @@ -0,0 +1,58 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_flower_bottom", + "texture": "betterend:block/hydralux_flower_bottom", + "petal_bottom": "betterend:block/hydralux_flower_bud_petal_bottom", + "petal_side": "betterend:block/hydralux_flower_bud_petal_side" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 6, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 6, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box3", + "from": [ 4, 6, 4 ], + "to": [ 12, 8, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#petal_bottom" }, + "north": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "south": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "west": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" }, + "east": { "uv": [ 4, 8, 12, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box4", + "from": [ 3, 8, 3 ], + "to": [ 13, 16, 13 ], + "shade": false, + "faces": { + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#petal_bottom" }, + "north": { "uv": [ 3, 8, 13, 16 ], "texture": "#petal_side" }, + "south": { "uv": [ 3, 8, 13, 16 ], "texture": "#petal_side" }, + "west": { "uv": [ 3, 8, 13, 16 ], "texture": "#petal_side" }, + "east": { "uv": [ 3, 8, 13, 16 ], "texture": "#petal_side" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_small_top.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_small_top.json new file mode 100644 index 00000000..68be2bc3 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_small_top.json @@ -0,0 +1,23 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_flower_bud_petal_side", + "texture": "betterend:block/hydralux_flower_bud_petal_side", + "petal_top": "betterend:block/hydralux_flower_bud_petal_top" + }, + "elements": [ + { + "__comment": "Box4", + "from": [ 3, 0, 3 ], + "to": [ 13, 8, 13 ], + "shade": false, + "faces": { + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#petal_top" }, + "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "west": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, + "east": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_roots.json b/src/main/resources/assets/betterend/models/block/hydralux_roots.json new file mode 100644 index 00000000..22560827 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_roots.json @@ -0,0 +1,31 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_vine_bottom", + "texture": "betterend:block/hydralux_vine_bottom" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_sapling_1.json b/src/main/resources/assets/betterend/models/block/hydralux_sapling_1.json new file mode 100644 index 00000000..03a16dfb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_sapling_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/hydralux_sapling_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_sapling_2.json b/src/main/resources/assets/betterend/models/block/hydralux_sapling_2.json new file mode 100644 index 00000000..35e4df6c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_sapling_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/hydralux_sapling_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_sapling_3.json b/src/main/resources/assets/betterend/models/block/hydralux_sapling_3.json new file mode 100644 index 00000000..6f1007dc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_sapling_3.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/hydralux_sapling_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_sapling_4.json b/src/main/resources/assets/betterend/models/block/hydralux_sapling_4.json new file mode 100644 index 00000000..8b50f5a5 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_sapling_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/hydralux_sapling_4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_vine.json b/src/main/resources/assets/betterend/models/block/hydralux_vine.json new file mode 100644 index 00000000..25db406b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_vine.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/hydralux_vine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/hydralux_roots.json b/src/main/resources/assets/betterend/models/hydralux_roots.json new file mode 100644 index 00000000..8ee64882 --- /dev/null +++ b/src/main/resources/assets/betterend/models/hydralux_roots.json @@ -0,0 +1,76 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_vine_bottom", + "texture": "betterend:block/hydralux_vine_bottom", + "roots": "betterend:block/hydralux_roots" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 0.5 ], + "to": [ 5.001, 16, 16.5 ], + "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 11 ], + "to": [ 16.5, 16, 11.001 ], + "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 16, 16.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 5 ], + "to": [ 16.5, 16, 5.001 ], + "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/hydralux_sapling.json b/src/main/resources/assets/betterend/models/item/hydralux_sapling.json new file mode 100644 index 00000000..0f7e1e46 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/hydralux_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/hydralux_spore" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_bloom_bottom.png b/src/main/resources/assets/betterend/textures/block/hydralux_bloom_bottom.png new file mode 100644 index 00000000..ca9df9d3 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_bloom_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_bloom_top.png b/src/main/resources/assets/betterend/textures/block/hydralux_bloom_top.png new file mode 100644 index 00000000..746e2d45 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_bloom_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_flower_bottom.png b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bottom.png new file mode 100644 index 00000000..22e70a26 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud.png b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud.png new file mode 100644 index 00000000..e208d969 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud_petal_bottom.png b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud_petal_bottom.png new file mode 100644 index 00000000..51ee0c5a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud_petal_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud_petal_side.png b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud_petal_side.png new file mode 100644 index 00000000..9ca82af8 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud_petal_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud_petal_top.png b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud_petal_top.png new file mode 100644 index 00000000..e60f50f2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bud_petal_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_flower_petal.png b/src/main/resources/assets/betterend/textures/block/hydralux_flower_petal.png new file mode 100644 index 00000000..52c056e2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_flower_petal.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_roots.png b/src/main/resources/assets/betterend/textures/block/hydralux_roots.png new file mode 100644 index 00000000..1238efff Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_roots.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_sapling_1.png b/src/main/resources/assets/betterend/textures/block/hydralux_sapling_1.png new file mode 100644 index 00000000..05358632 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_sapling_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_sapling_2.png b/src/main/resources/assets/betterend/textures/block/hydralux_sapling_2.png new file mode 100644 index 00000000..774fa495 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_sapling_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_sapling_3.png b/src/main/resources/assets/betterend/textures/block/hydralux_sapling_3.png new file mode 100644 index 00000000..e635983a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_sapling_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_sapling_4.png b/src/main/resources/assets/betterend/textures/block/hydralux_sapling_4.png new file mode 100644 index 00000000..47a49fad Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_sapling_4.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_vine.png b/src/main/resources/assets/betterend/textures/block/hydralux_vine.png new file mode 100644 index 00000000..530492cc Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_vine.png differ diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_vine_bottom.png b/src/main/resources/assets/betterend/textures/block/hydralux_vine_bottom.png new file mode 100644 index 00000000..e79a75dc Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/hydralux_vine_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/item/hydralux_petal.png b/src/main/resources/assets/betterend/textures/item/hydralux_petal.png new file mode 100644 index 00000000..3f38d97b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/hydralux_petal.png differ diff --git a/src/main/resources/assets/betterend/textures/item/hydralux_spore.png b/src/main/resources/assets/betterend/textures/item/hydralux_spore.png new file mode 100644 index 00000000..c3c00eaf Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/hydralux_spore.png differ