diff --git a/src/main/java/ru/betterend/blocks/BlockProperties.java b/src/main/java/ru/betterend/blocks/BlockProperties.java index fca28924..14933431 100644 --- a/src/main/java/ru/betterend/blocks/BlockProperties.java +++ b/src/main/java/ru/betterend/blocks/BlockProperties.java @@ -121,9 +121,10 @@ public class BlockProperties { } public static enum LumecornShape implements StringIdentifiable { - LIGHT1("light1", 15), - LIGHT2("light2", 14), - LIGHT3("light3", 13), + LIGHT_TOP("light_top", 10), + LIGHT_TOP_MIDDLE("light_top_middle", 13), + LIGHT_MIDDLE("light_middle", 15), + LIGHT_BOTTOM("light_bottom", 10), MIDDLE("middle", 0), BOTTOM_BIG("bottom_big", 0), BOTTOM_SMALL("bottom_small", 0); diff --git a/src/main/java/ru/betterend/blocks/LumecornBlock.java b/src/main/java/ru/betterend/blocks/LumecornBlock.java index c04b1ed5..a201101c 100644 --- a/src/main/java/ru/betterend/blocks/LumecornBlock.java +++ b/src/main/java/ru/betterend/blocks/LumecornBlock.java @@ -46,10 +46,10 @@ public class LumecornBlock extends BaseBlockNotFull implements IRenderTypeable { @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { LumecornShape shape = state.get(SHAPE); - if (shape == LumecornShape.LIGHT3) { + if (shape == LumecornShape.LIGHT_MIDDLE) { return SHAPE_SMALL; } - else if (shape == LumecornShape.LIGHT2) { + else if (shape == LumecornShape.LIGHT_TOP_MIDDLE) { return SHAPE_MEDIUM; } else { diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 504c8739..851a1cff 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -206,6 +206,10 @@ public class EndBlocks { public static final Block TWISTED_UMBRELLA_MOSS = registerBlock("twisted_umbrella_moss", new TwistedUmbrellaMossBlock()); public static final Block TWISTED_UMBRELLA_MOSS_TALL = registerBlock("twisted_umbrella_moss_tall", new TwistedUmbrellaMossTallBlock()); public static final Block JUNGLE_GRASS = registerBlock("jungle_grass", new TerrainPlantBlock(JUNGLE_MOSS)); + public static final Block BLOOMING_COOKSONIA = registerBlock("blooming_cooksonia", new TerrainPlantBlock(END_MOSS)); + public static final Block SALTEAGO = registerBlock("salteago", new TerrainPlantBlock(END_MOSS)); + public static final Block VAIOLUSH_FERN = registerBlock("vaiolush_fern", new TerrainPlantBlock(END_MOSS)); + public static final Block FRACTURN = registerBlock("fracturn", new TerrainPlantBlock(END_MOSS)); public static final Block BLUE_VINE_SEED = registerBlock("blue_vine_seed", new BlueVineSeedBlock()); public static final Block BLUE_VINE = registerBlockNI("blue_vine", new BlueVineBlock()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index ee25cdd2..96c646e5 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -91,6 +91,13 @@ public class EndFeatures { public static final EndFeature JUNGLE_GRASS = new EndFeature("jungle_grass", new SinglePlantFeature(EndBlocks.JUNGLE_GRASS, 7, 3), 8); public static final EndFeature SMALL_JELLYSHROOM_FLOOR = new EndFeature("small_jellyshroom_floor", new SinglePlantFeature(EndBlocks.SMALL_JELLYSHROOM, 5, 5), 4); public static final EndFeature BLOSSOM_BERRY = new EndFeature("blossom_berry", new SinglePlantFeature(EndBlocks.BLOSSOM_BERRY, 3, 3), 2); + public static final EndFeature BLOOMING_COOKSONIA = new EndFeature("blooming_cooksonia", new SinglePlantFeature(EndBlocks.BLOOMING_COOKSONIA, 5), 5); + public static final EndFeature SALTEAGO = new EndFeature("salteago", new SinglePlantFeature(EndBlocks.SALTEAGO, 5), 5); + public static final EndFeature VAIOLUSH_FERN = new EndFeature("vaiolush_fern", new SinglePlantFeature(EndBlocks.VAIOLUSH_FERN, 5), 5); + public static final EndFeature FRACTURN = new EndFeature("fracturn", new SinglePlantFeature(EndBlocks.FRACTURN, 5), 5); + public static final EndFeature UMBRELLA_MOSS_RARE = new EndFeature("umbrella_moss_rare", new SinglePlantFeature(EndBlocks.UMBRELLA_MOSS, 3), 2); + public static final EndFeature CREEPING_MOSS_RARE = new EndFeature("creeping_moss_rare", new SinglePlantFeature(EndBlocks.CREEPING_MOSS, 3), 2); + public static final EndFeature TWISTED_UMBRELLA_MOSS_RARE = new EndFeature("twisted_umbrella_moss_rare", new SinglePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, 3), 2); // Vines // public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(EndBlocks.DENSE_VINE, 24), 3); diff --git a/src/main/java/ru/betterend/world/biome/GlowingGrasslandsBiome.java b/src/main/java/ru/betterend/world/biome/GlowingGrasslandsBiome.java index be5bdd10..b8ac72bc 100644 --- a/src/main/java/ru/betterend/world/biome/GlowingGrasslandsBiome.java +++ b/src/main/java/ru/betterend/world/biome/GlowingGrasslandsBiome.java @@ -16,9 +16,13 @@ public class GlowingGrasslandsBiome extends EndBiome { .setSurface(EndBlocks.END_MOSS) .addFeature(EndFeatures.END_LAKE_RARE) .addFeature(EndFeatures.LUMECORN) - .addFeature(EndFeatures.UMBRELLA_MOSS) - .addFeature(EndFeatures.CREEPING_MOSS) - .addFeature(EndFeatures.TWISTED_UMBRELLA_MOSS) + .addFeature(EndFeatures.BLOOMING_COOKSONIA) + .addFeature(EndFeatures.SALTEAGO) + .addFeature(EndFeatures.VAIOLUSH_FERN) + .addFeature(EndFeatures.FRACTURN) + .addFeature(EndFeatures.UMBRELLA_MOSS_RARE) + .addFeature(EndFeatures.CREEPING_MOSS_RARE) + .addFeature(EndFeatures.TWISTED_UMBRELLA_MOSS_RARE) .addFeature(EndFeatures.CHARNIA_CYAN) .addFeature(EndFeatures.CHARNIA_GREEN) .addFeature(EndFeatures.CHARNIA_LIGHT_BLUE) diff --git a/src/main/java/ru/betterend/world/features/bushes/Lumecorn.java b/src/main/java/ru/betterend/world/features/bushes/Lumecorn.java index f9d6c5da..81bad45d 100644 --- a/src/main/java/ru/betterend/world/features/bushes/Lumecorn.java +++ b/src/main/java/ru/betterend/world/features/bushes/Lumecorn.java @@ -2,10 +2,10 @@ package ru.betterend.world.features.bushes; import java.util.Random; +import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; @@ -22,7 +22,7 @@ public class Lumecorn extends DefaultFeature { public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) { if (!world.getBlockState(pos.down()).getBlock().isIn(EndTags.END_GROUND)) return false; - int height = MHelper.randRange(3, 6, random); + int height = MHelper.randRange(4, 7, random); Mutable mut = new Mutable().set(pos); for (int i = 1; i < height; i++) { mut.move(Direction.UP); @@ -31,39 +31,31 @@ public class Lumecorn extends DefaultFeature { } } mut.set(pos); - if (height == 3) { + BlockState topMiddle = EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.LIGHT_TOP_MIDDLE); + BlockState middle = EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.LIGHT_MIDDLE); + BlockState bottom = EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.LIGHT_BOTTOM); + BlockState top = EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.LIGHT_TOP); + if (height == 4) { BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.BOTTOM_SMALL)); - BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.LIGHT2)); - BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.LIGHT3)); + BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), bottom); + BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), topMiddle); + BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), top); return true; } - boolean tall = random.nextBoolean(); - if (tall) { - BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.BOTTOM_BIG)); - BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.MIDDLE)); - height -= 2; + if (random.nextBoolean()) { + BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.BOTTOM_SMALL)); } else { - BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.BOTTOM_SMALL)); + BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.BOTTOM_BIG)); + BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.MIDDLE)); height --; } - boolean smallBottom = height > 2 && random.nextBoolean(); - for (int i = 0; i < height; i++) { - int size = i - height + 4; - size = MathHelper.clamp(size, 1, 3); - if (smallBottom && i == 0) { - size ++; - } - if (size == 1) { - BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.LIGHT1)); - } - else if (size == 2) { - BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.LIGHT2)); - } - else { - BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), EndBlocks.LUMECORN.getDefaultState().with(LumecornBlock.SHAPE, LumecornShape.LIGHT3)); - } + BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), bottom); + for (int i = 4; i < height; i++) { + BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), middle); } + BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), topMiddle); + BlocksHelper.setWithoutUpdate(world, mut.move(Direction.UP), top); return false; } } diff --git a/src/main/resources/assets/betterend/blockstates/blooming_cooksonia.json b/src/main/resources/assets/betterend/blockstates/blooming_cooksonia.json new file mode 100644 index 00000000..8ff50a40 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/blooming_cooksonia.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/blooming_cooksonia_01" }, + { "model": "betterend:block/blooming_cooksonia_02" }, + { "model": "betterend:block/blooming_cooksonia_03" }, + { "model": "betterend:block/blooming_cooksonia_04" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/fracturn.json b/src/main/resources/assets/betterend/blockstates/fracturn.json new file mode 100644 index 00000000..b53acc64 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/fracturn.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/fracturn_01" }, + { "model": "betterend:block/fracturn_02" }, + { "model": "betterend:block/fracturn_03" }, + { "model": "betterend:block/fracturn_04" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/lumecorn.json b/src/main/resources/assets/betterend/blockstates/lumecorn.json index ab9cf754..f35cf962 100644 --- a/src/main/resources/assets/betterend/blockstates/lumecorn.json +++ b/src/main/resources/assets/betterend/blockstates/lumecorn.json @@ -1,8 +1,9 @@ { "variants": { - "shape=light1": { "model": "betterend:block/lumecorn_light_1" }, - "shape=light2": { "model": "betterend:block/lumecorn_light_2" }, - "shape=light3": { "model": "betterend:block/lumecorn_light_3" }, + "shape=light_bottom": { "model": "betterend:block/lumecorn_light_bottom" }, + "shape=light_middle": { "model": "betterend:block/lumecorn_light_middle" }, + "shape=light_top_middle": { "model": "betterend:block/lumecorn_light_top_middle" }, + "shape=light_top": { "model": "betterend:block/lumecorn_light_top" }, "shape=middle": { "model": "betterend:block/lumecorn_middle" }, "shape=bottom_big": { "model": "betterend:block/lumecorn_roots_big" }, "shape=bottom_small": { "model": "betterend:block/lumecorn_roots_small" } diff --git a/src/main/resources/assets/betterend/blockstates/salteago.json b/src/main/resources/assets/betterend/blockstates/salteago.json new file mode 100644 index 00000000..a3a2de25 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/salteago.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/salteago_01" }, + { "model": "betterend:block/salteago_02" }, + { "model": "betterend:block/salteago_03" }, + { "model": "betterend:block/salteago_04" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/vaiolush_fern.json b/src/main/resources/assets/betterend/blockstates/vaiolush_fern.json new file mode 100644 index 00000000..4956451d --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/vaiolush_fern.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/vaiolush_fern_01" }, + { "model": "betterend:block/vaiolush_fern_02" }, + { "model": "betterend:block/vaiolush_fern_03" }, + { "model": "betterend:block/vaiolush_fern_04" } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index ddfa5ebd..dfba0019 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -564,5 +564,15 @@ "item.betterend.blossom_berry": "Blossom Berry", "biome.betterend.nightshade_redwoods": "Nightshade Redwoods", - "block.betterend.nightshade_moss": "Nightshade Moss" + "block.betterend.nightshade_moss": "Nightshade Moss", + + "biome.betterend.glowing_grasslands": "Glowing Grasslands", + "block.betterend.blooming_cooksonia": "Blooming Cooksonia", + "block.betterend.fracturn": "Fracturn", + "block.betterend.lumecorn": "Lumecorn", + "block.betterend.salteago": "Salteago", + "block.betterend.vaiolush_fern": "Vaiolush Fern", + "entity.betterend.silk_moth": "Silk Moth", + "item.betterend.silk_fiber": "Silk Fiber", + "item.betterend.spawn_egg_silk_moth": "Silk Moth Spawn Egg" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 97b67028..e337d629 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -566,5 +566,15 @@ "item.betterend.blossom_berry": "Цветущая ягода", "biome.betterend.nightshade_redwoods": "Теневой Секвойник", - "block.betterend.nightshade_moss": "Теневой мох" + "block.betterend.nightshade_moss": "Теневой мох", + + "biome.betterend.glowing_grasslands": "Светящиеся луга", + "block.betterend.blooming_cooksonia": "Цветущая куксония", + "block.betterend.fracturn": "Фрактюрн", + "block.betterend.lumecorn": "Люмекорн", + "block.betterend.salteago": "Сальтеаго", + "block.betterend.vaiolush_fern": "Пышнопёрый папоротник", + "entity.betterend.silk_moth": "Шелковичная моль", + "item.betterend.silk_fiber": "Шёлковое волокно", + "item.betterend.spawn_egg_silk_moth": "Яйцо призыва шелковичной моли" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/blooming_cooksonia.json b/src/main/resources/assets/betterend/materialmaps/block/blooming_cooksonia.json new file mode 100644 index 00000000..c19e0715 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/blooming_cooksonia.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor_glow_50" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/fracturn.json b/src/main/resources/assets/betterend/materialmaps/block/fracturn.json new file mode 100644 index 00000000..c19e0715 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/fracturn.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor_glow_50" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/lumecorn.json b/src/main/resources/assets/betterend/materialmaps/block/lumecorn.json index f2157010..5b4926ac 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/lumecorn.json +++ b/src/main/resources/assets/betterend/materialmaps/block/lumecorn.json @@ -2,7 +2,19 @@ "defaultMap": { "spriteMap": [ { - "sprite": "betterend:block/lumecorn_light_1", + "sprite": "betterend:block/lumecorn_light_bottom", + "material": "betterend:glow_inc" + }, + { + "sprite": "betterend:block/lumecorn_light_middle", + "material": "betterend:glow_inc" + }, + { + "sprite": "betterend:block/lumecorn_light_top_middle", + "material": "betterend:glow_inc" + }, + { + "sprite": "betterend:block/lumecorn_light_top", "material": "betterend:glow_inc" }, { diff --git a/src/main/resources/assets/betterend/materialmaps/block/salteago.json b/src/main/resources/assets/betterend/materialmaps/block/salteago.json new file mode 100644 index 00000000..352de84b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/salteago.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/vaiolush_fern.json b/src/main/resources/assets/betterend/materialmaps/block/vaiolush_fern.json new file mode 100644 index 00000000..352de84b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/vaiolush_fern.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor" +} diff --git a/src/main/resources/assets/betterend/materialmaps/item/blooming_cooksonia.json b/src/main/resources/assets/betterend/materialmaps/item/blooming_cooksonia.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/blooming_cooksonia.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/materialmaps/item/fracturn.json b/src/main/resources/assets/betterend/materialmaps/item/fracturn.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/fracturn.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/materialmaps/item/salteago.json b/src/main/resources/assets/betterend/materialmaps/item/salteago.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/salteago.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/item/vaiolush_fern.json b/src/main/resources/assets/betterend/materialmaps/item/vaiolush_fern.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/vaiolush_fern.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blooming_cooksonia_01.json b/src/main/resources/assets/betterend/models/block/blooming_cooksonia_01.json new file mode 100644 index 00000000..c68906bb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/blooming_cooksonia_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/blooming_cooksonia" + } +} diff --git a/src/main/resources/assets/betterend/models/block/blooming_cooksonia_02.json b/src/main/resources/assets/betterend/models/block/blooming_cooksonia_02.json new file mode 100644 index 00000000..ac276975 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/blooming_cooksonia_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/blooming_cooksonia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blooming_cooksonia_03.json b/src/main/resources/assets/betterend/models/block/blooming_cooksonia_03.json new file mode 100644 index 00000000..ccaffe10 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/blooming_cooksonia_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/blooming_cooksonia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blooming_cooksonia_04.json b/src/main/resources/assets/betterend/models/block/blooming_cooksonia_04.json new file mode 100644 index 00000000..703797e8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/blooming_cooksonia_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/blooming_cooksonia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/fracturn_01.json b/src/main/resources/assets/betterend/models/block/fracturn_01.json new file mode 100644 index 00000000..f2fec641 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/fracturn_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/fracturn" + } +} diff --git a/src/main/resources/assets/betterend/models/block/fracturn_02.json b/src/main/resources/assets/betterend/models/block/fracturn_02.json new file mode 100644 index 00000000..3ad3fb70 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/fracturn_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/fracturn" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/fracturn_03.json b/src/main/resources/assets/betterend/models/block/fracturn_03.json new file mode 100644 index 00000000..0d401711 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/fracturn_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/fracturn" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/fracturn_04.json b/src/main/resources/assets/betterend/models/block/fracturn_04.json new file mode 100644 index 00000000..f7727012 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/fracturn_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/fracturn" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lumecorn_light_1.json b/src/main/resources/assets/betterend/models/block/lumecorn_light_1.json deleted file mode 100644 index c7c70e16..00000000 --- a/src/main/resources/assets/betterend/models/block/lumecorn_light_1.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/lumecorn_light_1", - "texture": "betterend:block/lumecorn_light_1" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 5, 0, 5 ], - "to": [ 11, 16, 11 ], - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 5, 0, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 0, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 0, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 0, 11, 16 ], "texture": "#texture" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lumecorn_light_2.json b/src/main/resources/assets/betterend/models/block/lumecorn_light_2.json deleted file mode 100644 index 866e326b..00000000 --- a/src/main/resources/assets/betterend/models/block/lumecorn_light_2.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/lumecorn_light_1", - "texture": "betterend:block/lumecorn_light_1" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 6, 0, 6 ], - "to": [ 10, 16, 10 ], - "faces": { - "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "up" }, - "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/lumecorn_light_3.json b/src/main/resources/assets/betterend/models/block/lumecorn_light_3.json deleted file mode 100644 index 771c759e..00000000 --- a/src/main/resources/assets/betterend/models/block/lumecorn_light_3.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/lumecorn_light_1", - "texture": "betterend:block/lumecorn_light_1" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 7, 0, 7 ], - "to": [ 9, 16, 9 ], - "faces": { - "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture" }, - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lumecorn_light_bottom.json b/src/main/resources/assets/betterend/models/block/lumecorn_light_bottom.json new file mode 100644 index 00000000..c46d9653 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lumecorn_light_bottom.json @@ -0,0 +1,31 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lumecorn_light_bottom", + "particle": "#texture" + }, + "elements": [ + { + "__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": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__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": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lumecorn_light_middle.json b/src/main/resources/assets/betterend/models/block/lumecorn_light_middle.json new file mode 100644 index 00000000..5bdf6223 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lumecorn_light_middle.json @@ -0,0 +1,31 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lumecorn_light_middle", + "particle": "#texture" + }, + "elements": [ + { + "__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": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__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": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lumecorn_light_top.json b/src/main/resources/assets/betterend/models/block/lumecorn_light_top.json new file mode 100644 index 00000000..bde1ef2a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lumecorn_light_top.json @@ -0,0 +1,31 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lumecorn_light_top", + "particle": "#texture" + }, + "elements": [ + { + "__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": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__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": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lumecorn_light_top_middle.json b/src/main/resources/assets/betterend/models/block/lumecorn_light_top_middle.json new file mode 100644 index 00000000..f9639ab8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lumecorn_light_top_middle.json @@ -0,0 +1,31 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/lumecorn_light_top_middle", + "particle": "#texture" + }, + "elements": [ + { + "__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": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__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": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/salteago_01.json b/src/main/resources/assets/betterend/models/block/salteago_01.json new file mode 100644 index 00000000..d7efc8e0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/salteago_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/salteago" + } +} diff --git a/src/main/resources/assets/betterend/models/block/salteago_02.json b/src/main/resources/assets/betterend/models/block/salteago_02.json new file mode 100644 index 00000000..1f3cd308 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/salteago_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/salteago" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/salteago_03.json b/src/main/resources/assets/betterend/models/block/salteago_03.json new file mode 100644 index 00000000..3e56d4ed --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/salteago_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/salteago" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/salteago_04.json b/src/main/resources/assets/betterend/models/block/salteago_04.json new file mode 100644 index 00000000..abc5b3fc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/salteago_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/salteago" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/vaiolush_fern_01.json b/src/main/resources/assets/betterend/models/block/vaiolush_fern_01.json new file mode 100644 index 00000000..a77378fd --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/vaiolush_fern_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/vaiolush_fern" + } +} diff --git a/src/main/resources/assets/betterend/models/block/vaiolush_fern_02.json b/src/main/resources/assets/betterend/models/block/vaiolush_fern_02.json new file mode 100644 index 00000000..d65a3ecd --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/vaiolush_fern_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/vaiolush_fern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/vaiolush_fern_03.json b/src/main/resources/assets/betterend/models/block/vaiolush_fern_03.json new file mode 100644 index 00000000..0e7d06d6 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/vaiolush_fern_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/vaiolush_fern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/vaiolush_fern_04.json b/src/main/resources/assets/betterend/models/block/vaiolush_fern_04.json new file mode 100644 index 00000000..4e1eaf13 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/vaiolush_fern_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/vaiolush_fern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/blooming_cooksonia.json b/src/main/resources/assets/betterend/models/item/blooming_cooksonia.json new file mode 100644 index 00000000..a93ec2e2 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/blooming_cooksonia.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/blooming_cooksonia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/fracturn.json b/src/main/resources/assets/betterend/models/item/fracturn.json new file mode 100644 index 00000000..d233c677 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/fracturn.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/fracturn" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/salteago.json b/src/main/resources/assets/betterend/models/item/salteago.json new file mode 100644 index 00000000..720dd34b --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/salteago.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/salteago" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/vaiolush_fern.json b/src/main/resources/assets/betterend/models/item/vaiolush_fern.json new file mode 100644 index 00000000..ff63ab3c --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/vaiolush_fern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/vaiolush_fern" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/blooming_cooksonia.png b/src/main/resources/assets/betterend/textures/block/blooming_cooksonia.png new file mode 100644 index 00000000..673ee47c Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/blooming_cooksonia.png differ diff --git a/src/main/resources/assets/betterend/textures/block/fracturn.png b/src/main/resources/assets/betterend/textures/block/fracturn.png new file mode 100644 index 00000000..75844059 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/fracturn.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_light_bottom.png b/src/main/resources/assets/betterend/textures/block/lumecorn_light_bottom.png new file mode 100644 index 00000000..e65650c5 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_light_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_light_middle.png b/src/main/resources/assets/betterend/textures/block/lumecorn_light_middle.png new file mode 100644 index 00000000..fb20994a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_light_middle.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_light_top.png b/src/main/resources/assets/betterend/textures/block/lumecorn_light_top.png new file mode 100644 index 00000000..d5955163 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_light_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lumecorn_light_top_middle.png b/src/main/resources/assets/betterend/textures/block/lumecorn_light_top_middle.png new file mode 100644 index 00000000..13801a45 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lumecorn_light_top_middle.png differ diff --git a/src/main/resources/assets/betterend/textures/block/salteago.png b/src/main/resources/assets/betterend/textures/block/salteago.png new file mode 100644 index 00000000..a79bedcb Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/salteago.png differ diff --git a/src/main/resources/assets/betterend/textures/block/vaiolush_fern.png b/src/main/resources/assets/betterend/textures/block/vaiolush_fern.png new file mode 100644 index 00000000..4d44e6dd Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/vaiolush_fern.png differ