diff --git a/src/main/java/ru/betterend/blocks/AmaranitaCapBlock.java b/src/main/java/ru/betterend/blocks/AmaranitaCapBlock.java new file mode 100644 index 00000000..2af9deb0 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/AmaranitaCapBlock.java @@ -0,0 +1,13 @@ +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.Material; +import net.minecraft.sound.BlockSoundGroup; +import ru.betterend.blocks.basis.BlockBase; + +public class AmaranitaCapBlock extends BlockBase { + public AmaranitaCapBlock() { + super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sounds(BlockSoundGroup.WOOD)); + } +} diff --git a/src/main/java/ru/betterend/blocks/AmaranitaHymenophoreBlock.java b/src/main/java/ru/betterend/blocks/AmaranitaHymenophoreBlock.java new file mode 100644 index 00000000..36c8310c --- /dev/null +++ b/src/main/java/ru/betterend/blocks/AmaranitaHymenophoreBlock.java @@ -0,0 +1,20 @@ +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.Material; +import net.minecraft.sound.BlockSoundGroup; +import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.client.render.ERenderLayer; +import ru.betterend.interfaces.IRenderTypeable; + +public class AmaranitaHymenophoreBlock extends BlockBase implements IRenderTypeable { + public AmaranitaHymenophoreBlock() { + super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sounds(BlockSoundGroup.WOOD)); + } + + @Override + public ERenderLayer getRenderLayer() { + return ERenderLayer.CUTOUT; + } +} diff --git a/src/main/java/ru/betterend/blocks/BlockProperties.java b/src/main/java/ru/betterend/blocks/BlockProperties.java index 34dfb472..b3bad26f 100644 --- a/src/main/java/ru/betterend/blocks/BlockProperties.java +++ b/src/main/java/ru/betterend/blocks/BlockProperties.java @@ -12,8 +12,10 @@ public class BlockProperties { public static final EnumProperty TRIPLE_SHAPE = EnumProperty.of("shape", TripleShape.class); public static final EnumProperty PENTA_SHAPE = EnumProperty.of("shape", PentaShape.class); + public static final BooleanProperty TRANSITION = BooleanProperty.of("transition"); public static final BooleanProperty HAS_LIGHT = BooleanProperty.of("has_light"); public static final BooleanProperty HAS_ITEM = BooleanProperty.of("has_item"); + public static final BooleanProperty IS_FLOOR = BooleanProperty.of("is_floor"); public static final BooleanProperty NATURAL = BooleanProperty.of("natural"); public static final BooleanProperty ACTIVE = BooleanProperty.of("active"); diff --git a/src/main/java/ru/betterend/blocks/LargeAmaranitaBlock.java b/src/main/java/ru/betterend/blocks/LargeAmaranitaBlock.java new file mode 100644 index 00000000..e8765669 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/LargeAmaranitaBlock.java @@ -0,0 +1,44 @@ +package ru.betterend.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.EnumProperty; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldView; +import ru.betterend.blocks.BlockProperties.TripleShape; +import ru.betterend.blocks.basis.EndPlantBlock; +import ru.betterend.registry.EndBlocks; + +public class LargeAmaranitaBlock extends EndPlantBlock { + public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; + + @Override + protected boolean isTerrain(BlockState state) { + return state.getBlock() == EndBlocks.SANGNUM; + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(SHAPE); + } + + @Override + public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + TripleShape shape = state.get(SHAPE); + if (shape == TripleShape.BOTTOM) { + return isTerrain(world.getBlockState(pos.down())) && world.getBlockState(pos.up()).isOf(this); + } + else if (shape == TripleShape.TOP) { + return world.getBlockState(pos.down()).isOf(this); + } + else { + return world.getBlockState(pos.down()).isOf(this) && world.getBlockState(pos.up()).isOf(this); + } + } + + @Override + public OffsetType getOffsetType() { + return OffsetType.NONE; + } +} diff --git a/src/main/java/ru/betterend/blocks/MossyGlowshroomCapBlock.java b/src/main/java/ru/betterend/blocks/MossyGlowshroomCapBlock.java index af9338a4..7f635583 100644 --- a/src/main/java/ru/betterend/blocks/MossyGlowshroomCapBlock.java +++ b/src/main/java/ru/betterend/blocks/MossyGlowshroomCapBlock.java @@ -13,7 +13,7 @@ import ru.betterend.blocks.basis.BlockBase; import ru.betterend.registry.EndBlocks; public class MossyGlowshroomCapBlock extends BlockBase { - public static final BooleanProperty TRANSITION = BooleanProperty.of("transition"); + public static final BooleanProperty TRANSITION = BlockProperties.TRANSITION; public MossyGlowshroomCapBlock() { super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sounds(BlockSoundGroup.WOOD)); diff --git a/src/main/java/ru/betterend/blocks/SmallAmaranitaBlock.java b/src/main/java/ru/betterend/blocks/SmallAmaranitaBlock.java new file mode 100644 index 00000000..4b2f6563 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/SmallAmaranitaBlock.java @@ -0,0 +1,12 @@ +package ru.betterend.blocks; + +import net.minecraft.block.BlockState; +import ru.betterend.blocks.basis.EndPlantBlock; +import ru.betterend.registry.EndBlocks; + +public class SmallAmaranitaBlock extends EndPlantBlock { + @Override + protected boolean isTerrain(BlockState state) { + return state.getBlock() == EndBlocks.SANGNUM; + } +} diff --git a/src/main/java/ru/betterend/blocks/basis/EndLanternBlock.java b/src/main/java/ru/betterend/blocks/basis/EndLanternBlock.java index 79992a35..0b876665 100644 --- a/src/main/java/ru/betterend/blocks/basis/EndLanternBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/EndLanternBlock.java @@ -18,9 +18,10 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import ru.betterend.blocks.BlockProperties; public class EndLanternBlock extends BlockBaseNotFull implements Waterloggable, FluidFillable { - public static final BooleanProperty IS_FLOOR = BooleanProperty.of("is_floor"); + public static final BooleanProperty IS_FLOOR = BlockProperties.IS_FLOOR; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; public EndLanternBlock(Block source) { diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 5b511b3c..4835bf46 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -9,6 +9,8 @@ import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; import ru.betterend.blocks.AeterniumAnvil; import ru.betterend.blocks.AeterniumBlock; +import ru.betterend.blocks.AmaranitaCapBlock; +import ru.betterend.blocks.AmaranitaHymenophoreBlock; import ru.betterend.blocks.AmberBlock; import ru.betterend.blocks.AncientEmeraldIceBlock; import ru.betterend.blocks.AuroraCrystalBlock; @@ -59,6 +61,7 @@ import ru.betterend.blocks.JellyshroomCapBlock; import ru.betterend.blocks.LacugroveSaplingBlock; import ru.betterend.blocks.LanceleafBlock; import ru.betterend.blocks.LanceleafSeedBlock; +import ru.betterend.blocks.LargeAmaranitaBlock; import ru.betterend.blocks.LumecornBlock; import ru.betterend.blocks.LumecornSeedBlock; import ru.betterend.blocks.MengerSpongeBlock; @@ -77,6 +80,7 @@ import ru.betterend.blocks.RunedFlavolite; import ru.betterend.blocks.ShadowBerryBlock; import ru.betterend.blocks.ShadowGrassBlock; import ru.betterend.blocks.SilkMothNestBlock; +import ru.betterend.blocks.SmallAmaranitaBlock; import ru.betterend.blocks.SmallJellyshroomBlock; import ru.betterend.blocks.SulphurCrystalBlock; import ru.betterend.blocks.TenaneaFlowersBlock; @@ -122,6 +126,7 @@ public class EndBlocks { public static final Block PINK_MOSS = registerBlock("pink_moss", new EndTerrainBlock(MaterialColor.PINK)); public static final Block AMBER_MOSS = registerBlock("amber_moss", new EndTerrainBlock(MaterialColor.ORANGE)); public static final Block JUNGLE_MOSS = registerBlock("jungle_moss", new EndTerrainBlock(MaterialColor.GREEN)); + public static final Block SANGNUM = registerBlock("sangnum", new EndTerrainBlock(MaterialColor.RED)); public static final Block RUTISCUS = registerBlock("rutiscus", new EndTerrainBlock(MaterialColor.ORANGE)); // Roads // @@ -134,6 +139,7 @@ public class EndBlocks { public static final Block PINK_MOSS_PATH = registerBlock("pink_moss_path", new EndPathBlock(PINK_MOSS)); public static final Block AMBER_MOSS_PATH = registerBlock("amber_moss_path", new EndPathBlock(AMBER_MOSS)); public static final Block JUNGLE_MOSS_PATH = registerBlock("jungle_moss_path", new EndPathBlock(JUNGLE_MOSS)); + public static final Block SANGNUM_PATH = registerBlock("sangnum_path", new EndPathBlock(SANGNUM)); public static final Block RUTISCUS_PATH = registerBlock("rutiscus_path", new EndPathBlock(RUTISCUS)); public static final Block MOSSY_OBSIDIAN = registerBlock("mossy_obsidian", new MossyObsidian()); @@ -247,6 +253,13 @@ public class EndBlocks { public static final Block LUMECORN_SEED = registerBlock("lumecorn_seed", new LumecornSeedBlock()); public static final Block LUMECORN = registerBlockNI("lumecorn", new LumecornBlock()); + public static final Block SMALL_AMARANITA_MUSHROOM = registerBlock("small_amaranita_mushroom", new SmallAmaranitaBlock()); + public static final Block LARGE_AMARANITA_MUSHROOM = registerBlockNI("large_amaranita_mushroom", new LargeAmaranitaBlock()); + public static final Block AMARANITA_HYPHAE = registerBlock("amaranita_hyphae", new AmaranitaCapBlock()); + public static final Block AMARANITA_HYMENOPHORE = registerBlock("amaranita_hymenophore", new AmaranitaHymenophoreBlock()); + public static final Block AMARANITA_FUR = registerBlock("amaranita_fur", new FurBlock(MOSSY_GLOWSHROOM_SAPLING, 15, 4)); + public static final Block AMARANITA_CAP = registerBlock("amaranita_cap", new AmaranitaCapBlock()); + // Crops public static final Block BLOSSOM_BERRY = registerBlock("blossom_berry_seed", new EndCropBlock(EndItems.BLOSSOM_BERRY, PINK_MOSS)); diff --git a/src/main/java/ru/betterend/util/BonemealUtil.java b/src/main/java/ru/betterend/util/BonemealUtil.java index 67146c8b..226235fd 100644 --- a/src/main/java/ru/betterend/util/BonemealUtil.java +++ b/src/main/java/ru/betterend/util/BonemealUtil.java @@ -42,6 +42,11 @@ public class BonemealUtil { addBonemealGrass(EndBiomes.GLOWING_GRASSLANDS, EndBlocks.END_MOSS, EndBlocks.CREEPING_MOSS, 0.1F); addBonemealGrass(EndBiomes.GLOWING_GRASSLANDS, EndBlocks.END_MOSS, EndBlocks.UMBRELLA_MOSS, 0.1F); addBonemealGrass(EndBiomes.GLOWING_GRASSLANDS, EndBlocks.END_MOSS, EndBlocks.TWISTED_UMBRELLA_MOSS, 0.1F); + + addBonemealGrass(EndBlocks.RUTISCUS, EndBlocks.ORANGO); + addBonemealGrass(EndBlocks.RUTISCUS, EndBlocks.AERIDIUM, 0.2F); + addBonemealGrass(EndBlocks.RUTISCUS, EndBlocks.LUTEBUS, 0.2F); + addBonemealGrass(EndBlocks.RUTISCUS, EndBlocks.LAMELLARIUM); } public static void addBonemealGrass(Block terrain, Block plant) { diff --git a/src/main/java/ru/betterend/world/biome/DragonGraveyardsBiome.java b/src/main/java/ru/betterend/world/biome/DragonGraveyardsBiome.java index 17fdf531..41500b94 100644 --- a/src/main/java/ru/betterend/world/biome/DragonGraveyardsBiome.java +++ b/src/main/java/ru/betterend/world/biome/DragonGraveyardsBiome.java @@ -13,7 +13,7 @@ public class DragonGraveyardsBiome extends EndBiome { .setFogDensity(1.1F) .setMusic(EndSounds.MUSIC_OPENSPACE) .setLoop(EndSounds.AMBIENT_GLOWING_GRASSLANDS) - .setSurface(EndBlocks.CAVE_MOSS) + .setSurface(EndBlocks.SANGNUM) .setWaterAndFogColor(203, 59, 167) .setPlantsColor(244, 46, 79) .addFeature(EndFeatures.OBSIDIAN_PILLAR_BASEMENT) diff --git a/src/main/resources/assets/betterend/blockstates/amaranita_fur.json b/src/main/resources/assets/betterend/blockstates/amaranita_fur.json new file mode 100644 index 00000000..88cfa9e0 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/amaranita_fur.json @@ -0,0 +1,10 @@ +{ + "variants": { + "facing=up": { "model": "betterend:block/amaranita_fur" }, + "facing=down": { "model": "betterend:block/amaranita_fur", "x": 180 }, + "facing=north": { "model": "betterend:block/amaranita_fur", "x": 90 }, + "facing=south": { "model": "betterend:block/amaranita_fur", "x": 90, "y": 180 }, + "facing=east": { "model": "betterend:block/amaranita_fur", "x": 90, "y": 90 }, + "facing=west": { "model": "betterend:block/amaranita_fur", "x": 90, "y": 270 } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/large_amaranita_mushroom.json b/src/main/resources/assets/betterend/blockstates/large_amaranita_mushroom.json new file mode 100644 index 00000000..80bbb6c3 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/large_amaranita_mushroom.json @@ -0,0 +1,7 @@ +{ + "variants": { + "shape=top": { "model": "betterend:block/large_amaranita_cap" }, + "shape=middle": { "model": "betterend:block/large_amaranita_stem" }, + "shape=bottom": { "model": "betterend:block/large_amaranita_roots" } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/small_amaranita_mushroom.json b/src/main/resources/assets/betterend/blockstates/small_amaranita_mushroom.json new file mode 100644 index 00000000..84030665 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/small_amaranita_mushroom.json @@ -0,0 +1,8 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/small_amaranita_mushroom_01" }, + { "model": "betterend:block/small_amaranita_mushroom_02" } + ] + } +} diff --git a/src/main/resources/assets/betterend/models/block/amaranita_fur.json b/src/main/resources/assets/betterend/models/block/amaranita_fur.json new file mode 100644 index 00000000..2d30f61f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amaranita_fur.json @@ -0,0 +1,75 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/amaranita_fur", + "texture": "betterend:block/amaranita_fur" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -8 ], + "to": [ 16, 0, 8 ], + "rotation": { "origin": [ 0, 0, 8 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 8 ], + "to": [ 16, 0.001, 24 ], + "rotation": { "origin": [ 0, 0.000000954, 8 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY4", + "from": [ 8, -0.001, 0 ], + "to": [ 24, 0, 16 ], + "rotation": { "origin": [ 8, 0, 16 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -8, 0, 2 ], + "to": [ 8, 0.001, 18 ], + "rotation": { "origin": [ 8, 0, 18 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneX6", + "from": [ 0, 0, -6.5 ], + "to": [ 0.001, 16, 16 ], + "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneX6", + "from": [ -6.5, 0, 15.999 ], + "to": [ 16, 16, 16 ], + "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "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/amaranita_hymenophore_fur.json b/src/main/resources/assets/betterend/models/block/amaranita_hymenophore_fur.json new file mode 100644 index 00000000..71b5a46c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amaranita_hymenophore_fur.json @@ -0,0 +1,81 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/amaranita_hymenophore_fur", + "texture": "betterend:block/amaranita_hymenophore_fur" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 5, 12, 0 ], + "to": [ 5.001, 16, 16 ], + "faces": { + "west": { "uv": [ 16, 0, 0, 4 ], "texture": "#texture" }, + "east": { "uv": [ 16, 0, 0, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 11, 12, 0 ], + "to": [ 11.001, 16, 16 ], + "faces": { + "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 16, 12, 0 ], + "to": [ 16.001, 16, 16 ], + "faces": { + "west": { "uv": [ 16, 0, 0, 4 ], "texture": "#texture" }, + "east": { "uv": [ 16, 0, 0, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 0, 12, 0 ], + "to": [ 0.001, 16, 16 ], + "faces": { + "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneZ11", + "from": [ 0, 12, 0 ], + "to": [ 16, 16, 0.001 ], + "faces": { + "north": { "uv": [ 16, 0, 0, 4 ], "texture": "#texture" }, + "south": { "uv": [ 16, 0, 0, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneZ11", + "from": [ 0, 12, 5 ], + "to": [ 16, 16, 5.001 ], + "faces": { + "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneZ11", + "from": [ 0, 12, 11 ], + "to": [ 16, 16, 11.001 ], + "faces": { + "north": { "uv": [ 16, 0, 0, 4 ], "texture": "#texture" }, + "south": { "uv": [ 16, 0, 0, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneZ11", + "from": [ 0, 12, 16 ], + "to": [ 16, 16, 16.001 ], + "faces": { + "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/large_amaranita_cap.json b/src/main/resources/assets/betterend/models/block/large_amaranita_cap.json new file mode 100644 index 00000000..8a5e634b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/large_amaranita_cap.json @@ -0,0 +1,96 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/large_amaranita_cap_side", + "side": "betterend:block/large_amaranita_cap_side", + "top": "betterend:block/large_amaranita_cap_top", + "bottom": "betterend:block/large_amaranita_cap_bottom", + "stem": "betterend:block/amaranita_stem_top" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 7, 1 ], + "to": [ 15, 14, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#bottom" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, + "north": { "uv": [ 1, 2, 15, 9 ], "texture": "#side" }, + "south": { "uv": [ 1, 2, 15, 9 ], "texture": "#side" }, + "west": { "uv": [ 1, 2, 15, 9 ], "texture": "#side" }, + "east": { "uv": [ 1, 2, 15, 9 ], "texture": "#side" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 14, 3 ], + "to": [ 13, 16, 13 ], + "faces": { + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 3, 0, 13, 2 ], "texture": "#side" }, + "south": { "uv": [ 3, 0, 13, 2 ], "texture": "#side" }, + "west": { "uv": [ 3, 0, 13, 2 ], "texture": "#side" }, + "east": { "uv": [ 3, 0, 13, 2 ], "texture": "#side" } + } + }, + { + "__comment": "Box4", + "from": [ 6, 0, 6 ], + "to": [ 10, 4, 10 ], + "faces": { + "north": { "uv": [ 6, 12, 10, 16 ], "texture": "#stem" }, + "south": { "uv": [ 6, 12, 10, 16 ], "texture": "#stem" }, + "west": { "uv": [ 6, 12, 10, 16 ], "texture": "#stem" }, + "east": { "uv": [ 6, 12, 10, 16 ], "texture": "#stem" } + } + }, + { + "__comment": "Box4", + "from": [ 5, 4, 5 ], + "to": [ 11, 7, 11 ], + "faces": { + "down": { "uv": [ 5, 2, 11, 8 ], "texture": "#stem" }, + "north": { "uv": [ 5, 9, 11, 12 ], "texture": "#stem" }, + "south": { "uv": [ 5, 9, 11, 12 ], "texture": "#stem" }, + "west": { "uv": [ 5, 9, 11, 12 ], "texture": "#stem" }, + "east": { "uv": [ 5, 9, 11, 12 ], "texture": "#stem" } + } + }, + { + "__comment": "PlaneX6", + "from": [ 2, 3, 1 ], + "to": [ 2.001, 7, 15 ], + "faces": { + "west": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" }, + "east": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" } + } + }, + { + "__comment": "PlaneX6", + "from": [ 14, 3, 1 ], + "to": [ 14.001, 7, 15 ], + "faces": { + "west": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" }, + "east": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" } + } + }, + { + "__comment": "PlaneZ8", + "from": [ 1, 3, 2 ], + "to": [ 15, 7, 2.001 ], + "faces": { + "north": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" }, + "south": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" } + } + }, + { + "__comment": "PlaneZ8", + "from": [ 1, 3, 14 ], + "to": [ 15, 7, 14.001 ], + "faces": { + "north": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" }, + "south": { "uv": [ 1, 9, 15, 13 ], "texture": "#side" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/large_amaranita_roots.json b/src/main/resources/assets/betterend/models/block/large_amaranita_roots.json new file mode 100644 index 00000000..21b01862 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/large_amaranita_roots.json @@ -0,0 +1,43 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/amaranita_stem", + "texture": "betterend:block/amaranita_stem", + "texture1": "betterend:block/amaranita_roots" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0, 0, 0 ], + "to": [ 0.001, 16, 22.5 ], + "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 16, 0, 0 ], + "to": [ 16.001, 16, 22.5 ], + "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/large_amaranita_stem.json b/src/main/resources/assets/betterend/models/block/large_amaranita_stem.json new file mode 100644 index 00000000..5bde4f65 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/large_amaranita_stem.json @@ -0,0 +1,20 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/amaranita_stem", + "texture": "betterend:block/amaranita_stem" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_obsidian.json b/src/main/resources/assets/betterend/models/block/mossy_obsidian.json index 78d52422..082f4bca 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_obsidian.json +++ b/src/main/resources/assets/betterend/models/block/mossy_obsidian.json @@ -6,7 +6,7 @@ "north": "betterend:block/mossy_obsidian_side", "particle": "betterend:block/mossy_obsidian_side", "south": "betterend:block/mossy_obsidian_side", - "up": "betterend:block/cave_moss_top", + "up": "betterend:block/sangnum_top", "west": "betterend:block/mossy_obsidian_side" } } diff --git a/src/main/resources/assets/betterend/models/block/small_amaranita_mushroom_01.json b/src/main/resources/assets/betterend/models/block/small_amaranita_mushroom_01.json new file mode 100644 index 00000000..ae20c5ad --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/small_amaranita_mushroom_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/small_amaranita_mushroom" + } +} diff --git a/src/main/resources/assets/betterend/models/block/small_amaranita_mushroom_02.json b/src/main/resources/assets/betterend/models/block/small_amaranita_mushroom_02.json new file mode 100644 index 00000000..6f917ca4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/small_amaranita_mushroom_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/small_amaranita_mushroom" + } +} diff --git a/src/main/resources/assets/betterend/models/item/amaranita_fur.json b/src/main/resources/assets/betterend/models/item/amaranita_fur.json new file mode 100644 index 00000000..67e96e5e --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/amaranita_fur.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/amaranita_fur" + } +} diff --git a/src/main/resources/assets/betterend/models/item/small_amaranita_mushroom.json b/src/main/resources/assets/betterend/models/item/small_amaranita_mushroom.json new file mode 100644 index 00000000..c6893c41 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/small_amaranita_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/small_amaranita_mushroom" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/amaranita_cap.png b/src/main/resources/assets/betterend/textures/block/amaranita_cap.png new file mode 100644 index 00000000..d01c8f75 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amaranita_cap.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amaranita_fur.png b/src/main/resources/assets/betterend/textures/block/amaranita_fur.png new file mode 100644 index 00000000..57f1b505 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amaranita_fur.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amaranita_hymenophore.png b/src/main/resources/assets/betterend/textures/block/amaranita_hymenophore.png new file mode 100644 index 00000000..20df36d0 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amaranita_hymenophore.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amaranita_hymenophore_fur.png b/src/main/resources/assets/betterend/textures/block/amaranita_hymenophore_fur.png new file mode 100644 index 00000000..e3f12d26 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amaranita_hymenophore_fur.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amaranita_hyphae_side.png b/src/main/resources/assets/betterend/textures/block/amaranita_hyphae_side.png new file mode 100644 index 00000000..40d6f6a2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amaranita_hyphae_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amaranita_hyphae_top.png b/src/main/resources/assets/betterend/textures/block/amaranita_hyphae_top.png new file mode 100644 index 00000000..f41856aa Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amaranita_hyphae_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amaranita_roots.png b/src/main/resources/assets/betterend/textures/block/amaranita_roots.png new file mode 100644 index 00000000..11edd90d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amaranita_roots.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amaranita_stem.png b/src/main/resources/assets/betterend/textures/block/amaranita_stem.png new file mode 100644 index 00000000..b33c8778 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amaranita_stem.png differ diff --git a/src/main/resources/assets/betterend/textures/block/amaranita_stem_top.png b/src/main/resources/assets/betterend/textures/block/amaranita_stem_top.png new file mode 100644 index 00000000..afa144c5 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/amaranita_stem_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/large_amaranita_cap_bottom.png b/src/main/resources/assets/betterend/textures/block/large_amaranita_cap_bottom.png new file mode 100644 index 00000000..2376260c Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/large_amaranita_cap_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/large_amaranita_cap_side.png b/src/main/resources/assets/betterend/textures/block/large_amaranita_cap_side.png new file mode 100644 index 00000000..95a1b9af Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/large_amaranita_cap_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/large_amaranita_cap_top.png b/src/main/resources/assets/betterend/textures/block/large_amaranita_cap_top.png new file mode 100644 index 00000000..bc969595 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/large_amaranita_cap_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_obsidian_side.png b/src/main/resources/assets/betterend/textures/block/mossy_obsidian_side.png index 180693eb..9bdf1da3 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_obsidian_side.png and b/src/main/resources/assets/betterend/textures/block/mossy_obsidian_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/sangnum_path_top.png b/src/main/resources/assets/betterend/textures/block/sangnum_path_top.png new file mode 100644 index 00000000..04ad7f4d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/sangnum_path_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/sangnum_side.png b/src/main/resources/assets/betterend/textures/block/sangnum_side.png new file mode 100644 index 00000000..feb1aca4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/sangnum_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/sangnum_top.png b/src/main/resources/assets/betterend/textures/block/sangnum_top.png new file mode 100644 index 00000000..29f2e39a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/sangnum_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/small_amaranita_mushroom.png b/src/main/resources/assets/betterend/textures/block/small_amaranita_mushroom.png new file mode 100644 index 00000000..2dd0ce70 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/small_amaranita_mushroom.png differ