diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPlant.java b/src/main/java/ru/betterend/blocks/basis/BlockPlant.java index ef675a52..64e17a66 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPlant.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockPlant.java @@ -38,15 +38,23 @@ public class BlockPlant extends BlockBaseNotFull implements IRenderTypeable, Fer private static final VoxelShape SHAPE = Block.createCuboidShape(4, 0, 4, 12, 14, 12); public BlockPlant() { - super(FabricBlockSettings.of(Material.PLANT) + this(false); + } + + public BlockPlant(int light) { + this(false, light); + } + + public BlockPlant(boolean replaceable) { + super(FabricBlockSettings.of(replaceable ? Material.PLANT : Material.REPLACEABLE_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) .breakByHand(true) .noCollision()); } - public BlockPlant(int light) { - super(FabricBlockSettings.of(Material.PLANT) + public BlockPlant(boolean replaceable, int light) { + super(FabricBlockSettings.of(replaceable ? Material.PLANT : Material.REPLACEABLE_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) .lightLevel(light) diff --git a/src/main/java/ru/betterend/compat/REIAlloyingCategory.java b/src/main/java/ru/betterend/compat/REIAlloyingCategory.java index c6f829bb..b48c3641 100644 --- a/src/main/java/ru/betterend/compat/REIAlloyingCategory.java +++ b/src/main/java/ru/betterend/compat/REIAlloyingCategory.java @@ -17,12 +17,10 @@ import me.shedaniel.rei.api.widgets.Widgets; import me.shedaniel.rei.gui.entries.RecipeEntry; import me.shedaniel.rei.gui.entries.SimpleRecipeEntry; import me.shedaniel.rei.gui.widget.Widget; - import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; - import ru.betterend.recipe.AlloyingRecipe; import ru.betterend.registry.BlockRegistry; import ru.betterend.util.LangUtil; diff --git a/src/main/java/ru/betterend/entity/EntityEndSlime.java b/src/main/java/ru/betterend/entity/EntityEndSlime.java index 349059af..083457f8 100644 --- a/src/main/java/ru/betterend/entity/EntityEndSlime.java +++ b/src/main/java/ru/betterend/entity/EntityEndSlime.java @@ -24,6 +24,7 @@ import net.minecraft.util.math.Box; import net.minecraft.world.LocalDifficulty; import net.minecraft.world.ServerWorldAccess; import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; import ru.betterend.registry.BiomeRegistry; import ru.betterend.util.ISlime; @@ -105,7 +106,12 @@ public class EntityEndSlime extends SlimeEntity { } public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { - return notManyEntities(world, pos, 32, 3) && isWaterNear(world, pos, 32); + return isPermanentBiome(world, pos) || (notManyEntities(world, pos, 32, 3) && isWaterNear(world, pos, 32, 8)); + } + + private static boolean isPermanentBiome(ServerWorldAccess world, BlockPos pos) { + Biome biome = world.getBiome(pos); + return BiomeRegistry.getFromBiome(biome) == BiomeRegistry.CHORUS_FOREST; } private static boolean notManyEntities(ServerWorldAccess world, BlockPos pos, int radius, int maxCount) { @@ -114,12 +120,12 @@ public class EntityEndSlime extends SlimeEntity { return list.size() <= maxCount; } - private static boolean isWaterNear(ServerWorldAccess world, BlockPos pos, int radius) { + private static boolean isWaterNear(ServerWorldAccess world, BlockPos pos, int radius, int radius2) { for (int x = pos.getX() - radius; x <= pos.getX() + radius; x++) { POS.setX(x); for (int z = pos.getZ() - radius; z <= pos.getZ() + radius; z++) { POS.setZ(z); - for (int y = pos.getY() - radius; y <= pos.getY() + radius; y++) { + for (int y = pos.getY() - radius2; y <= pos.getY() + radius2; y++) { POS.setY(y); if (world.getBlockState(POS).getBlock() == Blocks.WATER) { return true; diff --git a/src/main/java/ru/betterend/registry/BiomeRegistry.java b/src/main/java/ru/betterend/registry/BiomeRegistry.java index 47cd9d6c..e4b65660 100644 --- a/src/main/java/ru/betterend/registry/BiomeRegistry.java +++ b/src/main/java/ru/betterend/registry/BiomeRegistry.java @@ -12,6 +12,7 @@ import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome.Category; import net.minecraft.world.biome.BiomeKeys; +import ru.betterend.world.biome.BiomeChorusForest; import ru.betterend.world.biome.BiomeFoggyMushroomland; import ru.betterend.world.biome.EndBiome; import ru.betterend.world.generator.BiomePicker; @@ -30,6 +31,7 @@ public class BiomeRegistry { public static final EndBiome END_MIDLANDS = registerBiome(BiomeKeys.END_MIDLANDS, BiomeType.LAND, false); public static final EndBiome SMALL_END_ISLANDS = registerBiome(BiomeKeys.SMALL_END_ISLANDS, BiomeType.VOID, true); public static final EndBiome FOGGY_MUSHROOMLAND = registerBiome(new BiomeFoggyMushroomland(), BiomeType.LAND); + public static final EndBiome CHORUS_FOREST = registerBiome(new BiomeChorusForest(), BiomeType.LAND); public static void register() {} diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index bfc38ec6..eab11156 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -29,6 +29,7 @@ import ru.betterend.blocks.EndStoneSmelter; import ru.betterend.blocks.EnderBlock; import ru.betterend.blocks.TerminiteBlock; import ru.betterend.blocks.basis.BlockGlowingFur; +import ru.betterend.blocks.basis.BlockPlant; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.blocks.complex.WoodenMaterial; import ru.betterend.tab.CreativeTab; @@ -38,10 +39,12 @@ public class BlockRegistry { public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new BlockEndstoneDust()); public static final Block END_MYCELIUM = registerBlock("end_mycelium", new BlockTerrain(MaterialColor.LIGHT_BLUE)); public static final Block END_MOSS = registerBlock("end_moss", new BlockTerrain(MaterialColor.CYAN)); + public static final Block CHORUS_NYLIUM = registerBlock("chorus_nylium", new BlockTerrain(MaterialColor.MAGENTA)); // Roads // public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new BlockPath(END_MYCELIUM)); public static final Block END_MOSS_PATH = registerBlock("end_moss_path", new BlockPath(END_MOSS)); + public static final Block CHORUS_NYLIUM_PATH = registerBlock("chorus_nylium_path", new BlockPath(CHORUS_NYLIUM)); // Rocks // public static final Block FLAVOLITE = registerBlock("flavolite", new BlockStone(MaterialColor.SAND)); @@ -52,6 +55,7 @@ public class BlockRegistry { public static final Block MOSSY_GLOWSHROOM_HYMENOPHORE = registerBlock("mossy_glowshroom_hymenophore", new BlockMossyGlowshroomHymenophore()); public static final Block MOSSY_GLOWSHROOM_FUR = registerBlock("mossy_glowshroom_fur", new BlockGlowingFur(MOSSY_GLOWSHROOM_SAPLING, 16)); public static final WoodenMaterial MOSSY_GLOWSHROOM = new WoodenMaterial("mossy_glowshroom", MaterialColor.GRAY, MaterialColor.WOOD); + public static final WoodenMaterial CHORUS = new WoodenMaterial("chorus", MaterialColor.MAGENTA, MaterialColor.PURPLE); // Small Plants // public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new BlockUmbrellaMoss()); @@ -67,6 +71,8 @@ public class BlockRegistry { public static final Block END_LILY = registerBlockNI("end_lily", new BlockEndLily()); public static final Block END_LILY_SEED = registerBlock("end_lily_seed", new BlockEndLilySeed()); + public static final Block CHORUS_GRASS = registerBlock("chorus_grass", new BlockPlant(true)); + // Vines // public static final Block DENSE_VINE = registerBlock("dense_vine", new BlockVine(15, true)); diff --git a/src/main/java/ru/betterend/registry/BlockTagRegistry.java b/src/main/java/ru/betterend/registry/BlockTagRegistry.java index c6bcc7e1..029074b1 100644 --- a/src/main/java/ru/betterend/registry/BlockTagRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockTagRegistry.java @@ -22,6 +22,7 @@ public class BlockTagRegistry { public static void register() { addSurfaceBlock(BlockRegistry.END_MOSS); addSurfaceBlock(BlockRegistry.END_MYCELIUM); + addSurfaceBlock(BlockRegistry.CHORUS_NYLIUM); TagHelper.addTag(GEN_TERRAIN, BlockRegistry.ENDER_ORE); } diff --git a/src/main/java/ru/betterend/registry/FeatureRegistry.java b/src/main/java/ru/betterend/registry/FeatureRegistry.java index 7e453e50..60a2d3f6 100644 --- a/src/main/java/ru/betterend/registry/FeatureRegistry.java +++ b/src/main/java/ru/betterend/registry/FeatureRegistry.java @@ -16,11 +16,13 @@ public class FeatureRegistry { public static final EndFeature UMBRELLA_MOSS = new EndFeature("umbrella_moss", new DoublePlantFeature(BlockRegistry.UMBRELLA_MOSS, BlockRegistry.UMBRELLA_MOSS_TALL, 5), 5); public static final EndFeature CREEPING_MOSS = new EndFeature("creeping_moss", new SinglePlantFeature(BlockRegistry.CREEPING_MOSS, 5), 5); public static final EndFeature BLUE_VINE = new EndFeature("blue_vine", new BlueVineFeature(), 1); + public static final EndFeature CHORUS_GRASS = new EndFeature("chorus_grass", new SinglePlantFeature(BlockRegistry.CHORUS_GRASS, 4), 4); public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(BlockRegistry.DENSE_VINE, 24), 3); // Features // public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 4); + public static final EndFeature RARE_END_LAKE = EndFeature.makeLakeFeature("rare_end_lake", new EndLakeFeature(), 40); // Ores // public static final EndFeature ENDER_ORE = EndFeature.makeOreFeature("ender_ore", BlockRegistry.ENDER_ORE, 6, 3, 0, 4, 96); diff --git a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java new file mode 100644 index 00000000..4d07d47d --- /dev/null +++ b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java @@ -0,0 +1,25 @@ +package ru.betterend.world.biome; + +import net.minecraft.entity.EntityType; +import ru.betterend.registry.BlockRegistry; +import ru.betterend.registry.EntityRegistry; +import ru.betterend.registry.FeatureRegistry; +import ru.betterend.registry.StructureRegistry; + +public class BiomeChorusForest extends EndBiome { + public BiomeChorusForest() { + super(new BiomeDefinition("chorus_forest") + .setFogColor(87, 26, 87) + .setFogDensity(3) + .setSurface(BlockRegistry.CHORUS_NYLIUM) + //.setParticles(ParticleRegistry.GLOWING_SPHERE, 0.001F) + //.setLoop(SoundRegistry.AMBIENT_FOGGY_MUSHROOMLAND) + //.setMusic(SoundRegistry.MUSIC_FOGGY_MUSHROOMLAND) + .addStructureFeature(StructureRegistry.GIANT_MOSSY_GLOWSHROOM) + .addFeature(FeatureRegistry.ENDER_ORE) + .addFeature(FeatureRegistry.RARE_END_LAKE) + .addFeature(FeatureRegistry.CHORUS_GRASS) + .addMobSpawn(EntityRegistry.END_SLIME, 5, 1, 2) + .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); + } +} diff --git a/src/main/java/ru/betterend/world/features/EndLakeFeature.java b/src/main/java/ru/betterend/world/features/EndLakeFeature.java index cd6d55f2..f2fe5996 100644 --- a/src/main/java/ru/betterend/world/features/EndLakeFeature.java +++ b/src/main/java/ru/betterend/world/features/EndLakeFeature.java @@ -8,15 +8,18 @@ import net.minecraft.fluid.FluidState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.world.StructureWorldAccess; +import net.minecraft.world.WorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import ru.betterend.blocks.BlockEndLily; import ru.betterend.blocks.BlockProperties.TripleShape; import ru.betterend.noise.OpenSimplexNoise; +import ru.betterend.registry.BiomeRegistry; import ru.betterend.registry.BlockRegistry; import ru.betterend.registry.BlockTagRegistry; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; +import ru.betterend.world.biome.EndBiome; public class EndLakeFeature extends DefaultFeature { private static final BlockState END_STONE = Blocks.END_STONE.getDefaultState(); @@ -165,18 +168,10 @@ public class EndLakeFeature extends DefaultFeature { if (world.getBlockState(pos).getBlock().isIn(BlockTagRegistry.GEN_TERRAIN)) { BlocksHelper.setWithoutUpdate(world, POS.down(), BlockRegistry.ENDSTONE_DUST.getDefaultState()); - if (y < waterLevel - 1 && random.nextInt(3) == 0 && ((x + z) & 1) == 0) { - if (NOISE.eval(x * 0.1, z * 0.1, 0) > 0) { - BlocksHelper.setWithoutUpdate(world, POS, BlockRegistry.BUBBLE_CORAL.getDefaultState()); - } - else if (NOISE.eval(x * 0.1, z * 0.1, 1) > 0) { - world.setBlockState(POS, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.BOTTOM), 0); - BlockPos up = POS.up(); - while (up.getY() < waterLevel) { - BlocksHelper.setWithoutUpdate(world, up, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.MIDDLE)); - up = up.up(); - } - BlocksHelper.setWithoutUpdate(world, up, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.TOP)); + if (random.nextInt(3) == 0 && pos.getY() < waterLevel - 1) { + EndBiome biome = BiomeRegistry.getFromBiome(world.getBiome(POS)); + if (biome == BiomeRegistry.FOGGY_MUSHROOMLAND) { + generateFoggyMushroomland(world, x, z, waterLevel); } } } @@ -214,4 +209,19 @@ public class EndLakeFeature extends DefaultFeature { return true; } + + private void generateFoggyMushroomland(WorldAccess world, int x, int z, int waterLevel) { + if (NOISE.eval(x * 0.1, z * 0.1, 0) > 0) { + BlocksHelper.setWithoutUpdate(world, POS, BlockRegistry.BUBBLE_CORAL.getDefaultState()); + } + else if (NOISE.eval(x * 0.1, z * 0.1, 1) > 0) { + world.setBlockState(POS, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.BOTTOM), 0); + BlockPos up = POS.up(); + while (up.getY() < waterLevel) { + BlocksHelper.setWithoutUpdate(world, up, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.MIDDLE)); + up = up.up(); + } + BlocksHelper.setWithoutUpdate(world, up, BlockRegistry.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.TOP)); + } + } } diff --git a/utility_res/blockstates/%name%_log.json b/src/main/resources/assets/betterend/blockstates/chorus_bark.json similarity index 51% rename from utility_res/blockstates/%name%_log.json rename to src/main/resources/assets/betterend/blockstates/chorus_bark.json index ad192214..4d809c18 100644 --- a/utility_res/blockstates/%name%_log.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_bark.json @@ -1,16 +1,16 @@ -{ - "variants": { - "axis=x": { - "model": "betterend:block/%name%_log", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "betterend:block/%name%_log" - }, - "axis=z": { - "model": "betterend:block/%name%_log", - "x": 90 - } - } -} \ No newline at end of file +{ + "variants": { + "axis=x": { + "model": "betterend:block/chorus_bark", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "betterend:block/chorus_bark" + }, + "axis=z": { + "model": "betterend:block/chorus_bark", + "x": 90 + } + } +} diff --git a/utility_res/blockstates/%name%_barrel.json b/src/main/resources/assets/betterend/blockstates/chorus_barrel.json similarity index 55% rename from utility_res/blockstates/%name%_barrel.json rename to src/main/resources/assets/betterend/blockstates/chorus_barrel.json index c7cd6877..b6afbffe 100644 --- a/utility_res/blockstates/%name%_barrel.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_barrel.json @@ -1,56 +1,56 @@ -{ - "variants": { - "facing=down,open=false": { - "model": "betterend:block/%name%_barrel", - "x": 180 - }, - "facing=down,open=true": { - "model": "betterend:block/%name%_barrel_open", - "x": 180 - }, - "facing=east,open=false": { - "model": "betterend:block/%name%_barrel", - "x": 90, - "y": 90 - }, - "facing=east,open=true": { - "model": "betterend:block/%name%_barrel_open", - "x": 90, - "y": 90 - }, - "facing=north,open=false": { - "model": "betterend:block/%name%_barrel", - "x": 90 - }, - "facing=north,open=true": { - "model": "betterend:block/%name%_barrel_open", - "x": 90 - }, - "facing=south,open=false": { - "model": "betterend:block/%name%_barrel", - "x": 90, - "y": 180 - }, - "facing=south,open=true": { - "model": "betterend:block/%name%_barrel_open", - "x": 90, - "y": 180 - }, - "facing=up,open=false": { - "model": "betterend:block/%name%_barrel" - }, - "facing=up,open=true": { - "model": "betterend:block/%name%_barrel_open" - }, - "facing=west,open=false": { - "model": "betterend:block/%name%_barrel", - "x": 90, - "y": 270 - }, - "facing=west,open=true": { - "model": "betterend:block/%name%_barrel_open", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file +{ + "variants": { + "facing=down,open=false": { + "model": "betterend:block/chorus_barrel", + "x": 180 + }, + "facing=down,open=true": { + "model": "betterend:block/chorus_barrel_open", + "x": 180 + }, + "facing=east,open=false": { + "model": "betterend:block/chorus_barrel", + "x": 90, + "y": 90 + }, + "facing=east,open=true": { + "model": "betterend:block/chorus_barrel_open", + "x": 90, + "y": 90 + }, + "facing=north,open=false": { + "model": "betterend:block/chorus_barrel", + "x": 90 + }, + "facing=north,open=true": { + "model": "betterend:block/chorus_barrel_open", + "x": 90 + }, + "facing=south,open=false": { + "model": "betterend:block/chorus_barrel", + "x": 90, + "y": 180 + }, + "facing=south,open=true": { + "model": "betterend:block/chorus_barrel_open", + "x": 90, + "y": 180 + }, + "facing=up,open=false": { + "model": "betterend:block/chorus_barrel" + }, + "facing=up,open=true": { + "model": "betterend:block/chorus_barrel_open" + }, + "facing=west,open=false": { + "model": "betterend:block/chorus_barrel", + "x": 90, + "y": 270 + }, + "facing=west,open=true": { + "model": "betterend:block/chorus_barrel_open", + "x": 90, + "y": 270 + } + } +} diff --git a/utility_res/blockstates/%name%_button.json b/src/main/resources/assets/betterend/blockstates/chorus_button.json similarity index 61% rename from utility_res/blockstates/%name%_button.json rename to src/main/resources/assets/betterend/blockstates/chorus_button.json index f0a946f9..b79307f0 100644 --- a/utility_res/blockstates/%name%_button.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_button.json @@ -1,118 +1,118 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "betterend:block/%name%_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=east,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=north,powered=false": { - "model": "betterend:block/%name%_button", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=south,powered=false": { - "model": "betterend:block/%name%_button", - "x": 180 - }, - "face=ceiling,facing=south,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "x": 180 - }, - "face=ceiling,facing=west,powered=false": { - "model": "betterend:block/%name%_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=west,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "x": 180, - "y": 90 - }, - "face=floor,facing=east,powered=false": { - "model": "betterend:block/%name%_button", - "y": 90 - }, - "face=floor,facing=east,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "y": 90 - }, - "face=floor,facing=north,powered=false": { - "model": "betterend:block/%name%_button" - }, - "face=floor,facing=north,powered=true": { - "model": "betterend:block/%name%_button_pressed" - }, - "face=floor,facing=south,powered=false": { - "model": "betterend:block/%name%_button", - "y": 180 - }, - "face=floor,facing=south,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "y": 180 - }, - "face=floor,facing=west,powered=false": { - "model": "betterend:block/%name%_button", - "y": 270 - }, - "face=floor,facing=west,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "y": 270 - }, - "face=wall,facing=east,powered=false": { - "model": "betterend:block/%name%_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=east,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=north,powered=false": { - "model": "betterend:block/%name%_button", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=north,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=south,powered=false": { - "model": "betterend:block/%name%_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=south,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=west,powered=false": { - "model": "betterend:block/%name%_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=west,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - } - } -} \ No newline at end of file +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "betterend:block/chorus_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "betterend:block/chorus_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "betterend:block/chorus_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "betterend:block/chorus_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "betterend:block/chorus_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "betterend:block/chorus_button" + }, + "face=floor,facing=north,powered=true": { + "model": "betterend:block/chorus_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "betterend:block/chorus_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "betterend:block/chorus_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "betterend:block/chorus_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "betterend:block/chorus_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "betterend:block/chorus_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "betterend:block/chorus_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "betterend:block/chorus_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_chest.json b/src/main/resources/assets/betterend/blockstates/chorus_chest.json new file mode 100644 index 00000000..876216dd --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/chorus_empty" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_crafting_table.json b/src/main/resources/assets/betterend/blockstates/chorus_crafting_table.json new file mode 100644 index 00000000..8d82f28d --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/chorus_crafting_table" + } + } +} diff --git a/utility_res/blockstates/%name%_door.json b/src/main/resources/assets/betterend/blockstates/chorus_door.json similarity index 57% rename from utility_res/blockstates/%name%_door.json rename to src/main/resources/assets/betterend/blockstates/chorus_door.json index 5abde295..90b6d457 100644 --- a/utility_res/blockstates/%name%_door.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_door.json @@ -1,124 +1,124 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "betterend:block/%name%_door_bottom" - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "betterend:block/%name%_door_bottom_hinge", - "y": 90 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "betterend:block/%name%_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "betterend:block/%name%_door_bottom", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "betterend:block/%name%_door_top" - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "betterend:block/%name%_door_top_hinge", - "y": 90 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "betterend:block/%name%_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "betterend:block/%name%_door_top", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "betterend:block/%name%_door_bottom", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "betterend:block/%name%_door_bottom_hinge" - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "betterend:block/%name%_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "betterend:block/%name%_door_bottom", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "betterend:block/%name%_door_top", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "betterend:block/%name%_door_top_hinge" - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "betterend:block/%name%_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "betterend:block/%name%_door_top", - "y": 180 - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "betterend:block/%name%_door_bottom", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "betterend:block/%name%_door_bottom_hinge", - "y": 180 - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "betterend:block/%name%_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "betterend:block/%name%_door_bottom" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "betterend:block/%name%_door_top", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "betterend:block/%name%_door_top_hinge", - "y": 180 - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "betterend:block/%name%_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "betterend:block/%name%_door_top" - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "betterend:block/%name%_door_bottom", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "betterend:block/%name%_door_bottom_hinge", - "y": 270 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "betterend:block/%name%_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "betterend:block/%name%_door_bottom", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "betterend:block/%name%_door_top", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "betterend:block/%name%_door_top_hinge", - "y": 270 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "betterend:block/%name%_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "betterend:block/%name%_door_top", - "y": 90 - } - } -} \ No newline at end of file +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { + "model": "betterend:block/chorus_door_bottom" + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "betterend:block/chorus_door_bottom_hinge", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "betterend:block/chorus_door_bottom_hinge" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "betterend:block/chorus_door_bottom", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "betterend:block/chorus_door_top" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "betterend:block/chorus_door_top_hinge", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "betterend:block/chorus_door_top_hinge" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "betterend:block/chorus_door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "betterend:block/chorus_door_bottom", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "betterend:block/chorus_door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "betterend:block/chorus_door_bottom_hinge", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "betterend:block/chorus_door_bottom", + "y": 180 + }, + "facing=north,half=upper,hinge=left,open=false": { + "model": "betterend:block/chorus_door_top", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "betterend:block/chorus_door_top_hinge" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "betterend:block/chorus_door_top_hinge", + "y": 270 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "betterend:block/chorus_door_top", + "y": 180 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "betterend:block/chorus_door_bottom", + "y": 90 + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "betterend:block/chorus_door_bottom_hinge", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "betterend:block/chorus_door_bottom_hinge", + "y": 90 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "betterend:block/chorus_door_bottom" + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "betterend:block/chorus_door_top", + "y": 90 + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "betterend:block/chorus_door_top_hinge", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "betterend:block/chorus_door_top_hinge", + "y": 90 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "betterend:block/chorus_door_top" + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "betterend:block/chorus_door_bottom", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "betterend:block/chorus_door_bottom_hinge", + "y": 270 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "betterend:block/chorus_door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "betterend:block/chorus_door_bottom", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "betterend:block/chorus_door_top", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "betterend:block/chorus_door_top_hinge", + "y": 270 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "betterend:block/chorus_door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "betterend:block/chorus_door_top", + "y": 90 + } + } +} diff --git a/utility_res/blockstates/%name%_fence.json b/src/main/resources/assets/betterend/blockstates/chorus_fence.json similarity index 68% rename from utility_res/blockstates/%name%_fence.json rename to src/main/resources/assets/betterend/blockstates/chorus_fence.json index 25a9a18b..910acfe5 100644 --- a/utility_res/blockstates/%name%_fence.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_fence.json @@ -1,48 +1,48 @@ -{ - "multipart": [ - { - "apply": { - "model": "betterend:block/%name%_fence_post" - } - }, - { - "apply": { - "model": "betterend:block/%name%_fence_side", - "uvlock": true - }, - "when": { - "north": true - } - }, - { - "apply": { - "model": "betterend:block/%name%_fence_side", - "uvlock": true, - "y": 90 - }, - "when": { - "east": true - } - }, - { - "apply": { - "model": "betterend:block/%name%_fence_side", - "uvlock": true, - "y": 180 - }, - "when": { - "south": true - } - }, - { - "apply": { - "model": "betterend:block/%name%_fence_side", - "uvlock": true, - "y": 270 - }, - "when": { - "west": true - } - } - ] -} \ No newline at end of file +{ + "multipart": [ + { + "apply": { + "model": "betterend:block/chorus_fence_post" + } + }, + { + "apply": { + "model": "betterend:block/chorus_fence_side", + "uvlock": true + }, + "when": { + "north": true + } + }, + { + "apply": { + "model": "betterend:block/chorus_fence_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": true + } + }, + { + "apply": { + "model": "betterend:block/chorus_fence_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": true + } + }, + { + "apply": { + "model": "betterend:block/chorus_fence_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": true + } + } + ] +} diff --git a/utility_res/blockstates/%name%_gate.json b/src/main/resources/assets/betterend/blockstates/chorus_gate.json similarity index 61% rename from utility_res/blockstates/%name%_gate.json rename to src/main/resources/assets/betterend/blockstates/chorus_gate.json index 3ea285ea..62079bd0 100644 --- a/utility_res/blockstates/%name%_gate.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_gate.json @@ -1,80 +1,80 @@ -{ - "variants": { - "facing=east,in_wall=false,open=false": { - "model": "betterend:block/%name%_fence_gate_closed", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=false,open=true": { - "model": "betterend:block/%name%_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=false": { - "model": "betterend:block/%name%_wall_gate_closed", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=true": { - "model": "betterend:block/%name%_wall_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=north,in_wall=false,open=false": { - "model": "betterend:block/%name%_fence_gate_closed", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=false,open=true": { - "model": "betterend:block/%name%_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=false": { - "model": "betterend:block/%name%_wall_gate_closed", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=true": { - "model": "betterend:block/%name%_wall_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=south,in_wall=false,open=false": { - "model": "betterend:block/%name%_fence_gate_closed", - "uvlock": true - }, - "facing=south,in_wall=false,open=true": { - "model": "betterend:block/%name%_fence_gate_open", - "uvlock": true - }, - "facing=south,in_wall=true,open=false": { - "model": "betterend:block/%name%_wall_gate_closed", - "uvlock": true - }, - "facing=south,in_wall=true,open=true": { - "model": "betterend:block/%name%_wall_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "betterend:block/%name%_fence_gate_closed", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=false,open=true": { - "model": "betterend:block/%name%_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=false": { - "model": "betterend:block/%name%_wall_gate_closed", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=true": { - "model": "betterend:block/%name%_wall_gate_open", - "uvlock": true, - "y": 90 - } - } -} \ No newline at end of file +{ + "variants": { + "facing=east,in_wall=false,open=false": { + "model": "betterend:block/chorus_fence_gate_closed", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=false,open=true": { + "model": "betterend:block/chorus_fence_gate_open", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=true,open=false": { + "model": "betterend:block/chorus_wall_gate_closed", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=true,open=true": { + "model": "betterend:block/chorus_wall_gate_open", + "uvlock": true, + "y": 270 + }, + "facing=north,in_wall=false,open=false": { + "model": "betterend:block/chorus_fence_gate_closed", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=false,open=true": { + "model": "betterend:block/chorus_fence_gate_open", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=true,open=false": { + "model": "betterend:block/chorus_wall_gate_closed", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=true,open=true": { + "model": "betterend:block/chorus_wall_gate_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "betterend:block/chorus_fence_gate_closed", + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "betterend:block/chorus_fence_gate_open", + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "betterend:block/chorus_wall_gate_closed", + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "betterend:block/chorus_wall_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "betterend:block/chorus_fence_gate_closed", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=false,open=true": { + "model": "betterend:block/chorus_fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "betterend:block/chorus_wall_gate_closed", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { + "model": "betterend:block/chorus_wall_gate_open", + "uvlock": true, + "y": 90 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_grass.json b/src/main/resources/assets/betterend/blockstates/chorus_grass.json new file mode 100644 index 00000000..6de30ad2 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_grass.json @@ -0,0 +1,38 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/chorus_grass_01" }, + { "model": "betterend:block/chorus_grass_02" }, + { "model": "betterend:block/chorus_grass_03" }, + { "model": "betterend:block/chorus_grass_04" }, + { "model": "betterend:block/chorus_grass_05" }, + { "model": "betterend:block/chorus_grass_06" }, + { "model": "betterend:block/chorus_grass_07" }, + { "model": "betterend:block/chorus_grass_08" }, + { "model": "betterend:block/chorus_grass_01", "y": 90 }, + { "model": "betterend:block/chorus_grass_02", "y": 90 }, + { "model": "betterend:block/chorus_grass_03", "y": 90 }, + { "model": "betterend:block/chorus_grass_04", "y": 90 }, + { "model": "betterend:block/chorus_grass_05", "y": 90 }, + { "model": "betterend:block/chorus_grass_06", "y": 90 }, + { "model": "betterend:block/chorus_grass_07", "y": 90 }, + { "model": "betterend:block/chorus_grass_08", "y": 90 }, + { "model": "betterend:block/chorus_grass_01", "y": 180 }, + { "model": "betterend:block/chorus_grass_02", "y": 180 }, + { "model": "betterend:block/chorus_grass_03", "y": 180 }, + { "model": "betterend:block/chorus_grass_04", "y": 180 }, + { "model": "betterend:block/chorus_grass_05", "y": 180 }, + { "model": "betterend:block/chorus_grass_06", "y": 180 }, + { "model": "betterend:block/chorus_grass_07", "y": 180 }, + { "model": "betterend:block/chorus_grass_08", "y": 180 }, + { "model": "betterend:block/chorus_grass_01", "y": 270 }, + { "model": "betterend:block/chorus_grass_02", "y": 270 }, + { "model": "betterend:block/chorus_grass_03", "y": 270 }, + { "model": "betterend:block/chorus_grass_04", "y": 270 }, + { "model": "betterend:block/chorus_grass_05", "y": 270 }, + { "model": "betterend:block/chorus_grass_06", "y": 270 }, + { "model": "betterend:block/chorus_grass_07", "y": 270 }, + { "model": "betterend:block/chorus_grass_08", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_ladder.json b/src/main/resources/assets/betterend/blockstates/chorus_ladder.json new file mode 100644 index 00000000..2c9ae49f --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_ladder.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "betterend:block/chorus_ladder", + "y": 90 + }, + "facing=north": { + "model": "betterend:block/chorus_ladder" + }, + "facing=south": { + "model": "betterend:block/chorus_ladder", + "y": 180 + }, + "facing=west": { + "model": "betterend:block/chorus_ladder", + "y": 270 + } + } +} diff --git a/utility_res/blockstates/%name%_bark.json b/src/main/resources/assets/betterend/blockstates/chorus_log.json similarity index 51% rename from utility_res/blockstates/%name%_bark.json rename to src/main/resources/assets/betterend/blockstates/chorus_log.json index ccf25d5e..4c74bf8e 100644 --- a/utility_res/blockstates/%name%_bark.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_log.json @@ -1,16 +1,16 @@ -{ - "variants": { - "axis=x": { - "model": "betterend:block/%name%_bark", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "betterend:block/%name%_bark" - }, - "axis=z": { - "model": "betterend:block/%name%_bark", - "x": 90 - } - } -} \ No newline at end of file +{ + "variants": { + "axis=x": { + "model": "betterend:block/chorus_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "betterend:block/chorus_log" + }, + "axis=z": { + "model": "betterend:block/chorus_log", + "x": 90 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_nylium.json b/src/main/resources/assets/betterend/blockstates/chorus_nylium.json new file mode 100644 index 00000000..6c04ddb7 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_nylium.json @@ -0,0 +1,10 @@ +{ + "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 new file mode 100644 index 00000000..3e160ef6 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_nylium_path.json @@ -0,0 +1,10 @@ +{ + "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/chorus_planks.json b/src/main/resources/assets/betterend/blockstates/chorus_planks.json new file mode 100644 index 00000000..82f0ceb6 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/chorus_planks" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_plate.json b/src/main/resources/assets/betterend/blockstates/chorus_plate.json new file mode 100644 index 00000000..51b85cb1 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "betterend:block/chorus_pressure_plate_up" + }, + "powered=true": { + "model": "betterend:block/chorus_pressure_plate_down" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_sign.json b/src/main/resources/assets/betterend/blockstates/chorus_sign.json new file mode 100644 index 00000000..876216dd --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/chorus_empty" + } + } +} diff --git a/utility_res/blockstates/%name%_slab.json b/src/main/resources/assets/betterend/blockstates/chorus_slab.json similarity index 50% rename from utility_res/blockstates/%name%_slab.json rename to src/main/resources/assets/betterend/blockstates/chorus_slab.json index bcf1af27..6e1df909 100644 --- a/utility_res/blockstates/%name%_slab.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_slab.json @@ -1,15 +1,15 @@ -{ - "variants": { - "type=bottom": { - "model": "betterend:block/%name%_half_slab" - }, - "type=double": { - "model": "betterend:block/%name%_planks" - }, - "type=top": { - "model": "betterend:block/%name%_half_slab", - "uvlock": true, - "x": 180 - } - } -} \ No newline at end of file +{ + "variants": { + "type=bottom": { + "model": "betterend:block/chorus_half_slab" + }, + "type=double": { + "model": "betterend:block/chorus_planks" + }, + "type=top": { + "model": "betterend:block/chorus_half_slab", + "uvlock": true, + "x": 180 + } + } +} diff --git a/utility_res/blockstates/%name%_stairs.json b/src/main/resources/assets/betterend/blockstates/chorus_stairs.json similarity index 64% rename from utility_res/blockstates/%name%_stairs.json rename to src/main/resources/assets/betterend/blockstates/chorus_stairs.json index 685e1861..16062b5d 100644 --- a/utility_res/blockstates/%name%_stairs.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_stairs.json @@ -1,209 +1,209 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs" - }, - "facing=east,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "betterend:block/chorus_inner_stairs" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "betterend:block/chorus_outer_stairs" + }, + "facing=east,half=bottom,shape=straight": { + "model": "betterend:block/chorus_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "betterend:block/chorus_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "betterend:block/chorus_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "betterend:block/chorus_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "betterend:block/chorus_inner_stairs" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "betterend:block/chorus_outer_stairs" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "betterend:block/chorus_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "betterend:block/chorus_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "betterend:block/chorus_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "betterend:block/chorus_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "betterend:block/chorus_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "betterend:block/chorus_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_stripped_bark.json b/src/main/resources/assets/betterend/blockstates/chorus_stripped_bark.json new file mode 100644 index 00000000..69bda4eb --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_stripped_bark.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "betterend:block/chorus_stripped_bark", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "betterend:block/chorus_stripped_bark" + }, + "axis=z": { + "model": "betterend:block/chorus_stripped_bark", + "x": 90 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/chorus_stripped_log.json b/src/main/resources/assets/betterend/blockstates/chorus_stripped_log.json new file mode 100644 index 00000000..8252e4b4 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/chorus_stripped_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "betterend:block/chorus_stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "betterend:block/chorus_stripped_log" + }, + "axis=z": { + "model": "betterend:block/chorus_stripped_log", + "x": 90 + } + } +} diff --git a/utility_res/blockstates/%name%_trapdoor.json b/src/main/resources/assets/betterend/blockstates/chorus_trapdoor.json similarity index 60% rename from utility_res/blockstates/%name%_trapdoor.json rename to src/main/resources/assets/betterend/blockstates/chorus_trapdoor.json index d59b2831..f55e3c61 100644 --- a/utility_res/blockstates/%name%_trapdoor.json +++ b/src/main/resources/assets/betterend/blockstates/chorus_trapdoor.json @@ -1,77 +1,77 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "betterend:block/%name%_trapdoor", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "betterend:block/%name%_trapdoor", - "x": 90, - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "betterend:block/%name%_trapdoor", - "x": 180, - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "betterend:block/%name%_trapdoor", - "x": 270, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "betterend:block/%name%_trapdoor" - }, - "facing=north,half=bottom,open=true": { - "model": "betterend:block/%name%_trapdoor", - "x": 90 - }, - "facing=north,half=top,open=false": { - "model": "betterend:block/%name%_trapdoor", - "x": 180 - }, - "facing=north,half=top,open=true": { - "model": "betterend:block/%name%_trapdoor", - "x": 270, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "betterend:block/%name%_trapdoor", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "betterend:block/%name%_trapdoor", - "x": 90, - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "betterend:block/%name%_trapdoor", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "betterend:block/%name%_trapdoor", - "x": 270, - "y": 0 - }, - "facing=west,half=bottom,open=false": { - "model": "betterend:block/%name%_trapdoor", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "betterend:block/%name%_trapdoor", - "x": 90, - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "betterend:block/%name%_trapdoor", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "betterend:block/%name%_trapdoor", - "x": 270, - "y": 90 - } - } -} \ No newline at end of file +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "betterend:block/chorus_trapdoor", + "y": 90 + }, + "facing=east,half=bottom,open=true": { + "model": "betterend:block/chorus_trapdoor", + "x": 90, + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "betterend:block/chorus_trapdoor", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "betterend:block/chorus_trapdoor", + "x": 270, + "y": 270 + }, + "facing=north,half=bottom,open=false": { + "model": "betterend:block/chorus_trapdoor" + }, + "facing=north,half=bottom,open=true": { + "model": "betterend:block/chorus_trapdoor", + "x": 90 + }, + "facing=north,half=top,open=false": { + "model": "betterend:block/chorus_trapdoor", + "x": 180 + }, + "facing=north,half=top,open=true": { + "model": "betterend:block/chorus_trapdoor", + "x": 270, + "y": 180 + }, + "facing=south,half=bottom,open=false": { + "model": "betterend:block/chorus_trapdoor", + "y": 180 + }, + "facing=south,half=bottom,open=true": { + "model": "betterend:block/chorus_trapdoor", + "x": 90, + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "betterend:block/chorus_trapdoor", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "betterend:block/chorus_trapdoor", + "x": 270, + "y": 0 + }, + "facing=west,half=bottom,open=false": { + "model": "betterend:block/chorus_trapdoor", + "y": 270 + }, + "facing=west,half=bottom,open=true": { + "model": "betterend:block/chorus_trapdoor", + "x": 90, + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "betterend:block/chorus_trapdoor", + "x": 180, + "y": 270 + }, + "facing=west,half=top,open=true": { + "model": "betterend:block/chorus_trapdoor", + "x": 270, + "y": 90 + } + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index d9643347..7f8e4b9a 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -98,5 +98,24 @@ "block.betterend.bubble_coral": "Bubble Coral", "block.betterend.aurora_crystal": "Aurora Crystal", - "category.rei.damage.amount&dmg": "Tool damage: %s" + "category.rei.damage.amount&dmg": "Tool damage: %s", + + "block.betterend.chorus_bark": "Chorus Bark", + "block.betterend.chorus_barrel": "Chorus Barrel", + "block.betterend.chorus_button": "Chorus Button", + "block.betterend.chorus_chest": "Chorus Chest", + "block.betterend.chorus_crafting_table": "Chorus Crafting Table", + "block.betterend.chorus_door": "Chorus Door", + "block.betterend.chorus_fence": "Chorus Fence", + "block.betterend.chorus_gate": "Chorus Gate", + "block.betterend.chorus_ladder": "Chorus Ladder", + "block.betterend.chorus_log": "Chorus Log", + "block.betterend.chorus_planks": "Chorus Planks", + "block.betterend.chorus_plate": "Chorus Plate", + "block.betterend.chorus_sign": "Chorus Sign", + "block.betterend.chorus_slab": "Chorus Slab", + "block.betterend.chorus_stairs": "Chorus Stairs", + "block.betterend.chorus_stripped_bark": "Chorus Stripped Bark", + "block.betterend.chorus_stripped_log": "Chorus Stripped Log", + "block.betterend.chorus_trapdoor": "Chorus Trapdoor" } \ No newline at end of file diff --git a/utility_res/block/%name%_planks.json b/src/main/resources/assets/betterend/models/block/chorus_bark.json similarity index 52% rename from utility_res/block/%name%_planks.json rename to src/main/resources/assets/betterend/models/block/chorus_bark.json index 1f5af9a5..9823e1c8 100644 --- a/utility_res/block/%name%_planks.json +++ b/src/main/resources/assets/betterend/models/block/chorus_bark.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/chorus_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_barrel.json b/src/main/resources/assets/betterend/models/block/chorus_barrel.json new file mode 100644 index 00000000..6c29232a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_barrel.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "betterend:block/chorus_barrel_bottom", + "side": "betterend:block/chorus_barrel_side", + "top": "betterend:block/chorus_barrel_top" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_barrel_open.json b/src/main/resources/assets/betterend/models/block/chorus_barrel_open.json new file mode 100644 index 00000000..6b546dc0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_barrel_open.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "betterend:block/chorus_barrel_bottom", + "side": "betterend:block/chorus_barrel_side", + "top": "betterend:block/chorus_barrel_top_open" + } +} diff --git a/utility_res/block/%name%_button.json b/src/main/resources/assets/betterend/models/block/chorus_button.json similarity index 50% rename from utility_res/block/%name%_button.json rename to src/main/resources/assets/betterend/models/block/chorus_button.json index 83287ff9..34111f27 100644 --- a/utility_res/block/%name%_button.json +++ b/src/main/resources/assets/betterend/models/block/chorus_button.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/button", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_button_inventory.json b/src/main/resources/assets/betterend/models/block/chorus_button_inventory.json similarity index 54% rename from utility_res/block/%name%_button_inventory.json rename to src/main/resources/assets/betterend/models/block/chorus_button_inventory.json index 2de49594..30d941a1 100644 --- a/utility_res/block/%name%_button_inventory.json +++ b/src/main/resources/assets/betterend/models/block/chorus_button_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/button_inventory", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_button_pressed.json b/src/main/resources/assets/betterend/models/block/chorus_button_pressed.json similarity index 53% rename from utility_res/block/%name%_button_pressed.json rename to src/main/resources/assets/betterend/models/block/chorus_button_pressed.json index b5e6f56a..e0de0f82 100644 --- a/utility_res/block/%name%_button_pressed.json +++ b/src/main/resources/assets/betterend/models/block/chorus_button_pressed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/button_pressed", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_crafting_table.json b/src/main/resources/assets/betterend/models/block/chorus_crafting_table.json new file mode 100644 index 00000000..bdc682f5 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "betterend:block/chorus_crafting_table_bottom", + "east": "betterend:block/chorus_crafting_table_side", + "north": "betterend:block/chorus_crafting_table_front", + "particle": "betterend:block/chorus_crafting_table_front", + "south": "betterend:block/chorus_crafting_table_side", + "up": "betterend:block/chorus_crafting_table_top", + "west": "betterend:block/chorus_crafting_table_front" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_door_bottom.json b/src/main/resources/assets/betterend/models/block/chorus_door_bottom.json new file mode 100644 index 00000000..beda9004 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/sided_door_bottom", + "textures": { + "facade": "betterend:block/chorus_door_bottom", + "side": "betterend:block/chorus_door_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_door_bottom_hinge.json b/src/main/resources/assets/betterend/models/block/chorus_door_bottom_hinge.json new file mode 100644 index 00000000..44d57257 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/sided_door_bottom_rh", + "textures": { + "facade": "betterend:block/chorus_door_bottom", + "side": "betterend:block/chorus_door_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_door_top.json b/src/main/resources/assets/betterend/models/block/chorus_door_top.json new file mode 100644 index 00000000..c2710e87 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/sided_door_top", + "textures": { + "facade": "betterend:block/chorus_door_top", + "side": "betterend:block/chorus_door_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_door_top_hinge.json b/src/main/resources/assets/betterend/models/block/chorus_door_top_hinge.json new file mode 100644 index 00000000..8c79aaee --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/sided_door_top_rh", + "textures": { + "facade": "betterend:block/chorus_door_top", + "side": "betterend:block/chorus_door_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_empty.json b/src/main/resources/assets/betterend/models/block/chorus_empty.json new file mode 100644 index 00000000..6cb64950 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_empty.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_fence_gate_closed.json b/src/main/resources/assets/betterend/models/block/chorus_fence_gate_closed.json similarity index 55% rename from utility_res/block/%name%_fence_gate_closed.json rename to src/main/resources/assets/betterend/models/block/chorus_fence_gate_closed.json index 3bbd7441..6dbc328a 100644 --- a/utility_res/block/%name%_fence_gate_closed.json +++ b/src/main/resources/assets/betterend/models/block/chorus_fence_gate_closed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/template_fence_gate", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_fence_gate_open.json b/src/main/resources/assets/betterend/models/block/chorus_fence_gate_open.json similarity index 56% rename from utility_res/block/%name%_fence_gate_open.json rename to src/main/resources/assets/betterend/models/block/chorus_fence_gate_open.json index 3c4d6e5a..aae430ed 100644 --- a/utility_res/block/%name%_fence_gate_open.json +++ b/src/main/resources/assets/betterend/models/block/chorus_fence_gate_open.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/template_fence_gate_open", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_fence_inventory.json b/src/main/resources/assets/betterend/models/block/chorus_fence_inventory.json similarity index 53% rename from utility_res/block/%name%_fence_inventory.json rename to src/main/resources/assets/betterend/models/block/chorus_fence_inventory.json index 1703d001..13b5e888 100644 --- a/utility_res/block/%name%_fence_inventory.json +++ b/src/main/resources/assets/betterend/models/block/chorus_fence_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_fence_post.json b/src/main/resources/assets/betterend/models/block/chorus_fence_post.json similarity index 51% rename from utility_res/block/%name%_fence_post.json rename to src/main/resources/assets/betterend/models/block/chorus_fence_post.json index 6046614e..3157df4a 100644 --- a/utility_res/block/%name%_fence_post.json +++ b/src/main/resources/assets/betterend/models/block/chorus_fence_post.json @@ -1,6 +1,6 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/fence_post", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_fence_side.json b/src/main/resources/assets/betterend/models/block/chorus_fence_side.json similarity index 51% rename from utility_res/block/%name%_fence_side.json rename to src/main/resources/assets/betterend/models/block/chorus_fence_side.json index 497d8678..46f924e3 100644 --- a/utility_res/block/%name%_fence_side.json +++ b/src/main/resources/assets/betterend/models/block/chorus_fence_side.json @@ -1,6 +1,6 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/fence_side", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_grass_01.json b/src/main/resources/assets/betterend/models/block/chorus_grass_01.json new file mode 100644 index 00000000..2231cc82 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_grass_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/chorus_grass_01" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_grass_02.json b/src/main/resources/assets/betterend/models/block/chorus_grass_02.json new file mode 100644 index 00000000..761c1e67 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_grass_02.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/chorus_grass_02" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_grass_03.json b/src/main/resources/assets/betterend/models/block/chorus_grass_03.json new file mode 100644 index 00000000..14c78de3 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_grass_03.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/chorus_grass_03" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_grass_04.json b/src/main/resources/assets/betterend/models/block/chorus_grass_04.json new file mode 100644 index 00000000..8630cd2d --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_grass_04.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/chorus_grass_04" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_grass_05.json b/src/main/resources/assets/betterend/models/block/chorus_grass_05.json new file mode 100644 index 00000000..8fead9a9 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_grass_05.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_grass_01" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_grass_06.json b/src/main/resources/assets/betterend/models/block/chorus_grass_06.json new file mode 100644 index 00000000..3fc34e68 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_grass_06.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_grass_02" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_grass_07.json b/src/main/resources/assets/betterend/models/block/chorus_grass_07.json new file mode 100644 index 00000000..e7ffd9bf --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_grass_07.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_grass_03" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_grass_08.json b/src/main/resources/assets/betterend/models/block/chorus_grass_08.json new file mode 100644 index 00000000..687c6976 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_grass_08.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_grass_04" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_half_slab.json b/src/main/resources/assets/betterend/models/block/chorus_half_slab.json new file mode 100644 index 00000000..356c35ff --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_half_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "betterend:block/chorus_planks", + "side": "betterend:block/chorus_planks", + "top": "betterend:block/chorus_planks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_inner_stairs.json b/src/main/resources/assets/betterend/models/block/chorus_inner_stairs.json new file mode 100644 index 00000000..0f75fc09 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/chorus_planks", + "side": "betterend:block/chorus_planks", + "top": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_ladder.json b/src/main/resources/assets/betterend/models/block/chorus_ladder.json similarity index 54% rename from utility_res/block/%name%_ladder.json rename to src/main/resources/assets/betterend/models/block/chorus_ladder.json index 5c1bb128..a3e5dfa3 100644 --- a/utility_res/block/%name%_ladder.json +++ b/src/main/resources/assets/betterend/models/block/chorus_ladder.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/ladder", - "textures": { - "texture": "betterend:block/%name%_ladder" - } -} \ No newline at end of file +{ + "parent": "betterend:block/ladder", + "textures": { + "texture": "betterend:block/chorus_ladder" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_log.json b/src/main/resources/assets/betterend/models/block/chorus_log.json new file mode 100644 index 00000000..6e78f0dc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_log.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/chorus_log_top", + "east": "betterend:block/chorus_log_side", + "north": "betterend:block/chorus_log_side", + "particle": "betterend:block/chorus_log_side", + "south": "betterend:block/chorus_log_side", + "up": "betterend:block/chorus_log_top", + "west": "betterend:block/chorus_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_nylium.json b/src/main/resources/assets/betterend/models/block/chorus_nylium.json new file mode 100644 index 00000000..9acf413a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_nylium.json @@ -0,0 +1,12 @@ +{ + "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 new file mode 100644 index 00000000..8dcbf941 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_nylium_path.json @@ -0,0 +1,7 @@ +{ "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/chorus_outer_stairs.json b/src/main/resources/assets/betterend/models/block/chorus_outer_stairs.json new file mode 100644 index 00000000..797a3dac --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/chorus_planks", + "side": "betterend:block/chorus_planks", + "top": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_bark.json b/src/main/resources/assets/betterend/models/block/chorus_planks.json similarity index 51% rename from utility_res/block/%name%_bark.json rename to src/main/resources/assets/betterend/models/block/chorus_planks.json index adf52c39..ef59c38e 100644 --- a/utility_res/block/%name%_bark.json +++ b/src/main/resources/assets/betterend/models/block/chorus_planks.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_log_side" - } -} \ No newline at end of file +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_pressure_plate_down.json b/src/main/resources/assets/betterend/models/block/chorus_pressure_plate_down.json similarity index 55% rename from utility_res/block/%name%_pressure_plate_down.json rename to src/main/resources/assets/betterend/models/block/chorus_pressure_plate_down.json index 45c7fa14..334c89fd 100644 --- a/utility_res/block/%name%_pressure_plate_down.json +++ b/src/main/resources/assets/betterend/models/block/chorus_pressure_plate_down.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/pressure_plate_down", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_pressure_plate_up.json b/src/main/resources/assets/betterend/models/block/chorus_pressure_plate_up.json similarity index 54% rename from utility_res/block/%name%_pressure_plate_up.json rename to src/main/resources/assets/betterend/models/block/chorus_pressure_plate_up.json index 1fffa964..fdbca476 100644 --- a/utility_res/block/%name%_pressure_plate_up.json +++ b/src/main/resources/assets/betterend/models/block/chorus_pressure_plate_up.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/pressure_plate_up", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_stairs.json b/src/main/resources/assets/betterend/models/block/chorus_stairs.json new file mode 100644 index 00000000..7a44198d --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/chorus_planks", + "side": "betterend:block/chorus_planks", + "top": "betterend:block/chorus_planks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_stripped_bark.json b/src/main/resources/assets/betterend/models/block/chorus_stripped_bark.json new file mode 100644 index 00000000..ecc6540b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_stripped_bark.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/chorus_stripped_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_stripped_log.json b/src/main/resources/assets/betterend/models/block/chorus_stripped_log.json new file mode 100644 index 00000000..41d57792 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_stripped_log.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/chorus_stripped_log_top", + "east": "betterend:block/chorus_stripped_log_side", + "north": "betterend:block/chorus_stripped_log_side", + "particle": "betterend:block/chorus_stripped_log_side", + "south": "betterend:block/chorus_stripped_log_side", + "up": "betterend:block/chorus_stripped_log_top", + "west": "betterend:block/chorus_stripped_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_trapdoor.json b/src/main/resources/assets/betterend/models/block/chorus_trapdoor.json new file mode 100644 index 00000000..c2c4d9f8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/chorus_trapdoor.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/sided_trapdoor", + "textures": { + "texture": "betterend:block/chorus_trapdoor", + "side": "betterend:block/chorus_door_side" + } +} diff --git a/utility_res/block/%name%_wall_gate_closed.json b/src/main/resources/assets/betterend/models/block/chorus_wall_gate_closed.json similarity index 56% rename from utility_res/block/%name%_wall_gate_closed.json rename to src/main/resources/assets/betterend/models/block/chorus_wall_gate_closed.json index 721da886..ca20f233 100644 --- a/utility_res/block/%name%_wall_gate_closed.json +++ b/src/main/resources/assets/betterend/models/block/chorus_wall_gate_closed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/template_fence_gate_wall", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/utility_res/block/%name%_wall_gate_open.json b/src/main/resources/assets/betterend/models/block/chorus_wall_gate_open.json similarity index 58% rename from utility_res/block/%name%_wall_gate_open.json rename to src/main/resources/assets/betterend/models/block/chorus_wall_gate_open.json index 351d1bbc..33f1ba06 100644 --- a/utility_res/block/%name%_wall_gate_open.json +++ b/src/main/resources/assets/betterend/models/block/chorus_wall_gate_open.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "betterend:block/%name%_planks" - } -} \ No newline at end of file +{ + "parent": "block/template_fence_gate_wall_open", + "textures": { + "texture": "betterend:block/chorus_planks" + } +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_bark.json b/src/main/resources/assets/betterend/models/item/chorus_bark.json new file mode 100644 index 00000000..70aa57ba --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_bark.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_bark" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_barrel.json b/src/main/resources/assets/betterend/models/item/chorus_barrel.json new file mode 100644 index 00000000..2f13843a --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_barrel" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_button.json b/src/main/resources/assets/betterend/models/item/chorus_button.json new file mode 100644 index 00000000..08f583e0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_button.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_button_inventory" +} diff --git a/utility_res/item/%name%_chest.json b/src/main/resources/assets/betterend/models/item/chorus_chest.json similarity index 52% rename from utility_res/item/%name%_chest.json rename to src/main/resources/assets/betterend/models/item/chorus_chest.json index 9d917818..cec12186 100644 --- a/utility_res/item/%name%_chest.json +++ b/src/main/resources/assets/betterend/models/item/chorus_chest.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/chest_item", - "textures": { - "texture": "betterend:entity/chest/%name%_chest" - } -} \ No newline at end of file +{ + "parent": "betterend:block/chest_item", + "textures": { + "texture": "betterend:entity/chest/chorus_chest" + } +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_crafting_table.json b/src/main/resources/assets/betterend/models/item/chorus_crafting_table.json new file mode 100644 index 00000000..29aad3a2 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_crafting_table.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_crafting_table" +} diff --git a/utility_res/item/%name%_door.json b/src/main/resources/assets/betterend/models/item/chorus_door.json similarity index 52% rename from utility_res/item/%name%_door.json rename to src/main/resources/assets/betterend/models/item/chorus_door.json index c3db895a..a9c9edb2 100644 --- a/utility_res/item/%name%_door.json +++ b/src/main/resources/assets/betterend/models/item/chorus_door.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/%name%_door" - } -} \ No newline at end of file +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/chorus_door" + } +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_fence.json b/src/main/resources/assets/betterend/models/item/chorus_fence.json new file mode 100644 index 00000000..e8b859e5 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_fence.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_fence_inventory" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_gate.json b/src/main/resources/assets/betterend/models/item/chorus_gate.json new file mode 100644 index 00000000..a55d29c6 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_gate.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_fence_gate_closed" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_grass.json b/src/main/resources/assets/betterend/models/item/chorus_grass.json new file mode 100644 index 00000000..e4965460 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_grass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/chorus_grass_01" + } +} diff --git a/utility_res/item/%name%_sign.json b/src/main/resources/assets/betterend/models/item/chorus_ladder.json similarity index 52% rename from utility_res/item/%name%_sign.json rename to src/main/resources/assets/betterend/models/item/chorus_ladder.json index 01b1922f..e7c8bc4d 100644 --- a/utility_res/item/%name%_sign.json +++ b/src/main/resources/assets/betterend/models/item/chorus_ladder.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/%name%_sign" - } -} \ No newline at end of file +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/chorus_ladder" + } +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_log.json b/src/main/resources/assets/betterend/models/item/chorus_log.json new file mode 100644 index 00000000..cb6992cf --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_log.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_log" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_nylium.json b/src/main/resources/assets/betterend/models/item/chorus_nylium.json new file mode 100644 index 00000000..c3e7084c --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_nylium.json @@ -0,0 +1,3 @@ +{ + "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 new file mode 100644 index 00000000..da096761 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_nylium_path.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_nylium_path" +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/chorus_planks.json b/src/main/resources/assets/betterend/models/item/chorus_planks.json new file mode 100644 index 00000000..3a524cbc --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_planks" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_plate.json b/src/main/resources/assets/betterend/models/item/chorus_plate.json new file mode 100644 index 00000000..489a25a0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_plate.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_pressure_plate_up" +} diff --git a/utility_res/item/%name%_ladder.json b/src/main/resources/assets/betterend/models/item/chorus_sign.json similarity index 51% rename from utility_res/item/%name%_ladder.json rename to src/main/resources/assets/betterend/models/item/chorus_sign.json index 31c1ffbd..cd5c073f 100644 --- a/utility_res/item/%name%_ladder.json +++ b/src/main/resources/assets/betterend/models/item/chorus_sign.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:block/%name%_ladder" - } -} \ No newline at end of file +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/chorus_sign" + } +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_slab.json b/src/main/resources/assets/betterend/models/item/chorus_slab.json new file mode 100644 index 00000000..174557d4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_half_slab" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_stairs.json b/src/main/resources/assets/betterend/models/item/chorus_stairs.json new file mode 100644 index 00000000..ab61aa8a --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_stairs" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_stripped_bark.json b/src/main/resources/assets/betterend/models/item/chorus_stripped_bark.json new file mode 100644 index 00000000..fc18c9fd --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_stripped_bark.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_stripped_bark" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_stripped_log.json b/src/main/resources/assets/betterend/models/item/chorus_stripped_log.json new file mode 100644 index 00000000..2b991a06 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_stripped_log.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_stripped_log" +} diff --git a/src/main/resources/assets/betterend/models/item/chorus_trapdoor.json b/src/main/resources/assets/betterend/models/item/chorus_trapdoor.json new file mode 100644 index 00000000..a326aa39 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/chorus_trapdoor.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_trapdoor" +} diff --git a/src/main/resources/assets/betterend/textures/block/chorus_grass_01.png b/src/main/resources/assets/betterend/textures/block/chorus_grass_01.png new file mode 100644 index 00000000..5962de43 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_grass_01.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_grass_02.png b/src/main/resources/assets/betterend/textures/block/chorus_grass_02.png new file mode 100644 index 00000000..4ec51920 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_grass_02.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_grass_03.png b/src/main/resources/assets/betterend/textures/block/chorus_grass_03.png new file mode 100644 index 00000000..1a1118a8 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_grass_03.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_grass_04.png b/src/main/resources/assets/betterend/textures/block/chorus_grass_04.png new file mode 100644 index 00000000..f60f5956 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_grass_04.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_nylium_path_top.png b/src/main/resources/assets/betterend/textures/block/chorus_nylium_path_top.png new file mode 100644 index 00000000..ddf3c345 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_nylium_path_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_nylium_side.png b/src/main/resources/assets/betterend/textures/block/chorus_nylium_side.png new file mode 100644 index 00000000..b59e7cfd Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_nylium_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_nylium_top.png b/src/main/resources/assets/betterend/textures/block/chorus_nylium_top.png new file mode 100644 index 00000000..a73f0dfa Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_nylium_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_planks.png b/src/main/resources/assets/betterend/textures/block/chorus_planks.png new file mode 100644 index 00000000..45d0ba97 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_planks.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/sign/chorus_sign.png b/src/main/resources/assets/betterend/textures/entity/sign/chorus_sign.png new file mode 100644 index 00000000..b62db573 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/sign/chorus_sign.png differ diff --git a/utilities/WoodenMaterialMaker.xml b/utilities/WoodenMaterialMaker.xml deleted file mode 100644 index b40c2a5e..00000000 --- a/utilities/WoodenMaterialMaker.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utilities/json_pretty_print.py b/utilities/json_pretty_print.py deleted file mode 100644 index 14dd28f1..00000000 --- a/utilities/json_pretty_print.py +++ /dev/null @@ -1,22 +0,0 @@ -import json -import os -import re - -data = {} -def save_json(json_file): - with open(json_file) as read_file: - data = json.load(read_file) - dump = json.dumps(data, sort_keys=True, indent=4, separators=(',', ': ')) - new_data = re.sub('\n +', lambda match: '\n' + '\t' * (len(match.group().strip('\n')) / 3), dump) - print >> open(json_file, 'w'), new_data - -def scan_rec(path): - for r, d, f in os.walk(path): - for file in f: - if '.json' in file: - save_json(os.path.join(r, file)) - print("Saved " + file) - for dir in d: - scan_rec(os.path.join(r, dir)) - -scan_rec(os.path.abspath("./../src/main/resources/assets/betterend")) \ No newline at end of file diff --git a/utilities/paulevs/converter/BlockBenchToFabricJava.java b/utilities/paulevs/converter/BlockBenchToFabricJava.java deleted file mode 100644 index 877e58d8..00000000 --- a/utilities/paulevs/converter/BlockBenchToFabricJava.java +++ /dev/null @@ -1,43 +0,0 @@ -package paulevs.converter; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; - -public class BlockBenchToFabricJava { - public static void main(String[] args) throws Exception { - new BlockBenchToFabricJava("D:/blockbench_models/", "dragonfly.java"); - } - - private BlockBenchToFabricJava(String path, String nameIn) throws Exception { - String string; - File in = new File(path + nameIn); - File out = new File(path + "out.txt"); - - BufferedReader br = new BufferedReader(new FileReader(in)); - BufferedWriter wr = new BufferedWriter(new FileWriter(out)); - - boolean write = false; - while ((string = br.readLine()) != null) { - string = string - .replace("ModelRenderer", "ModelPart") - .replace("setRotationPoint", "setPivot") - .replace("addBox", "addCuboid") - .replace(", false", ""); - - if (write) - wr.write(string + "\n"); - - if (string.contains("{")) - write = true; - - if (string.contains("}")) - break; - } - - wr.close(); - br.close(); - } -} diff --git a/utilities/paulevs/wooden/Helper.java b/utilities/paulevs/wooden/Helper.java deleted file mode 100644 index 38f84d27..00000000 --- a/utilities/paulevs/wooden/Helper.java +++ /dev/null @@ -1,82 +0,0 @@ -package paulevs.wooden; - -public class Helper -{ - public static final String MASK = "%name%"; - - public static final String[] BLOCKSTATES = new String[] { - "%name%_bark.json", - "%name%_barrel.json", - "%name%_button.json", - "%name%_chest.json", - "%name%_crafting_table.json", - "%name%_door.json", - "%name%_fence.json", - "%name%_gate.json", - "%name%_ladder.json", - "%name%_log.json", - "%name%_planks.json", - "%name%_plate.json", - "%name%_sign.json", - "%name%_slab.json", - "%name%_stairs.json", - "%name%_stripped_bark.json", - "%name%_stripped_log.json", - "%name%_trapdoor.json" - }; - - public static final String[] BLOCKS = new String[] { - "%name%_bark.json", - "%name%_barrel.json", - "%name%_barrel_open.json", - "%name%_button.json", - "%name%_button_inventory.json", - "%name%_button_pressed.json", - "%name%_crafting_table.json", - "%name%_door_bottom.json", - "%name%_door_bottom_hinge.json", - "%name%_door_top.json", - "%name%_door_top_hinge.json", - "%name%_empty.json", - "%name%_fence_gate_closed.json", - "%name%_fence_gate_open.json", - "%name%_fence_inventory.json", - "%name%_fence_post.json", - "%name%_fence_side.json", - "%name%_half_slab.json", - "%name%_inner_stairs.json", - "%name%_ladder.json", - "%name%_log.json", - "%name%_outer_stairs.json", - "%name%_planks.json", - "%name%_pressure_plate_down.json", - "%name%_pressure_plate_up.json", - "%name%_stairs.json", - "%name%_stripped_bark.json", - "%name%_stripped_log.json", - "%name%_trapdoor.json", - "%name%_wall_gate_closed.json", - "%name%_wall_gate_open.json" - }; - - public static final String[] ITEMS = new String[] { - "%name%_bark.json", - "%name%_barrel.json", - "%name%_button.json", - "%name%_chest.json", - "%name%_crafting_table.json", - "%name%_door.json", - "%name%_fence.json", - "%name%_gate.json", - "%name%_ladder.json", - "%name%_log.json", - "%name%_planks.json", - "%name%_plate.json", - "%name%_sign.json", - "%name%_slab.json", - "%name%_stairs.json", - "%name%_stripped_bark.json", - "%name%_stripped_log.json", - "%name%_trapdoor.json" - }; -} diff --git a/utilities/paulevs/wooden/ModelHelper.java b/utilities/paulevs/wooden/ModelHelper.java deleted file mode 100644 index 5e972dcf..00000000 --- a/utilities/paulevs/wooden/ModelHelper.java +++ /dev/null @@ -1,101 +0,0 @@ -package paulevs.wooden; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - -public class ModelHelper { - public static void main(String[] args) throws IOException { - new ModelHelper(args[0]); - } - - private ModelHelper(String name) throws IOException { - clearOutput(); - editBlockstates(name); - editBlocks(name); - editItems(name); - printStates(name); - } - - private void clearOutput() { - File out = new File("./output"); - if (out.exists()) { - for (File file: new File("./output/blockstates").listFiles()) - file.delete(); - for (File file: new File("./output/models/block").listFiles()) - file.delete(); - for (File file: new File("./output/models/item").listFiles()) - file.delete(); - } - else { - out.mkdir(); - } - } - - private void editBlockstates(String name) throws IOException { - String string; - new File("./output/blockstates").mkdirs(); - for (String state: Helper.BLOCKSTATES) { - InputStream stream = Helper.class.getResourceAsStream("/blockstates/" + state); - BufferedReader br = new BufferedReader(new InputStreamReader(stream)); - BufferedWriter wr = new BufferedWriter(new FileWriter(new File("./output/blockstates/" + state.replace(Helper.MASK, name)))); - while ((string = br.readLine()) != null) wr.write(string.replace(Helper.MASK, name) + "\n"); - wr.close(); - br.close(); - } - } - - private void editBlocks(String name) throws IOException { - String string; - new File("./output/models/block").mkdirs(); - for (String block: Helper.BLOCKS) { - InputStream stream = Helper.class.getResourceAsStream("/block/" + block); - BufferedReader br = new BufferedReader(new InputStreamReader(stream)); - BufferedWriter wr = new BufferedWriter(new FileWriter(new File("./output/models/block/" + block.replace(Helper.MASK, name)))); - while ((string = br.readLine()) != null) wr.write(string.replace(Helper.MASK, name) + "\n"); - wr.close(); - br.close(); - } - } - - private void editItems(String name) throws IOException { - String string; - new File("./output/models/item").mkdirs(); - for (String item: Helper.ITEMS) { - InputStream stream = Helper.class.getResourceAsStream("/item/" + item); - BufferedReader br = new BufferedReader(new InputStreamReader(stream)); - BufferedWriter wr = new BufferedWriter(new FileWriter(new File("./output/models/item/" + item.replace(Helper.MASK, name)))); - while ((string = br.readLine()) != null) wr.write(string.replace(Helper.MASK, name) + "\n"); - wr.close(); - br.close(); - } - } - - private String capitalize(String str) { - String out = ""; - for (int i = 0; i < str.length(); i++) - { - if (i == 0 || str.charAt(i - 1) == ' ') - out += Character.toUpperCase(str.charAt(i)); - else - out += str.charAt(i); - } - return out; - } - - private void printStates(String name) throws IOException { - BufferedWriter wr = new BufferedWriter(new FileWriter(new File("./output/states.txt"))); - for (String state: Helper.BLOCKSTATES) - { - String rname = state.replace(Helper.MASK, name); - String onlyName = rname.substring(0, rname.indexOf('.')); - String finName = name.replace('_', ' ') + " " + state.substring(0, state.indexOf('.')).replace(Helper.MASK, "").replace('_', ' ').trim(); - wr.write(" \"block.betterend." + onlyName + "\": \"" + capitalize(finName) + "\",\n"); - } - wr.close(); - } -} diff --git a/utility_res/block/%name%_barrel.json b/utility_res/block/%name%_barrel.json deleted file mode 100644 index a5281570..00000000 --- a/utility_res/block/%name%_barrel.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "betterend:block/%name%_barrel_bottom", - "side": "betterend:block/%name%_barrel_side", - "top": "betterend:block/%name%_barrel_top" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_barrel_open.json b/utility_res/block/%name%_barrel_open.json deleted file mode 100644 index 798e4016..00000000 --- a/utility_res/block/%name%_barrel_open.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "betterend:block/%name%_barrel_bottom", - "side": "betterend:block/%name%_barrel_side", - "top": "betterend:block/%name%_barrel_top_open" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_crafting_table.json b/utility_res/block/%name%_crafting_table.json deleted file mode 100644 index ef156ae2..00000000 --- a/utility_res/block/%name%_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "down": "betterend:block/%name%_crafting_table_bottom", - "east": "betterend:block/%name%_crafting_table_side", - "north": "betterend:block/%name%_crafting_table_front", - "particle": "betterend:block/%name%_crafting_table_front", - "south": "betterend:block/%name%_crafting_table_side", - "up": "betterend:block/%name%_crafting_table_top", - "west": "betterend:block/%name%_crafting_table_front" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_door_bottom.json b/utility_res/block/%name%_door_bottom.json deleted file mode 100644 index bfe8f00d..00000000 --- a/utility_res/block/%name%_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "betterend:block/%name%_door_bottom", - "top": "betterend:block/%name%_door_bottom" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_door_bottom_hinge.json b/utility_res/block/%name%_door_bottom_hinge.json deleted file mode 100644 index e7ac09d7..00000000 --- a/utility_res/block/%name%_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "betterend:block/%name%_door_bottom", - "top": "betterend:block/%name%_door_bottom" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_door_top.json b/utility_res/block/%name%_door_top.json deleted file mode 100644 index d54c62d2..00000000 --- a/utility_res/block/%name%_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "betterend:block/%name%_door_top", - "top": "betterend:block/%name%_door_top" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_door_top_hinge.json b/utility_res/block/%name%_door_top_hinge.json deleted file mode 100644 index 253f10e8..00000000 --- a/utility_res/block/%name%_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "betterend:block/%name%_door_top", - "top": "betterend:block/%name%_door_top" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_empty.json b/utility_res/block/%name%_empty.json deleted file mode 100644 index ff2eaa83..00000000 --- a/utility_res/block/%name%_empty.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "betterend:block/%name%_planks" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_half_slab.json b/utility_res/block/%name%_half_slab.json deleted file mode 100644 index 11cc8ec9..00000000 --- a/utility_res/block/%name%_half_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "betterend:block/%name%_planks", - "side": "betterend:block/%name%_planks", - "top": "betterend:block/%name%_planks" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_inner_stairs.json b/utility_res/block/%name%_inner_stairs.json deleted file mode 100644 index 285d5889..00000000 --- a/utility_res/block/%name%_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "betterend:block/%name%_planks", - "side": "betterend:block/%name%_planks", - "top": "betterend:block/%name%_planks" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_log.json b/utility_res/block/%name%_log.json deleted file mode 100644 index f39f702c..00000000 --- a/utility_res/block/%name%_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "betterend:block/%name%_log_top", - "east": "betterend:block/%name%_log_side", - "north": "betterend:block/%name%_log_side", - "particle": "betterend:block/%name%_log_side", - "south": "betterend:block/%name%_log_side", - "up": "betterend:block/%name%_log_top", - "west": "betterend:block/%name%_log_side" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_outer_stairs.json b/utility_res/block/%name%_outer_stairs.json deleted file mode 100644 index a9d31e13..00000000 --- a/utility_res/block/%name%_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "betterend:block/%name%_planks", - "side": "betterend:block/%name%_planks", - "top": "betterend:block/%name%_planks" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_stairs.json b/utility_res/block/%name%_stairs.json deleted file mode 100644 index 1ef39de8..00000000 --- a/utility_res/block/%name%_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "betterend:block/%name%_planks", - "side": "betterend:block/%name%_planks", - "top": "betterend:block/%name%_planks" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_stripped_bark.json b/utility_res/block/%name%_stripped_bark.json deleted file mode 100644 index 00ba3150..00000000 --- a/utility_res/block/%name%_stripped_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_stripped_log_side" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_stripped_log.json b/utility_res/block/%name%_stripped_log.json deleted file mode 100644 index 317395d6..00000000 --- a/utility_res/block/%name%_stripped_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "betterend:block/%name%_stripped_log_top", - "east": "betterend:block/%name%_stripped_log_side", - "north": "betterend:block/%name%_stripped_log_side", - "particle": "betterend:block/%name%_stripped_log_side", - "south": "betterend:block/%name%_stripped_log_side", - "up": "betterend:block/%name%_stripped_log_top", - "west": "betterend:block/%name%_stripped_log_side" - } -} \ No newline at end of file diff --git a/utility_res/block/%name%_trapdoor.json b/utility_res/block/%name%_trapdoor.json deleted file mode 100644 index eca1f02e..00000000 --- a/utility_res/block/%name%_trapdoor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "betterend:block/%name%_trapdoor" - } -} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_chest.json b/utility_res/blockstates/%name%_chest.json deleted file mode 100644 index 9b653c2b..00000000 --- a/utility_res/blockstates/%name%_chest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_empty" - } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_crafting_table.json b/utility_res/blockstates/%name%_crafting_table.json deleted file mode 100644 index c9232bea..00000000 --- a/utility_res/blockstates/%name%_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_crafting_table" - } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_ladder.json b/utility_res/blockstates/%name%_ladder.json deleted file mode 100644 index c316f3e0..00000000 --- a/utility_res/blockstates/%name%_ladder.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=east": { - "model": "betterend:block/%name%_ladder", - "y": 90 - }, - "facing=north": { - "model": "betterend:block/%name%_ladder" - }, - "facing=south": { - "model": "betterend:block/%name%_ladder", - "y": 180 - }, - "facing=west": { - "model": "betterend:block/%name%_ladder", - "y": 270 - } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_planks.json b/utility_res/blockstates/%name%_planks.json deleted file mode 100644 index 4037252d..00000000 --- a/utility_res/blockstates/%name%_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_planks" - } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_plate.json b/utility_res/blockstates/%name%_plate.json deleted file mode 100644 index 4060f8da..00000000 --- a/utility_res/blockstates/%name%_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "betterend:block/%name%_pressure_plate_up" - }, - "powered=true": { - "model": "betterend:block/%name%_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_sign.json b/utility_res/blockstates/%name%_sign.json deleted file mode 100644 index 9b653c2b..00000000 --- a/utility_res/blockstates/%name%_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_empty" - } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_stripped_bark.json b/utility_res/blockstates/%name%_stripped_bark.json deleted file mode 100644 index 1d3479a5..00000000 --- a/utility_res/blockstates/%name%_stripped_bark.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "betterend:block/%name%_stripped_bark", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "betterend:block/%name%_stripped_bark" - }, - "axis=z": { - "model": "betterend:block/%name%_stripped_bark", - "x": 90 - } - } -} \ No newline at end of file diff --git a/utility_res/blockstates/%name%_stripped_log.json b/utility_res/blockstates/%name%_stripped_log.json deleted file mode 100644 index e382998b..00000000 --- a/utility_res/blockstates/%name%_stripped_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "betterend:block/%name%_stripped_log", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "betterend:block/%name%_stripped_log" - }, - "axis=z": { - "model": "betterend:block/%name%_stripped_log", - "x": 90 - } - } -} \ No newline at end of file diff --git a/utility_res/item/%name%_bark.json b/utility_res/item/%name%_bark.json deleted file mode 100644 index 115e8d98..00000000 --- a/utility_res/item/%name%_bark.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_bark" -} \ No newline at end of file diff --git a/utility_res/item/%name%_barrel.json b/utility_res/item/%name%_barrel.json deleted file mode 100644 index 55386ba8..00000000 --- a/utility_res/item/%name%_barrel.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_barrel" -} \ No newline at end of file diff --git a/utility_res/item/%name%_button.json b/utility_res/item/%name%_button.json deleted file mode 100644 index 240fb2d7..00000000 --- a/utility_res/item/%name%_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_button_inventory" -} \ No newline at end of file diff --git a/utility_res/item/%name%_crafting_table.json b/utility_res/item/%name%_crafting_table.json deleted file mode 100644 index efa83ee1..00000000 --- a/utility_res/item/%name%_crafting_table.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_crafting_table" -} \ No newline at end of file diff --git a/utility_res/item/%name%_fence.json b/utility_res/item/%name%_fence.json deleted file mode 100644 index 825e7224..00000000 --- a/utility_res/item/%name%_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_fence_inventory" -} \ No newline at end of file diff --git a/utility_res/item/%name%_gate.json b/utility_res/item/%name%_gate.json deleted file mode 100644 index 634c8f92..00000000 --- a/utility_res/item/%name%_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_fence_gate_closed" -} \ No newline at end of file diff --git a/utility_res/item/%name%_log.json b/utility_res/item/%name%_log.json deleted file mode 100644 index d4b638bc..00000000 --- a/utility_res/item/%name%_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_log" -} \ No newline at end of file diff --git a/utility_res/item/%name%_planks.json b/utility_res/item/%name%_planks.json deleted file mode 100644 index 205b9d64..00000000 --- a/utility_res/item/%name%_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_planks" -} \ No newline at end of file diff --git a/utility_res/item/%name%_plate.json b/utility_res/item/%name%_plate.json deleted file mode 100644 index d774f9bc..00000000 --- a/utility_res/item/%name%_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_pressure_plate_up" -} \ No newline at end of file diff --git a/utility_res/item/%name%_slab.json b/utility_res/item/%name%_slab.json deleted file mode 100644 index 1c83dcd9..00000000 --- a/utility_res/item/%name%_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_half_slab" -} \ No newline at end of file diff --git a/utility_res/item/%name%_stairs.json b/utility_res/item/%name%_stairs.json deleted file mode 100644 index c4871532..00000000 --- a/utility_res/item/%name%_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_stairs" -} \ No newline at end of file diff --git a/utility_res/item/%name%_striped_bark.json b/utility_res/item/%name%_striped_bark.json deleted file mode 100644 index baf4cf8e..00000000 --- a/utility_res/item/%name%_striped_bark.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_stripped_bark" -} \ No newline at end of file diff --git a/utility_res/item/%name%_striped_log.json b/utility_res/item/%name%_striped_log.json deleted file mode 100644 index 10860ebb..00000000 --- a/utility_res/item/%name%_striped_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_stripped_log" -} \ No newline at end of file diff --git a/utility_res/item/%name%_trapdoor.json b/utility_res/item/%name%_trapdoor.json deleted file mode 100644 index 8d731e31..00000000 --- a/utility_res/item/%name%_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/%name%_trapdoor" -} \ No newline at end of file