From 77457bf976b45731be0a95dc9b2fc1b4369d32d6 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 15 Oct 2020 01:33:57 +0300 Subject: [PATCH] Fixes, compression --- .../blocks/basis/BlockStoneButton.java | 2 - .../betterend/blocks/basis/BlockTrapdoor.java | 2 - .../ru/betterend/blocks/model/SlabModel.java | 2 - .../mixin/client/ModelLoaderMixin.java | 1 - .../mixin/common/ChorusFlowerBlockMixin.java | 23 +++++++ .../mixin/common/ChorusPlantBlockMixin.java | 23 +++++++ .../mixin/common/ChorusPlantFeatureMixin.java | 29 +++++++++ .../mixin/common/ChunkGeneratorMixin.java | 16 ----- .../ru/betterend/registry/BlockRegistry.java | 2 - .../world/biome/BiomeChorusForest.java | 4 +- .../textures/block/chorus_nylium_path_top.png | Bin 711 -> 711 bytes .../betterend/textures/block/end_lily_2.png | Bin 228 -> 228 bytes .../textures/block/end_moss_side.png | Bin 645 -> 645 bytes .../betterend/textures/block/end_moss_top.png | Bin 720 -> 720 bytes .../textures/block/end_mycelium_path_top.png | Bin 548 -> 548 bytes .../textures/block/flavolite_tiles.png | Bin 606 -> 606 bytes .../block/mossy_glowshroom_barrel_bottom.png | Bin 577 -> 577 bytes .../block/mossy_glowshroom_cap_transition.png | Bin 672 -> 672 bytes .../block/mossy_glowshroom_log_side_4.png | Bin 718 -> 718 bytes .../block/mossy_glowshroom_log_side_5.png | Bin 711 -> 711 bytes .../block/mossy_glowshroom_log_top.png | Bin 719 -> 719 bytes .../mossy_glowshroom_stripped_log_side.png | Bin 635 -> 635 bytes .../textures/block/pythadendron_log_side.png | Bin 1624 -> 234 bytes .../block/pythadendron_log_side_2.png | Bin 646 -> 646 bytes .../block/pythadendron_log_side_mossy.png | Bin 2291 -> 375 bytes .../textures/block/pythadendron_log_top.png | Bin 488 -> 453 bytes .../betterend/textures/block/violecite.png | Bin 237 -> 237 bytes .../resources/betterend.mixins.common.json | 57 +++++++++--------- 28 files changed, 108 insertions(+), 53 deletions(-) create mode 100644 src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java create mode 100644 src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java create mode 100644 src/main/java/ru/betterend/mixin/common/ChorusPlantFeatureMixin.java delete mode 100644 src/main/java/ru/betterend/mixin/common/ChunkGeneratorMixin.java diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java b/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java index 3c9d6d43..8c2154be 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java @@ -5,7 +5,6 @@ import java.util.Collections; import java.util.List; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; - import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.StoneButtonBlock; @@ -13,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; - import ru.betterend.interfaces.Patterned; public class BlockStoneButton extends StoneButtonBlock implements Patterned { diff --git a/src/main/java/ru/betterend/blocks/basis/BlockTrapdoor.java b/src/main/java/ru/betterend/blocks/basis/BlockTrapdoor.java index 945e1be8..64209a3f 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockTrapdoor.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockTrapdoor.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.List; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; - import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.TrapdoorBlock; @@ -14,7 +13,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; - import ru.betterend.client.ERenderLayer; import ru.betterend.client.IRenderTypeable; import ru.betterend.interfaces.Patterned; diff --git a/src/main/java/ru/betterend/blocks/model/SlabModel.java b/src/main/java/ru/betterend/blocks/model/SlabModel.java index 093a6f2b..91e24cb0 100644 --- a/src/main/java/ru/betterend/blocks/model/SlabModel.java +++ b/src/main/java/ru/betterend/blocks/model/SlabModel.java @@ -18,7 +18,6 @@ import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; - import net.minecraft.block.BlockState; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedQuad; @@ -36,7 +35,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; - import ru.betterend.BetterEnd; public class SlabModel implements UnbakedModel, BakedModel, FabricBakedModel { diff --git a/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java index 3a6013d0..698fa33e 100644 --- a/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java @@ -21,7 +21,6 @@ import net.minecraft.resource.Resource; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; - import ru.betterend.BetterEnd; import ru.betterend.interfaces.IdentifiedContext; import ru.betterend.interfaces.Patterned; diff --git a/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java b/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java new file mode 100644 index 00000000..ae32e565 --- /dev/null +++ b/src/main/java/ru/betterend/mixin/common/ChorusFlowerBlockMixin.java @@ -0,0 +1,23 @@ +package ru.betterend.mixin.common; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.block.BlockState; +import net.minecraft.block.ChorusFlowerBlock; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldView; +import ru.betterend.registry.BlockRegistry; + +@Mixin(ChorusFlowerBlock.class) +public class ChorusFlowerBlockMixin { + @Inject(method = "canPlaceAt", at = @At("HEAD"), cancellable = true) + private void canPlace(BlockState state, WorldView world, BlockPos pos, CallbackInfoReturnable info) { + if (world.getBlockState(pos.down()).isOf(BlockRegistry.CHORUS_NYLIUM)) { + info.setReturnValue(true); + info.cancel(); + } + } +} diff --git a/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java b/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java new file mode 100644 index 00000000..96024254 --- /dev/null +++ b/src/main/java/ru/betterend/mixin/common/ChorusPlantBlockMixin.java @@ -0,0 +1,23 @@ +package ru.betterend.mixin.common; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.block.BlockState; +import net.minecraft.block.ChorusPlantBlock; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldView; +import ru.betterend.registry.BlockRegistry; + +@Mixin(ChorusPlantBlock.class) +public class ChorusPlantBlockMixin { + @Inject(method = "canPlaceAt", at = @At("HEAD"), cancellable = true) + private void canPlace(BlockState state, WorldView world, BlockPos pos, CallbackInfoReturnable info) { + if (world.getBlockState(pos.down()).isOf(BlockRegistry.CHORUS_NYLIUM)) { + info.setReturnValue(true); + info.cancel(); + } + } +} diff --git a/src/main/java/ru/betterend/mixin/common/ChorusPlantFeatureMixin.java b/src/main/java/ru/betterend/mixin/common/ChorusPlantFeatureMixin.java new file mode 100644 index 00000000..d15d44c2 --- /dev/null +++ b/src/main/java/ru/betterend/mixin/common/ChorusPlantFeatureMixin.java @@ -0,0 +1,29 @@ +package ru.betterend.mixin.common; + +import java.util.Random; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.block.ChorusFlowerBlock; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.StructureWorldAccess; +import net.minecraft.world.gen.chunk.ChunkGenerator; +import net.minecraft.world.gen.feature.ChorusPlantFeature; +import net.minecraft.world.gen.feature.DefaultFeatureConfig; +import ru.betterend.registry.BlockRegistry; +import ru.betterend.util.MHelper; + +@Mixin(ChorusPlantFeature.class) +public class ChorusPlantFeatureMixin { + @Inject(method = "generate", at = @At("HEAD"), cancellable = true) + private void onGenerate(StructureWorldAccess structureWorldAccess, ChunkGenerator chunkGenerator, Random random, BlockPos blockPos, DefaultFeatureConfig defaultFeatureConfig, CallbackInfoReturnable info) { + if (structureWorldAccess.isAir(blockPos) && structureWorldAccess.getBlockState(blockPos.down()).isOf(BlockRegistry.CHORUS_NYLIUM)) { + ChorusFlowerBlock.generate(structureWorldAccess, blockPos, random, MHelper.randRange(8, 16, random)); + info.setReturnValue(true); + info.cancel(); + } + } +} diff --git a/src/main/java/ru/betterend/mixin/common/ChunkGeneratorMixin.java b/src/main/java/ru/betterend/mixin/common/ChunkGeneratorMixin.java deleted file mode 100644 index b27f1ddd..00000000 --- a/src/main/java/ru/betterend/mixin/common/ChunkGeneratorMixin.java +++ /dev/null @@ -1,16 +0,0 @@ -package ru.betterend.mixin.common; - -import org.spongepowered.asm.mixin.Mixin; - -import net.minecraft.world.gen.chunk.ChunkGenerator; - -@Mixin(ChunkGenerator.class) -public class ChunkGeneratorMixin { - /*@Inject(method = "generateFeatures", at = @At("HEAD")) - private void fixerPass(ChunkRegion region, StructureAccessor accessor, CallbackInfo info) { - int chunkX = region.getCenterChunkX(); - int chunkZ = region.getCenterChunkZ(); - BlockPos start = new BlockPos(chunkX << 4, 16, chunkZ << 4); - DefaultBiomeFeatures.MOUNTAINS.getFeature() - }*/ -} diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index 2c51116b..5a76869f 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -5,7 +5,6 @@ import net.minecraft.block.MaterialColor; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.util.registry.Registry; - import ru.betterend.BetterEnd; import ru.betterend.blocks.AeterniumBlock; import ru.betterend.blocks.AuroraCrystalBlock; @@ -35,7 +34,6 @@ import ru.betterend.blocks.basis.BlockLeaves; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.blocks.complex.WoodenMaterial; - import ru.betterend.tab.CreativeTab; public class BlockRegistry { diff --git a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java index cd6a658d..f4d4a810 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java @@ -1,6 +1,7 @@ package ru.betterend.world.biome; import net.minecraft.entity.EntityType; +import net.minecraft.particle.ParticleTypes; import net.minecraft.world.gen.GenerationStep.Feature; import net.minecraft.world.gen.feature.ConfiguredFeatures; import ru.betterend.registry.BlockRegistry; @@ -13,7 +14,7 @@ public class BiomeChorusForest extends EndBiome { .setFogColor(87, 26, 87) .setFogDensity(1.5F) .setSurface(BlockRegistry.CHORUS_NYLIUM) - //.setParticles(ParticleRegistry.GLOWING_SPHERE, 0.001F) + .setParticles(ParticleTypes.PORTAL, 0.001F) //.setLoop(SoundRegistry.AMBIENT_FOGGY_MUSHROOMLAND) //.setMusic(SoundRegistry.MUSIC_FOGGY_MUSHROOMLAND) .addFeature(FeatureRegistry.ENDER_ORE) @@ -21,6 +22,7 @@ public class BiomeChorusForest extends EndBiome { .addFeature(FeatureRegistry.PYTHADENDRON_TREE) .addFeature(FeatureRegistry.PYTHADENDRON_BUSH) .addFeature(Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT) + .addFeature(Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT) .addFeature(FeatureRegistry.CHORUS_GRASS) .addMobSpawn(EntityRegistry.END_SLIME, 5, 1, 2) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); 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 index 459a3d637c68bdcc8559fc11c0ceded27b65341b..dc0ea52d69cb503b32b8556f0a2113af9f32086a 100644 GIT binary patch delta 29 jcmX@kdYpBF7UQjr+C5AHTiL^BGXR07tDnm{r-UW|lWYk{ delta 29 jcmX@kdYpBF7GvB-?H(op-j;G<1|aZs^>bP0l+XkKfNuyn diff --git a/src/main/resources/assets/betterend/textures/block/end_lily_2.png b/src/main/resources/assets/betterend/textures/block/end_lily_2.png index 8c15ff648c90c47842ce114f8f79beffb6e7707f..d6636191132ab0c19113a5557779139a55f3fd72 100644 GIT binary patch delta 158 zcmV;P0Ac^+0ptOYPJfVOGs#RcHkKl5w)MelKW1K~s_4=R9rFji0IT~(XWO+F15fL_ zUEn-HLn;HtmmBKo((uEU0X+pK=PPKwC@7XeNeF;CP;e#F@YUvCWbTthBK0nzrCPAP>Di=7r63_#%N>gTe~DWM4fe_#lT delta 29 jcmZo=ZDpOH#Td6y+lxuS{CLx01|aZs^>bP0l+XkKeJ}`{ diff --git a/src/main/resources/assets/betterend/textures/block/end_moss_top.png b/src/main/resources/assets/betterend/textures/block/end_moss_top.png index 0f537882dd8bbbed8d2a543ef4265a4e5c8c6ac4..38e28989c71e6b85fa5ccee5a141387cda261ed5 100644 GIT binary patch delta 29 jcmcb>dVzI<7UQjr+EbYX8df$NGXR07tDnm{r-UW|nOzB# delta 29 jcmcb>dVzI<7GvB-?Ws%xuT7O)8Gyjk)z4*}Q$iB}iZuwp diff --git a/src/main/resources/assets/betterend/textures/block/end_mycelium_path_top.png b/src/main/resources/assets/betterend/textures/block/end_mycelium_path_top.png index 14f7385b8a9bfcc215c36ae151118e2eed60671d..efd16c00ee064df829cf751684098b3172412268 100644 GIT binary patch delta 29 jcmZ3&vV>)V79-MHFaUw4tDnm{r-UW|i_-~M delta 29 jcmZ3&vV>)V7UQjr+AkRen0IO&VgLe9S3j3^P6J&=1l|OYDt`ebQp-}@Fc7q@(Zlj%1ECTQ$szZAK+gI1a7*R3yaE)dg1|1| zWo=p3!*<%i2iLf*>F#Mw>bF0#ESsij9LEqsnx^>l&0YENOOhnkS|CD*7$fJreYhs? zeY?38QfG`z+a$?M#ILW;zShT&H|xBpm0tDHPtg)(zb{WS!he5}CuuU+fw*L(eVD+i zwT5g6t~X7}^B7S_=N$Ai?}oldZEW9%apI~32tQor-Z|o$%}!NEbF#Q4xEyQ;_l#gP zh-881c?P}A%VeHn@R)*_4bB56r4$TUYq*F)fYPD?0pQ=h*)Ss4K7&}72P#*P%`m<$ z>!PU86TA~r34d8&Fj(C0Uv|wlV+?Xb|C*!>vJ_wc-rk&p58lQYcDpU;8DmHm{lFjY zZ{K3wZtj4m;pt=;20$1zB>E) z?fd7=pNpa>z_M#zq{?-!PuIT)DyD0RD~5|Rop(=MNPo-#zN%Uo(~e`r79e>k1wevU zSs%NTY@<9$bk>%(jcmjxnJs zj7lKm#1KfiI{LqWp35cgzV8`V^}7#5Hi6%5>>`nXZM_gWoZBuCqpbd ze1FWcxj1WIVHmR1J>HyOtlJ&=1l|OYDu3D~Qp<9iKoA6W_Q3*D?6?vil0)wKfSmL1$t{(e{EF>Ts_fX3 zZ6v|6>;p(+bD)-Hr@NxT)&dbi#27i}&BG0O z@0-n9NS!eBY*rCd6Fi*?TJf9+J_OW zT5HIL;5t*MJdY9Q=$y-D1Fr8noQ>_eFpON40O5zr+&f2Hv&pIIWJ+eY1ed*S;hqtU z29eD0G)L6+kF-}?3feDF5Ju-k1x&lp3ps0aRV zzkZ8#ySW3NhNqu>-vfd%DB>)o#BF)}35lcNZ8CV{9Cr7!H0ID-OR7?WCZ^l^`TG3V zx9^`fe=m!o0L!j^kt)}@K3n}JsF=1Pt{4VqTJN5?kbmd_d{wnHrWuBaEkN>8ia8}{ zm5ZY(rM_!`+OE|_g*N78N#-sc#5teF0cG>lP=uvG4#*obhcwRY^}$FyVzzCZcZ>;D zp;ZDICx$@E<;m*;dM@X@yRKtgE#7@V6hg?dT5vfp3n3HCk*G4pI(y(8EOP;%I2vNv z@%vMjO*n0{hhfN4`*?eCxq>$YiUmfLZ?}=)_0^d%1_VH`J6K2D`46lGg-MA7{1yNJ N002ovPDHLkV1m~w8>IjM diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_barrel_bottom.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_barrel_bottom.png index 7e09714be35baecfbc795eda26ddc5b69189048b..8df3c4384b7f7537904767fbd0699785e5650f10 100644 GIT binary patch delta 420 zcmV;V0bBmT1i=K5Dgj=RD?V0abN1dj=giEx2Hgfa>-<_jKmHy6J;9q9G- z1d+c+e^ggqf8Old(5Ya*gu^Wza#}hpSZCc(2S(0{diXZ-Q8<1iA1D%bKZ)MgRWtzK zh(r&tAQsr-2KhR8BAlC4~KS zO-nf3wz}J>&Xb#{GrqUzHLql=8>eb0NM10SMC`Sa5kz?_}r{E}p^I1-&9#e(Q?9MHr@^IHG0X(;f6#|`5QR9FW>ARrHE#8@x4W_c_drim|QY6j+1{GL&-%hj`9m}YZg&oLOrKM^Kmt}h<)VS zjyH#(50iJa#cL==bf2OyCnxwj7veh*fH2L01(yf)PKHk5;u(xx&?}0PYzmCr@t`82n-JLDY>B;E@5(GT)CJK=`WfRZ2suUD8;=o!5{aS+ZEMX{%PQ!G0ppS+ zQDwPUE+McYAb%lEl6VnSmzRTS5Jiz7Gb({54DHrJah z;|ZmYLpM!QEaA$M13HdlXPn;*9!IWg6%5ldA*HNbG@+Yw_VhUNMqc<5d)_qT8Mx9k zwb@*4t-qbm!kFjeV^nLb`2OsAa5JC32zdtY?VEaYtx<2(QpzO5G@9#8i4av&7)?1B zBrJ(J|9$)~PU*)F??IeMWOt`SQ|b;qh_w)f5oa9o1`K{NLABL7=jr3a@bs)d7~De8 zhOY1JZhx&dYiR0CU3UUbs?HKiDLA~ly{|YG$1V?_p8MCgelUYTU|gvLYp@W+4NC!D zno>9lC@j-dG}7&E+jeO<9L;9ovpdc*KmqdKXug6Q!E&UBq}?oc;%{ WXIkh7H?Q3Q0000{OVcz} zMTsfzJv<}e$*Qu9m&+t(l!6YzNRlLPGKyk4n+F(^i_7*hjxiR9LQoKf^;%6;)kUx% zifkAJ#PX|Do%+d6dXSE9?MSIv5SM}m(E>p=FcGz7*{C38Y~2H!%~2k zBovMU3d=MVjT|2C+IC?u7|!Rxi#JMBKmqc{X>(l3t zuw8FBxw^Um5zf;zOJQWTTB#uLgu$q4JNcYpNGTE$M8UD0Lcx3)dYO>Td>W7c-kB$!ZcDGH_{Be4Ia`LI;FYNC0wl~*= z5TCz%{e2l8AMfw)_N%HqJ-b9{I!TjPUDK*kV2mxxY&Kj?(|?%G((y!5)qI{ij>B}F zm(`!Y4+w-+q=Hypa8Z^DQsG%u)#vzS&dXWOF{Wqd7deMQp*lq%Nht-Tx~>h2IgWL4 z6=Fh|#-iv&*9bV#H3}9=Q9GuA5K`gPwbXUCy1e8y99b(j*EgK!Ow-~xrJCmZ9VsPT z8%>X-Njmdeihm-7D4}cUj2YV1<&EENG0V~!RTRatj5+6o;OTUVd%bnYiV5zt7r^?$ zLaVN-!R>t%MWB*p(>yOWHdhVC2*y%DxWBW85MhSCyx4^>gc8QsWH!4WKBn227hILn zw5_F}Eh>3;H$+k@p64c`G<{7~6+~sjb+&qILEz73bAM=d{0>6kOLc7f>FI?)3AwXu z9NrF?$t=^TYi0G#QXIvIqVVdL7lmcnm6X|JQYi|4`|e=7zm+CQcsmqz)eYLUl#~z{ zI~h-2)A4vbSy@@M9oKKQN+FPC+c2@e(<_P`eE&SX2*Uw@HVvb9G@{QKdYSIaNdn|Gf<~hevR%h(y1=KmwZ6QvtPvfyPN?R&u5Gd`9o3cK zg~+B;+q9me7%0hZ5Fm`1!P@QSe4a0MebZz`St7t6ff4^HF)$)3K`{9TzLHVipcCE# P00000NkvXXu0mjfybn?0 delta 681 zcmV;a0#^OU1;+)DDu3D?lIc#{Koo`TS?uu|CnR=&g4jYpEP_gXkiI~rzG{C}?T@Mp zg|eBngw>9*vw7^Xr?(wxq?tR?x#xU$)OYXS9vvO*?QWZ<`TgYV!-tO@e_?m0x4pS0 zg!uIN%dd;@_;`PRw_jD|$>{}3(@C1V=$clQ0%L4hX0zdHnt#T0mX0Tis^;_DaU7=W zysUozxkn(ZA{E5)f{U_LkP6SLsy@Zfb6(DJjxjwwJI^^B6sl7Ml9Wtmc-;q+n zwbArQnxr$orGF?=h!U!X&X}QHUR?X_7PBm!QAJTK%b0Uc2%b)-xYt{UteD_VdjYI3 zEVSyX8r zjl-J(Gnr)?b*-$vT8g6>Q50U@@S?CRyOJ`SOe#geuiqSO_qWm{32%m?uDU_HmXZSiNfqyr=|N8Cc<5ML5t+EsqrbO2b6=4|bV?3%vjYKIp=bq;r9_~Tp zhli&)O0L2I(1h_)s&ihxBngn$2pWw>$aWpC=>nhL*81|wvPN{6I-#29y0*!(bW~S@ z7b2TZZPR*+VxT0uL4Yu325YyQ^Lf75^-Yr%Wg-E81X}#3#K4HC1i|DlzLHViF1C^P P00000NkvXXu0mjfm@QJ5 diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_top.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_top.png index 96ee739d52736530c2abfbc8ad45cee7658c5710..d1ba6310178708c7b0689eb63f4a1e7203096ba8 100644 GIT binary patch delta 460 zcmV;-0W<#31rf53V;wghcdZ*JFhGdtQ)CyzJAzwSW=m!a6g zv+%s_YNjOsk^sxwP`p}-my!ib03yRhc#--qf&XuCp{Z_(&V*H+A*cYu-K%3kN_tmi z5Tn8{IdFqACsIQ~1b#;L>#D)7bu6OjG|dKEYh`r$3(VxVeYl5poWaoTyTh(He|Nrz z44f6M+p|e+RmTsW6^Z2{GyMwO&;5E2>r5t8an*c@gOE|+08pu_)tW|XbsZBJf7?L< zvQ9(0({n(NWZZEgJW$S zlYv7dL>8AGO{^CuiWyKs0});Kf2Y|Hf~vR7k}Y~v>fY~K*{@p>F6id9Xsd)yg$YQ z25pr^VmmUNJos}meY!PqHW1|`X5>3;!EsKYuD7P_DA>;1mq!&xA>rr(I+nK4G<%y> z+f{+ZONsWn^>U}N^`gd$ajb(;$d)Xj-Yi67i+=%3kT`lRHU9ko00000E-M4;YI4d1pdFlg{HbCIullPhM)o-?p_@WQqsFB z!!arhlY?)#%!$;H5CPA~eqA-#wT?v;ou=7fYpsklJR(1T~S&>*SGSjbse(u+Mz%ZFm#Z~hq4njtOgMms_t=2SBtLvD+_}dN= zkaZf`ot^`9Bm=^VtFT-Y4yXHNub#^CQ6fl*Xkv-ZhEVO)wEVw`rg6rfAi+(V4UV;S zOa_EVh%7EWnpiJR6f%*c1x0&z~DuD7P_DA>;1mq!&xA>rr(I+nK4G<%y> z+f`wUmlExD>*Y>k>qU(h<5&lykS$q4y;+FF7XJcFkT`lYSO(ny0000(pP0j^3Du}zZ?3HUhWrNrT_o{07*qo IM6N<$g3Rz?@&Et; literal 1624 zcmbVMZEVzJ94~kgH`yEtX1rvUf-p9FeYy3vRw|D6e=bM1Nr@%^mD z;%;1eic?J8FRNw(_;b1i(Fn4AN6wO!e&C`BkkSkuyD@(bLp7DhdKih6ECHmo@Q@9< zhoUiMs9#}KY{z5h_8bQZbl}QpPR|$)m*cSlF9+w|Hi4l9h}+L&?Vdn1E_I@UX#PX$SqZg~WyNvf3~TL~(FlN3h=xd4ln9t=ve)g;#?K2eedS3H(>U5g`# zY&Pr92K=U-A}E$+36dsg8ixqn88louha1kOGJ^;l#nvoWGY!;ZloRHF%VSW}q6xZH zp*5V6o1nvpoNN)4pY%*B09B=evj*%;LAa_AAOmz@xDLcp6|9vuUDHXMe?wh4zD)ph ztt3@sEUAmGS422&Xdg7AF+(0b2o~eNfF!o;4OH*g$qoJ7$`ha-cfP zDx-qn1*Q#c?9mL>%sSg{xdTMm1w2NRG>KF2Wnv`B(G15>&18Th$s$xTRV_KVB$VYS z<~AtI8dY}Xe+8=wmo#l%hBj-uoC1Vpq%gGNNlq{`rVRx{?E(cYB#Da{jw>4qh=@D} z&Gu`W3N=l#jFKdACc!9pkZA$9Oa%d+l;t*+Q31)S$?|>CR0h1@mhY?o^L~e|!QzrL zcg*9JoR<|`SaV>!21`ZJ4W28_G8$S)1Ws1G1m`iui!4yF(zbTT9w^dg(*TnGL%54D z$4t6e*#_+?=&k>fQ3TYV@T#$B3h`Gf3um`fZW#{Sfj6!6A-Je?GGM^=Wy3zzHZ$3S zAj|HJi0!e)OZxbH_4&u^Lhl{%MW*stV&jwR9{ynTp^XRkUpzFC$4-RueT&a_)USvf z1`Uq}Zho<4!_Bwvx8sr^X}xu@c78+msk1kU-~%ypgh+!kr$#fB3V>*w{k-*2|a9V&6nN-U`rh z#`>^f^{G|84{W*WJJPhabL!U>r+wEKkMBIQa?Pppi~FzCbX;h;??UsohPmnG?;hJF zR&{;SwC0t|2e0kE5$fIZ#v$RZ(d*;C(8o>;k9~Bey?bTjjIj6Bh2E{-jh?G}+TAcW sviZ%vlc(z&Mn0_?R;O2;L>&tZBWGXck0QU_@AGbP0l+XkKdgTe~DWM4fi*^Y^ diff --git a/src/main/resources/assets/betterend/textures/block/pythadendron_log_side_mossy.png b/src/main/resources/assets/betterend/textures/block/pythadendron_log_side_mossy.png index 97588acb47c98a677044de44f44cb3dbd2294aff..bc53c4c112cad9b1b29760d75a51ed9a286ab182 100644 GIT binary patch delta 349 zcmV-j0iyo%5%&U+BYy!tNklpO-=$q5QX~=W`eUI7&Asiegu>;K!_%~GsZP1 z7!yvw88`tej>6IW+Rqe|bSkf^Ue~Lt?lixD>GuX-i*Et;x~v2d!Ja-(o8AUmBF%{$ zAwb;0g(rJA++h<58Nucp*GF>37uD*a9Aca4&t0dVl!HM5(tqH?@-Q!I>)9%Cz+-m` zPEsf3%#u)-RRoDtD6@sZfYs}-&1mR_!qJ}-Ycp`ot zTFU@bbucXL{cHZUM4)tUYiV?u36_3kF#c1sP>ce$$XM8y! z!hIGM*HY9V>Q)_wvrjO==B822(#cKlpZ8SS-fr6+g9*}S>@+L53Vajs+gyXM;ZDz6 va@i*0Q`vx3VLL#6X?=4h;??}&Z5R9tZd|cPBDVQt00000NkvXXu0mjfXH}*F literal 2291 zcmc&$eNYr-96mJ-F+`b2QbXlY6Tc>W_R>$@otkLwU zbUCt>Yc1PJwc{JeOdBZyY=dLoU_=Pb2J@-J8TY zUAAJ0%PdZFFva-{$--mDKnZ>d5O_F+hWsA4AX9z|9N?wExjKx(PynLjTi`@BAe3!S zhmu5zg9xn=VQ_;EGLc%`h>Kas zQ+xz<@b*IiKxysvV2m!ccs#)nvXWc~(imuT5h!+;>I$kiQ#kez6u5?^75YEHEJN|4%E)Si@pmhJux(l0>&CfxtkW zKA^&Gr&0u2p#_FZv07k|w$|lhDYKqqXg!M|W}G7t!fY@jxuk(WOgd6W^BB(P&3Na0 ztH>0n%~j{O`-q^Mh@X=+RPFxhmkC=8am(+%I16huk$E(-#IL_;68Znqa>3Q5>M95sw2^MDwlac0eGY>r3E~_i`5Bc#a)pyV{PFl$0 zzzT}OPoK||x%20JEg>-wW#>}=VyeQv|R#M=4Z;+%*v33C@r9dmrm-l*p7&8M;!efRtKCFkT) z;X;o{TSLFpCGXaU!AGu&JqpJTi)q}F17+{sJ^oDk$@r;d#81WvpUrHwuKl>Otm$mk zR5Uw7IN@oHeXeTlt}C@sgCguZum38zoGY%sR94xPHamPidjA#s;*CRVrc-TE>q74D zUR5&h)R8;)dTt)ozj;PzwX=9=WbNDEuKQqZbmH)xJ+RW3&$K=B3Vp!3u%h(O4WrlW z+4$!1nyWr2lf<`Q@Wq5#OxdVp_>lwy?5hV_R9s=NIqI zlBzB>ZcB~MY&rhni){n8A&n91&qmIhez@-DzM8BNRo7B)-9FIxzBHWM-fJ0>5pny_ zg0hS9osvVwqQxgqFuQPJ`6s8Jz4q2Yq<-&LiL;9we}J!(tf-pGiFHH1p1H2?b=SC@g?|IjMj-+K diff --git a/src/main/resources/assets/betterend/textures/block/pythadendron_log_top.png b/src/main/resources/assets/betterend/textures/block/pythadendron_log_top.png index 31205c5b2b1e4aa8bd7d35e39d2221870de410ed..76dcbdeaa351e8ba4ff3b799a3857b35418fcae6 100644 GIT binary patch delta 427 zcmV;c0aX6z1H}W7B!7%aL_t(|0Zr1^PC`)-1yFv&ClkAX4I5(j1B^d_g(43~QP6}3 zUg-6oT{nk_$=u1FbI$D9dvarEyXp99@-g!ifV{S{;RN_QQ94w57K6S|zRU4)^SD__ zR)C+=A16uy2w*8jd$$vd>JijO3os{-U%8$gy zqT%!KGrOLZbp~R&x>pr}Ug?1$R7Dfim|V~9XT6JFH{Bgx4MUzk%%^wLucI%+(M1iW z;3k9m$?e2w&4NP001ec`yhWx>s2|i_n?AZ8Q4E+y0MUp|!{vd)g$D$fBJaq$!Zbcvlal24AT>U*Cd3! zM-zN55Rf4=1GomT*d|vDxMFoFiA$`80w@LGg@9!P%_Ld;8hjHc030DJU5o!E{0r)( V?|`|Y3Ejnp-Y!^|s}k>f7P9@$Fn!vALlm-(7{iUdsaFF?q}|u*a|>6zZku+qE1S0CU2^P)qlgnVP&8K9E=?74ejj@ z@9*Y!k4wi+PRb{?r^Qo3l6F_)S39{KtI8l2=jC$|^tKW-Av=+1kICns^`Dpdm*=_X z_oeq(e>Z-=*S@bOt~E!Od0-1S8PtERerc^(P)Hb{KogiZV@Q6NW0yYb{;~W)F`yd( zL?hM*mjs6fn16XdfXVu~^2wh(Ne`0`fGvy>kU)Rt0XixkA$VPQH5uS>_K_dbd8Lzj zjJDX5F7^uWvB(2SFjhfQ6hw!A52nNu>rb;!fZznBZs7qp%(Mw5lcK?t5Fj&?h?uM? zzb(G`q!MH1!CfH0XDk33D@;#-xVV^m=D}^py^vvLCP!We5Vye<195TQQSzQh;u4vr z07?PK5U^E4eZ17ngFmI(k;s-&1U5ie0@;M1Zmeth1F9wHcL|J#Qvd(}07*qoM6N<$ Ef;5ZXKmY&$ diff --git a/src/main/resources/assets/betterend/textures/block/violecite.png b/src/main/resources/assets/betterend/textures/block/violecite.png index 7b3f9b76558aeed726f3c074de97640c7313119a..d919a3a5e468d581b2d44114d9cc94a168d3c156 100644 GIT binary patch delta 28 icmaFM_?B@(86)Gw@-%_S<962=fWXt$&t;ucLK6Uzh6#xP delta 28 icmaFM_?B@(8RM;q=d#Wzp$Pz)Pzja* diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json index 4b16d8bd..4162c4e2 100644 --- a/src/main/resources/betterend.mixins.common.json +++ b/src/main/resources/betterend.mixins.common.json @@ -1,27 +1,30 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "ru.betterend.mixin.common", - "compatibilityLevel": "JAVA_8", - "mixins": [ - "ServerPlayNetworkHandlerMixin", - "CraftingScreenHandlerMixin", - "DefaultBiomeCreatorMixin", - "GenerationSettingsMixin", - "AnvilScreenHandlerMixin", - "TagGroupLoaderMixin", - "EndermanEntityMixin", - "LocateCommandMixin", - "DimensionTypeMixin", - "RecipeManagerMixin", - "AbstractBlockMixin", - "LivingEntityMixin", - "BoneMealItemMixin", - "SlimeEntityMixin", - "BrewingAccessor", - "BiomeMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} +{ + "required": true, + "minVersion": "0.8", + "package": "ru.betterend.mixin.common", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "ServerPlayNetworkHandlerMixin", + "CraftingScreenHandlerMixin", + "DefaultBiomeCreatorMixin", + "GenerationSettingsMixin", + "AnvilScreenHandlerMixin", + "ChorusPlantFeatureMixin", + "ChorusFlowerBlockMixin", + "ChorusPlantBlockMixin", + "TagGroupLoaderMixin", + "EndermanEntityMixin", + "LocateCommandMixin", + "DimensionTypeMixin", + "RecipeManagerMixin", + "AbstractBlockMixin", + "LivingEntityMixin", + "BoneMealItemMixin", + "SlimeEntityMixin", + "BrewingAccessor", + "BiomeMixin" + ], + "injectors": { + "defaultRequire": 1 + } +}