From b0d967ecd498050b0a5b3874ba39d763fe4d4995 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 10 Oct 2020 21:23:46 +0300 Subject: [PATCH 1/4] Chorus nylium & chorus forest, lake fixes --- .../betterend/compat/REIAlloyingCategory.java | 2 -- .../ru/betterend/entity/EntityEndSlime.java | 12 +++++-- .../ru/betterend/registry/BiomeRegistry.java | 2 ++ .../ru/betterend/registry/BlockRegistry.java | 2 ++ .../betterend/registry/BlockTagRegistry.java | 1 + .../betterend/registry/FeatureRegistry.java | 1 + .../world/biome/BiomeChorusForest.java | 24 +++++++++++++ .../world/features/EndLakeFeature.java | 34 +++++++++++------- .../betterend/blockstates/chorus_nylium.json | 10 ++++++ .../blockstates/chorus_nylium_path.json | 10 ++++++ .../betterend/models/block/chorus_nylium.json | 12 +++++++ .../models/block/chorus_nylium_path.json | 7 ++++ .../betterend/models/item/chorus_nylium.json | 3 ++ .../models/item/chorus_nylium_path.json | 3 ++ .../textures/block/chorus_nylium_path_top.png | Bin 0 -> 722 bytes .../textures/block/chorus_nylium_side.png | Bin 0 -> 2122 bytes .../textures/block/chorus_nylium_top.png | Bin 0 -> 480 bytes 17 files changed, 105 insertions(+), 18 deletions(-) create mode 100644 src/main/java/ru/betterend/world/biome/BiomeChorusForest.java create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_nylium.json create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_nylium_path.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_nylium.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_nylium_path.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_nylium.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_nylium_path.json create mode 100644 src/main/resources/assets/betterend/textures/block/chorus_nylium_path_top.png create mode 100644 src/main/resources/assets/betterend/textures/block/chorus_nylium_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/chorus_nylium_top.png 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..8f9251cd 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -38,10 +38,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)); 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..92c4589e 100644 --- a/src/main/java/ru/betterend/registry/FeatureRegistry.java +++ b/src/main/java/ru/betterend/registry/FeatureRegistry.java @@ -21,6 +21,7 @@ public class FeatureRegistry { // 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..b647bb02 --- /dev/null +++ b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java @@ -0,0 +1,24 @@ +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) + .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..f92cf8a3 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,19 +168,9 @@ 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)); - } + EndBiome biome = BiomeRegistry.getFromBiome(world.getBiome(POS)); + if (biome == BiomeRegistry.CHORUS_FOREST) { + generateFoggyMushroomland(world, x, z, waterLevel); } } pos = POS.up(); @@ -214,4 +207,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/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/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/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/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 0000000000000000000000000000000000000000..ddf3c34549a01cc1c3da279c41671a314eb37861 GIT binary patch literal 722 zcmV;@0xkWCP)gT>X`l5-vIp+XE>lF4Kj+?~%5*E4bsZrFUeB*wrVFJM z=4HlZM^2edzhNUb$jMJMeM8Qf$M%sV5`EY6+&mLYs>d!SMkebqDc1M+k8nXc`KIdWg_?1w$It{LYMr4>tF zsGFLt-Ln0(<>-!#ZltYR3oOi?$`MUke@p1&jzVp0$MihZk3SDdRno&aWegBY#ux9;xI<&JqYAaA*#=yF;vkU9+RC1^Iq|#~8z*Kk)bcFSfSqh8@Z(ZsA5Q znI$b4X}B+Uo`xrU@|058)Eo3*2gY%viWU2I&)J`mNJ0+86lv=gTU&1Pjjruj)5;Vk zlu$@1k=9rqh6j>JD6N>>L`Z?3`=6|0CFV#81zTH|ys)r*pi7BM4w-XiXLhu0i;E7S z1dshAS9hgS6+a$+Ff;=skVOJe>zX;vtm}$i(t?W)pFBnxN-5-$@zK+njycV=vc>d< zHLPGE`9vy-r}hc?vU@>SnmNt**|Qlo9Q~105`!H$UXFwqaFZjcgw7g|r?u_JiQapb zbs?9GZZv60v~^2Z1J1b*iZWx2q1QduSd1}fp&93q|BV`m%Z*#!;s5{u07*qoM6N<$ Ef&uwgV*mgE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b59e7cfd6048b1ff286e1d1f4a943d79be2e72a9 GIT binary patch literal 2122 zcmbVN3rrJd9IrZ~s4%CS7*sfmb2`1=^+mbET55|zv_P>N;KcFu?(0L^UcEb@Jf;iG z*CJ8OCa4>34voR+#vUSqb1ygDbV}TeOU!)D_}H*U986u@zAL4}1)W*b>wS0k`+mRQ z|8f7W&CZ+`JtA&|OeTxYNH^!8^JwW9J{bLOsC6ZwQe!vt#5wk<5+ozWY+YZSwH>;QDYAvM2Z-Op& zdN~glmS@_S@*;*}<%ZeVtN@J&yif#K!0Yh|bU-f;@zQ85-6rH%2qG5gmMTis3XXRYN{XTgQbnj#I6~k;nNI`(+$SXVF_@vi@NU28=6smM2<%+3 zsFx$By&-u05n7)RP7_KP5deNdsUW40LO_;@;QYnBCnU}?1oS{J^oat(DkE6GixWA) z#XW>N^7sJ(lv;}=qA{QsuQwtgh-oD#jBr8*L<_buKO}OXz!mchOe;Y)6QyYUw26m6 zK-DepynWVxbW7BfoK9(yLruW+e%|L{Dxr$VgIH|)`Dw|SEqpwCggH+Qb z*$cIBtlLr652_?_C23QU2!YTKKvCDQKm`8@W*OSS@m_#pc6)&n5`Ldkjzuy_n>Y{0 zBVpuD9dco@&>22K1U?34nDufLw!-aZX*C1vb|p#SYMqY6)ue{S?W_*sBmj&<101A= zRQByRb4;;RTxoxApR*i;IQ~(k7>cAwRT7>|sns}eAT~;^)8KZBO11-53s|+Pk1dOL zqgM@h`m;)|Sj1@8Fr>!r(BTdWXmLOx9-soqB!o)43P7b6LaCucJwm6u1ysGV@GG(q zE(@hd({QbA(jFj8l5P2kJDeo z!~6@N(I@HruxpoCnChmdAXZ)u2sS1t6c-(2d0qhTj4 zBU2V#MCLT~A!;5?;dQrz*JZN72^nUiZCb59J1c$RvWY7U!_TH}+LC|KFRVJ%YFtvK zdAfugF4atB)xh>uWx1$!jNniqE=c zIdHpd`7Z~*tP2La?o=AK1$)*8vfAH?osy9w9`5wlWzN6)Yt!|`F?B0@sCy@GPTx7? zl-X+ZJkv7qg_u!=IffsBG4cDJw!6m%@!3NLPl_^+>ltUw?b=;X*EW3P;rj7H&F5pf z>w)Ph+*%v8q4~;;9m{uC=2l+Vce5PmE9#>QM&?hbj_X-pQFKt4p}!VR_{6xJiGtgpXFy#W>(czC3Ys>k1cPlY`;nB@7*Zr-duL{+m<&Wb?cQB zL&}}zuBBIg;CDC0f79^W8ulX9&TQWBqJ}&*#KA!JPXxz1LWcRsw&&QqQ=dQ}#(^i|+xH;;LFB-BhA4!c%ZEAgP zPQBx2+4Si1xbx8V_iaTllK@Lodvu-DgB9J}z*v+k%wTf?x^i=$Es=ie~B h4Uhe0+%)0-u-}trZ{OIdyD$CQXQXAC_s%J-`WrB5^C@eD3jl~(aX*R3_S9kln-@4G~LUUfveDHxTG}r2y9XsAX z-+BA<#*Mz=Wqtu*jVt?N&ue@|IpY%K)5D2UmuW)I-_M?=YB)WdQVu}1wgn)>z_1Qj zV<~l+3WZ*Mr~!DMo(VB{G+1^V8M^aYFucG}2V4 z%E128f4kskkI{yvYJO12i-mtqNr^4pv7^8ANuVVzsY!?dXB@*iP#@|Pcg9i3=7|=5 z_8ZvpoiExF7x=qt3ivPN?${AxV2KMxn-u?7GX>u(DN2VJs1G&6IwWePE-~69G^H++ z8)^(=IxNc}&4jlIEAZvMG*yEVOQfUGW+P?}+0UN(P}5)fL`%suc?;ZJG|7u~xo%$$ WM;aIm&fy6F0000 Date: Sat, 10 Oct 2020 21:52:47 +0300 Subject: [PATCH 2/4] Chorus grass --- .../ru/betterend/blocks/basis/BlockPlant.java | 14 +++++-- .../ru/betterend/registry/BlockRegistry.java | 3 ++ .../betterend/registry/FeatureRegistry.java | 1 + .../world/biome/BiomeChorusForest.java | 1 + .../world/features/EndLakeFeature.java | 8 ++-- .../betterend/blockstates/chorus_grass.json | 38 ++++++++++++++++++ .../models/block/chorus_grass_01.json | 6 +++ .../models/block/chorus_grass_02.json | 6 +++ .../models/block/chorus_grass_03.json | 6 +++ .../models/block/chorus_grass_04.json | 6 +++ .../models/block/chorus_grass_05.json | 6 +++ .../models/block/chorus_grass_06.json | 6 +++ .../models/block/chorus_grass_07.json | 6 +++ .../models/block/chorus_grass_08.json | 6 +++ .../betterend/models/item/chorus_grass.json | 6 +++ .../textures/block/chorus_grass_01.png | Bin 0 -> 2061 bytes .../textures/block/chorus_grass_02.png | Bin 0 -> 2039 bytes .../textures/block/chorus_grass_03.png | Bin 0 -> 2108 bytes .../textures/block/chorus_grass_04.png | Bin 0 -> 2015 bytes 19 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_grass.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_grass_01.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_grass_02.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_grass_03.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_grass_04.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_grass_05.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_grass_06.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_grass_07.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_grass_08.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_grass.json create mode 100644 src/main/resources/assets/betterend/textures/block/chorus_grass_01.png create mode 100644 src/main/resources/assets/betterend/textures/block/chorus_grass_02.png create mode 100644 src/main/resources/assets/betterend/textures/block/chorus_grass_03.png create mode 100644 src/main/resources/assets/betterend/textures/block/chorus_grass_04.png 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/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index 8f9251cd..5860712a 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; @@ -69,6 +70,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/FeatureRegistry.java b/src/main/java/ru/betterend/registry/FeatureRegistry.java index 92c4589e..60a2d3f6 100644 --- a/src/main/java/ru/betterend/registry/FeatureRegistry.java +++ b/src/main/java/ru/betterend/registry/FeatureRegistry.java @@ -16,6 +16,7 @@ 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); diff --git a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java index b647bb02..4d07d47d 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java @@ -18,6 +18,7 @@ public class BiomeChorusForest extends EndBiome { .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 f92cf8a3..f2fe5996 100644 --- a/src/main/java/ru/betterend/world/features/EndLakeFeature.java +++ b/src/main/java/ru/betterend/world/features/EndLakeFeature.java @@ -168,9 +168,11 @@ public class EndLakeFeature extends DefaultFeature { if (world.getBlockState(pos).getBlock().isIn(BlockTagRegistry.GEN_TERRAIN)) { BlocksHelper.setWithoutUpdate(world, POS.down(), BlockRegistry.ENDSTONE_DUST.getDefaultState()); - EndBiome biome = BiomeRegistry.getFromBiome(world.getBiome(POS)); - if (biome == BiomeRegistry.CHORUS_FOREST) { - generateFoggyMushroomland(world, x, z, waterLevel); + 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); + } } } pos = POS.up(); 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/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/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/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 0000000000000000000000000000000000000000..5962de43f87464773ba979f540995252af9a86f3 GIT binary patch literal 2061 zcmcIleQXnD9KMdo5ZG8GOZd=u-hhB`y^nV7daTaTj;(ARb8ALN1a`f9+a7E0j=S61 z4rDq7fjB>q1sQC*Fk+&SiF`$d8H9lX3B(W}Lku_tlpzf8BSZn;+uBMDkp1K3-n;j` zd*0{w{66k?Ys*Rt(?(AkjUY&xtH@an?-}|SH42)!4Co-5~09 zm!S?x0cf_-f^(FaMy)m@Wg%^}c@|2Ol$9W@1ZBcWiXknG$%e)c3|dooKU40U8@B~l zb}XoAGD8rNNW>U186_n^P&S*5AZdc8afraxn5eN)TvW3X3{IeOiXdx(B%(Sa>yv6V zI|h{wxe%6QN31Dy5e_;Hq}{G1O~ z8*640Z1WWXemrdGK~`NA4;cYzGyAP38YcndG5gIdo@1g}9MBdkNtq~~xB4-Z=NP}F zgjrZBLYNHzLKXuU`mY*?6p|FT#KV}I^n!-$(2F8Lh1rY6KamQsEItbf=wRJ3ET@;d z9pm&o10IV%79JA4;prTrjRXNCeN6I)V5;QTBCG=P12EFVsW0MD`c<~>@#=?{`~O#c zJh)tt6$1cvPy*BaA@p7|lp5l{SsQ%!KwnD0VYAbx$u0{Q$vzE4NUgvwyhlB{7C{Vs zE@!?cr|J9kvx~Q~8LI+H_xo>5X`R*B{84Lb>x`abc){Nz{;0f{GWlkzx2o#1rd6ws zS5`K9N3FZp_~M*z?zZ)+mkSQocilw?R^I+9cEV=b>YsN1*3S(o(Q~id+8E6>_J%5t z{J3M*#^OyS)99zur+#?yFY6iXy)|P;jws$%zAx4_5$ViZGIdhZyq&!pN~UG)>@8V; zwBxP0S*|HhrT0Y+gm-wSU%g-$_j~Gsi`&G##hI7OpFfq~UM9ckdHb+$@yw0K_uZ_? zLas-y1E#h7wCtMMyw1?^i?+~ny8X+SPds<~&UwUh=4yApLEgLk3bG~bP9`;WPv+9q z=jR1lOAD9oZs|Hy6}vxhlSH=f>CBaOcy}%C{5V7TbVc>qtq3o7G|fHq%;(nBhV+z+ zzW&C(CF@=t)xxjo2)4XFVcfF)ugO28m$uDMxv1UUP;jz1^UMd$;=FC^cQ3>XPURTd zO-CG_*~{}Px>xM4D>;75CG)$^ihG-~E?qNJTu=468rxhlaOpdMTTll0;|7R`AOfRcYDc(Oa5Dhpr_h%p=a}-lkbd4t6DVBJi1N)%_FXYQs?$L)s6oE De@oUr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4ec519207e1d347bb35944ac40db2ba623cea143 GIT binary patch literal 2039 zcmcIleQ?uc9PW_uF^+*UZW+e@B?-z+`$0~GIbyy^Uc;(&I4}$kb9H7Z}Pm) z@A-Y?m!*XTd4p3%r|5LL!TBDy58a1q=YW3b`fz(EK(~RCXO^PV4H~AMNxHgqBXzpu z@A#r(wb(n2Va2c>aH1dTqhSf5b-Ju6Q3=O4fQ6tyz)S#}i6(5Ei6Q`Pga%04 zVZg|C=|cP6B3rISP}|>Kxtz!%jzo|co1e3oOaYFtaBKiknpnbb;b_8YplFIRS}ZJ= zV0%jD(Z>Tqx3X%gIK;?t95A!y0AaP5?Sz#w`3XB^HWOx})x-kU4{dgF@V*|-GQ@O zo*{?FAM>|~Uhi~v(?&`mBE3uUyJ3nLP$NKw&LE0(Z|aM@lYRwM++BU|a({2t$Ain3 z0wD-d2PJXMA5!Zz-Kin}pS7-cxAdhRIBIs$6@iymWTfkdy~9QqrroVxETTdPC@yrm@yxm-o_^vT)j}>%X*jUbxwLX1~?dygbnS zcx~&SFCJo(+r#ZwF12iHpU^u&;qaD|t zk3>7ZnQ|(7ZSwZFPW^rUwd6JPB(-gw+IZsF>@J&&|J+S)ScwVh3CYElM>GzuQwM*@pKo+gz4*ZeDg%uyNFp*+)tmPDtyo@5|rNwnExpQ0F_gDz@s} zv>jmN2bnbw9du@;_rL$sjs>afiiEm}vC-z0p`Tk9A8XuRn|tz^*~@a@DUqL~!nM0L zWeyy-(lg=kPi@QO-OJye`Te@uFDIl3NlwR!w%GJVXXgLI4Tm*-{fjI@dMvsA)s;^# mJ;{}n%y}>HdB(e2ZX`WhJoaYRRnu7Q*PNeI;NCX%x!AwC#m<)i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1a1118a8621dd6a632b11050abb6864216e78fb1 GIT binary patch literal 2108 zcmcIldr%a096t>TVZ>LGp@Z8ZrpVsz?cN=CnZ}+#b!QCFadmJD> z5GNlDreZ$wIi*f!<7ArJfTp4;L!@SngxN!EYJ^cqBrTPG3&-U&>hMoH``i8fc0a$* z_w#-1cUL&lUL6`58LH7}hNdLjGT?o*YUS|7I^q683w)`+n>J&DAdwK^kVCiQU$N$BEnA|BUK7@?yHBTbnR|A9hl635dSwwZog zaAiRY6vad1xXNZD*^Cn;PLdczU~-vTVM;N#9No`g12QWK9z_t{h|0(~ zMXzE(q0&AVT%G`}TlR+u1`ID{Jh)Cvs4n#b?e?cbU9JFHR+37f6~Erc63ba-9)M>6 zS@cRQNGbttCA!}j#|HL#yi!rGryPreBH)5B84A+{OnC}KMU)G~C-@O~9q`6OTP46K zqLd|yMg56#^s^vVtC|=SGHH(B=0u-7Srz5q18j@}EGS8k1g2BZEK)~PI@(~GLQph8 z^g->g6gWm<1_l;6fiD{f)NZF!+_J*BS&(A0piq=n5ICCUSSQPx4H&_bJO(IzJZ3VQ z^%$imD1(VIaXNzR)dlz4MAoZDP~G2Gxtz#CjzExTp3*rfo})01H<>UUrPpI7z)%?J zB%K7s7y&_<`q^HS1o-hVMUS$osyN6vdJ=PTCOyU*^gLx`30}_` zQG{b@UX)x6EEU1U91j5(ziG-QWfBnvXkUYY+B$pppzS&@MB z)*a2TYPnlbR?RcuQ2%4$G0_{C&OTaS0f3}WNq!$p7J0?TNMJ@jjPyY23xAS+nJIa? z`hn&C|5fh~E?dC3^8xIjII8-CtG%W#HTZwC*8A>}zSIwg%}$*Lx-47-`ZRDuY6*7X zt4*e38qMGlDYh9|rlwt)=L$!q4}Ul@p`^hXK6J>P9eLs1-&!rPp@~a^#fbZZB5$4l zAa|vsJml`MkZt9$QE^yQdFMCQ$p_Qxcm94Nb#&1F*^`?2_{|$SjCJj+{?2Vo{191N zR=@SinXlq+FA&#ne6cMjlx=O%Y+4i?XV?C6FP}YI+tv72j~A)+wvBA*(I$*`9B93^ zCcOJ*NA%XT2EBdE+m)M|H;q_b`*rxj2X_~TZD?9_>G;S9`ayV?Om}Rn`LcOt#tGk{ z`0mmN7M z9xX&-x*BgZ9;Xg<0*RTFKY=ZBp+%Eqj{HhJNjRl^fw8lHRo z(&_6p*{7yg^w_J8J*;0cuQT$yyu9KYSEsaAbO+sTF8jQ(Yu57Q)!XkB`xY#FL&~mn z3_G{7<@#aA_I(Gsta6(-FDe-ij%h!2vi0J!jthGhS7%mlaeT61Y|~HcM==q*U&yj4_>?CUPY8`>507KofGfv6C$sU ziTNmKm1Xv^k5^xxzI4f_-^aajvXU>TxHfLhZ)KC758Y@=sB|B$UUj)LZg%Xu=ObLF zI@dXFWlsB{a&K(v_?>Ot(thLnyZ8wqgM*kIySvU$UDtRvJuUt2Gj(-AyJ~ZH((3;` MB`M9eFEMY)KboWQL;wH) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f60f5956949e6d214be704ce1255bc23aa3b285c GIT binary patch literal 2015 zcmcIleQeZZ96mOM4J1wmgdvWmLjdGxNB?M?QR&2 z!U7Hw84itGmJB3-5ZxTYGR1(AOd(?d0||-=35oI{fn^SuBO&;9cRPszvVUy)w(r|M z@AG?pAN{p{d0FYi@zclKY_^F3zqbP3^Q@6G7G7r#JP_b5SM$GN*lZK>tue;d+%nB( zd-`WNSZP-BOF2=E+XYDt0edp8LA1@bU|~`d#Pz^LLLee59<=Z1aTJjy54zI96TDUe zqOyO34pwX^3yK@oi>!n$EJhY2IY74QlTL!AnE41rkS?5X;UtX_Bu6+onnltF3a#l%}ywSK49SEkX2URsT zlBne)EJ#U-l^8cNXQix2YQmUniAwJQUcm$&lp-hsBds$?ksM8NwEJa(<_IDMs+tV(jYb~I3)=K_jh3W^8rq|kr6RAMAH~0h20Ve zvkpMe!@A&puPRns5w!NFDpyiP$dL&WC%GJqQxKgPL(nWnu?&m32}tQC1XiS3(H$03 zUP88Ix(q)aA@(qbK zEEPE}L;$WS5fu4XO^F&)bzYTV%xSBjAv?6|mkpS`+Vm%~0=$);#bji-?l?iT%H4yC zR-S=`rXS0Xh~DUQrf3sU07;*a{1nVk!)8Lz!J-I^^l0h}f1G|psClyb(dGXCRi6&7 z7!{NVfE^S^Eq`#U*Q8Q||2J#H?;h$)BXHR4tZAmp!bPS}0|ip+unUueeML6gn8N|@ zqM*B{yOCG+yfV4&#`{B4?&iGKc_oXk2=6dX2M(PYqkr-1X;!cEc3>~Q*D;hkkZp2L3Aj)s?C1+R6`3+T^LqSGBxx{*QL{%vf`+d}ry*$gY>B%$0D*w@YT9 zb9MxrmF*XZ8QIVFXJ72}sCgeh7yi0HJm0cd+WyV8@moL3+18y^Q`PE9&TEY>ZF=FS z-IxB{;hg(p!>M`xY5)wQQ<>+aZ{yO(>UDX{elC&GH=`Bs*V2u D+84R7 literal 0 HcmV?d00001 From 04275f835373666b7bd948647d55c0e3da21590f Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 10 Oct 2020 22:55:01 +0300 Subject: [PATCH 3/4] Chorus wood --- .../ru/betterend/registry/BlockRegistry.java | 1 + .../betterend/blockstates/chorus_bark.json | 32 +- .../betterend/blockstates/chorus_barrel.json | 112 ++--- .../betterend/blockstates/chorus_button.json | 236 +++++----- .../betterend/blockstates/chorus_chest.json | 7 + .../blockstates/chorus_crafting_table.json | 7 + .../betterend/blockstates/chorus_door.json | 248 +++++------ .../betterend/blockstates/chorus_fence.json | 96 ++-- .../betterend/blockstates/chorus_gate.json | 160 +++---- .../betterend/blockstates/chorus_ladder.json | 19 + .../betterend/blockstates/chorus_log.json | 32 +- .../betterend/blockstates/chorus_planks.json | 7 + .../betterend/blockstates/chorus_plate.json | 10 + .../betterend/blockstates/chorus_sign.json | 7 + .../betterend/blockstates/chorus_slab.json | 30 +- .../betterend/blockstates/chorus_stairs.json | 418 +++++++++--------- .../blockstates/chorus_stripped_bark.json | 16 + .../blockstates/chorus_stripped_log.json | 16 + .../blockstates/chorus_trapdoor.json | 154 +++---- .../assets/betterend/lang/en_us.json | 21 +- .../betterend/models/block/chorus_bark.json | 12 +- .../betterend/models/block/chorus_barrel.json | 8 + .../models/block/chorus_barrel_open.json | 8 + .../betterend/models/block/chorus_button.json | 12 +- .../models/block/chorus_button_inventory.json | 12 +- .../models/block/chorus_button_pressed.json | 12 +- .../models/block/chorus_crafting_table.json | 12 + .../models/block/chorus_door_bottom.json | 7 + .../block/chorus_door_bottom_hinge.json | 7 + .../models/block/chorus_door_top.json | 7 + .../models/block/chorus_door_top_hinge.json | 7 + .../betterend/models/block/chorus_empty.json | 5 + .../block/chorus_fence_gate_closed.json | 12 +- .../models/block/chorus_fence_gate_open.json | 12 +- .../models/block/chorus_fence_inventory.json | 12 +- .../models/block/chorus_fence_post.json | 12 +- .../models/block/chorus_fence_side.json | 12 +- .../models/block/chorus_half_slab.json | 8 + .../models/block/chorus_inner_stairs.json | 8 + .../betterend/models/block/chorus_ladder.json | 12 +- .../betterend/models/block/chorus_log.json | 12 + .../models/block/chorus_outer_stairs.json | 8 + .../betterend/models/block/chorus_planks.json | 12 +- .../block/chorus_pressure_plate_down.json | 12 +- .../block/chorus_pressure_plate_up.json | 12 +- .../betterend/models/block/chorus_stairs.json | 8 + .../models/block/chorus_stripped_bark.json | 6 + .../models/block/chorus_stripped_log.json | 12 + .../models/block/chorus_trapdoor.json | 7 + .../models/block/chorus_wall_gate_closed.json | 12 +- .../models/block/chorus_wall_gate_open.json | 12 +- .../betterend/models/item/chorus_bark.json | 3 + .../betterend/models/item/chorus_barrel.json | 3 + .../betterend/models/item/chorus_button.json | 3 + .../betterend/models/item/chorus_chest.json | 12 +- .../models/item/chorus_crafting_table.json | 3 + .../betterend/models/item/chorus_door.json | 12 +- .../betterend/models/item/chorus_fence.json | 3 + .../betterend/models/item/chorus_gate.json | 3 + .../betterend/models/item/chorus_ladder.json | 12 +- .../betterend/models/item/chorus_log.json | 3 + .../betterend/models/item/chorus_planks.json | 3 + .../betterend/models/item/chorus_plate.json | 3 + .../betterend/models/item/chorus_sign.json | 12 +- .../betterend/models/item/chorus_slab.json | 3 + .../betterend/models/item/chorus_stairs.json | 3 + .../models/item/chorus_stripped_bark.json | 3 + .../models/item/chorus_stripped_log.json | 3 + .../models/item/chorus_trapdoor.json | 3 + .../textures/block/chorus_planks.png | Bin 0 -> 1961 bytes utilities/WoodenMaterialMaker.xml | 108 ----- utilities/json_pretty_print.py | 22 - .../converter/BlockBenchToFabricJava.java | 43 -- utilities/paulevs/wooden/Helper.java | 82 ---- utilities/paulevs/wooden/ModelHelper.java | 101 ----- utility_res/block/%name%_barrel.json | 8 - utility_res/block/%name%_barrel_open.json | 8 - utility_res/block/%name%_crafting_table.json | 12 - utility_res/block/%name%_door_bottom.json | 7 - .../block/%name%_door_bottom_hinge.json | 7 - utility_res/block/%name%_door_top.json | 7 - utility_res/block/%name%_door_top_hinge.json | 7 - utility_res/block/%name%_empty.json | 5 - utility_res/block/%name%_half_slab.json | 8 - utility_res/block/%name%_inner_stairs.json | 8 - utility_res/block/%name%_log.json | 12 - utility_res/block/%name%_outer_stairs.json | 8 - utility_res/block/%name%_stairs.json | 8 - utility_res/block/%name%_stripped_bark.json | 6 - utility_res/block/%name%_stripped_log.json | 12 - utility_res/block/%name%_trapdoor.json | 6 - utility_res/blockstates/%name%_chest.json | 7 - .../blockstates/%name%_crafting_table.json | 7 - utility_res/blockstates/%name%_ladder.json | 19 - utility_res/blockstates/%name%_planks.json | 7 - utility_res/blockstates/%name%_plate.json | 10 - utility_res/blockstates/%name%_sign.json | 7 - .../blockstates/%name%_stripped_bark.json | 16 - .../blockstates/%name%_stripped_log.json | 16 - utility_res/item/%name%_bark.json | 3 - utility_res/item/%name%_barrel.json | 3 - utility_res/item/%name%_button.json | 3 - utility_res/item/%name%_crafting_table.json | 3 - utility_res/item/%name%_fence.json | 3 - utility_res/item/%name%_gate.json | 3 - utility_res/item/%name%_log.json | 3 - utility_res/item/%name%_planks.json | 3 - utility_res/item/%name%_plate.json | 3 - utility_res/item/%name%_slab.json | 3 - utility_res/item/%name%_stairs.json | 3 - utility_res/item/%name%_striped_bark.json | 3 - utility_res/item/%name%_striped_log.json | 3 - utility_res/item/%name%_trapdoor.json | 3 - 113 files changed, 1155 insertions(+), 1490 deletions(-) rename utility_res/blockstates/%name%_log.json => src/main/resources/assets/betterend/blockstates/chorus_bark.json (51%) rename utility_res/blockstates/%name%_barrel.json => src/main/resources/assets/betterend/blockstates/chorus_barrel.json (55%) rename utility_res/blockstates/%name%_button.json => src/main/resources/assets/betterend/blockstates/chorus_button.json (61%) create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_chest.json create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_crafting_table.json rename utility_res/blockstates/%name%_door.json => src/main/resources/assets/betterend/blockstates/chorus_door.json (57%) rename utility_res/blockstates/%name%_fence.json => src/main/resources/assets/betterend/blockstates/chorus_fence.json (68%) rename utility_res/blockstates/%name%_gate.json => src/main/resources/assets/betterend/blockstates/chorus_gate.json (61%) create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_ladder.json rename utility_res/blockstates/%name%_bark.json => src/main/resources/assets/betterend/blockstates/chorus_log.json (51%) create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_planks.json create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_plate.json create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_sign.json rename utility_res/blockstates/%name%_slab.json => src/main/resources/assets/betterend/blockstates/chorus_slab.json (50%) rename utility_res/blockstates/%name%_stairs.json => src/main/resources/assets/betterend/blockstates/chorus_stairs.json (64%) create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_stripped_bark.json create mode 100644 src/main/resources/assets/betterend/blockstates/chorus_stripped_log.json rename utility_res/blockstates/%name%_trapdoor.json => src/main/resources/assets/betterend/blockstates/chorus_trapdoor.json (60%) rename utility_res/block/%name%_planks.json => src/main/resources/assets/betterend/models/block/chorus_bark.json (52%) create mode 100644 src/main/resources/assets/betterend/models/block/chorus_barrel.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_barrel_open.json rename utility_res/block/%name%_button.json => src/main/resources/assets/betterend/models/block/chorus_button.json (50%) rename utility_res/block/%name%_button_inventory.json => src/main/resources/assets/betterend/models/block/chorus_button_inventory.json (54%) rename utility_res/block/%name%_button_pressed.json => src/main/resources/assets/betterend/models/block/chorus_button_pressed.json (53%) create mode 100644 src/main/resources/assets/betterend/models/block/chorus_crafting_table.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_door_bottom.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_door_bottom_hinge.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_door_top.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_door_top_hinge.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_empty.json rename utility_res/block/%name%_fence_gate_closed.json => src/main/resources/assets/betterend/models/block/chorus_fence_gate_closed.json (55%) rename utility_res/block/%name%_fence_gate_open.json => src/main/resources/assets/betterend/models/block/chorus_fence_gate_open.json (56%) rename utility_res/block/%name%_fence_inventory.json => src/main/resources/assets/betterend/models/block/chorus_fence_inventory.json (53%) rename utility_res/block/%name%_fence_post.json => src/main/resources/assets/betterend/models/block/chorus_fence_post.json (51%) rename utility_res/block/%name%_fence_side.json => src/main/resources/assets/betterend/models/block/chorus_fence_side.json (51%) create mode 100644 src/main/resources/assets/betterend/models/block/chorus_half_slab.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_inner_stairs.json rename utility_res/block/%name%_ladder.json => src/main/resources/assets/betterend/models/block/chorus_ladder.json (54%) create mode 100644 src/main/resources/assets/betterend/models/block/chorus_log.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_outer_stairs.json rename utility_res/block/%name%_bark.json => src/main/resources/assets/betterend/models/block/chorus_planks.json (51%) rename utility_res/block/%name%_pressure_plate_down.json => src/main/resources/assets/betterend/models/block/chorus_pressure_plate_down.json (55%) rename utility_res/block/%name%_pressure_plate_up.json => src/main/resources/assets/betterend/models/block/chorus_pressure_plate_up.json (54%) create mode 100644 src/main/resources/assets/betterend/models/block/chorus_stairs.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_stripped_bark.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_stripped_log.json create mode 100644 src/main/resources/assets/betterend/models/block/chorus_trapdoor.json rename utility_res/block/%name%_wall_gate_closed.json => src/main/resources/assets/betterend/models/block/chorus_wall_gate_closed.json (56%) rename utility_res/block/%name%_wall_gate_open.json => src/main/resources/assets/betterend/models/block/chorus_wall_gate_open.json (58%) create mode 100644 src/main/resources/assets/betterend/models/item/chorus_bark.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_barrel.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_button.json rename utility_res/item/%name%_chest.json => src/main/resources/assets/betterend/models/item/chorus_chest.json (52%) create mode 100644 src/main/resources/assets/betterend/models/item/chorus_crafting_table.json rename utility_res/item/%name%_door.json => src/main/resources/assets/betterend/models/item/chorus_door.json (52%) create mode 100644 src/main/resources/assets/betterend/models/item/chorus_fence.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_gate.json rename utility_res/item/%name%_sign.json => src/main/resources/assets/betterend/models/item/chorus_ladder.json (52%) create mode 100644 src/main/resources/assets/betterend/models/item/chorus_log.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_planks.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_plate.json rename utility_res/item/%name%_ladder.json => src/main/resources/assets/betterend/models/item/chorus_sign.json (51%) create mode 100644 src/main/resources/assets/betterend/models/item/chorus_slab.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_stairs.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_stripped_bark.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_stripped_log.json create mode 100644 src/main/resources/assets/betterend/models/item/chorus_trapdoor.json create mode 100644 src/main/resources/assets/betterend/textures/block/chorus_planks.png delete mode 100644 utilities/WoodenMaterialMaker.xml delete mode 100644 utilities/json_pretty_print.py delete mode 100644 utilities/paulevs/converter/BlockBenchToFabricJava.java delete mode 100644 utilities/paulevs/wooden/Helper.java delete mode 100644 utilities/paulevs/wooden/ModelHelper.java delete mode 100644 utility_res/block/%name%_barrel.json delete mode 100644 utility_res/block/%name%_barrel_open.json delete mode 100644 utility_res/block/%name%_crafting_table.json delete mode 100644 utility_res/block/%name%_door_bottom.json delete mode 100644 utility_res/block/%name%_door_bottom_hinge.json delete mode 100644 utility_res/block/%name%_door_top.json delete mode 100644 utility_res/block/%name%_door_top_hinge.json delete mode 100644 utility_res/block/%name%_empty.json delete mode 100644 utility_res/block/%name%_half_slab.json delete mode 100644 utility_res/block/%name%_inner_stairs.json delete mode 100644 utility_res/block/%name%_log.json delete mode 100644 utility_res/block/%name%_outer_stairs.json delete mode 100644 utility_res/block/%name%_stairs.json delete mode 100644 utility_res/block/%name%_stripped_bark.json delete mode 100644 utility_res/block/%name%_stripped_log.json delete mode 100644 utility_res/block/%name%_trapdoor.json delete mode 100644 utility_res/blockstates/%name%_chest.json delete mode 100644 utility_res/blockstates/%name%_crafting_table.json delete mode 100644 utility_res/blockstates/%name%_ladder.json delete mode 100644 utility_res/blockstates/%name%_planks.json delete mode 100644 utility_res/blockstates/%name%_plate.json delete mode 100644 utility_res/blockstates/%name%_sign.json delete mode 100644 utility_res/blockstates/%name%_stripped_bark.json delete mode 100644 utility_res/blockstates/%name%_stripped_log.json delete mode 100644 utility_res/item/%name%_bark.json delete mode 100644 utility_res/item/%name%_barrel.json delete mode 100644 utility_res/item/%name%_button.json delete mode 100644 utility_res/item/%name%_crafting_table.json delete mode 100644 utility_res/item/%name%_fence.json delete mode 100644 utility_res/item/%name%_gate.json delete mode 100644 utility_res/item/%name%_log.json delete mode 100644 utility_res/item/%name%_planks.json delete mode 100644 utility_res/item/%name%_plate.json delete mode 100644 utility_res/item/%name%_slab.json delete mode 100644 utility_res/item/%name%_stairs.json delete mode 100644 utility_res/item/%name%_striped_bark.json delete mode 100644 utility_res/item/%name%_striped_log.json delete mode 100644 utility_res/item/%name%_trapdoor.json diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index 5860712a..eab11156 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -55,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()); 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_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_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_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_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/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_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_planks.png b/src/main/resources/assets/betterend/textures/block/chorus_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..45d0ba97b5c08863d3f5524ca242c3d6758895de GIT binary patch literal 1961 zcmbVNeQXnD9KP`(--HB#u^=8t#NoW&N58Je>VS5z89L@xWJCYh+xOnC$J)Ew-F59| zCLaR9FJv%4md%7=SXe+s5Qrvj$}&teStKD~{KFtIG6p)M5EK;O>$*D3Kw{JDy?6J# z&-45~?$=jKOIA*soHLmqh-t+|{xW=?VI334;NP815f?s9(uyh#f|xSXIgsQ3cPC`AHEI#E=QdWGt!}V$w^cctyOnZZi~_f|xa4YMCWSRs>2( zpQ-w#bMU0wW8++`hj%qkI2mgd+X&x=l8w7c$s;;xZ^3H}o-K{2fAF@R&1W1t!_no>=XnM{g4HLB`Z7`wBl zTm%AQv0|7&fvDK;rEu6bS(d~wCxx9th@(Bu5TZGkBTR>cFrq_t0C@*=3IJyI`&AgX zifip3>T^kjnByN+-tOdi2szp~?^L-K^GS{HlTINLI_0 zgc+fWg(1O>H}YX8&aA^h12^Dl2giq5ggjChu~tK;dPFRe4P3qY^ea-1YSXKzOs3jG z1kh@CF9oeSBZ*4imPg6QLn){CCn5-wKA`wR>V_IN6F^7Hs&VcfroWi``8Pn_gWW$| zHHU1Ca6fuK{!jPm*k4MWl#N!Yu23YCz~HFZs~|` z`(eTMU8lczHfPVJb++~Ao4aoe)@J8V51zjsUo!pdYvRl^r@)ds2YOa5C2lTKy&WC9 zpKFzW|5$4O>Yc}T{8IZHdoG^0#?jc)a;Sgj*nt;5&E2|l^Y*K5>VoO%JJncq)pqQW zwwmlMy&EP>>gbz!__KchtgO8~vz6wRC+feu(s=9qUx#ic=Fy!S-Y)37w6W&f^}ZFm zo~&$|g~0y30asP~3{<(fabZqD)x@QFPsI1NUw*gX($x7)>y9=||KlXP|Mk-+uFdYe za{JsJf+!Cj+&HE7%uj=B$L4e&DR_nWU^QA_N*@}iJ64#zyt(kh<{kZ2`-CyK$8Wnl W?)k;^Q;V!W)8fJs|9i`;HvbJ?+Mo0Q literal 0 HcmV?d00001 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 From 8132288c1094aa2945e9170ff2b4cceb74061498 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 10 Oct 2020 23:04:46 +0300 Subject: [PATCH 4/4] Sign texture protorype --- .../textures/entity/sign/chorus_sign.png | Bin 0 -> 2779 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/entity/sign/chorus_sign.png 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 0000000000000000000000000000000000000000..b62db5739bc5586e7614e1420b3e3b90146b0765 GIT binary patch literal 2779 zcmbVO2~-nj9uHBxDi*M-zIqMgMOP+sv?wZIVW=A-#QVW&ryvxg z3x_nkjf3P81;XGm0#cF^T!E2<%m*ScT!~^z6qh0xPGJg4N$%w^1sgFU+*%_P3Dwuc+d^=rJ)i`m>SVHbiDK^VOWc_G>!m15=42+q#0urXXvBCt8h z8I6_F*f?6?ZBaa*&{wGNKFg3s<1CB{@?K!FuzZsJt>@NoT3X=zU;-mB1S1hC7KIa( z6sHLJbWBQNSPxXkvnE5zb5I;Za4d=-D7liti9bL=*RZre|4%T>PzK&+ra{amGabjF zR!bZV^=FdO@Cm#P2m^Q0ZWlTo6>6~yw1we9wSF)NTVgV?6vq;BTtS15Qz{9B*2@$K zsR9islXFS~V<1S*pzm9+<(U=E;yTy&^f}8jfa7;nno!bul4B9QLCPQsT&6@+tdvCn zm7LLYdR#>+``E&4Ca~4$gy&hEu2{gRmnu~NXPY#5={OtHcd$71i>&kqEwMAVo=Fch@JrjWl2VbsX#KM zG&civ?iD}*^^AIG(UbrH!e@Am_BH!Vdo&dultGtMsLSh)AH=>^q# zrM&d6Pcm|V^d+s?qi*L7LK1D`)N!D)uhRYKpZT}bi7$8mYQ5HD>pAx?-Yx&9``+X* zM%og`f#*94JLBoDZck~@|E^m1z2}~qeQ@w7b`JaB0btVq7U3*_+6LYcr^fj{6Nv_T zhHBMO#`@-%st?BoyLYxM?b`D0%A^AXylKx7uYb+ZEGgx$?s(ntv}M)(W9uSw-kT{V zn_a{w1~hrT9~*eM)-7>Ql~I1q*tzq3^!CAb+!b5g2I9MB8J899UiRg0?Ym~5TkQ^| zbev@zAAC0^r}bV^Zp9h-_=W2W++B<2Z@O@<*zWuV#zl_rF`skx$t_h_r zw)OEgfzA?w9pZ;NL1@W%_ zr-}Dh-QDo){KRcFfmx4k++H8P4!*8_6Z`4-Tdr_H9W*c@Fl=wb>L$s>lC)=q^TnsI z*G}eFt}hsSJ6k+5TUW=9X$kZX$@8j&*T}0prX*H5=8H$QW{uxl_!pV3ab}q`Yn1Ec zee>L}6>q6-_Wm&I&KnoHs_MhiZWQI@oK?e~_45iN7b}~?+h~u%t}jAjZz3V#Z(s>vMhdDlDSLM#0Cq&)tzdH<=JE!!S6fB$VsMsim`EkCv- zQQUDRcq$?6IW70EDkU{lgwKe;iLMn3RgGJ{ehZ&cKc)TBP-yc!MYP(>|G-|wXsFUh zz1e?YTv0{%#tueRnSao*)YoOnZFO1JD))?`>F2GLwJld;1}oh@NeT5;7v~-Qct}6TW}_v$)A` zG;Qq~VYwVs-TLX`MdhX0GDg~ujWEV*%iu4l3LVSz-R1_iJC zYt-lKE>CG+bl_;2?~08PQ=>Im!kyf!xoqf9@ z7}oa9o}-Jio5IiR;0tTZJBgy=nn~U(J+Gn51K!c*w^X0=k!0@QxbH`o4f`)vI{wYO zG&ddO{YPe`&Tbv^O) zrH(HP%~}wUhB!JpJ~O6?=jy*6