From d272597e87e6ae5b64161e92ce6727c84ca28a70 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Wed, 30 Sep 2020 11:32:46 +0300 Subject: [PATCH] Feature fix --- .../blocks/BlockMossyGlowshroomSapling.java | 3 +-- .../blocks/basis/BlockFeatureSapling.java | 10 +++++----- .../block/mossy_glowshroom_log_side.png | Bin 2183 -> 2391 bytes .../block/mossy_glowshroom_log_side_2.png | Bin 2439 -> 2439 bytes .../block/mossy_glowshroom_log_side_3.png | Bin 2441 -> 2441 bytes .../block/mossy_glowshroom_log_side_4.png | Bin 2448 -> 2448 bytes .../block/mossy_glowshroom_log_side_5.png | Bin 2441 -> 2441 bytes 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java b/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java index fc39646a..4a8ad413 100644 --- a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java +++ b/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java @@ -2,10 +2,9 @@ package ru.betterend.blocks; import ru.betterend.blocks.basis.BlockFeatureSapling; import ru.betterend.registry.FeatureRegistry; -import ru.betterend.world.features.DefaultFeature; public class BlockMossyGlowshroomSapling extends BlockFeatureSapling { public BlockMossyGlowshroomSapling() { - super((DefaultFeature) FeatureRegistry.MOSSY_GLOWSHROOM.getFeature(), 7); + super(FeatureRegistry.MOSSY_GLOWSHROOM, 7); } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java b/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java index e119ee14..b365408c 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java @@ -23,13 +23,13 @@ import ru.betterend.client.ERenderLayer; import ru.betterend.client.IRenderTypeable; import ru.betterend.registry.BlockTagRegistry; import ru.betterend.util.BlocksHelper; -import ru.betterend.world.features.DefaultFeature; +import ru.betterend.world.features.EndFeature; public class BlockFeatureSapling extends BlockBaseNotFull implements Fertilizable, IRenderTypeable { private static final VoxelShape SHAPE = Block.createCuboidShape(4, 2, 4, 12, 16, 12); - private final DefaultFeature feature; + private final EndFeature feature; - public BlockFeatureSapling(DefaultFeature feature) { + public BlockFeatureSapling(EndFeature feature) { super(FabricBlockSettings.of(Material.PLANT) .breakByHand(true) .collidable(false) @@ -39,7 +39,7 @@ public class BlockFeatureSapling extends BlockBaseNotFull implements Fertilizabl this.feature = feature; } - public BlockFeatureSapling(DefaultFeature feature, int light) { + public BlockFeatureSapling(EndFeature feature, int light) { super(FabricBlockSettings.of(Material.PLANT) .breakByHand(true) .collidable(false) @@ -81,7 +81,7 @@ public class BlockFeatureSapling extends BlockBaseNotFull implements Fertilizabl @Override public void grow(ServerWorld world, Random random, BlockPos pos, BlockState state) { BlocksHelper.setWithoutUpdate(world, pos, Blocks.AIR.getDefaultState()); - feature.generate(world, world.getChunkManager().getChunkGenerator(), random, pos, DefaultFeatureConfig.INSTANCE); + feature.getFeature().generate(world, world.getChunkManager().getChunkGenerator(), random, pos, DefaultFeatureConfig.INSTANCE); } @Override diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png index b9859e8f367e3473f660cb2c4dfd4a27808cd850..cf710533ad93ac6b1b11d200c853c737ec08eb47 100644 GIT binary patch delta 204 zcmZn{ye>4sf{AVNMyoz1Gh>4gLqjV=Q!685Z3AN~0|O<6irfM#-~5!!v`Ux6l2ltI zBLgD?T?0#9B&C!8FsK8wh_606OuY)wo6!s|Hf delta 63 zcmV-F0Kos(5{D6xI06O3u{w?dlSl;<4tQ;FI!$k6X=ZsuVRU7aJ_Q|<1_LpZ4+SN& VTmwu3lXwPM1iN+5ud~$#f&!ER6(0Zq diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png index d993d7a2f3dcc1e690d5cc51c0e475017be70092..dbea16853adae76dfe32f4592f479ce36298496a 100644 GIT binary patch delta 173 zcmZn{ZWrEgg2~j_AjHtn%Fxux$WYtB*vh~_NueUQz{)p2B{QwkC9x#cR>{b~$UxV? zQWv3g@?R!P70cvAGfN}m6y21xv?Sd`Qxi*F3$qksUE@>}ixlJJ#1sPq!_865lbDE7 aIoW|#j0?#I1Ge=n0!*)>H$P@u!UO;#{x7=# delta 166 zcmZn{ZWrEgg2~j#BE-{b~$UxV? zQWv3g@?R!P72`BhQ_EB%BV9v73v*qQL=z)ji{b~$UxV? zQWr_-z{toV#mppaa}@I=CZbeM ac3_od0Xbu`A=^3@oueL;H$P@u#smN@2QI__ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png index 95112942e47921ef174610ea67f9064f49f43ecb..34d1c0feecd0ed7f4cc8e1139c650bcb0ecd7240 100644 GIT binary patch delta 174 zcmbOrJVAKF2_`dRgAhYQD??K&Lkn#KV=Ds#C54LI0xRGAl+3hBm&B4(TO}g{BLiIn zOI;+Tlm9VUsF;~rq!}e9Tk0C7m?!BP8JigDTAEp;>6#du8>g6<8>X0~CT)&lp2Va~ cgv!bGtm53rHW;$4V|l*k`-aVr+14@v0Q({^Z~y=R delta 168 zcmbOrJVAKF2_`cmix5LoD+6OIQ*&(~X<(qFP?1|;<(r?9nO5nNSdwb1WMp7uple{M zi==e&KPC$mOH)g8a|?@9UDFgpbKOJ>lSEw$gH%IZV`H!*%~8ygn21t2 a*@0D-1>}s$hHUFtB3nD+Ha})t%LD-8Z!Mkx diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png index 71bacf237546e9db436df0b9e5fd52dcd4f21b94..3db2e15b5cc50180144c3a1822536eef58d085af 100644 GIT binary patch delta 175 zcmeAa?iAi|g2~L-AjHtn%Fxux&`jIF*vh~_NueUQz{)p2B{QwkC9x#cR>{b~$UxV? zQWr_-6bMz+F`Z5@ks;XKjJkJ*+n0RUldFV6q~ delta 168 zcmeAa?iAi|g2~LtBE-{b~$UxV? zQWr_-