From 671e2e601562b569c77bc37e7fd086652c7f9a99 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 27 Nov 2020 12:55:55 +0300 Subject: [PATCH] Byshy grass --- .../java/ru/betterend/registry/EndBlocks.java | 1 + .../java/ru/betterend/registry/EndFeatures.java | 1 + .../betterend/world/biome/BlossomingSpires.java | 1 + .../betterend/blockstates/bushy_grass.json | 10 ++++++++++ .../resources/assets/betterend/lang/en_us.json | 4 +++- .../resources/assets/betterend/lang/ru_ru.json | 4 +++- .../betterend/models/block/bushy_grass_01.json | 6 ++++++ .../betterend/models/block/bushy_grass_02.json | 6 ++++++ .../betterend/models/block/bushy_grass_03.json | 6 ++++++ .../betterend/models/block/bushy_grass_04.json | 6 ++++++ .../betterend/models/item/bushy_grass.json | 6 ++++++ .../betterend/textures/block/bushy_grass_1.png | Bin 0 -> 1787 bytes .../betterend/textures/block/bushy_grass_2.png | Bin 0 -> 2005 bytes 13 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/bushy_grass.json create mode 100644 src/main/resources/assets/betterend/models/block/bushy_grass_01.json create mode 100644 src/main/resources/assets/betterend/models/block/bushy_grass_02.json create mode 100644 src/main/resources/assets/betterend/models/block/bushy_grass_03.json create mode 100644 src/main/resources/assets/betterend/models/block/bushy_grass_04.json create mode 100644 src/main/resources/assets/betterend/models/item/bushy_grass.json create mode 100644 src/main/resources/assets/betterend/textures/block/bushy_grass_1.png create mode 100644 src/main/resources/assets/betterend/textures/block/bushy_grass_2.png diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 7c81a00f..5472f7d3 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -142,6 +142,7 @@ public class EndBlocks { public static final Block CAVE_GRASS = registerBlock("cave_grass", new BlockTerrainPlant(CAVE_MOSS)); public static final Block CRYSTAL_GRASS = registerBlock("crystal_grass", new BlockTerrainPlant(CRYSTAL_MOSS)); public static final Block SHADOW_PLANT = registerBlock("shadow_plant", new BlockTerrainPlant(SHADOW_GRASS)); + public static final Block BUSHY_GRASS = registerBlock("bushy_grass", new BlockTerrainPlant(PINK_MOSS)); public static final Block BLUE_VINE_SEED = registerBlock("blue_vine_seed", new BlockBlueVineSeed()); public static final Block BLUE_VINE = registerBlockNI("blue_vine", new BlockBlueVine()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 9457c51a..7c1925c1 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -58,6 +58,7 @@ public class EndFeatures { public static final EndFeature MURKWEED = new EndFeature("murkweed", new SinglePlantFeature(EndBlocks.MURKWEED, 3), 2); public static final EndFeature NEEDLEGRASS = new EndFeature("needlegrass", new SinglePlantFeature(EndBlocks.NEEDLEGRASS, 3), 2); public static final EndFeature SHADOW_BERRY = new EndFeature("shadow_berry", new SinglePlantFeature(EndBlocks.SHADOW_BERRY, 2), 1); + public static final EndFeature BUSHY_GRASS = new EndFeature("bushy_grass", new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 6, false), 10); // Vines // public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(EndBlocks.DENSE_VINE, 24), 3); diff --git a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java index 1fc74dcc..fe2254c1 100644 --- a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java +++ b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java @@ -16,6 +16,7 @@ public class BlossomingSpires extends EndBiome { .addFeature(EndFeatures.TENANEA) .addFeature(EndFeatures.TENANEA_BUSH) .addFeature(EndFeatures.BULB_VINE) + .addFeature(EndFeatures.BUSHY_GRASS) .addFeature(EndFeatures.TWISTED_MOSS) .addFeature(EndFeatures.TWISTED_MOSS_WOOD) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); diff --git a/src/main/resources/assets/betterend/blockstates/bushy_grass.json b/src/main/resources/assets/betterend/blockstates/bushy_grass.json new file mode 100644 index 00000000..5ec2c27e --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/bushy_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/bushy_grass_01" }, + { "model": "betterend:block/bushy_grass_02" }, + { "model": "betterend:block/bushy_grass_03" }, + { "model": "betterend:block/bushy_grass_04" } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index cb3b133c..391c2a89 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -360,5 +360,7 @@ "block.betterend.bulb_lantern_purple": "Purple Bulb Lantern", "block.betterend.bulb_lantern_red": "Red Bulb Lantern", "block.betterend.bulb_lantern_white": "White Bulb Lantern", - "block.betterend.bulb_lantern_yellow": "Yellow Bulb Lantern" + "block.betterend.bulb_lantern_yellow": "Yellow Bulb Lantern", + + "block.betterend.bushy_grass": "Bushy Grass" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index fc6ca788..0af1f84f 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -362,5 +362,7 @@ "block.betterend.bulb_lantern_purple": "Пурпурный луковичный фонарь", "block.betterend.bulb_lantern_red": "Красный луковичный фонарь", "block.betterend.bulb_lantern_white": "Белый луковичный фонарь", - "block.betterend.bulb_lantern_yellow": "Жёлтый луковичный фонарь" + "block.betterend.bulb_lantern_yellow": "Жёлтый луковичный фонарь", + + "block.betterend.bushy_grass": "Густая трава" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_01.json b/src/main/resources/assets/betterend/models/block/bushy_grass_01.json new file mode 100644 index 00000000..f306dc6d --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/bushy_grass_1" + } +} diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_02.json b/src/main/resources/assets/betterend/models/block/bushy_grass_02.json new file mode 100644 index 00000000..c9030aa4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/bushy_grass_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_03.json b/src/main/resources/assets/betterend/models/block/bushy_grass_03.json new file mode 100644 index 00000000..1fda0f2c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/bushy_grass_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_04.json b/src/main/resources/assets/betterend/models/block/bushy_grass_04.json new file mode 100644 index 00000000..be730e67 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/bushy_grass_2" + } +} diff --git a/src/main/resources/assets/betterend/models/item/bushy_grass.json b/src/main/resources/assets/betterend/models/item/bushy_grass.json new file mode 100644 index 00000000..27879c7d --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/bushy_grass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/bushy_grass_2" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/bushy_grass_1.png b/src/main/resources/assets/betterend/textures/block/bushy_grass_1.png new file mode 100644 index 0000000000000000000000000000000000000000..08b7e35e7bfb3d445ffa266df721c252ecd2a743 GIT binary patch literal 1787 zcmbVNe{2&~96zE=98Nc#3!8~MZ|ay^dq3K>y>s0t?c5saD5GRU_s4E`Z|$-6?!3FL z-9kji7J`{hw?L*59Sa5%bR>WQK~kbH1Y}00m=VCBIN4bIRlo&Y^j+6B#-JjXynFB6 z`@GNh_xCn>YpOER^U@In$#7S@YT=xzj|FM)oge#yh11<~^=cJC7CxYldB_`YE<%ty zV}h?#2k+xU*vc zO_LcM4~N6Xu*oPXew?If8Yd{6q6`pWP}@a~jTl6=Aj#kYDyImtCP*TxGqO!mt7gZb zrgJ8QPO|qa)rydv^y0}gdc`2+G>4Fk>fQ!|D9is?}Fp#8yvieAhFXPQf` zR$w!k4JM+g)Igfe76VOM34_VT5tNy-&`pFjdEX^*t$GlX_xb;Mf4L&SB4UHL&yxxg zGM_mo*IlzCxJ zPW7=7w7>5oj4#<%GCgA-$lclP2zKT6=4Y*Yksh5r66p_~-G46jq>+bcQ%kx+wlXWj_9HDDF%)2km{GMKX6gA4@+vwkA5W z84azC?s%!eJoRf|&n9ux<6CxL8DFPFCmYX9zH@k+ZCTOm(4%9HBJrW_rD=Q4wSIZ% zm)&V+M8w}P7;eeVZ*kU-G?WcTd$#T?y?#HjYbvYb)kg}`#2@z!d`Hf{pH^5hOwVCjHFL-MiPQS;$z56F J8eZDi`6mK8avcBw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/bushy_grass_2.png b/src/main/resources/assets/betterend/textures/block/bushy_grass_2.png new file mode 100644 index 0000000000000000000000000000000000000000..68f23c30e63ca66e718a8233bbc99be348205be3 GIT binary patch literal 2005 zcmbVNeQeZZ7(b@Km@K*|iV#BS3=E;y&%0a8PB!m`cWyW4cEAks@m~AhUESTaw%y%r zpx`vZ7}F_(h#`oe#1K)l1R?{ce990=2tf$S2od}T2wNZ|5W{@C`v46ri%r_T?fZLv z&+qx@)0XP0SMu{Fwxl5&tVOHi~x*#(xz(g%*bX;M(AanDKnLQhUS zY#6FQl8HpZnqaMp79we$=Shko8HPXzLT`*2AW6jZ!VH5O>Y^sAhOERelMw`z2E&OX zrKu32YL+&pr_+QIMkawu(pJh0DFgKRhK5F?S+s7H$B~z`-iH$F{zes&HBeU?G!d4^ zVazDZIFrPzt=gbP1|yY35=LMY!E_{y&bm^=ilOLXgYx3kfxf=h$IP&B`yL^6e{ z&ahxEmsyx%tZ0E8laz!$-4vC!fo@`F>JHZDzp5QrJB5ago z;}~cQ*n_q~UC7?8hz({2P5V^mN{Wa$vPlwXha(sSqD0WpCK7<NcM)OGi9F$Lqs}6@l!Be2^tBY!Lks_^l0+>D1bXHBX!(H*Jn)+fKZURYmruztrFPtW6ZBiZG5wvG2L-d~X4-Z}bj zcK+4=?vZ~aT91Z$D(I4B&BD~a%C5u5^4PUau%sjBa>wTSS;@EOy*ss)e!pkZEN|$h zx_{<;>#Og0N;ed2y~<3un%{on`;8YSxhn!4=hsH6$DSN_y+3}dtN&(rd#hR}uBzOAK`Zla=A`*N0uCq_J&HU@`g{tT8&+jpx4g>z?aND>{{d|m BwZ8xW literal 0 HcmV?d00001