From 6ab8cd5b5be100583c7d639294a3dbc39721d832 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Sun, 14 Mar 2021 16:30:27 -0700
Subject: [PATCH] fix mushrooms on fabric

---
 .../java/com/dfsek/terra/api/platform/block/Block.java    | 8 ++++++--
 .../java/com/dfsek/terra/fabric/world/FabricTree.java     | 3 ++-
 .../com/dfsek/terra/fabric/world/block/FabricBlock.java   | 5 -----
 .../world/generator/FabricChunkGeneratorWrapper.java      | 5 +++++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/com/dfsek/terra/api/platform/block/Block.java b/common/src/main/java/com/dfsek/terra/api/platform/block/Block.java
index becb5d436..b6132ef0a 100644
--- a/common/src/main/java/com/dfsek/terra/api/platform/block/Block.java
+++ b/common/src/main/java/com/dfsek/terra/api/platform/block/Block.java
@@ -11,7 +11,9 @@ public interface Block extends Handle {
 
     BlockState getState();
 
-    Block getRelative(BlockFace face);
+    default Block getRelative(BlockFace face) {
+        return getRelative(face, 1);
+    }
 
     Block getRelative(BlockFace face, int len);
 
@@ -19,7 +21,9 @@ public interface Block extends Handle {
 
     Location getLocation();
 
-    BlockType getType();
+    default BlockType getType() {
+        return getBlockData().getBlockType();
+    }
 
     int getX();
 
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
index f7480a57d..1055c0964 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
@@ -30,6 +30,7 @@ public class FabricTree implements Tree {
     @Override
     public MaterialSet getSpawnable() {
         return MaterialSet.get(TerraFabricPlugin.getInstance().getWorldHandle().createBlockData("minecraft:grass_block"),
-                TerraFabricPlugin.getInstance().getWorldHandle().createBlockData("minecraft:podzol"));
+                TerraFabricPlugin.getInstance().getWorldHandle().createBlockData("minecraft:podzol"),
+                TerraFabricPlugin.getInstance().getWorldHandle().createBlockData("minecraft:mycelium"));
     }
 }
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java
index a4d2d0017..9379380ca 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java
@@ -34,11 +34,6 @@ public class FabricBlock implements Block {
         return FabricBlockState.newInstance(this);
     }
 
-    @Override
-    public Block getRelative(BlockFace face) {
-        return getRelative(face, 1);
-    }
-
     @Override
     public Block getRelative(BlockFace face, int len) {
         BlockPos newPos = delegate.position.add(face.getModX() * len, face.getModY() * len, face.getModZ() * len);
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java
index b1d769cef..cb7ebe8b8 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java
@@ -103,6 +103,11 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
 
     }
 
+    @Override
+    public void generateFeatures(ChunkRegion region, StructureAccessor accessor) {
+        super.generateFeatures(region, accessor);
+    }
+
     @Override
     public void populateNoise(WorldAccess world, StructureAccessor accessor, Chunk chunk) {
         FabricSeededWorldAccess worldAccess = new FabricSeededWorldAccess(world, seed, this);