diff --git a/src/main/java/ru/betterend/blocks/BoluxMushroomBlock.java b/src/main/java/ru/betterend/blocks/BoluxMushroomBlock.java new file mode 100644 index 00000000..e59a4283 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BoluxMushroomBlock.java @@ -0,0 +1,57 @@ +package ru.betterend.blocks; + +import java.util.List; +import java.util.Random; + +import com.google.common.collect.Lists; + +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import ru.betterend.blocks.basis.EndPlantBlock; +import ru.betterend.registry.EndBlocks; + +public class BoluxMushroomBlock extends EndPlantBlock { + private static final VoxelShape SHAPE = Block.createCuboidShape(1, 0, 1, 15, 9, 15); + + public BoluxMushroomBlock() { + super(10); + } + + @Override + protected boolean isTerrain(BlockState state) { + return state.isOf(EndBlocks.RUTISCUS); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { + return SHAPE; + } + + @Override + public AbstractBlock.OffsetType getOffsetType() { + return AbstractBlock.OffsetType.NONE; + } + + @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 + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Lists.newArrayList(new ItemStack(this)); + } +} diff --git a/src/main/java/ru/betterend/blocks/FlamaeaBlock.java b/src/main/java/ru/betterend/blocks/FlamaeaBlock.java new file mode 100644 index 00000000..183891c3 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/FlamaeaBlock.java @@ -0,0 +1,63 @@ +package ru.betterend.blocks; + +import java.util.List; + +import com.google.common.collect.Lists; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.Material; +import net.minecraft.block.ShapeContext; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import ru.betterend.blocks.basis.EndPlantBlock; +import ru.betterend.interfaces.ISpetialItem; + +public class FlamaeaBlock extends EndPlantBlock implements ISpetialItem { + private static final VoxelShape SHAPE = Block.createCuboidShape(0, 0, 0, 16, 1, 16); + + public FlamaeaBlock() { + super(FabricBlockSettings.of(Material.PLANT) + .breakByTool(FabricToolTags.SHEARS) + .sounds(BlockSoundGroup.WET_GRASS) + .breakByHand(true)); + } + + @Override + protected boolean isTerrain(BlockState state) { + return state.isOf(Blocks.WATER); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { + return SHAPE; + } + + @Override + public AbstractBlock.OffsetType getOffsetType() { + return AbstractBlock.OffsetType.NONE; + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Lists.newArrayList(new ItemStack(this)); + } + + @Override + public int getStackSize() { + return 64; + } + + @Override + public boolean canPlaceOnWater() { + return true; + } +} diff --git a/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java b/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java index 88ec4aa0..b194dc26 100644 --- a/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java @@ -13,6 +13,7 @@ import net.minecraft.block.ShapeContext; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemPlacementContext; @@ -38,11 +39,12 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import ru.betterend.blocks.entities.ESignBlockEntity; +import ru.betterend.interfaces.ISpetialItem; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; import ru.betterend.util.BlocksHelper; -public class EndSignBlock extends AbstractSignBlock implements BlockPatterned { +public class EndSignBlock extends AbstractSignBlock implements BlockPatterned, ISpetialItem { public static final IntProperty ROTATION = Properties.ROTATION; public static final BooleanProperty FLOOR = BooleanProperty.of("floor"); private static final VoxelShape[] WALL_SHAPES = new VoxelShape[] { @@ -177,4 +179,32 @@ public class EndSignBlock extends AbstractSignBlock implements BlockPatterned { public List getDroppedStacks(BlockState state, LootContext.Builder builder) { return Collections.singletonList(new ItemStack(this)); } + + @Override + public Fluid tryDrainFluid(WorldAccess world, BlockPos pos, BlockState state) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean canFillWithFluid(BlockView world, BlockPos pos, BlockState state, Fluid fluid) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState state, FluidState fluidState) { + // TODO Auto-generated method stub + return false; + } + + @Override + public int getStackSize() { + return 16; + } + + @Override + public boolean canPlaceOnWater() { + return false; + } } \ No newline at end of file diff --git a/src/main/java/ru/betterend/interfaces/ISpetialItem.java b/src/main/java/ru/betterend/interfaces/ISpetialItem.java new file mode 100644 index 00000000..ef19bc36 --- /dev/null +++ b/src/main/java/ru/betterend/interfaces/ISpetialItem.java @@ -0,0 +1,7 @@ +package ru.betterend.interfaces; + +public interface ISpetialItem { + public int getStackSize(); + + public boolean canPlaceOnWater(); +} diff --git a/src/main/java/ru/betterend/item/DrinkItem.java b/src/main/java/ru/betterend/item/DrinkItem.java index 27043142..2dd617c8 100644 --- a/src/main/java/ru/betterend/item/DrinkItem.java +++ b/src/main/java/ru/betterend/item/DrinkItem.java @@ -1,8 +1,13 @@ package ru.betterend.item; +import net.minecraft.advancement.criterion.Criteria; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsage; +import net.minecraft.item.Items; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.stat.Stats; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.util.UseAction; @@ -27,4 +32,23 @@ public class DrinkItem extends PatternedItem { public TypedActionResult use(World world, PlayerEntity user, Hand hand) { return ItemUsage.consumeHeldItem(world, user, hand); } + + @Override + public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { + if (user instanceof ServerPlayerEntity) { + ServerPlayerEntity serverPlayerEntity = (ServerPlayerEntity) user; + Criteria.CONSUME_ITEM.trigger(serverPlayerEntity, stack); + serverPlayerEntity.incrementStat(Stats.USED.getOrCreateStat(this)); + } + + if (user instanceof PlayerEntity && !((PlayerEntity) user).abilities.creativeMode) { + stack.decrement(1); + } + + if (!world.isClient) { + user.clearStatusEffects(); + } + + return stack.isEmpty() ? new ItemStack(Items.GLASS_BOTTLE) : stack; + } } diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index c310d53e..33dc7e76 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -4,6 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.MaterialColor; import net.minecraft.item.BlockItem; +import net.minecraft.item.Item.Settings; +import net.minecraft.item.LilyPadItem; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; @@ -18,6 +20,7 @@ import ru.betterend.blocks.AuroraCrystalBlock; import ru.betterend.blocks.BlueVineBlock; import ru.betterend.blocks.BlueVineLanternBlock; import ru.betterend.blocks.BlueVineSeedBlock; +import ru.betterend.blocks.BoluxMushroomBlock; import ru.betterend.blocks.BrimstoneBlock; import ru.betterend.blocks.BubbleCoralBlock; import ru.betterend.blocks.BulbVineBlock; @@ -47,6 +50,7 @@ import ru.betterend.blocks.EndstoneDustBlock; import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.EternalRunedFlavolite; import ru.betterend.blocks.FilaluxLanternBlock; +import ru.betterend.blocks.FlamaeaBlock; import ru.betterend.blocks.GlowingHymenophoreBlock; import ru.betterend.blocks.GlowingMossBlock; import ru.betterend.blocks.GlowingPillarLuminophorBlock; @@ -105,7 +109,6 @@ import ru.betterend.blocks.basis.EndFurnaceBlock; import ru.betterend.blocks.basis.EndLeavesBlock; import ru.betterend.blocks.basis.EndOreBlock; import ru.betterend.blocks.basis.EndPillarBlock; -import ru.betterend.blocks.basis.EndSignBlock; import ru.betterend.blocks.basis.EndSlabBlock; import ru.betterend.blocks.basis.EndStairsBlock; import ru.betterend.blocks.basis.EndUnderwaterWallPlantBlock; @@ -122,6 +125,7 @@ import ru.betterend.blocks.complex.MetalMaterial; import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.blocks.complex.WoodenMaterial; import ru.betterend.config.Configs; +import ru.betterend.interfaces.ISpetialItem; import ru.betterend.item.material.EndArmorMaterial; import ru.betterend.item.material.EndToolMaterial; @@ -277,6 +281,7 @@ public class EndBlocks { public static final Block GLOWING_PILLAR_LEAVES = registerBlock("glowing_pillar_leaves", new FurBlock(GLOWING_PILLAR_SEED, 15, 3)); public static final Block SMALL_JELLYSHROOM = registerBlock("small_jellyshroom", new SmallJellyshroomBlock()); + public static final Block BOLUX_MUSHROOM = registerBlock("bolux_mushroom", new BoluxMushroomBlock()); public static final Block LUMECORN_SEED = registerBlock("lumecorn_seed", new LumecornSeedBlock()); public static final Block LUMECORN = registerBlockNI("lumecorn", new LumecornBlock()); @@ -316,6 +321,10 @@ public class EndBlocks { public static final Block HYDRALUX_PETAL_BLOCK = registerBlock("hydralux_petal_block", new HydraluxPetalBlock()); public static final ColoredMaterial HYDRALUX_PETAL_BLOCK_COLORED = new ColoredMaterial(HydraluxPetalColoredBlock::new, HYDRALUX_PETAL_BLOCK, true); + public static final Block POND_ANEMONE = registerBlock("pond_anemone", new BubbleCoralBlock()); + + public static final Block FLAMAEA = registerBlock("flamaea", new FlamaeaBlock()); + public static final Block CAVE_BUSH = registerBlock("cave_bush", new SimpleLeavesBlock(MaterialColor.MAGENTA)); public static final Block MURKWEED = registerBlock("murkweed", new MurkweedBlock()); @@ -323,12 +332,14 @@ public class EndBlocks { // Wall Plants // public static final Block PURPLE_POLYPORE = registerBlock("purple_polypore", new WallMushroomBlock(13)); + public static final Block AURANT_POLYPORE = registerBlock("aurant_polypore", new WallMushroomBlock(13)); public static final Block TAIL_MOSS = registerBlock("tail_moss", new EndWallPlantBlock()); public static final Block CYAN_MOSS = registerBlock("cyan_moss", new EndWallPlantBlock()); public static final Block TWISTED_MOSS = registerBlock("twisted_moss", new EndWallPlantBlock()); public static final Block TUBE_WORM = registerBlock("tube_worm", new EndUnderwaterWallPlantBlock()); public static final Block BULB_MOSS = registerBlock("bulb_moss", new EndWallPlantBlock(12)); public static final Block JUNGLE_FERN = registerBlock("jungle_fern", new EndWallPlantBlock()); + public static final Block RUSCUS = registerBlock("ruscus", new EndWallPlantBlock()); // Vines // public static final Block DENSE_VINE = registerBlock("dense_vine", new VineBlock(15, true)); @@ -394,8 +405,20 @@ public class EndBlocks { return block; } Registry.register(Registry.BLOCK, id, block); - int maxCount = block instanceof EndSignBlock ? 16 : 64; - EndItems.registerBlockItem(id, new BlockItem(block, EndItems.makeBlockItemSettings().maxCount(maxCount))); + int maxCount = 64; + boolean placeOnWater = false; + if (block instanceof ISpetialItem) { + ISpetialItem item = (ISpetialItem) block; + maxCount = item.getStackSize(); + placeOnWater = item.canPlaceOnWater(); + } + Settings item = EndItems.makeBlockItemSettings().maxCount(maxCount); + if (placeOnWater) { + EndItems.registerBlockItem(id, new LilyPadItem(block, item)); + } + else { + EndItems.registerBlockItem(id, new BlockItem(block, item)); + } return block; } diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 4ca3195c..8646a7fb 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -123,6 +123,7 @@ public class EndFeatures { public static final EndFeature SMALL_AMARANITA = new EndFeature("small_amaranita", new SinglePlantFeature(EndBlocks.SMALL_AMARANITA_MUSHROOM, 5, 5), 4); public static final EndFeature GLOBULAGUS = new EndFeature("globulagus", new SinglePlantFeature(EndBlocks.GLOBULAGUS, 5, 3), 6); public static final EndFeature CLAWFERN = new EndFeature("clawfern", new SinglePlantFeature(EndBlocks.CLAWFERN, 5, 4), 5); + public static final EndFeature BOLUX_MUSHROOM = new EndFeature("bolux_mushroom", new SinglePlantFeature(EndBlocks.BOLUX_MUSHROOM, 5, 5), 2); // Vines // public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(EndBlocks.DENSE_VINE, 24), 3); @@ -135,6 +136,7 @@ public class EndFeatures { // Wall Plants // public static final EndFeature PURPLE_POLYPORE = new EndFeature("purple_polypore", new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, 3), 5); + public static final EndFeature AURANT_POLYPORE = new EndFeature("aurant_polypore", new WallPlantOnLogFeature(EndBlocks.AURANT_POLYPORE, 3), 5); public static final EndFeature TAIL_MOSS = new EndFeature("tail_moss", new WallPlantFeature(EndBlocks.TAIL_MOSS, 3), 15); public static final EndFeature CYAN_MOSS = new EndFeature("cyan_moss", new WallPlantFeature(EndBlocks.CYAN_MOSS, 3), 15); public static final EndFeature TAIL_MOSS_WOOD = new EndFeature("tail_moss_wood", new WallPlantOnLogFeature(EndBlocks.TAIL_MOSS, 4), 25); @@ -158,6 +160,7 @@ public class EndFeatures { 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); + public static final EndFeature POND_ANEMONE = new EndFeature("pond_anemone", new UnderwaterPlantFeature(EndBlocks.POND_ANEMONE, 6), 10); public static final EndFeature CHARNIA_RED = new EndFeature("charnia_red", new CharniaFeature(EndBlocks.CHARNIA_RED), 10); public static final EndFeature CHARNIA_PURPLE = new EndFeature("charnia_purple", new CharniaFeature(EndBlocks.CHARNIA_PURPLE), 10); @@ -168,6 +171,7 @@ public class EndFeatures { public static final EndFeature MENGER_SPONGE = new EndFeature("menger_sponge", new MengerSpongeFeature(5), 1); public static final EndFeature CHARNIA_RED_RARE = new EndFeature("charnia_red_rare", new CharniaFeature(EndBlocks.CHARNIA_RED), 2); public static final EndFeature OVERWORLD_ISLAND = EndFeature.makeFetureConfigured("overworld_island", new OverworldIslandFeature()); + public static final EndFeature FLAMAEA = new EndFeature("flamaea", new SinglePlantFeature(EndBlocks.FLAMAEA, 12, false, 5), 20); // 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 3d142761..9cff5332 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -120,6 +120,7 @@ public class EndItems { public final static Item AMBER_ROOT_RAW = registerFood("amber_root_raw", 2, 0.8F); public final static Item CHORUS_MUSHROOM_RAW = registerFood("chorus_mushroom_raw", 3, 0.5F); public final static Item CHORUS_MUSHROOM_COOKED = registerFood("chorus_mushroom_cooked", FoodComponents.MUSHROOM_STEW); + public final static Item BOLUX_MUSHROOM_COOKED = registerFood("bolux_mushroom_cooked", FoodComponents.MUSHROOM_STEW); // Drinks // public final static Item UMBRELLA_CLUSTER_JUICE = registerDrink("umbrella_cluster_juice", 5, 0.7F); diff --git a/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java b/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java index c2aebccf..1ed6436b 100644 --- a/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java +++ b/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java @@ -18,11 +18,17 @@ public class LanternWoodsBiome extends EndBiome { .setMusic(EndSounds.MUSIC_FOREST) .setParticles(EndParticles.GLOWING_SPHERE, 0.001F) .addFeature(EndFeatures.END_LAKE_NORMAL) + .addFeature(EndFeatures.FLAMAEA) .addFeature(EndFeatures.LUCERNIA) .addFeature(EndFeatures.LUCERNIA_BUSH) .addFeature(EndFeatures.FILALUX) .addFeature(EndFeatures.AERIDIUM) .addFeature(EndFeatures.LAMELLARIUM) + .addFeature(EndFeatures.BOLUX_MUSHROOM) + .addFeature(EndFeatures.AURANT_POLYPORE) + .addFeature(EndFeatures.POND_ANEMONE) + .addFeature(EndFeatures.CHARNIA_ORANGE) + .addFeature(EndFeatures.CHARNIA_RED) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 2)); } diff --git a/src/main/resources/assets/betterend/blockstates/aurant_polypore.json b/src/main/resources/assets/betterend/blockstates/aurant_polypore.json new file mode 100644 index 00000000..9c816bd6 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/aurant_polypore.json @@ -0,0 +1,24 @@ +{ + "variants": { + "facing=north": [ + { "model": "betterend:block/aurant_polypore_1", "y": 180 }, + { "model": "betterend:block/aurant_polypore_2", "y": 180 }, + { "model": "betterend:block/aurant_polypore_3", "y": 180 } + ], + "facing=south": [ + { "model": "betterend:block/aurant_polypore_1" }, + { "model": "betterend:block/aurant_polypore_2" }, + { "model": "betterend:block/aurant_polypore_3" } + ], + "facing=east": [ + { "model": "betterend:block/aurant_polypore_1", "y": 270 }, + { "model": "betterend:block/aurant_polypore_2", "y": 270 }, + { "model": "betterend:block/aurant_polypore_3", "y": 270 } + ], + "facing=west": [ + { "model": "betterend:block/aurant_polypore_1", "y": 90 }, + { "model": "betterend:block/aurant_polypore_2", "y": 90 }, + { "model": "betterend:block/aurant_polypore_3", "y": 90 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/bolux_mushroom.json b/src/main/resources/assets/betterend/blockstates/bolux_mushroom.json new file mode 100644 index 00000000..ab881614 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/bolux_mushroom.json @@ -0,0 +1,18 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/bolux_mushroom_1" }, + { "model": "betterend:block/bolux_mushroom_2" }, + { "model": "betterend:block/bolux_mushroom_3" }, + { "model": "betterend:block/bolux_mushroom_1", "y": 90 }, + { "model": "betterend:block/bolux_mushroom_2", "y": 90 }, + { "model": "betterend:block/bolux_mushroom_3", "y": 90 }, + { "model": "betterend:block/bolux_mushroom_1", "y": 180 }, + { "model": "betterend:block/bolux_mushroom_2", "y": 180 }, + { "model": "betterend:block/bolux_mushroom_3", "y": 180 }, + { "model": "betterend:block/bolux_mushroom_1", "y": 270 }, + { "model": "betterend:block/bolux_mushroom_2", "y": 270 }, + { "model": "betterend:block/bolux_mushroom_3", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/flamaea.json b/src/main/resources/assets/betterend/blockstates/flamaea.json new file mode 100644 index 00000000..6b9238e1 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/flamaea.json @@ -0,0 +1,11 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/flamaea_1" }, + { "model": "betterend:block/flamaea_2" }, + { "model": "betterend:block/flamaea_3" }, + { "model": "betterend:block/flamaea_4" }, + { "model": "betterend:block/flamaea_5" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/pond_anemone.json b/src/main/resources/assets/betterend/blockstates/pond_anemone.json new file mode 100644 index 00000000..59a741ed --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/pond_anemone.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/pond_anemone" }, + { "model": "betterend:block/pond_anemone", "y": 90 }, + { "model": "betterend:block/pond_anemone", "y": 180 }, + { "model": "betterend:block/pond_anemone", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/ruscus.json b/src/main/resources/assets/betterend/blockstates/ruscus.json new file mode 100644 index 00000000..99388f2d --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/ruscus.json @@ -0,0 +1,24 @@ +{ + "variants": { + "facing=north": [ + { "model": "betterend:block/ruscus_1", "y": 180 }, + { "model": "betterend:block/ruscus_2", "y": 180 }, + { "model": "betterend:block/ruscus_3", "y": 180 } + ], + "facing=south": [ + { "model": "betterend:block/ruscus_1" }, + { "model": "betterend:block/ruscus_2" }, + { "model": "betterend:block/ruscus_3" } + ], + "facing=east": [ + { "model": "betterend:block/ruscus_1", "y": 270 }, + { "model": "betterend:block/ruscus_2", "y": 270 }, + { "model": "betterend:block/ruscus_3", "y": 270 } + ], + "facing=west": [ + { "model": "betterend:block/ruscus_1", "y": 90 }, + { "model": "betterend:block/ruscus_2", "y": 90 }, + { "model": "betterend:block/ruscus_3", "y": 90 } + ] + } +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/aurant_polypore.json b/src/main/resources/assets/betterend/materialmaps/block/aurant_polypore.json new file mode 100644 index 00000000..2163812f --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/aurant_polypore.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_inc" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/bolux_mushroom.json b/src/main/resources/assets/betterend/materialmaps/block/bolux_mushroom.json new file mode 100644 index 00000000..2163812f --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bolux_mushroom.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_inc" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/flamaea.json b/src/main/resources/assets/betterend/materialmaps/block/flamaea.json new file mode 100644 index 00000000..2163812f --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/flamaea.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_inc" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/pond_anemone.json b/src/main/resources/assets/betterend/materialmaps/block/pond_anemone.json new file mode 100644 index 00000000..2163812f --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/pond_anemone.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_inc" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/ruscus.json b/src/main/resources/assets/betterend/materialmaps/block/ruscus.json new file mode 100644 index 00000000..45210670 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/ruscus.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_wall" +} diff --git a/src/main/resources/assets/betterend/materialmaps/item/lucernia_outer_leaves.json b/src/main/resources/assets/betterend/materialmaps/item/lucernia_outer_leaves.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/lucernia_outer_leaves.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/materialmaps/item/lucernia_sapling.json b/src/main/resources/assets/betterend/materialmaps/item/lucernia_sapling.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/lucernia_sapling.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/materials/glow_80_blue.json b/src/main/resources/assets/betterend/materials/glow_80_blue.json new file mode 100644 index 00000000..57abfb68 --- /dev/null +++ b/src/main/resources/assets/betterend/materials/glow_80_blue.json @@ -0,0 +1,8 @@ +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_80_blue.frag" + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/aurant_polypore_1.json b/src/main/resources/assets/betterend/models/block/aurant_polypore_1.json new file mode 100644 index 00000000..34b18ae5 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/aurant_polypore_1.json @@ -0,0 +1,153 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/aurant_polypore", + "texture": "betterend:block/aurant_polypore" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 0, 4, 0 ], + "to": [ 8, 7, 6 ], + "faces": { + "down": { "uv": [ 8, 10, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 8, 6 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, + "west": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" }, + "east": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 12, 0 ], + "to": [ 15, 15, 6 ], + "faces": { + "down": { "uv": [ 8, 10, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 8, 6 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, + "west": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" }, + "east": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 1, 0 ], + "to": [ 15, 3, 6 ], + "faces": { + "down": { "uv": [ 9, 10, 15, 16 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 6 ], "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": "Box1", + "from": [ 1, 9, 0 ], + "to": [ 7, 11, 3 ], + "faces": { + "down": { "uv": [ 10, 5, 16, 8 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 3 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 6, 0 ], + "to": [ 15, 8, 2 ], + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 14, 0 ], + "to": [ 6, 16, 2 ], + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 10, 0, 0 ], + "to": [ 14, 1, 4 ], + "faces": { + "down": { "uv": [ 10, 12, 14, 16 ], "texture": "#texture" }, + "north": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" }, + "south": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" }, + "west": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" }, + "east": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 12, 5, 0 ], + "to": [ 14, 6, 1 ], + "faces": { + "down": { "uv": [ 12, 15, 14, 16 ], "texture": "#texture" }, + "north": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "south": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "west": { "uv": [ 3, 12, 4, 13 ], "texture": "#texture" }, + "east": { "uv": [ 2, 12, 3, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 2, 8, 0 ], + "to": [ 6, 9, 2 ], + "faces": { + "down": { "uv": [ 10, 12, 14, 14 ], "texture": "#texture" }, + "north": { "uv": [ 1, 14, 5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 1, 14, 5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "east": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 8, 10, 0 ], + "to": [ 14, 12, 5 ], + "faces": { + "down": { "uv": [ 9, 11, 15, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 13, 6, 15 ], "texture": "#texture" }, + "south": { "uv": [ 0, 13, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 5, 14 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 5, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 1, 2, 0 ], + "to": [ 7, 4, 5 ], + "faces": { + "down": { "uv": [ 9, 11, 15, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 13, 6, 15 ], "texture": "#texture" }, + "south": { "uv": [ 0, 13, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 5, 14 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 5, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 3, 13, 0 ], + "to": [ 5, 14, 1 ], + "faces": { + "down": { "uv": [ 12, 15, 14, 16 ], "texture": "#texture" }, + "north": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "south": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "west": { "uv": [ 3, 12, 4, 13 ], "texture": "#texture" }, + "east": { "uv": [ 2, 12, 3, 13 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/aurant_polypore_2.json b/src/main/resources/assets/betterend/models/block/aurant_polypore_2.json new file mode 100644 index 00000000..1072b074 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/aurant_polypore_2.json @@ -0,0 +1,105 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/aurant_polypore", + "texture": "betterend:block/aurant_polypore" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 8, 0 ], + "to": [ 9, 11, 6 ], + "faces": { + "down": { "uv": [ 8, 10, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 8, 6 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, + "west": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" }, + "east": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 5, 3, 0 ], + "to": [ 11, 5, 6 ], + "faces": { + "down": { "uv": [ 9, 10, 15, 16 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 6 ], "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": "Box1", + "from": [ 8, 13, 0 ], + "to": [ 14, 15, 3 ], + "faces": { + "down": { "uv": [ 10, 5, 16, 8 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 3 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 7, 0 ], + "to": [ 15, 9, 2 ], + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 6, 2, 0 ], + "to": [ 10, 3, 4 ], + "faces": { + "down": { "uv": [ 10, 12, 14, 16 ], "texture": "#texture" }, + "north": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" }, + "south": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" }, + "west": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" }, + "east": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 12, 6, 0 ], + "to": [ 14, 7, 1 ], + "faces": { + "down": { "uv": [ 12, 15, 14, 16 ], "texture": "#texture" }, + "north": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "south": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "west": { "uv": [ 3, 12, 4, 13 ], "texture": "#texture" }, + "east": { "uv": [ 2, 12, 3, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 9, 12, 0 ], + "to": [ 13, 13, 2 ], + "faces": { + "down": { "uv": [ 10, 12, 14, 14 ], "texture": "#texture" }, + "north": { "uv": [ 1, 14, 5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 1, 14, 5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "east": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 2, 6, 0 ], + "to": [ 8, 8, 5 ], + "faces": { + "down": { "uv": [ 9, 11, 15, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 13, 6, 15 ], "texture": "#texture" }, + "south": { "uv": [ 0, 13, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 5, 14 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 5, 14 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/aurant_polypore_3.json b/src/main/resources/assets/betterend/models/block/aurant_polypore_3.json new file mode 100644 index 00000000..ffae55f7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/aurant_polypore_3.json @@ -0,0 +1,129 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/aurant_polypore", + "texture": "betterend:block/aurant_polypore" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, 6, 0 ], + "to": [ 8, 8, 6 ], + "faces": { + "down": { "uv": [ 9, 10, 15, 16 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 6 ], "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": "Box1", + "from": [ 8, 13, 0 ], + "to": [ 14, 15, 3 ], + "faces": { + "down": { "uv": [ 10, 5, 16, 8 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 3 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 8, 0 ], + "to": [ 14, 10, 2 ], + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 3, 5, 0 ], + "to": [ 7, 6, 4 ], + "faces": { + "down": { "uv": [ 10, 12, 14, 16 ], "texture": "#texture" }, + "north": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" }, + "south": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" }, + "west": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" }, + "east": { "uv": [ 1, 12, 5, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 11, 7, 0 ], + "to": [ 13, 8, 1 ], + "faces": { + "down": { "uv": [ 12, 15, 14, 16 ], "texture": "#texture" }, + "north": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "south": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "west": { "uv": [ 3, 12, 4, 13 ], "texture": "#texture" }, + "east": { "uv": [ 2, 12, 3, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 9, 12, 0 ], + "to": [ 13, 13, 2 ], + "faces": { + "down": { "uv": [ 10, 12, 14, 14 ], "texture": "#texture" }, + "north": { "uv": [ 1, 14, 5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 1, 14, 5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "east": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 11, 0 ], + "to": [ 5, 13, 2 ], + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 2, 10, 0 ], + "to": [ 4, 11, 1 ], + "faces": { + "down": { "uv": [ 12, 15, 14, 16 ], "texture": "#texture" }, + "north": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "south": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "west": { "uv": [ 3, 12, 4, 13 ], "texture": "#texture" }, + "east": { "uv": [ 2, 12, 3, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 2, 0 ], + "to": [ 12, 4, 2 ], + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 9, 1, 0 ], + "to": [ 11, 2, 1 ], + "faces": { + "down": { "uv": [ 12, 15, 14, 16 ], "texture": "#texture" }, + "north": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "south": { "uv": [ 2, 12, 4, 13 ], "texture": "#texture" }, + "west": { "uv": [ 3, 12, 4, 13 ], "texture": "#texture" }, + "east": { "uv": [ 2, 12, 3, 13 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bolux_mushroom_1.json b/src/main/resources/assets/betterend/models/block/bolux_mushroom_1.json new file mode 100644 index 00000000..4c80d918 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bolux_mushroom_1.json @@ -0,0 +1,81 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/bolux_mushroom", + "texture": "betterend:block/bolux_mushroom" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 3, 1 ], + "to": [ 9, 7, 9 ], + "faces": { + "down": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, + "north": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 7, 2 ], + "to": [ 8, 8, 8 ], + "faces": { + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, + "north": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "south": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "west": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "east": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 0, 4 ], + "to": [ 6, 3, 6 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "west": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" }, + "east": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 12 ], + "to": [ 12, 2, 14 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 2, 10 ], + "to": [ 14, 5, 16 ], + "faces": { + "down": { "uv": [ 1, 9, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 5, 11 ], + "to": [ 13, 6, 15 ], + "faces": { + "up": { "uv": [ 10, 2, 14, 6 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bolux_mushroom_2.json b/src/main/resources/assets/betterend/models/block/bolux_mushroom_2.json new file mode 100644 index 00000000..e8b85497 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bolux_mushroom_2.json @@ -0,0 +1,117 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/bolux_mushroom", + "texture": "betterend:block/bolux_mushroom" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 11, 0, 4 ], + "to": [ 13, 2, 6 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 2, 2 ], + "to": [ 15, 5, 8 ], + "faces": { + "down": { "uv": [ 1, 9, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 5, 3 ], + "to": [ 14, 6, 7 ], + "faces": { + "up": { "uv": [ 10, 2, 14, 6 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 0, 6 ], + "to": [ 5, 3, 8 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 3, 4 ], + "to": [ 7, 6, 10 ], + "faces": { + "down": { "uv": [ 1, 9, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture", "rotation": 270 }, + "north": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 6, 5 ], + "to": [ 6, 7, 9 ], + "faces": { + "up": { "uv": [ 10, 2, 14, 6 ], "texture": "#texture", "rotation": 270 }, + "north": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 12 ], + "to": [ 12, 2, 14 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 2, 11 ], + "to": [ 13, 4, 15 ], + "faces": { + "down": { "uv": [ 2, 10, 6, 14 ], "texture": "#texture" }, + "up": { "uv": [ 4, 4, 8, 8 ], "texture": "#texture" }, + "north": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" }, + "south": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" }, + "west": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 4, 12 ], + "to": [ 12, 5, 14 ], + "faces": { + "up": { "uv": [ 5, 5, 7, 7 ], "texture": "#texture" }, + "north": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" }, + "south": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" }, + "west": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" }, + "east": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bolux_mushroom_3.json b/src/main/resources/assets/betterend/models/block/bolux_mushroom_3.json new file mode 100644 index 00000000..f11b78b7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bolux_mushroom_3.json @@ -0,0 +1,153 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/bolux_mushroom", + "texture": "betterend:block/bolux_mushroom" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 7, 3, 6 ], + "to": [ 15, 7, 14 ], + "faces": { + "down": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, + "north": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 7, 7 ], + "to": [ 14, 8, 13 ], + "faces": { + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, + "north": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "south": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "west": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "east": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 9 ], + "to": [ 12, 3, 11 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "west": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" }, + "east": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 0, 5 ], + "to": [ 4, 3, 7 ], + "faces": { + "north": { "uv": [ 1, 0, 3, 3 ], "texture": "#texture" }, + "south": { "uv": [ 1, 0, 3, 3 ], "texture": "#texture" }, + "west": { "uv": [ 1, 0, 3, 3 ], "texture": "#texture" }, + "east": { "uv": [ 1, 0, 3, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 3, 3 ], + "to": [ 6, 6, 9 ], + "faces": { + "down": { "uv": [ 1, 9, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, + "north": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 6, 4 ], + "to": [ 5, 7, 8 ], + "faces": { + "up": { "uv": [ 10, 2, 14, 6 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 0, 2 ], + "to": [ 11, 4, 4 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 4, 1 ], + "to": [ 12, 9, 5 ], + "faces": { + "down": { "uv": [ 2, 10, 6, 14 ], "texture": "#texture" }, + "up": { "uv": [ 10, 2, 14, 6 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 14, 16 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 14, 16 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 14, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 14, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 9, 2 ], + "to": [ 11, 10, 4 ], + "faces": { + "up": { "uv": [ 11, 3, 13, 5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 10, 13, 11 ], "texture": "#texture" }, + "south": { "uv": [ 11, 10, 13, 11 ], "texture": "#texture" }, + "west": { "uv": [ 11, 10, 13, 11 ], "texture": "#texture" }, + "east": { "uv": [ 11, 10, 13, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 5, 12 ], + "to": [ 4, 6, 14 ], + "faces": { + "up": { "uv": [ 11, 3, 13, 5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 11, 13, 12 ], "texture": "#texture" }, + "south": { "uv": [ 11, 11, 13, 12 ], "texture": "#texture" }, + "west": { "uv": [ 11, 11, 13, 12 ], "texture": "#texture" }, + "east": { "uv": [ 11, 11, 13, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 0, 12 ], + "to": [ 4, 2, 14 ], + "faces": { + "north": { "uv": [ 0, 1, 2, 3 ], "texture": "#texture" }, + "south": { "uv": [ 0, 1, 2, 3 ], "texture": "#texture" }, + "west": { "uv": [ 0, 1, 2, 3 ], "texture": "#texture" }, + "east": { "uv": [ 0, 1, 2, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 2, 11 ], + "to": [ 5, 5, 15 ], + "faces": { + "down": { "uv": [ 2, 10, 6, 14 ], "texture": "#texture" }, + "up": { "uv": [ 4, 4, 8, 8 ], "texture": "#texture" }, + "north": { "uv": [ 10, 13, 14, 16 ], "texture": "#texture" }, + "south": { "uv": [ 10, 13, 14, 16 ], "texture": "#texture" }, + "west": { "uv": [ 10, 13, 14, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 13, 14, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flamaea_1.json b/src/main/resources/assets/betterend/models/block/flamaea_1.json new file mode 100644 index 00000000..ca9b7abd --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flamaea_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/plane_bottom", + "textures": { + "texture": "betterend:block/flamaea_1" + } +} diff --git a/src/main/resources/assets/betterend/models/block/flamaea_2.json b/src/main/resources/assets/betterend/models/block/flamaea_2.json new file mode 100644 index 00000000..f004b7ed --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flamaea_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/plane_bottom", + "textures": { + "texture": "betterend:block/flamaea_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/flamaea_3.json b/src/main/resources/assets/betterend/models/block/flamaea_3.json new file mode 100644 index 00000000..78752c4c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flamaea_3.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/plane_bottom", + "textures": { + "texture": "betterend:block/flamaea_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/flamaea_4.json b/src/main/resources/assets/betterend/models/block/flamaea_4.json new file mode 100644 index 00000000..659574db --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flamaea_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/plane_bottom", + "textures": { + "texture": "betterend:block/flamaea_4" + } +} diff --git a/src/main/resources/assets/betterend/models/block/flamaea_5.json b/src/main/resources/assets/betterend/models/block/flamaea_5.json new file mode 100644 index 00000000..8c7f8f65 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/flamaea_5.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/plane_bottom", + "textures": { + "texture": "betterend:block/flamaea_5" + } +} diff --git a/src/main/resources/assets/betterend/models/block/pond_anemone.json b/src/main/resources/assets/betterend/models/block/pond_anemone.json new file mode 100644 index 00000000..92cbdbc7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/pond_anemone.json @@ -0,0 +1,111 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/pond_anemone", + "texture": "betterend:block/pond_anemone" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 0, 1 ], + "to": [ 7, 10, 7 ], + "faces": { + "up": { "uv": [ 10, 9, 16, 15 ], "texture": "#texture" }, + "north": { "uv": [ 3, 6, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 3, 6, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 3, 6, 9, 16 ], "texture": "#texture" }, + "east": { "uv": [ 3, 6, 9, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ -1, 7, -1 ], + "to": [ -0.999, 15, 13 ], + "rotation": { "origin": [ -1, 7, -1 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 9, 7, -1 ], + "to": [ 9.001, 15, 13 ], + "rotation": { "origin": [ 9, 7, -1 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 0, 5 ], + "to": [ 15, 8, 11 ], + "faces": { + "up": { "uv": [ 10, 9, 16, 15 ], "texture": "#texture" }, + "north": { "uv": [ 3, 6, 9, 14 ], "texture": "#texture" }, + "south": { "uv": [ 3, 6, 9, 14 ], "texture": "#texture" }, + "west": { "uv": [ 3, 6, 9, 14 ], "texture": "#texture" }, + "east": { "uv": [ 3, 6, 9, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 7, 5, 3 ], + "to": [ 7.001, 13, 17 ], + "rotation": { "origin": [ 7, 5, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 17, 5, 3 ], + "to": [ 17.001, 13, 17 ], + "rotation": { "origin": [ 17, 5, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 0, 10 ], + "to": [ 6, 7, 14 ], + "faces": { + "up": { "uv": [ 11, 10, 15, 14 ], "texture": "#texture" }, + "north": { "uv": [ 4, 6, 8, 13 ], "texture": "#texture" }, + "south": { "uv": [ 4, 6, 8, 13 ], "texture": "#texture" }, + "west": { "uv": [ 4, 6, 8, 13 ], "texture": "#texture" }, + "east": { "uv": [ 4, 6, 8, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ -1, 4, 7 ], + "to": [ -0.999, 12, 21 ], + "rotation": { "origin": [ -1, 4, 7 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 9, 4, 7 ], + "to": [ 9.001, 12, 21 ], + "rotation": { "origin": [ 9, 4, 7 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 12, 8 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/ruscus_1.json b/src/main/resources/assets/betterend/models/block/ruscus_1.json new file mode 100644 index 00000000..1945a450 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/ruscus_1.json @@ -0,0 +1,97 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/ruscus", + "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/ruscus_2.json b/src/main/resources/assets/betterend/models/block/ruscus_2.json new file mode 100644 index 00000000..1ecd5869 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/ruscus_2.json @@ -0,0 +1,64 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/ruscus", + "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/ruscus_3.json b/src/main/resources/assets/betterend/models/block/ruscus_3.json new file mode 100644 index 00000000..730d9820 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/ruscus_3.json @@ -0,0 +1,64 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/ruscus", + "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/item/aurant_polypore.json b/src/main/resources/assets/betterend/models/item/aurant_polypore.json new file mode 100644 index 00000000..75840642 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aurant_polypore.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/aurant_polypore" + } +} diff --git a/src/main/resources/assets/betterend/models/item/bolux_mushroom.json b/src/main/resources/assets/betterend/models/item/bolux_mushroom.json new file mode 100644 index 00000000..dd398963 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/bolux_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/bolux_mushroom" + } +} diff --git a/src/main/resources/assets/betterend/models/item/flamaea.json b/src/main/resources/assets/betterend/models/item/flamaea.json new file mode 100644 index 00000000..c3752866 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/flamaea.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/flamaea_1" + } +} diff --git a/src/main/resources/assets/betterend/models/item/pond_anemone.json b/src/main/resources/assets/betterend/models/item/pond_anemone.json new file mode 100644 index 00000000..97a6674a --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/pond_anemone.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/pond_anemone" + } +} diff --git a/src/main/resources/assets/betterend/models/item/ruscus.json b/src/main/resources/assets/betterend/models/item/ruscus.json new file mode 100644 index 00000000..5fc191c9 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/ruscus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/ruscus" + } +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_80_blue.frag b/src/main/resources/assets/betterend/shaders/material/glow_80_blue.frag index 85726ede..70450f40 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_80_blue.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_80_blue.frag @@ -2,5 +2,7 @@ #include frex:shaders/lib/math.glsl void frx_startFragment(inout frx_FragmentData fragData) { - fragData.emissivity = (fragData.spriteColor.b > 0.8) ? 1.0 : 0; + float a = abs(fragData.spriteColor.b - fragData.spriteColor.r); + float b = abs(fragData.spriteColor.b - fragData.spriteColor.g); + fragData.emissivity = (a > 0.1 && b > 0.1 && fragData.spriteColor.b > 0.8) ? 1.0 : 0; } diff --git a/src/main/resources/assets/betterend/textures/block/aurant_polypore.png b/src/main/resources/assets/betterend/textures/block/aurant_polypore.png new file mode 100644 index 00000000..f3f94190 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/aurant_polypore.png differ diff --git a/src/main/resources/assets/betterend/textures/block/bolux_mushroom.png b/src/main/resources/assets/betterend/textures/block/bolux_mushroom.png new file mode 100644 index 00000000..8b869fa1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/bolux_mushroom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flamaea_1.png b/src/main/resources/assets/betterend/textures/block/flamaea_1.png new file mode 100644 index 00000000..d7fb8cef Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flamaea_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flamaea_2.png b/src/main/resources/assets/betterend/textures/block/flamaea_2.png new file mode 100644 index 00000000..0b3486f9 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flamaea_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flamaea_3.png b/src/main/resources/assets/betterend/textures/block/flamaea_3.png new file mode 100644 index 00000000..4404b30e Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flamaea_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flamaea_4.png b/src/main/resources/assets/betterend/textures/block/flamaea_4.png new file mode 100644 index 00000000..098f1fd3 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flamaea_4.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flamaea_5.png b/src/main/resources/assets/betterend/textures/block/flamaea_5.png new file mode 100644 index 00000000..52458b41 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flamaea_5.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_sapling.png b/src/main/resources/assets/betterend/textures/block/lucernia_sapling.png new file mode 100644 index 00000000..6b8ec8ee Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_sapling.png differ diff --git a/src/main/resources/assets/betterend/textures/block/pond_anemone.png b/src/main/resources/assets/betterend/textures/block/pond_anemone.png new file mode 100644 index 00000000..48fef70e Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/pond_anemone.png differ diff --git a/src/main/resources/assets/betterend/textures/block/ruscus.png b/src/main/resources/assets/betterend/textures/block/ruscus.png new file mode 100644 index 00000000..50ad99ae Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/ruscus.png differ diff --git a/src/main/resources/assets/betterend/textures/item/aurant_polypore.png b/src/main/resources/assets/betterend/textures/item/aurant_polypore.png new file mode 100644 index 00000000..bfdde532 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/aurant_polypore.png differ diff --git a/src/main/resources/assets/betterend/textures/item/bolux_mushroom.png b/src/main/resources/assets/betterend/textures/item/bolux_mushroom.png new file mode 100644 index 00000000..350ed56b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/bolux_mushroom.png differ diff --git a/src/main/resources/assets/betterend/textures/item/bolux_mushroom_cooked.png b/src/main/resources/assets/betterend/textures/item/bolux_mushroom_cooked.png new file mode 100644 index 00000000..4541a243 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/bolux_mushroom_cooked.png differ diff --git a/src/main/resources/assets/betterend/textures/item/filalux_wings.aseprite b/src/main/resources/assets/betterend/textures/item/filalux_wings.aseprite deleted file mode 100644 index ecf307bf..00000000 Binary files a/src/main/resources/assets/betterend/textures/item/filalux_wings.aseprite and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/item/filalux_wings.png b/src/main/resources/assets/betterend/textures/item/filalux_wings.png new file mode 100644 index 00000000..e76070b4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/filalux_wings.png differ diff --git a/src/main/resources/assets/betterend/textures/item/pond_anemone.png b/src/main/resources/assets/betterend/textures/item/pond_anemone.png new file mode 100644 index 00000000..32414526 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/pond_anemone.png differ