From c3ab9d26f329fc4706e41d2081f0f27f02580ae0 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 27 Nov 2020 00:02:03 +0300 Subject: [PATCH] Bulb vine lantern --- .../blocks/BlockBulbVineLantern.java | 48 +++++++++++++++ .../java/ru/betterend/registry/EndBlocks.java | 5 +- .../blockstates/bulb_vine_lantern.json | 7 +++ .../materialmaps/block/bulb_vine_lantern.json | 3 + .../models/block/bulb_vine_lantern.json | 58 ++++++++++++++++++ .../models/item/bulb_vine_lantern.json | 3 + .../betterend/textures/block/bulb_vine.png | Bin 2270 -> 2304 bytes .../textures/block/bulb_vine_lantern.png | Bin 0 -> 2247 bytes 8 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 src/main/java/ru/betterend/blocks/BlockBulbVineLantern.java create mode 100644 src/main/resources/assets/betterend/blockstates/bulb_vine_lantern.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_vine_lantern.json create mode 100644 src/main/resources/assets/betterend/models/block/bulb_vine_lantern.json create mode 100644 src/main/resources/assets/betterend/models/item/bulb_vine_lantern.json create mode 100644 src/main/resources/assets/betterend/textures/block/bulb_vine_lantern.png diff --git a/src/main/java/ru/betterend/blocks/BlockBulbVineLantern.java b/src/main/java/ru/betterend/blocks/BlockBulbVineLantern.java new file mode 100644 index 00000000..4ab209a1 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockBulbVineLantern.java @@ -0,0 +1,48 @@ +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.block.ShapeContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; +import ru.betterend.blocks.basis.BlockBaseNotFull; +import ru.betterend.client.render.ERenderLayer; +import ru.betterend.interfaces.IRenderTypeable; + +public class BlockBulbVineLantern extends BlockBaseNotFull implements IRenderTypeable { + private static final VoxelShape SHAPE_CEIL = Block.createCuboidShape(4, 4, 4, 12, 16, 12); + + public BlockBulbVineLantern() { + super(FabricBlockSettings.of(Material.METAL) + .sounds(BlockSoundGroup.LANTERN) + .hardness(1) + .resistance(1) + .breakByTool(FabricToolTags.PICKAXES) + .materialColor(MaterialColor.LIGHT_GRAY) + .requiresTool() + .luminance(15)); + } + + @Override + public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + return sideCoversSmallSquare(world, pos.up(), Direction.DOWN); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { + return SHAPE_CEIL; + } + + @Override + public ERenderLayer getRenderLayer() { + return ERenderLayer.CUTOUT; + } +} diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 23c0dacc..a4a944a1 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -16,6 +16,7 @@ import ru.betterend.blocks.BlockBlueVineLantern; import ru.betterend.blocks.BlockBlueVineSeed; import ru.betterend.blocks.BlockBubbleCoral; import ru.betterend.blocks.BlockBulbVine; +import ru.betterend.blocks.BlockBulbVineLantern; import ru.betterend.blocks.BlockBulbVineSeed; import ru.betterend.blocks.BlockChorusGrass; import ru.betterend.blocks.BlockDragonTreeSapling; @@ -180,6 +181,7 @@ public class EndBlocks { public static final Block AURORA_CRYSTAL = registerBlock("aurora_crystal", new AuroraCrystalBlock()); public static final Block AMBER_BLOCK = registerBlock("amber_block", new BlockAmber()); + // Lanterns public static final Block ANDESITE_LANTERN = registerBlock("andesite_lantern", new BlockStoneLantern(Blocks.ANDESITE)); public static final Block DIORITE_LANTERN = registerBlock("diorite_lantern", new BlockStoneLantern(Blocks.DIORITE)); public static final Block GRANITE_LANTERN = registerBlock("granite_lantern", new BlockStoneLantern(Blocks.GRANITE)); @@ -187,6 +189,7 @@ public class EndBlocks { public static final Block PURPUR_LANTERN = registerBlock("purpur_lantern", new BlockStoneLantern(Blocks.PURPUR_BLOCK)); public static final Block END_STONE_LANTERN = registerBlock("end_stone_lantern", new BlockStoneLantern(Blocks.END_STONE)); public static final Block BLACKSTONE_LANTERN = registerBlock("blackstone_lantern", new BlockStoneLantern(Blocks.BLACKSTONE)); + public static final Block BULB_VINE_LANTERN = registerBlock("bulb_vine_lantern", new BlockBulbVineLantern()); // Blocks With Entity // public static final Block END_STONE_SMELTER = registerBlock("end_stone_smelter", new EndStoneSmelter()); @@ -194,7 +197,7 @@ public class EndBlocks { public static final Block INFUSION_PEDESTAL = registerBlock("infusion_pedestal", new InfusionPedestal()); //Technical - public static final Block END_PORTAL_BLOCK = registerBlock("end_portal_block", new EndPortalBlock()); + public static final Block END_PORTAL_BLOCK = registerBlockNI("end_portal_block", new EndPortalBlock()); public static void register() {} diff --git a/src/main/resources/assets/betterend/blockstates/bulb_vine_lantern.json b/src/main/resources/assets/betterend/blockstates/bulb_vine_lantern.json new file mode 100644 index 00000000..dd2043d2 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/bulb_vine_lantern.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/bulb_vine_lantern" } + ] + } +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_vine_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_vine_lantern.json new file mode 100644 index 00000000..2163812f --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_vine_lantern.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_inc" +} diff --git a/src/main/resources/assets/betterend/models/block/bulb_vine_lantern.json b/src/main/resources/assets/betterend/models/block/bulb_vine_lantern.json new file mode 100644 index 00000000..cac5d4b2 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bulb_vine_lantern.json @@ -0,0 +1,58 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/bulb_vine_lantern", + "texture": "betterend:block/bulb_vine_lantern" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "shade": false, + "faces": { + "down": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, + "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box11", + "from": [ 6, 12, 6 ], + "to": [ 10, 13, 10 ], + "faces": { + "up": { "uv": [ 10, 8, 14, 12 ], "texture": "#texture" }, + "north": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }, + "south": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }, + "west": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX15", + "from": [ 7, 13, 7 ], + "to": [ 7.001, 16, 10 ], + "rotation": { "origin": [ 7, 13, 7 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX15", + "from": [ 9, 13, 7 ], + "to": [ 9.001, 16, 10 ], + "rotation": { "origin": [ 9, 13, 7 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/bulb_vine_lantern.json b/src/main/resources/assets/betterend/models/item/bulb_vine_lantern.json new file mode 100644 index 00000000..a111ff2a --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/bulb_vine_lantern.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/bulb_vine_lantern" +} diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine.png b/src/main/resources/assets/betterend/textures/block/bulb_vine.png index 2c9f8ee8e5ad6256bb4e18244768b0ca61bfb03c..8cb952974037af078a981199fae2a748ef917e31 100644 GIT binary patch delta 715 zcmca7*dVmw3=_Mtm9eFjf$`+aOe%2pKPC&6)Kp^w6XP@kU9*%_1Ks2l6C+&~7%in)c!l^B&u3dJR^WhGYS8L4@;N=61o2D*lZx<+OpMlk!Qve-{f zV#}{@{i<=7fq_Zb)5S5w;&f|}ZMTS{KyB<@+xYJ4?d5CA=M~7zmf}!bx8K3QNYF%- zS-HMzVP{fS!lUyy?t}>PgjjsJv-9rFnJ@KsXU7N#Zf{$-I(=2#{<`%?Hb?g#?$7HK zVgD(Y=a>J$`*ZJi^{a*}_;!?Jb0`Lgu-@ACw0?3#{p-E$R+6&LUMJ=IyEM~&iOhXd zG5-_)P4x=t4JM|4el;})33%ScD324^8vHK@8EaU z;xjAK7Hwra`rP1ldr%jn*X+W3rLt23SdPS1-!$e9Dq`q4WSP9v;Jt}JshahMi5uN= zm_BLs^Sqkpe?7ctSx>@`lzipxYYTZSrLHS*ODPAsOuFbN`?f^4Uc*Xj+WYg(^PX(f zZ|EusZ(3=+&+k%-$?f#}&pua5^dDd28+$!MN9<4RNiXFuaz#tn>ogTe~DWM4fOTaJH delta 680 zcmZn=x+l2d3=_MNm8rRvku>(7=+-X$t5noie)6fU~_VN%hO zQppfx6}4}j#OC7dc({I{tJ5NeB^(pxTF>7*|4m=;1%>|9_wD8P_SAkpvikS=%kMY3 zb}AP)RKMQ+Ufh`MrkqPIGnr6_-9aJGrX2*Y3E6 zd))M&(_d*X^3RBE-|_pfgKCG$pL>n(Ufhnj$hbfC--Ex(Iae(Ai|5N7it3hQPMZ4R zaQq|jts96#Y2aEzDvs#1&M zn65ru$8x>5X6~YsMa33h-`YEFy69mR*F7UY+vsTPqgOpf!dl`kjG9(c`~}y$l*Vl4 z`^+$D*|$^$mxFc*X4mazaBDTS?oDTN;*#s;_cH3XVh^YZSQlkAG3b$)QODdG1MUy& r`MVk`HqTlU6J@#j;2i#EkMy6tdoTFxp~ReS1|aZs^>bP0l+XkKHD(_5 diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern.png b/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern.png new file mode 100644 index 0000000000000000000000000000000000000000..8f733b708e080555202b07e2ed1db56af5d493c8 GIT binary patch literal 2247 zcmb_e3s4kg96w4?QD+RLuzc(+nh5Ug>-O$;^-#J4K|3TwA)|C3-@(e=?RvX#hnkg6 z;(I2gaVRTwnjRyGhNz7*k|u`Q!^boxk~n2K(p02TsiA#)+})I+IgU58x8HvI`~Uv0 z-}imHGCyzX;DkpLOeWLd+#FW{ybm$1{_*gC^p%@DybVxup4LpJfkTZe&h*-*WRod= zgIrjw7rUS2M8#+3B}D+{kWYnZlWEfAkjjhYKt}{nD*GMiFZ-HMM3x+A5#uJ@suPsS zIST_|=EA%}abda0O6cSaWKxKO1U{hiNXX~)Yh1{IhIu(SHl}eD2}AU92byU(M2g+{ zh*JpwgfUw&k+e{VjWv^2f~71I5Q-peIAOy{8Y4)KuyQnuM1Cmr7LYt#fh#-W3qCo} zGF?|W91jMA<{)iW0;M>~vMf$eI7ML)foWBKoeyDtEhWm}0-6|*Rb5v6h{4DUN`>w~ zVWd4N_|zD!UyGCp77P#ZDo&aSBc(7<5@R^EBH#@>mqZ+Rfe-j~4Pwa{7FNmaj=_7S z_4#6GP0y-?5k+$A6|EIksQ@nknoQj;7KHnj?rF zs2fT_;&uMNV47nHj<){`tVpt_>VKh<$a$22kB5bleS9gvRex#No7>Ih`Zb;Riy+tK zKw+q6S(Z49mEk2uBr!=~1xz3;0>%nFgE4|6Fakj^0>wt{U5Z#?G%;!~L3`Fl+iBKL zU=komj0P4vCRk`I6e`UNHi5QF9$VCYMnHy(i1*$*PpnCtQ}HSRw<5tR(}sk@QsQ!C z4fd-lvM6SP1(A_gM#Adhc+n8J0~L+V0tt;w%e_?Q?lSA44VD2&dWUxRz%<392l)WV zEQM9P8%5!_i(lg_?;O3vdn6A{3K-+DP?(3Zh!|^SBuwyl7|F^I7Q4q1&A!*@?Hs{G z^>>faM~W+!@%~Z(_e>nU_k8Y7r?>0IE$ivN=7Sr%WslVGTU8i-_m7!8jbVG_X5;PC6Crs>Yg?9%+tb$FI;;L%`nDrdLE~AU z{bK&GzR8D^4=q^pjla67>E`AW^0ZM$Cr{gwmVTjjL(SMw!5p*tevO4!zsR#SKoYNnO33nlyd@Ga;@n`^Zac z7X7d_b?N0kovTke9z5!d8~RM;GW3t4y+i7r+gtMSg?Tj}6?HsvaWhN&{#i%eh#KP4 zi5IUYNwZ#Y&Uq*?ZRH?K+?pj#xXJvpGre`hfiH?u`j1Q8eWZK7`ZmP zxc+p@hlASpw;k(e8?BJZgO2~$wWGv5cB;DVt7}TjwX4_bGTxRSNL>DBSLc=WxjTNV zebu$iN~O*g^5kcSE^q2utkkzRHGkLr$y3*=AFHaq@_O*}#-tr5JG+kGB;tc_WlX1r zKfZNL>Z0LwZ@%+>LTUG3;_U02#w>|1Dr)?)p?(I_X>lcOdM~NuGV4;$x2=5P{KgI& Tu-0}MpBlMYd9LkG%v<_5BgYC) literal 0 HcmV?d00001