From c37e44efb602a5d51ad784ab52a3f0805cad1599 Mon Sep 17 00:00:00 2001 From: DaemonUmbra Date: Tue, 7 Jan 2020 16:15:11 -0500 Subject: [PATCH] Fixed Big Mushrooms not generating (#6390) Removed vanilla negation from Forge logic that negated the vanilla logic it was replacing also ran datagen to update the dirt tag to reflect changes that were previously made in the datagen code --- .../world/gen/feature/AbstractBigMushroomFeature.java.patch | 2 +- .../world/gen/feature/BigBrownMushroomFeature.java.patch | 2 +- .../world/gen/feature/BigRedMushroomFeature.java.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/gen/feature/AbstractBigMushroomFeature.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/AbstractBigMushroomFeature.java.patch index 30d554c31..c2e5bd6b8 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/AbstractBigMushroomFeature.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/AbstractBigMushroomFeature.java.patch @@ -5,7 +5,7 @@ for(int i = 0; i < p_227210_5_; ++i) { p_227210_6_.func_189533_g(p_227210_3_).func_189534_c(Direction.UP, i); - if (!p_227210_1_.func_180495_p(p_227210_6_).func_200015_d(p_227210_1_, p_227210_6_)) { -+ if (!p_227210_1_.func_180495_p(p_227210_6_).canBeReplacedByLeaves(p_227210_1_, p_227210_6_)) { ++ if (p_227210_1_.func_180495_p(p_227210_6_).canBeReplacedByLogs(p_227210_1_, p_227210_6_)) { this.func_202278_a(p_227210_1_, p_227210_6_, p_227210_4_.field_227273_b_.func_225574_a_(p_227210_2_, p_227210_3_)); } } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/BigBrownMushroomFeature.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/BigBrownMushroomFeature.java.patch index 270d75dfc..3da0500fd 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/BigBrownMushroomFeature.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/BigBrownMushroomFeature.java.patch @@ -5,7 +5,7 @@ if (!flag4 || !flag5) { p_225564_5_.func_189533_g(p_225564_3_).func_196234_d(j, p_225564_4_, k); - if (!p_225564_1_.func_180495_p(p_225564_5_).func_200015_d(p_225564_1_, p_225564_5_)) { -+ if (!p_225564_1_.func_180495_p(p_225564_5_).canBeReplacedByLeaves(p_225564_1_, p_225564_5_)) { ++ if (p_225564_1_.func_180495_p(p_225564_5_).canBeReplacedByLeaves(p_225564_1_, p_225564_5_)) { boolean flag6 = flag || flag5 && j == 1 - i; boolean flag7 = flag1 || flag5 && j == i - 1; boolean flag8 = flag2 || flag4 && k == 1 - i; diff --git a/patches/minecraft/net/minecraft/world/gen/feature/BigRedMushroomFeature.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/BigRedMushroomFeature.java.patch index 434a65fa5..24a938f0d 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/BigRedMushroomFeature.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/BigRedMushroomFeature.java.patch @@ -5,7 +5,7 @@ if (i >= p_225564_4_ || flag4 != flag5) { p_225564_5_.func_189533_g(p_225564_3_).func_196234_d(l, i, i1); - if (!p_225564_1_.func_180495_p(p_225564_5_).func_200015_d(p_225564_1_, p_225564_5_)) { -+ if (!p_225564_1_.func_180495_p(p_225564_5_).canBeReplacedByLeaves(p_225564_1_, p_225564_5_)) { ++ if (p_225564_1_.func_180495_p(p_225564_5_).canBeReplacedByLeaves(p_225564_1_, p_225564_5_)) { this.func_202278_a(p_225564_1_, p_225564_5_, p_225564_6_.field_227272_a_.func_225574_a_(p_225564_2_, p_225564_3_).func_206870_a(HugeMushroomBlock.field_196465_z, Boolean.valueOf(i >= p_225564_4_ - 1)).func_206870_a(HugeMushroomBlock.field_196464_y, Boolean.valueOf(l < -k)).func_206870_a(HugeMushroomBlock.field_196461_b, Boolean.valueOf(l > k)).func_206870_a(HugeMushroomBlock.field_196459_a, Boolean.valueOf(i1 < -k)).func_206870_a(HugeMushroomBlock.field_196463_c, Boolean.valueOf(i1 > k))); } }