From 71a3e88b62b8b9156397cc439f63bcb5778585c7 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 25 Dec 2020 17:29:06 +0300 Subject: [PATCH] Jungle vine --- .../betterend/blocks/BlockSmallJellyshroom.java | 3 ++- .../java/ru/betterend/registry/EndBlocks.java | 1 + .../java/ru/betterend/registry/EndFeatures.java | 5 +++-- .../world/biome/BiomeUmbrellaJungle.java | 1 + .../betterend/blockstates/jungle_vine.json | 16 ++++++++++++++++ .../resources/assets/betterend/lang/en_us.json | 3 ++- .../resources/assets/betterend/lang/ru_ru.json | 3 ++- .../materialmaps/block/jungle_vine.json | 3 +++ .../materialmaps/item/jungle_vine.json | 1 + .../models/block/jungle_vine_bottom_1.json | 6 ++++++ .../models/block/jungle_vine_bottom_2.json | 6 ++++++ .../models/block/jungle_vine_middle_1.json | 6 ++++++ .../models/block/jungle_vine_middle_2.json | 6 ++++++ .../betterend/models/item/jungle_vine.json | 6 ++++++ .../betterend/textures/block/jungle_vine.png | Bin 0 -> 503 bytes .../textures/block/jungle_vine_bottom.png | Bin 0 -> 1777 bytes 16 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/jungle_vine.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/jungle_vine.json create mode 100644 src/main/resources/assets/betterend/materialmaps/item/jungle_vine.json create mode 100644 src/main/resources/assets/betterend/models/block/jungle_vine_bottom_1.json create mode 100644 src/main/resources/assets/betterend/models/block/jungle_vine_bottom_2.json create mode 100644 src/main/resources/assets/betterend/models/block/jungle_vine_middle_1.json create mode 100644 src/main/resources/assets/betterend/models/block/jungle_vine_middle_2.json create mode 100644 src/main/resources/assets/betterend/models/item/jungle_vine.json create mode 100644 src/main/resources/assets/betterend/textures/block/jungle_vine.png create mode 100644 src/main/resources/assets/betterend/textures/block/jungle_vine_bottom.png diff --git a/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java b/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java index e0abafdc..c368f1ef 100644 --- a/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java +++ b/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java @@ -59,7 +59,8 @@ public class BlockSmallJellyshroom extends BlockAttached implements IRenderTypea public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { Direction direction = (Direction) state.get(FACING); BlockPos blockPos = pos.offset(direction.getOpposite()); - return sideCoversSmallSquare(world, blockPos, direction) && world.getBlockState(blockPos).isOpaque(); + BlockState support = world.getBlockState(blockPos); + return sideCoversSmallSquare(world, blockPos, direction) && support.isOpaque() && support.getLuminance() == 0; } @Override diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index c20dd69d..2347774a 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -254,6 +254,7 @@ public class EndBlocks { public static final Block TWISTED_VINE = registerBlock("twisted_vine", new BlockVine()); public static final Block BULB_VINE_SEED = registerBlock("bulb_vine_seed", new BlockBulbVineSeed()); public static final Block BULB_VINE = registerBlock("bulb_vine", new BlockBulbVine()); + public static final Block JUNGLE_VINE = registerBlock("jungle_vine", new BlockVine()); // Mob-Related public static final Block SILK_MOTH_NEST = registerBlock("silk_moth_nest", new BlockSilkMothNest()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 33e5ca03..35d64f26 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -89,6 +89,7 @@ public class EndFeatures { public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(EndBlocks.DENSE_VINE, 24), 3); public static final EndFeature TWISTED_VINE = new EndFeature("twisted_vine", new VineFeature(EndBlocks.TWISTED_VINE, 24), 3); public static final EndFeature BULB_VINE = new EndFeature("bulb_vine", new VineFeature(EndBlocks.BULB_VINE, 24), 5); + public static final EndFeature JUNGLE_VINE = new EndFeature("jungle_vine", new VineFeature(EndBlocks.JUNGLE_VINE, 24), 5); // Ceil plants public static final EndFeature SMALL_JELLYSHROOM_CEIL = new EndFeature("small_jellyshroom_ceil", new SingleInvertedScatterFeature(EndBlocks.SMALL_JELLYSHROOM, 8), 8); @@ -104,8 +105,8 @@ public class EndFeatures { public static final EndFeature TWISTED_MOSS_WOOD = new EndFeature("twisted_moss_wood", new WallPlantOnLogFeature(EndBlocks.TWISTED_MOSS, 6), 25); public static final EndFeature BULB_MOSS = new EndFeature("bulb_moss", new WallPlantFeature(EndBlocks.BULB_MOSS, 6), 1); public static final EndFeature BULB_MOSS_WOOD = new EndFeature("bulb_moss_wood", new WallPlantOnLogFeature(EndBlocks.BULB_MOSS, 6), 15); - public static final EndFeature SMALL_JELLYSHROOM_WALL = new EndFeature("small_jellyshroom_wall", new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, 6), 4); - public static final EndFeature SMALL_JELLYSHROOM_WOOD = new EndFeature("small_jellyshroom_wood", new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, 6), 8); + public static final EndFeature SMALL_JELLYSHROOM_WALL = new EndFeature("small_jellyshroom_wall", new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 4); + public static final EndFeature SMALL_JELLYSHROOM_WOOD = new EndFeature("small_jellyshroom_wood", new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 8); // Water // public static final EndFeature BUBBLE_CORAL = new EndFeature("bubble_coral", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 6), 10); diff --git a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java index a5ffe6c2..9506418f 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java +++ b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java @@ -21,6 +21,7 @@ public class BiomeUmbrellaJungle extends EndBiome { .addFeature(EndFeatures.SMALL_JELLYSHROOM_WALL) .addFeature(EndFeatures.SMALL_JELLYSHROOM_WOOD) .addFeature(EndFeatures.SMALL_JELLYSHROOM_CEIL) + .addFeature(EndFeatures.JUNGLE_VINE) .addFeature(EndFeatures.CHARNIA_CYAN) .addFeature(EndFeatures.CHARNIA_GREEN) .addFeature(EndFeatures.CHARNIA_LIGHT_BLUE) diff --git a/src/main/resources/assets/betterend/blockstates/jungle_vine.json b/src/main/resources/assets/betterend/blockstates/jungle_vine.json new file mode 100644 index 00000000..ed2bf59d --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/jungle_vine.json @@ -0,0 +1,16 @@ +{ + "variants": { + "shape=top": [ + { "model": "betterend:block/jungle_vine_middle_1" }, + { "model": "betterend:block/jungle_vine_middle_2" } + ], + "shape=middle": [ + { "model": "betterend:block/jungle_vine_middle_1" }, + { "model": "betterend:block/jungle_vine_middle_2" } + ], + "shape=bottom": [ + { "model": "betterend:block/jungle_vine_bottom_1" }, + { "model": "betterend:block/jungle_vine_bottom_2" } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 745046de..e3165444 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -521,5 +521,6 @@ "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss", "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss Tall", "block.betterend.umbrella_tree_cluster": "Umbrella Tree Cluster", - "block.betterend.umbrella_tree_cluster_empty": "Empty Umbrella Tree Cluster" + "block.betterend.umbrella_tree_cluster_empty": "Empty Umbrella Tree Cluster", + "block.betterend.jungle_vine": "Jungle Vine" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index d56eb055..0b007db6 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -523,5 +523,6 @@ "block.betterend.twisted_umbrella_moss": "Закрученный зонтичный мох", "block.betterend.twisted_umbrella_moss_tall": "Высокий закрученный зонтичный мох", "block.betterend.umbrella_tree_cluster": "Кластер зонтичного дерева", - "block.betterend.umbrella_tree_cluster_empty": "Пустой кластер хонтичного дерева" + "block.betterend.umbrella_tree_cluster_empty": "Пустой кластер хонтичного дерева", + "block.betterend.jungle_vine": "Лоза джунглей" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/jungle_vine.json b/src/main/resources/assets/betterend/materialmaps/block/jungle_vine.json new file mode 100644 index 00000000..1fc9123d --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/jungle_vine.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving" +} diff --git a/src/main/resources/assets/betterend/materialmaps/item/jungle_vine.json b/src/main/resources/assets/betterend/materialmaps/item/jungle_vine.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/jungle_vine.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_1.json b/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_1.json new file mode 100644 index 00000000..d0a016af --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/jungle_vine_bottom" + } +} diff --git a/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_2.json b/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_2.json new file mode 100644 index 00000000..0f6531f6 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_vine_bottom_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/jungle_vine_bottom" + } +} diff --git a/src/main/resources/assets/betterend/models/block/jungle_vine_middle_1.json b/src/main/resources/assets/betterend/models/block/jungle_vine_middle_1.json new file mode 100644 index 00000000..a6761519 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_vine_middle_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/jungle_vine" + } +} diff --git a/src/main/resources/assets/betterend/models/block/jungle_vine_middle_2.json b/src/main/resources/assets/betterend/models/block/jungle_vine_middle_2.json new file mode 100644 index 00000000..6c0d14c2 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_vine_middle_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/jungle_vine" + } +} diff --git a/src/main/resources/assets/betterend/models/item/jungle_vine.json b/src/main/resources/assets/betterend/models/item/jungle_vine.json new file mode 100644 index 00000000..24123820 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/jungle_vine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/jungle_vine_bottom" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/jungle_vine.png b/src/main/resources/assets/betterend/textures/block/jungle_vine.png new file mode 100644 index 0000000000000000000000000000000000000000..8d71387df42d8c78235d42b00f85b7eb17659bf2 GIT binary patch literal 503 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0gOpRK~y+TeUdLo z!%+~&Z!(6(unqY!4Fe}?w3y9`!JXEOy{J2SG5E^sfP5Xlh)RWs4M9pFCM-0tf@6ptP$rm?GZm#Iw ze0wlP74m#`#l7oJAZY)1zHN*h7l~2P=SL$Y@0Sm@4P7b(eB9V^B!LEiV1!bUd=QMy z--UpH7I0vs9L!Hi55BELB0pIZ{-_~&-L(J!002ovPDHLkV1nQk+I9c{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/jungle_vine_bottom.png b/src/main/resources/assets/betterend/textures/block/jungle_vine_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..e584bf10f495bb4da03a289eeb7f4c681d00349a GIT binary patch literal 1777 zcmbVN4Qvxt9KQj=C^Cr|Ue`1~h!Bpb;EG3`D_g3K&6z;A93Djbl?5j2Q&yM10qE4H*35l6UXDd%ySl zfB$bypkl#9Q-KLVkcmF8rxMPSjFCGQzV92j&cbQD;;q#XB(K95IU9=drXk3f0U=nU z*Z3DQoGe;cUJe0EQdA%sLFT%W3d_|49SwnqAUUz04;{u(fp=onc0b`)+#o7=8&y!% zSP|qJ>p7aoT=USmNd^*#KxfgU7?U(6>BQ2!3|t$ZaSTmE^m->&Y6wJY`~lQ0s{plI zip?BpqtFuCLKYJ=Wt)vs1X+R;B{*p{6C^_vGgcbSJQ$Rw@?oaZQ=X9pcTOy->k5P8 ziA2JZuv%m_f|E2&;{=6Mlo=w-T1wK{q*>AmM;JUn<5WS>1zAE3Mm8ij=uQl3I&6Zd zWN9TW<0j}ZJjp6JX(0@g(my^50Nrk8ctH zUF-K}W!zF1QOt_a^s+cKBjb=;qP1X30eB_Q!j?ItM98lKhJe+Ba#6P8txg*FQ!8v(c?MKCn$NyaV5WEBdA+F8?D`2CDe(sWkh zfY0N^pxG8d;F&PzC<)OdYqs0%oSApn2s7<)6q~I)#gSnLZKp%wk^3H*YcPU4a-aX7 z_ZO)GEG{;7+dM|e8Ck)21r5e4l_`oU@MLBc6VP-bFf3;zxD(@y$O0bAd=_ro1H-h5 zD1fB@5bj}^CWrL|tAf%9^wxjLC>-jK8`U^$3jS9s(`PqS?g$*V17n%(LvWMrWI%%L zOND)^sIa*OL2`EZJf%TL^M=a9xO?$E*QBAPXM?9ZF9>T&*SC~=np`W7w;hpQUa!B@ z=LwyvBZ*Dt21l<2g}YkbU$xa0^gS@y^;@d9b`*%haETwUHxcMqOCv~tt&=0AFt zmenIn>fo=XP7pC@9Q*CFW^FO$w{6KNdnW4UGmugLy$GDE2veynhdMx7le0s0L zzH#r#SMu^FEb*n`=LShDZ6=gutKU$*Dj0{_XomSHOjl#lk#n4Pnp+*&Jo zsTt>=*f=ZJar|g^enojxDslzsYiGVP#ak;ow?F>Fi_vJ)=$uj0-}`8xx1n;&~52Rkv;@=oaL#|u}l4c=Wk5c%-I zEe#!;?;myU?WwOi&-b?PoV97q{`v21Yunj%V!PEdr*4{zU=I(fmYGj)*|qM?{@NUt zHF+A3j#CcghNoPL?^$)ZYH3~TH@i)p6Thhb6<>~^&wt(BHqJEJ_$m3yDm?GbuUq*i D{=#jc literal 0 HcmV?d00001