From 6ec1a3711e4d48aedbe219993a77e80283b144cb Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Wed, 23 Sep 2020 17:25:46 +0300 Subject: [PATCH] Wet mycelium --- .../world/biome/BiomeDefinition.java | 18 +++++++++++++++++- .../world/biome/BiomeFoggyMushroomland.java | 2 ++ .../betterend/blockstates/wet_mycelium.json | 10 ++++++++++ .../betterend/models/block/wet_mycelium.json | 12 ++++++++++++ .../betterend/models/item/wet_mycelium.json | 3 +++ .../textures/block/wet_mycelium_side.png | Bin 0 -> 2505 bytes .../textures/block/wet_mycelium_top.png | Bin 0 -> 2097 bytes 7 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/betterend/blockstates/wet_mycelium.json create mode 100644 src/main/resources/assets/betterend/models/block/wet_mycelium.json create mode 100644 src/main/resources/assets/betterend/models/item/wet_mycelium.json create mode 100644 src/main/resources/assets/betterend/textures/block/wet_mycelium_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/wet_mycelium_top.png diff --git a/src/main/java/ru/betterend/world/biome/BiomeDefinition.java b/src/main/java/ru/betterend/world/biome/BiomeDefinition.java index e28ab6ea..92ec1ee4 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeDefinition.java +++ b/src/main/java/ru/betterend/world/biome/BiomeDefinition.java @@ -4,6 +4,8 @@ import java.util.List; import com.google.common.collect.Lists; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; import net.minecraft.client.sound.MusicType; import net.minecraft.entity.EntityType; import net.minecraft.sound.BiomeAdditionsSound; @@ -23,7 +25,10 @@ import net.minecraft.world.biome.SpawnSettings; import net.minecraft.world.gen.GenerationStep.Feature; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.ConfiguredStructureFeature; +import net.minecraft.world.gen.surfacebuilder.ConfiguredSurfaceBuilder; import net.minecraft.world.gen.surfacebuilder.ConfiguredSurfaceBuilders; +import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder; +import net.minecraft.world.gen.surfacebuilder.TernarySurfaceConfig; import ru.betterend.BetterEnd; import ru.betterend.util.MHelper; import ru.betterend.world.features.EndFeature; @@ -45,11 +50,22 @@ public class BiomeDefinition { private float fogDensity = 1F; private final Identifier id; + + private ConfiguredSurfaceBuilder surface; public BiomeDefinition(String name) { this.id = new Identifier(BetterEnd.MOD_ID, name); } + public BiomeDefinition setSurface(Block surfaceBlock) { + this.surface = SurfaceBuilder.DEFAULT.method_30478(new TernarySurfaceConfig( + surfaceBlock.getDefaultState(), + Blocks.END_STONE.getDefaultState(), + Blocks.END_STONE.getDefaultState() + )); + return this; + } + public BiomeDefinition setParticleConfig(BiomeParticleConfig config) { this.particleConfig = config; return this; @@ -148,7 +164,7 @@ public class BiomeDefinition { new SpawnSettings.SpawnEntry(spawn.type, spawn.weight, spawn.minGroupSize, spawn.maxGroupSize)); }); - generationSettings.surfaceBuilder(ConfiguredSurfaceBuilders.END); + generationSettings.surfaceBuilder(surface == null ? ConfiguredSurfaceBuilders.END : surface); structures.forEach((structure) -> generationSettings.structureFeature(structure)); features.forEach((info) -> generationSettings.feature(info.featureStep, info.feature)); diff --git a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java index c47d4339..728c4bf2 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java +++ b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java @@ -2,6 +2,7 @@ package ru.betterend.world.biome; import net.minecraft.world.gen.GenerationStep.Feature; import net.minecraft.world.gen.feature.ConfiguredFeatures; +import ru.betterend.registry.BlockRegistry; import ru.betterend.registry.FeatureRegistry; public class BiomeFoggyMushroomland extends EndBiome { @@ -11,6 +12,7 @@ public class BiomeFoggyMushroomland extends EndBiome { .setFogDensity(3) .setWaterColor(119, 227, 250) .setWaterFogColor(119, 227, 250) + .setSurface(BlockRegistry.WET_MYCELIUM) .addFeature(FeatureRegistry.STONE_SPIRAL) .addFeature(Feature.LAKES, ConfiguredFeatures.LAKE_WATER)); } diff --git a/src/main/resources/assets/betterend/blockstates/wet_mycelium.json b/src/main/resources/assets/betterend/blockstates/wet_mycelium.json new file mode 100644 index 00000000..8b63bc11 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/wet_mycelium.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/wet_mycelium" }, + { "model": "betterend:block/wet_mycelium", "y": 90 }, + { "model": "betterend:block/wet_mycelium", "y": 180 }, + { "model": "betterend:block/wet_mycelium", "y": 270 } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/wet_mycelium.json b/src/main/resources/assets/betterend/models/block/wet_mycelium.json new file mode 100644 index 00000000..4a8444a7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/wet_mycelium.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "betterend:block/wet_mycelium_side", + "down": "block/end_stone", + "up": "betterend:block/wet_mycelium_top", + "north": "betterend:block/wet_mycelium_side", + "east": "betterend:block/wet_mycelium_side", + "south": "betterend:block/wet_mycelium_side", + "west": "betterend:block/wet_mycelium_side" + } +} diff --git a/src/main/resources/assets/betterend/models/item/wet_mycelium.json b/src/main/resources/assets/betterend/models/item/wet_mycelium.json new file mode 100644 index 00000000..baa349e4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/wet_mycelium.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/wet_mycelium" +} diff --git a/src/main/resources/assets/betterend/textures/block/wet_mycelium_side.png b/src/main/resources/assets/betterend/textures/block/wet_mycelium_side.png new file mode 100644 index 0000000000000000000000000000000000000000..3da7c0b2eb19f14258fb2483b310bd48c2189f9b GIT binary patch literal 2505 zcmcIm3s4m29Y2*J<_d)hM&pC*Y}EML+s8fjcFRdm4g}>yIZ`kf5&#CC9E(2^8l)Chyr*0d8F>tmo$Z64ZhkK>w$Hcn=G zGkg2(x4-ZA|Nnpg-+sIGE0!-wHcm4d42IwFyr5X%B zNYjsThF@-Q3j&z`i zC^*m(tDA7k*`Qp^t5$%gdU-KlUBNQ~nzabYjIfX(2s93f1Op+JjX2OKFAK-|G>#%s zh*sf1oq9l|)V%`9mK1;r;G?~Tma5!uVn@y79$4Q1^aDu`q3WEqttqN&e1PiGTjxo4^$}6I* ziBbsB89A?1sX0)X>1YW-IZhi=V=_U(@CYa4q>0c=iUI{bj*}~uKs30(;~)TnAf%}f zOUAKKCAT{czb$Pr7)PsG&U%t)#54{;6*@{Dit2&tcMXF97{|tmo!N&m+nwU z{C2z=nax%Jr%6h&Bn8GAwPK6~$Ge?@M%g$X^U)R_vs~;=dBxL~@LwaqP)dB!V5jGn~b13rPxY<%bQrwaNH8<;qjv9;2 z6IIx~s@Nmq0qbI;fQUrB#B#iDcL&PreFg#=n-*`Q)7@n>N*gW*ko12ve-x%lJ}t~C z!0CsY-i^QTJLRu(>%Sv=GbNB_GmUuxw4>m&crm-rOJHUi@LrCfX_~W+RsZemzv0I3 znSD%LzMKpB0o*}x^!wLycdortH~ydX;QHP;CBR zo_=L{>w;S+TiV~+b8A)iftycT5APpN8EGuo5ghJ2xUk~!Jr&G0;{#6_??dOlJ9}{G z&4h`4S5jL$vU;vE7i$(>tU1)swuc!uZun>0m%mQi{b|sdwCQ#8)TFG&P0bl|($u$B z&v0(6Ts8gph0kgirFZ=zhwz=f(y;E{!OfvZ=gr*x%&a8g&u_0S`NuQ(oWq}XoZHsg zB~%|il$zi?_FiXI^5l%V=K9V1pY*g|e1Y54d+ivpFr8P-2_1{N>-(n-B#1>7_fJpX zGTErUR`?aX*@ZvBOQTa1^hn}^!dFHNPBW+qyL=OUh#y5R}1c>l$rvNnQ6}&LhF6ev|T8^Kdw&u<5akuB;D+(q0}p-fiKOvd`atyZ^7d zd`n#KWP`L@7J#sGBH$_PFG&`sC8S-nJj{1J<6d!4S z`q;7SGYjg_z3XO-Gap_5<6!E9j>G}ODa3H1Z+_>(+M3LX`~UQzGXXv0{8>-I8;Mn0 z_g^ZO3)kN0=t3s_Bz2sTKbc%QR64M7kjn)>k$-PU(Lc8G MbC$c>7q8v;ABZG?^#A|> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/wet_mycelium_top.png b/src/main/resources/assets/betterend/textures/block/wet_mycelium_top.png new file mode 100644 index 0000000000000000000000000000000000000000..c1f29ec9e915002d3d6f28d6b3c56abd3a3c7eb3 GIT binary patch literal 2097 zcmbVN2~ZPP7+x5xfM^kIIYih7+lr9vCO|^AM1+KvfI&_HWs1x0LROM&NEQ;1h)^q1 zFI1|QLkF*-h=@>+0aU6oh=@H@EG-_D;!zIqq841ygfl4%oRYe0OESFVJ-sm5icP){;(Kn8ax?^lzccYi`j`-a++2n z5Tw)TI65y5rAdLfLZJ|Xc@U4sW)N&`riw=OY?an+f07FTFYR$CM@G6nal)# zC9P6vLTl-u3`V1I+g^#*MrW!CD3Z`p=^Bg(%3vhAO(>?8Q#7TOQ-5QJ>DXkA8WC#< zl%_P%6s4F5RQLo7C>9$7;|tD>B~>`3)4Cf4jo%?8C{2i1JeUWwVIiC670u-%K70h` zdB9!>439x&Oe)|gjs7<wJK#)noNdBRazQVVT4p7 zVlk?6ND@adZvy8g2?@5ZFG{evJa2+6CiLKUyiV+s-?rWBM$M&XQ?y^JY5no3A8sb%7oIbIY|MB4aDL4u>%gP@o(!9^_0 z7+C^mjejOz+cRUdIyu3R{zJIOU|K4f)}b0AAcgVbf5|9_(H}Baw7TKk{^_=Pr2J0p(2AVd;UQ1l4=3JyH^R3VVsZ~9tb7<#wKADrK7Y7>b3|f$r`r}USx4^r6D`j@V`lC<5@*wl z;SIHhzL)F;j+>4cu7})_tRIOTxCt+gRi{>@c3u-CZmagbx7)>KsK=?2mu|>Q^B%nK z`=qUW_rX%$@UFWzcIBThds;EDz<sr8%Q3=V zw9sm>%nB(xx85NowxJ!&&fc2_@PDm%*y*%_Ygapyy*;iY=xAx>+8UU^?`)y=KXF@ z8>N?>M8Z7J#3f720q|?7ZOsKwmyPb2V|h_w)1I5QezDE$&@B-e4@E8 zr-r*NYZs!R)b5HVbDPvI(0*usvCpNl7mW?kXV{^)Y;%t#s9K*Bck3$(~8L(>#wUTib8t YtSM>YmHn7pZ2YN9gTf?-1DECf0j;