From daf3af06c9bc5869fc727b1f8862b45acc6e4b11 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 28 Feb 2021 18:39:12 +0300 Subject: [PATCH] Removed terrain json blockstates, plants for "savanna" biome --- .../ru/betterend/blocks/EndPathBlock.java | 20 ++++++++ .../ru/betterend/blocks/EndTerrainBlock.java | 45 +++++++++++++----- .../java/ru/betterend/patterns/Patterns.java | 3 ++ .../java/ru/betterend/registry/EndBlocks.java | 8 +++- .../betterend/blockstates/aeridium.json | 8 ++++ .../betterend/blockstates/cave_moss.json | 21 -------- .../betterend/blockstates/cave_moss_path.json | 10 ---- .../betterend/blockstates/chorus_nylium.json | 10 ---- .../blockstates/chorus_nylium_path.json | 10 ---- .../betterend/blockstates/crystal_moss.json | 10 ---- .../blockstates/crystal_moss_path.json | 10 ---- .../betterend/blockstates/end_moss.json | 21 -------- .../betterend/blockstates/end_moss_path.json | 10 ---- .../betterend/blockstates/end_mycelium.json | 21 -------- .../blockstates/end_mycelium_path.json | 10 ---- .../betterend/blockstates/jungle_moss.json | 21 -------- .../blockstates/jungle_moss_path.json | 10 ---- .../betterend/blockstates/lamellarium.json | 10 ++++ .../assets/betterend/blockstates/lutebus.json | 8 ++++ .../assets/betterend/blockstates/orango.json | 10 ++++ .../betterend/blockstates/pink_moss.json | 21 -------- .../betterend/blockstates/pink_moss_path.json | 10 ---- .../betterend/blockstates/shadow_grass.json | 21 -------- .../blockstates/shadow_grass_path.json | 10 ---- .../betterend/models/block/aeridium_01.json | 6 +++ .../betterend/models/block/aeridium_02.json | 6 +++ .../betterend/models/block/cave_moss.json | 12 ----- .../models/block/cave_moss_path.json | 7 --- .../betterend/models/block/chorus_nylium.json | 12 ----- .../models/block/chorus_nylium_path.json | 7 --- .../betterend/models/block/crystal_moss.json | 12 ----- .../models/block/crystal_moss_path.json | 7 --- .../betterend/models/block/end_moss.json | 12 ----- .../betterend/models/block/end_moss_path.json | 7 --- .../betterend/models/block/end_mycelium.json | 12 ----- .../models/block/end_mycelium_path.json | 7 --- .../betterend/models/block/jungle_moss.json | 12 ----- .../models/block/jungle_moss_path.json | 7 --- .../models/block/lamellarium_01.json | 6 +++ .../models/block/lamellarium_02.json | 6 +++ .../models/block/lamellarium_03.json | 6 +++ .../models/block/lamellarium_04.json | 6 +++ .../betterend/models/block/lutebus_01.json | 6 +++ .../betterend/models/block/lutebus_02.json | 6 +++ .../betterend/models/block/orango_01.json | 6 +++ .../betterend/models/block/orango_02.json | 6 +++ .../betterend/models/block/orango_03.json | 6 +++ .../betterend/models/block/orango_04.json | 6 +++ .../betterend/models/block/pink_moss.json | 12 ----- .../models/block/pink_moss_path.json | 7 --- .../betterend/models/block/shadow_grass.json | 12 ----- .../models/block/shadow_grass_path.json | 7 --- .../betterend/models/item/aeridium.json | 6 +++ .../betterend/models/item/cave_moss.json | 3 -- .../betterend/models/item/cave_moss_path.json | 3 -- .../betterend/models/item/chorus_nylium.json | 3 -- .../models/item/chorus_nylium_path.json | 3 -- .../betterend/models/item/crystal_moss.json | 3 -- .../models/item/crystal_moss_path.json | 3 -- .../betterend/models/item/end_moss.json | 3 -- .../betterend/models/item/end_moss_path.json | 3 -- .../betterend/models/item/end_mycelium.json | 3 -- .../models/item/end_mycelium_path.json | 3 -- .../betterend/models/item/jungle_moss.json | 3 -- .../models/item/jungle_moss_path.json | 3 -- .../betterend/models/item/lamellarium.json | 6 +++ .../assets/betterend/models/item/lutebus.json | 6 +++ .../assets/betterend/models/item/orango.json | 6 +++ .../betterend/models/item/pink_moss.json | 3 -- .../betterend/models/item/pink_moss_path.json | 3 -- .../betterend/models/item/shadow_grass.json | 3 -- .../models/item/shadow_grass_path.json | 3 -- .../assets/betterend/patterns/block/path.json | 7 +++ .../patterns/block/top_side_bottom.json | 8 ++++ .../patterns/blockstate/rotated_top.json | 10 ++++ .../betterend/textures/block/aeridium.png | Bin 0 -> 418 bytes .../betterend/textures/block/lamellarium.png | Bin 0 -> 281 bytes .../betterend/textures/block/lutebus.png | Bin 0 -> 503 bytes .../betterend/textures/block/orango.png | Bin 0 -> 205 bytes .../textures/block/rutiscus_path_top.png | Bin 0 -> 238 bytes .../textures/block/rutiscus_side.png | Bin 0 -> 285 bytes .../betterend/textures/block/rutiscus_top.png | Bin 0 -> 235 bytes 82 files changed, 221 insertions(+), 438 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/aeridium.json delete mode 100644 src/main/resources/assets/betterend/blockstates/cave_moss.json delete mode 100644 src/main/resources/assets/betterend/blockstates/cave_moss_path.json delete mode 100644 src/main/resources/assets/betterend/blockstates/chorus_nylium.json delete mode 100644 src/main/resources/assets/betterend/blockstates/chorus_nylium_path.json delete mode 100644 src/main/resources/assets/betterend/blockstates/crystal_moss.json delete mode 100644 src/main/resources/assets/betterend/blockstates/crystal_moss_path.json delete mode 100644 src/main/resources/assets/betterend/blockstates/end_moss.json delete mode 100644 src/main/resources/assets/betterend/blockstates/end_moss_path.json delete mode 100644 src/main/resources/assets/betterend/blockstates/end_mycelium.json delete mode 100644 src/main/resources/assets/betterend/blockstates/end_mycelium_path.json delete mode 100644 src/main/resources/assets/betterend/blockstates/jungle_moss.json delete mode 100644 src/main/resources/assets/betterend/blockstates/jungle_moss_path.json create mode 100644 src/main/resources/assets/betterend/blockstates/lamellarium.json create mode 100644 src/main/resources/assets/betterend/blockstates/lutebus.json create mode 100644 src/main/resources/assets/betterend/blockstates/orango.json delete mode 100644 src/main/resources/assets/betterend/blockstates/pink_moss.json delete mode 100644 src/main/resources/assets/betterend/blockstates/pink_moss_path.json delete mode 100644 src/main/resources/assets/betterend/blockstates/shadow_grass.json delete mode 100644 src/main/resources/assets/betterend/blockstates/shadow_grass_path.json create mode 100644 src/main/resources/assets/betterend/models/block/aeridium_01.json create mode 100644 src/main/resources/assets/betterend/models/block/aeridium_02.json delete mode 100644 src/main/resources/assets/betterend/models/block/cave_moss.json delete mode 100644 src/main/resources/assets/betterend/models/block/cave_moss_path.json delete mode 100644 src/main/resources/assets/betterend/models/block/chorus_nylium.json delete mode 100644 src/main/resources/assets/betterend/models/block/chorus_nylium_path.json delete mode 100644 src/main/resources/assets/betterend/models/block/crystal_moss.json delete mode 100644 src/main/resources/assets/betterend/models/block/crystal_moss_path.json delete mode 100644 src/main/resources/assets/betterend/models/block/end_moss.json delete mode 100644 src/main/resources/assets/betterend/models/block/end_moss_path.json delete mode 100644 src/main/resources/assets/betterend/models/block/end_mycelium.json delete mode 100644 src/main/resources/assets/betterend/models/block/end_mycelium_path.json delete mode 100644 src/main/resources/assets/betterend/models/block/jungle_moss.json delete mode 100644 src/main/resources/assets/betterend/models/block/jungle_moss_path.json create mode 100644 src/main/resources/assets/betterend/models/block/lamellarium_01.json create mode 100644 src/main/resources/assets/betterend/models/block/lamellarium_02.json create mode 100644 src/main/resources/assets/betterend/models/block/lamellarium_03.json create mode 100644 src/main/resources/assets/betterend/models/block/lamellarium_04.json create mode 100644 src/main/resources/assets/betterend/models/block/lutebus_01.json create mode 100644 src/main/resources/assets/betterend/models/block/lutebus_02.json create mode 100644 src/main/resources/assets/betterend/models/block/orango_01.json create mode 100644 src/main/resources/assets/betterend/models/block/orango_02.json create mode 100644 src/main/resources/assets/betterend/models/block/orango_03.json create mode 100644 src/main/resources/assets/betterend/models/block/orango_04.json delete mode 100644 src/main/resources/assets/betterend/models/block/pink_moss.json delete mode 100644 src/main/resources/assets/betterend/models/block/pink_moss_path.json delete mode 100644 src/main/resources/assets/betterend/models/block/shadow_grass.json delete mode 100644 src/main/resources/assets/betterend/models/block/shadow_grass_path.json create mode 100644 src/main/resources/assets/betterend/models/item/aeridium.json delete mode 100644 src/main/resources/assets/betterend/models/item/cave_moss.json delete mode 100644 src/main/resources/assets/betterend/models/item/cave_moss_path.json delete mode 100644 src/main/resources/assets/betterend/models/item/chorus_nylium.json delete mode 100644 src/main/resources/assets/betterend/models/item/chorus_nylium_path.json delete mode 100644 src/main/resources/assets/betterend/models/item/crystal_moss.json delete mode 100644 src/main/resources/assets/betterend/models/item/crystal_moss_path.json delete mode 100644 src/main/resources/assets/betterend/models/item/end_moss.json delete mode 100644 src/main/resources/assets/betterend/models/item/end_moss_path.json delete mode 100644 src/main/resources/assets/betterend/models/item/end_mycelium.json delete mode 100644 src/main/resources/assets/betterend/models/item/end_mycelium_path.json delete mode 100644 src/main/resources/assets/betterend/models/item/jungle_moss.json delete mode 100644 src/main/resources/assets/betterend/models/item/jungle_moss_path.json create mode 100644 src/main/resources/assets/betterend/models/item/lamellarium.json create mode 100644 src/main/resources/assets/betterend/models/item/lutebus.json create mode 100644 src/main/resources/assets/betterend/models/item/orango.json delete mode 100644 src/main/resources/assets/betterend/models/item/pink_moss.json delete mode 100644 src/main/resources/assets/betterend/models/item/pink_moss_path.json delete mode 100644 src/main/resources/assets/betterend/models/item/shadow_grass.json delete mode 100644 src/main/resources/assets/betterend/models/item/shadow_grass_path.json create mode 100644 src/main/resources/assets/betterend/patterns/block/path.json create mode 100644 src/main/resources/assets/betterend/patterns/block/top_side_bottom.json create mode 100644 src/main/resources/assets/betterend/patterns/blockstate/rotated_top.json create mode 100644 src/main/resources/assets/betterend/textures/block/aeridium.png create mode 100644 src/main/resources/assets/betterend/textures/block/lamellarium.png create mode 100644 src/main/resources/assets/betterend/textures/block/lutebus.png create mode 100644 src/main/resources/assets/betterend/textures/block/orango.png create mode 100644 src/main/resources/assets/betterend/textures/block/rutiscus_path_top.png create mode 100644 src/main/resources/assets/betterend/textures/block/rutiscus_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/rutiscus_top.png diff --git a/src/main/java/ru/betterend/blocks/EndPathBlock.java b/src/main/java/ru/betterend/blocks/EndPathBlock.java index acfb6c53..5d4534d9 100644 --- a/src/main/java/ru/betterend/blocks/EndPathBlock.java +++ b/src/main/java/ru/betterend/blocks/EndPathBlock.java @@ -2,6 +2,9 @@ package ru.betterend.blocks; import java.util.Collections; import java.util.List; +import java.util.Map; + +import com.google.common.collect.Maps; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; @@ -13,10 +16,13 @@ import net.minecraft.enchantment.Enchantments; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; import net.minecraft.loot.context.LootContextParameters; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import ru.betterend.blocks.basis.BlockBaseNotFull; +import ru.betterend.patterns.Patterns; public class EndPathBlock extends BlockBaseNotFull { private static final VoxelShape SHAPE = Block.createCuboidShape(0, 0, 0, 16, 15, 16); @@ -47,4 +53,18 @@ public class EndPathBlock extends BlockBaseNotFull { public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { return SHAPE; } + + @Override + public String getModelPattern(String block) { + String name = Registry.BLOCK.getId(this).getPath(); + Map map = Maps.newHashMap(); + map.put("%top%", name + "_top"); + map.put("%side%", name.replace("_path", "") + "_side"); + return Patterns.createJson(Patterns.BLOCK_PATH, map); + } + + @Override + public Identifier statePatternId() { + return Patterns.STATE_ROTATED_TOP; + } } diff --git a/src/main/java/ru/betterend/blocks/EndTerrainBlock.java b/src/main/java/ru/betterend/blocks/EndTerrainBlock.java index 3d34f8b3..c1dd4e0b 100644 --- a/src/main/java/ru/betterend/blocks/EndTerrainBlock.java +++ b/src/main/java/ru/betterend/blocks/EndTerrainBlock.java @@ -2,8 +2,11 @@ package ru.betterend.blocks; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Random; +import com.google.common.collect.Maps; + import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; @@ -23,13 +26,16 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraft.world.WorldView; import net.minecraft.world.chunk.light.ChunkLightProvider; import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.patterns.Patterns; public class EndTerrainBlock extends BlockBase { private Block pathBlock; @@ -74,15 +80,32 @@ public class EndTerrainBlock extends BlockBase { } public static boolean canSurvive(BlockState state, WorldView worldView, BlockPos pos) { - BlockPos blockPos = pos.up(); - BlockState blockState = worldView.getBlockState(blockPos); - if (blockState.isOf(Blocks.SNOW) && (Integer)blockState.get(SnowBlock.LAYERS) == 1) { - return true; - } else if (blockState.getFluidState().getLevel() == 8) { - return false; - } else { - int i = ChunkLightProvider.getRealisticOpacity(worldView, state, pos, blockState, blockPos, Direction.UP, blockState.getOpacity(worldView, blockPos)); - return i < 5; - } - } + BlockPos blockPos = pos.up(); + BlockState blockState = worldView.getBlockState(blockPos); + if (blockState.isOf(Blocks.SNOW) && (Integer) blockState.get(SnowBlock.LAYERS) == 1) { + return true; + } + else if (blockState.getFluidState().getLevel() == 8) { + return false; + } + else { + int i = ChunkLightProvider.getRealisticOpacity(worldView, state, pos, blockState, blockPos, Direction.UP, blockState.getOpacity(worldView, blockPos)); + return i < 5; + } + } + + @Override + public String getModelPattern(String block) { + String name = Registry.BLOCK.getId(this).getPath(); + Map map = Maps.newHashMap(); + map.put("%top%", "betterend:block/" + name + "_top"); + map.put("%side%", "betterend:block/" + name + "_side"); + map.put("%bottom%", "minecraft:block/end_stone"); + return Patterns.createJson(Patterns.BLOCK_TOP_SIDE_BOTTOM, map); + } + + @Override + public Identifier statePatternId() { + return Patterns.STATE_ROTATED_TOP; + } } diff --git a/src/main/java/ru/betterend/patterns/Patterns.java b/src/main/java/ru/betterend/patterns/Patterns.java index 48fbe9ca..e478035c 100644 --- a/src/main/java/ru/betterend/patterns/Patterns.java +++ b/src/main/java/ru/betterend/patterns/Patterns.java @@ -45,6 +45,7 @@ public class Patterns { public final static Identifier STATE_CHAIN = BetterEnd.makeID("patterns/blockstate/chain.json"); public final static Identifier STATE_CHANDELIER = BetterEnd.makeID("patterns/blockstate/chandelier.json"); public final static Identifier STATE_FURNACE = BetterEnd.makeID("patterns/blockstate/furnace.json"); + public final static Identifier STATE_ROTATED_TOP = BetterEnd.makeID("patterns/blockstate/rotated_top.json"); //Models Block public final static Identifier BLOCK_EMPTY = BetterEnd.makeID("patterns/block/empty.json"); @@ -100,6 +101,8 @@ public class Patterns { public final static Identifier BLOCK_CHANDELIER_CEIL = BetterEnd.makeID("patterns/block/chandelier_ceil.json"); public final static Identifier BLOCK_FURNACE = BetterEnd.makeID("patterns/block/furnace.json"); public final static Identifier BLOCK_FURNACE_GLOW = BetterEnd.makeID("patterns/block/furnace_glow.json"); + public final static Identifier BLOCK_TOP_SIDE_BOTTOM = BetterEnd.makeID("patterns/block/top_side_bottom.json"); + public final static Identifier BLOCK_PATH = BetterEnd.makeID("patterns/block/path.json"); //Models Item public final static Identifier ITEM_WALL = BetterEnd.makeID("patterns/item/pattern_wall.json"); diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 029af24f..5b511b3c 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -121,7 +121,8 @@ public class EndBlocks { public static final Block SHADOW_GRASS = registerBlock("shadow_grass", new ShadowGrassBlock()); 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.ORANGE)); + public static final Block JUNGLE_MOSS = registerBlock("jungle_moss", new EndTerrainBlock(MaterialColor.GREEN)); + public static final Block RUTISCUS = registerBlock("rutiscus", new EndTerrainBlock(MaterialColor.ORANGE)); // Roads // public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new EndPathBlock(END_MYCELIUM)); @@ -133,6 +134,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 RUTISCUS_PATH = registerBlock("rutiscus_path", new EndPathBlock(RUTISCUS)); public static final Block MOSSY_OBSIDIAN = registerBlock("mossy_obsidian", new MossyObsidian()); @@ -222,6 +224,10 @@ public class EndBlocks { 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 ORANGO = registerBlock("orango", new TerrainPlantBlock(RUTISCUS)); + public static final Block AERIDIUM = registerBlock("aeridium", new TerrainPlantBlock(RUTISCUS)); + public static final Block LUTEBUS = registerBlock("lutebus", new TerrainPlantBlock(RUTISCUS)); + public static final Block LAMELLARIUM = registerBlock("lamellarium", new TerrainPlantBlock(RUTISCUS)); 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/resources/assets/betterend/blockstates/aeridium.json b/src/main/resources/assets/betterend/blockstates/aeridium.json new file mode 100644 index 00000000..b253a949 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/aeridium.json @@ -0,0 +1,8 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/aeridium_01" }, + { "model": "betterend:block/aeridium_02" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/cave_moss.json b/src/main/resources/assets/betterend/blockstates/cave_moss.json deleted file mode 100644 index 2850aa74..00000000 --- a/src/main/resources/assets/betterend/blockstates/cave_moss.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "betterend:block/cave_moss" - }, - { - "model": "betterend:block/cave_moss", - "y": 90 - }, - { - "model": "betterend:block/cave_moss", - "y": 180 - }, - { - "model": "betterend:block/cave_moss", - "y": 270 - } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/cave_moss_path.json b/src/main/resources/assets/betterend/blockstates/cave_moss_path.json deleted file mode 100644 index 41a59367..00000000 --- a/src/main/resources/assets/betterend/blockstates/cave_moss_path.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/cave_moss_path" }, - { "model": "betterend:block/cave_moss_path", "y": 90 }, - { "model": "betterend:block/cave_moss_path", "y": 180 }, - { "model": "betterend:block/cave_moss_path", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_nylium.json b/src/main/resources/assets/betterend/blockstates/chorus_nylium.json deleted file mode 100644 index 6c04ddb7..00000000 --- a/src/main/resources/assets/betterend/blockstates/chorus_nylium.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/chorus_nylium" }, - { "model": "betterend:block/chorus_nylium", "y": 90 }, - { "model": "betterend:block/chorus_nylium", "y": 180 }, - { "model": "betterend:block/chorus_nylium", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_nylium_path.json b/src/main/resources/assets/betterend/blockstates/chorus_nylium_path.json deleted file mode 100644 index 3e160ef6..00000000 --- a/src/main/resources/assets/betterend/blockstates/chorus_nylium_path.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/chorus_nylium_path" }, - { "model": "betterend:block/chorus_nylium_path", "y": 90 }, - { "model": "betterend:block/chorus_nylium_path", "y": 180 }, - { "model": "betterend:block/chorus_nylium_path", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/crystal_moss.json b/src/main/resources/assets/betterend/blockstates/crystal_moss.json deleted file mode 100644 index ddf93100..00000000 --- a/src/main/resources/assets/betterend/blockstates/crystal_moss.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/crystal_moss" }, - { "model": "betterend:block/crystal_moss", "y": 90 }, - { "model": "betterend:block/crystal_moss", "y": 180 }, - { "model": "betterend:block/crystal_moss", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/crystal_moss_path.json b/src/main/resources/assets/betterend/blockstates/crystal_moss_path.json deleted file mode 100644 index 2218e820..00000000 --- a/src/main/resources/assets/betterend/blockstates/crystal_moss_path.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/crystal_moss_path" }, - { "model": "betterend:block/crystal_moss_path", "y": 90 }, - { "model": "betterend:block/crystal_moss_path", "y": 180 }, - { "model": "betterend:block/crystal_moss_path", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/end_moss.json b/src/main/resources/assets/betterend/blockstates/end_moss.json deleted file mode 100644 index f784924d..00000000 --- a/src/main/resources/assets/betterend/blockstates/end_moss.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "betterend:block/end_moss" - }, - { - "model": "betterend:block/end_moss", - "y": 90 - }, - { - "model": "betterend:block/end_moss", - "y": 180 - }, - { - "model": "betterend:block/end_moss", - "y": 270 - } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/end_moss_path.json b/src/main/resources/assets/betterend/blockstates/end_moss_path.json deleted file mode 100644 index 336a778d..00000000 --- a/src/main/resources/assets/betterend/blockstates/end_moss_path.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/end_moss_path" }, - { "model": "betterend:block/end_moss_path", "y": 90 }, - { "model": "betterend:block/end_moss_path", "y": 180 }, - { "model": "betterend:block/end_moss_path", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/end_mycelium.json b/src/main/resources/assets/betterend/blockstates/end_mycelium.json deleted file mode 100644 index 42bb44e3..00000000 --- a/src/main/resources/assets/betterend/blockstates/end_mycelium.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "betterend:block/end_mycelium" - }, - { - "model": "betterend:block/end_mycelium", - "y": 90 - }, - { - "model": "betterend:block/end_mycelium", - "y": 180 - }, - { - "model": "betterend:block/end_mycelium", - "y": 270 - } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/end_mycelium_path.json b/src/main/resources/assets/betterend/blockstates/end_mycelium_path.json deleted file mode 100644 index 22db9d60..00000000 --- a/src/main/resources/assets/betterend/blockstates/end_mycelium_path.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/end_mycelium_path" }, - { "model": "betterend:block/end_mycelium_path", "y": 90 }, - { "model": "betterend:block/end_mycelium_path", "y": 180 }, - { "model": "betterend:block/end_mycelium_path", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/jungle_moss.json b/src/main/resources/assets/betterend/blockstates/jungle_moss.json deleted file mode 100644 index f037553e..00000000 --- a/src/main/resources/assets/betterend/blockstates/jungle_moss.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "betterend:block/jungle_moss" - }, - { - "model": "betterend:block/jungle_moss", - "y": 90 - }, - { - "model": "betterend:block/jungle_moss", - "y": 180 - }, - { - "model": "betterend:block/jungle_moss", - "y": 270 - } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/jungle_moss_path.json b/src/main/resources/assets/betterend/blockstates/jungle_moss_path.json deleted file mode 100644 index 7a5f4580..00000000 --- a/src/main/resources/assets/betterend/blockstates/jungle_moss_path.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/jungle_moss_path" }, - { "model": "betterend:block/jungle_moss_path", "y": 90 }, - { "model": "betterend:block/jungle_moss_path", "y": 180 }, - { "model": "betterend:block/jungle_moss_path", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/lamellarium.json b/src/main/resources/assets/betterend/blockstates/lamellarium.json new file mode 100644 index 00000000..0e6fcf7b --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/lamellarium.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lamellarium_01" }, + { "model": "betterend:block/lamellarium_02" }, + { "model": "betterend:block/lamellarium_03" }, + { "model": "betterend:block/lamellarium_04" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/lutebus.json b/src/main/resources/assets/betterend/blockstates/lutebus.json new file mode 100644 index 00000000..04520359 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/lutebus.json @@ -0,0 +1,8 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lutebus_01" }, + { "model": "betterend:block/lutebus_02" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/orango.json b/src/main/resources/assets/betterend/blockstates/orango.json new file mode 100644 index 00000000..c43c82ce --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/orango.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/orango_01" }, + { "model": "betterend:block/orango_02" }, + { "model": "betterend:block/orango_03" }, + { "model": "betterend:block/orango_04" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/pink_moss.json b/src/main/resources/assets/betterend/blockstates/pink_moss.json deleted file mode 100644 index 27f9613c..00000000 --- a/src/main/resources/assets/betterend/blockstates/pink_moss.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "betterend:block/pink_moss" - }, - { - "model": "betterend:block/pink_moss", - "y": 90 - }, - { - "model": "betterend:block/pink_moss", - "y": 180 - }, - { - "model": "betterend:block/pink_moss", - "y": 270 - } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/pink_moss_path.json b/src/main/resources/assets/betterend/blockstates/pink_moss_path.json deleted file mode 100644 index 4ca9deab..00000000 --- a/src/main/resources/assets/betterend/blockstates/pink_moss_path.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/pink_moss_path" }, - { "model": "betterend:block/pink_moss_path", "y": 90 }, - { "model": "betterend:block/pink_moss_path", "y": 180 }, - { "model": "betterend:block/pink_moss_path", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/shadow_grass.json b/src/main/resources/assets/betterend/blockstates/shadow_grass.json deleted file mode 100644 index 37d4a7f0..00000000 --- a/src/main/resources/assets/betterend/blockstates/shadow_grass.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "betterend:block/shadow_grass" - }, - { - "model": "betterend:block/shadow_grass", - "y": 90 - }, - { - "model": "betterend:block/shadow_grass", - "y": 180 - }, - { - "model": "betterend:block/shadow_grass", - "y": 270 - } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/shadow_grass_path.json b/src/main/resources/assets/betterend/blockstates/shadow_grass_path.json deleted file mode 100644 index e31a8a14..00000000 --- a/src/main/resources/assets/betterend/blockstates/shadow_grass_path.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/shadow_grass_path" }, - { "model": "betterend:block/shadow_grass_path", "y": 90 }, - { "model": "betterend:block/shadow_grass_path", "y": 180 }, - { "model": "betterend:block/shadow_grass_path", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/models/block/aeridium_01.json b/src/main/resources/assets/betterend/models/block/aeridium_01.json new file mode 100644 index 00000000..7c2d6701 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/aeridium_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/aeridium" + } +} diff --git a/src/main/resources/assets/betterend/models/block/aeridium_02.json b/src/main/resources/assets/betterend/models/block/aeridium_02.json new file mode 100644 index 00000000..37ebd850 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/aeridium_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/aeridium" + } +} diff --git a/src/main/resources/assets/betterend/models/block/cave_moss.json b/src/main/resources/assets/betterend/models/block/cave_moss.json deleted file mode 100644 index c5ae0c77..00000000 --- a/src/main/resources/assets/betterend/models/block/cave_moss.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "block/end_stone", - "east": "betterend:block/cave_moss_side", - "north": "betterend:block/cave_moss_side", - "particle": "betterend:block/cave_moss_side", - "south": "betterend:block/cave_moss_side", - "up": "betterend:block/cave_moss_top", - "west": "betterend:block/cave_moss_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/cave_moss_path.json b/src/main/resources/assets/betterend/models/block/cave_moss_path.json deleted file mode 100644 index d46c7c2e..00000000 --- a/src/main/resources/assets/betterend/models/block/cave_moss_path.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/cave_moss_path_top", - "side": "betterend:block/cave_moss_side", - "bottom": "block/end_stone" - } -} diff --git a/src/main/resources/assets/betterend/models/block/chorus_nylium.json b/src/main/resources/assets/betterend/models/block/chorus_nylium.json deleted file mode 100644 index 9acf413a..00000000 --- a/src/main/resources/assets/betterend/models/block/chorus_nylium.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "block/end_stone", - "east": "betterend:block/chorus_nylium_side", - "north": "betterend:block/chorus_nylium_side", - "particle": "betterend:block/chorus_nylium_side", - "south": "betterend:block/chorus_nylium_side", - "up": "betterend:block/chorus_nylium_top", - "west": "betterend:block/chorus_nylium_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/chorus_nylium_path.json b/src/main/resources/assets/betterend/models/block/chorus_nylium_path.json deleted file mode 100644 index 34fa8e53..00000000 --- a/src/main/resources/assets/betterend/models/block/chorus_nylium_path.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/chorus_nylium_path_top", - "side": "betterend:block/chorus_nylium_side", - "bottom": "block/end_stone" - } -} diff --git a/src/main/resources/assets/betterend/models/block/crystal_moss.json b/src/main/resources/assets/betterend/models/block/crystal_moss.json deleted file mode 100644 index a64db84a..00000000 --- a/src/main/resources/assets/betterend/models/block/crystal_moss.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "block/end_stone", - "east": "betterend:block/crystal_moss_side", - "north": "betterend:block/crystal_moss_side", - "particle": "betterend:block/crystal_moss_side", - "south": "betterend:block/crystal_moss_side", - "up": "betterend:block/crystal_moss_top", - "west": "betterend:block/crystal_moss_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/crystal_moss_path.json b/src/main/resources/assets/betterend/models/block/crystal_moss_path.json deleted file mode 100644 index ae4d6b55..00000000 --- a/src/main/resources/assets/betterend/models/block/crystal_moss_path.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/crystal_moss_path_top", - "side": "betterend:block/crystal_moss_side", - "bottom": "block/end_stone" - } -} diff --git a/src/main/resources/assets/betterend/models/block/end_moss.json b/src/main/resources/assets/betterend/models/block/end_moss.json deleted file mode 100644 index ee5cc869..00000000 --- a/src/main/resources/assets/betterend/models/block/end_moss.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "block/end_stone", - "east": "betterend:block/end_moss_side", - "north": "betterend:block/end_moss_side", - "particle": "betterend:block/end_moss_side", - "south": "betterend:block/end_moss_side", - "up": "betterend:block/end_moss_top", - "west": "betterend:block/end_moss_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/end_moss_path.json b/src/main/resources/assets/betterend/models/block/end_moss_path.json deleted file mode 100644 index 39a4c538..00000000 --- a/src/main/resources/assets/betterend/models/block/end_moss_path.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/end_moss_path_top", - "side": "betterend:block/end_moss_side", - "bottom": "block/end_stone" - } -} diff --git a/src/main/resources/assets/betterend/models/block/end_mycelium.json b/src/main/resources/assets/betterend/models/block/end_mycelium.json deleted file mode 100644 index 825b3395..00000000 --- a/src/main/resources/assets/betterend/models/block/end_mycelium.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "block/end_stone", - "east": "betterend:block/end_mycelium_side", - "north": "betterend:block/end_mycelium_side", - "particle": "betterend:block/end_mycelium_side", - "south": "betterend:block/end_mycelium_side", - "up": "betterend:block/end_mycelium_top", - "west": "betterend:block/end_mycelium_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/end_mycelium_path.json b/src/main/resources/assets/betterend/models/block/end_mycelium_path.json deleted file mode 100644 index 4fc48331..00000000 --- a/src/main/resources/assets/betterend/models/block/end_mycelium_path.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/end_mycelium_path_top", - "side": "betterend:block/end_mycelium_side", - "bottom": "block/end_stone" - } -} diff --git a/src/main/resources/assets/betterend/models/block/jungle_moss.json b/src/main/resources/assets/betterend/models/block/jungle_moss.json deleted file mode 100644 index 1c9272ba..00000000 --- a/src/main/resources/assets/betterend/models/block/jungle_moss.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "block/end_stone", - "east": "betterend:block/jungle_moss_side", - "north": "betterend:block/jungle_moss_side", - "particle": "betterend:block/jungle_moss_side", - "south": "betterend:block/jungle_moss_side", - "up": "betterend:block/jungle_moss_top", - "west": "betterend:block/jungle_moss_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/jungle_moss_path.json b/src/main/resources/assets/betterend/models/block/jungle_moss_path.json deleted file mode 100644 index b9bdda5c..00000000 --- a/src/main/resources/assets/betterend/models/block/jungle_moss_path.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/jungle_moss_path_top", - "side": "betterend:block/jungle_moss_side", - "bottom": "block/end_stone" - } -} diff --git a/src/main/resources/assets/betterend/models/block/lamellarium_01.json b/src/main/resources/assets/betterend/models/block/lamellarium_01.json new file mode 100644 index 00000000..0e73b1fd --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lamellarium_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/lamellarium" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lamellarium_02.json b/src/main/resources/assets/betterend/models/block/lamellarium_02.json new file mode 100644 index 00000000..8549d1ae --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lamellarium_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/lamellarium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lamellarium_03.json b/src/main/resources/assets/betterend/models/block/lamellarium_03.json new file mode 100644 index 00000000..82d784e4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lamellarium_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/lamellarium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lamellarium_04.json b/src/main/resources/assets/betterend/models/block/lamellarium_04.json new file mode 100644 index 00000000..94d36cef --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lamellarium_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/lamellarium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lutebus_01.json b/src/main/resources/assets/betterend/models/block/lutebus_01.json new file mode 100644 index 00000000..c30688e8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lutebus_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/lutebus" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lutebus_02.json b/src/main/resources/assets/betterend/models/block/lutebus_02.json new file mode 100644 index 00000000..0df1ef26 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lutebus_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/lutebus" + } +} diff --git a/src/main/resources/assets/betterend/models/block/orango_01.json b/src/main/resources/assets/betterend/models/block/orango_01.json new file mode 100644 index 00000000..9b12c38d --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/orango_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/orango" + } +} diff --git a/src/main/resources/assets/betterend/models/block/orango_02.json b/src/main/resources/assets/betterend/models/block/orango_02.json new file mode 100644 index 00000000..f1f7ee15 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/orango_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/orango" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/orango_03.json b/src/main/resources/assets/betterend/models/block/orango_03.json new file mode 100644 index 00000000..cb4a6076 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/orango_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/orango" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/orango_04.json b/src/main/resources/assets/betterend/models/block/orango_04.json new file mode 100644 index 00000000..2625775c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/orango_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/orango" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pink_moss.json b/src/main/resources/assets/betterend/models/block/pink_moss.json deleted file mode 100644 index 237cb110..00000000 --- a/src/main/resources/assets/betterend/models/block/pink_moss.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "block/end_stone", - "east": "betterend:block/pink_moss_side", - "north": "betterend:block/pink_moss_side", - "particle": "betterend:block/pink_moss_side", - "south": "betterend:block/pink_moss_side", - "up": "betterend:block/pink_moss_top", - "west": "betterend:block/pink_moss_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/pink_moss_path.json b/src/main/resources/assets/betterend/models/block/pink_moss_path.json deleted file mode 100644 index 9f46434e..00000000 --- a/src/main/resources/assets/betterend/models/block/pink_moss_path.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/pink_moss_path_top", - "side": "betterend:block/pink_moss_side", - "bottom": "block/end_stone" - } -} diff --git a/src/main/resources/assets/betterend/models/block/shadow_grass.json b/src/main/resources/assets/betterend/models/block/shadow_grass.json deleted file mode 100644 index fff020c9..00000000 --- a/src/main/resources/assets/betterend/models/block/shadow_grass.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "block/end_stone", - "east": "betterend:block/shadow_grass_side", - "north": "betterend:block/shadow_grass_side", - "particle": "betterend:block/shadow_grass_side", - "south": "betterend:block/shadow_grass_side", - "up": "betterend:block/shadow_grass_top", - "west": "betterend:block/shadow_grass_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/shadow_grass_path.json b/src/main/resources/assets/betterend/models/block/shadow_grass_path.json deleted file mode 100644 index 23a7a0ac..00000000 --- a/src/main/resources/assets/betterend/models/block/shadow_grass_path.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/shadow_grass_path_top", - "side": "betterend:block/shadow_grass_side", - "bottom": "block/end_stone" - } -} diff --git a/src/main/resources/assets/betterend/models/item/aeridium.json b/src/main/resources/assets/betterend/models/item/aeridium.json new file mode 100644 index 00000000..4ae73819 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeridium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/aeridium" + } +} diff --git a/src/main/resources/assets/betterend/models/item/cave_moss.json b/src/main/resources/assets/betterend/models/item/cave_moss.json deleted file mode 100644 index 56fbfe9f..00000000 --- a/src/main/resources/assets/betterend/models/item/cave_moss.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/cave_moss" -} diff --git a/src/main/resources/assets/betterend/models/item/cave_moss_path.json b/src/main/resources/assets/betterend/models/item/cave_moss_path.json deleted file mode 100644 index 8f2a130f..00000000 --- a/src/main/resources/assets/betterend/models/item/cave_moss_path.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/cave_moss_path" -} diff --git a/src/main/resources/assets/betterend/models/item/chorus_nylium.json b/src/main/resources/assets/betterend/models/item/chorus_nylium.json deleted file mode 100644 index c3e7084c..00000000 --- a/src/main/resources/assets/betterend/models/item/chorus_nylium.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/chorus_nylium" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/chorus_nylium_path.json b/src/main/resources/assets/betterend/models/item/chorus_nylium_path.json deleted file mode 100644 index da096761..00000000 --- a/src/main/resources/assets/betterend/models/item/chorus_nylium_path.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/chorus_nylium_path" -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/crystal_moss.json b/src/main/resources/assets/betterend/models/item/crystal_moss.json deleted file mode 100644 index 187ee92c..00000000 --- a/src/main/resources/assets/betterend/models/item/crystal_moss.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/crystal_moss" -} diff --git a/src/main/resources/assets/betterend/models/item/crystal_moss_path.json b/src/main/resources/assets/betterend/models/item/crystal_moss_path.json deleted file mode 100644 index fbfcbe61..00000000 --- a/src/main/resources/assets/betterend/models/item/crystal_moss_path.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/crystal_moss_path" -} diff --git a/src/main/resources/assets/betterend/models/item/end_moss.json b/src/main/resources/assets/betterend/models/item/end_moss.json deleted file mode 100644 index 2b859c25..00000000 --- a/src/main/resources/assets/betterend/models/item/end_moss.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/end_moss" -} diff --git a/src/main/resources/assets/betterend/models/item/end_moss_path.json b/src/main/resources/assets/betterend/models/item/end_moss_path.json deleted file mode 100644 index 7d7de48a..00000000 --- a/src/main/resources/assets/betterend/models/item/end_moss_path.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/end_moss_path" -} diff --git a/src/main/resources/assets/betterend/models/item/end_mycelium.json b/src/main/resources/assets/betterend/models/item/end_mycelium.json deleted file mode 100644 index 2dac73a6..00000000 --- a/src/main/resources/assets/betterend/models/item/end_mycelium.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/end_mycelium" -} diff --git a/src/main/resources/assets/betterend/models/item/end_mycelium_path.json b/src/main/resources/assets/betterend/models/item/end_mycelium_path.json deleted file mode 100644 index 44e814c3..00000000 --- a/src/main/resources/assets/betterend/models/item/end_mycelium_path.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/end_mycelium_path" -} diff --git a/src/main/resources/assets/betterend/models/item/jungle_moss.json b/src/main/resources/assets/betterend/models/item/jungle_moss.json deleted file mode 100644 index 321d91e6..00000000 --- a/src/main/resources/assets/betterend/models/item/jungle_moss.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/jungle_moss" -} diff --git a/src/main/resources/assets/betterend/models/item/jungle_moss_path.json b/src/main/resources/assets/betterend/models/item/jungle_moss_path.json deleted file mode 100644 index a061d63b..00000000 --- a/src/main/resources/assets/betterend/models/item/jungle_moss_path.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/jungle_moss_path" -} diff --git a/src/main/resources/assets/betterend/models/item/lamellarium.json b/src/main/resources/assets/betterend/models/item/lamellarium.json new file mode 100644 index 00000000..34cbcff7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/lamellarium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/lamellarium" + } +} diff --git a/src/main/resources/assets/betterend/models/item/lutebus.json b/src/main/resources/assets/betterend/models/item/lutebus.json new file mode 100644 index 00000000..335739a8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/lutebus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/lutebus" + } +} diff --git a/src/main/resources/assets/betterend/models/item/orango.json b/src/main/resources/assets/betterend/models/item/orango.json new file mode 100644 index 00000000..b0b842a6 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/orango.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/orango" + } +} diff --git a/src/main/resources/assets/betterend/models/item/pink_moss.json b/src/main/resources/assets/betterend/models/item/pink_moss.json deleted file mode 100644 index 275797f5..00000000 --- a/src/main/resources/assets/betterend/models/item/pink_moss.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pink_moss" -} diff --git a/src/main/resources/assets/betterend/models/item/pink_moss_path.json b/src/main/resources/assets/betterend/models/item/pink_moss_path.json deleted file mode 100644 index de77462e..00000000 --- a/src/main/resources/assets/betterend/models/item/pink_moss_path.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/pink_moss_path" -} diff --git a/src/main/resources/assets/betterend/models/item/shadow_grass.json b/src/main/resources/assets/betterend/models/item/shadow_grass.json deleted file mode 100644 index 2ae401d8..00000000 --- a/src/main/resources/assets/betterend/models/item/shadow_grass.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/shadow_grass" -} diff --git a/src/main/resources/assets/betterend/models/item/shadow_grass_path.json b/src/main/resources/assets/betterend/models/item/shadow_grass_path.json deleted file mode 100644 index 899af266..00000000 --- a/src/main/resources/assets/betterend/models/item/shadow_grass_path.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/shadow_grass_path" -} diff --git a/src/main/resources/assets/betterend/patterns/block/path.json b/src/main/resources/assets/betterend/patterns/block/path.json new file mode 100644 index 00000000..747d9c1b --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/block/path.json @@ -0,0 +1,7 @@ +{ "parent": "betterend:block/path", + "textures": { + "top": "betterend:block/%top%", + "side": "betterend:block/%side%", + "bottom": "block/end_stone" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/top_side_bottom.json b/src/main/resources/assets/betterend/patterns/block/top_side_bottom.json new file mode 100644 index 00000000..d0727650 --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/block/top_side_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "%bottom%", + "side": "%side%", + "top": "%top%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/blockstate/rotated_top.json b/src/main/resources/assets/betterend/patterns/blockstate/rotated_top.json new file mode 100644 index 00000000..f97c20c9 --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/blockstate/rotated_top.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:pattern/%block%" }, + { "model": "betterend:pattern/%block%", "y": 90 }, + { "model": "betterend:pattern/%block%", "y": 180 }, + { "model": "betterend:pattern/%block%", "y": 270 } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/aeridium.png b/src/main/resources/assets/betterend/textures/block/aeridium.png new file mode 100644 index 0000000000000000000000000000000000000000..359798c6468c348f7836da5675eeba6ad4dd9c6d GIT binary patch literal 418 zcmV;T0bTxyP)Px$TuDShR5*==k}+$-Kp2MKD?0R=t%HMNAW#qsPJ%-RDXoJ;gFm2uAcJ)6-v}Kt z_$Nv_i7lanLl=jDT>>Xpsv_bR<6z-Bl!WBc({H@*d!P62{SG)%`vDW&dK0St$uYrV zGQ*lJl?Da*AQlLxF92Zc+o<+*VE6}LOlHuX8xqeG82|vn>5Hw;!RNc=tlq8R%kN>$ zmS_&|^MIIMZ9HS^bMVzS^il-?-~}5Pl%n3Pfmlx&(O2h^g4!;0P^Vy{UCGdk<~l z&SneXx?amJ7q_OL{lBk>Omjd)1hd|n#*ka~x3&viO9&V1d4H-YR<7JWKEm?aGK-BB abJXn==PjDFE4=~eJqAx#KbLh*2~7YcUv5(X literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/lutebus.png b/src/main/resources/assets/betterend/textures/block/lutebus.png new file mode 100644 index 0000000000000000000000000000000000000000..0bb4ac518ad49b1d7ce4fc976212c82dea4cb1f2 GIT binary patch literal 503 zcmVPx$u}MThR5*>rl0Q$|Kp4h2M(IqUNKo)6}0SN~30V1(g>QpNo85p}Dv3Ez} z3*-Z|f(gkRk|mZ7VE}cp8>*{O|Ck|G)wq&NOne>SPEOjiV{bd%^LyS$&wKE{kNB5h zu)D5m&BmR0=gn-r>UNascGNVix*avxU01WXiiVRQBnd)#FP<22t=S+6Lj3;lw_y_o zNf5Gha3N%zvDx0>@Tp@2GR|;4Da!Dfe~wNy2e5Q-ApoK@#|c87KWlLaDhWcOG@qD! zblk)Bq|ieu{Bs=JLdF?Un&Wy>l=VVKlW~S)TLwBE6qHS(G^hRe5w&K6 zqvIYci}N_PMfGKU?v-{|qk;!Nzq8s}Z8Qr8_yw{E0V`HaLpA^a002ovPDHLkV1lz{AyYoqdVUxj$8eb>=Y-g`(kMMmh~X(^qV uE%(jlr!+k@6f!D4>l`HZv53J!yMm#opV5rfc(Do43I9@*XhY za60(6{*%M>n_B_}*1TA?OeN^NMdPW5Di6+ZJc$oxbkQ!l%Ds3eFIz9mjVjA-U3UHX z=~v$9y|}{YBeL<7b!A7CegDI%S1MofWepFTAM7pte`8^qm3Hr=!nS)FK1aX&>DSE3 dJ`krGzh8pc`ghUVUqJgAJYD@<);T3K0RWTlS^EG0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/rutiscus_side.png b/src/main/resources/assets/betterend/textures/block/rutiscus_side.png new file mode 100644 index 0000000000000000000000000000000000000000..6c4fcd0f42aeb4e2d9fbd4e807ad134d154f4797 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~^#Gp`S0KIL zUGr*?(cM_Xr`hIjtDJsx1s&bjefC)Q)mu~UJzMhb+m>&?_U0SU-~lS-EeY}qX84Z; zbXgqN0wuaVT^vIsrpo%Z3or(dd#EUd~8`kn|a7drmg z<`bP1|ub;1c_pPNS)M@*7kCr%F=ldMup)wD6@ksO${sd| zaO@JXW!B}`wfoy)oy}WS?^=6z?rGP&IrHzTf;Hv#3%{F2EZKN@f}YvDvyyNAG6r8| VT^sE-=>X7K44$rjF6*2UngEZJdD8#@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/rutiscus_top.png b/src/main/resources/assets/betterend/textures/block/rutiscus_top.png new file mode 100644 index 0000000000000000000000000000000000000000..916ab99873e6cbe0419c3acea3f5cf8e8091681d GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~p#Yx{S0H^g z$mnjY;nQsMw^dF*x`LQfJvIYH*-C=^f*JmUKvm^~e?XB^PZ!4!iK(jo>_QC&JY0wW z*GDdxSEZ@_g<-;^&%ft96k(A3bgHt?@yh1kmRxQ&ylU1QJdy?{POsSgNr7cu2+O}Y z#+{e%=m{`wU7=L9`sCqHT>8Q158c|i;dYy7V_5CiEqQ0I@a&y%*TExr-)dX6qubiL bHNG=P2r*UPzx8`M&;bmdu6{1-oD!M<>;_py literal 0 HcmV?d00001