Fixing more issues with farm generation

Brian-Wuest · Sep 15, 2021 · ce897a4 · ce897a4
1 parent 714fba4
commit ce897a4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/com/wuest/prefab/structures/base/Structure.java b/src/main/java/com/wuest/prefab/structures/base/Structure.java
@@ -417,11 +417,10 @@ public boolean BuildStructure(StructureConfiguration configuration, ServerWorld
                             block.setSubBlock(subBlock);
                         }
 
-                        boolean priorityTwoBlock = foundBlock instanceof HopperBlock;
+                        boolean priorityTwoBlock = foundBlock instanceof HopperBlock || foundBlock instanceof LeverBlock;
 
                         boolean priorityThreeBlock = foundBlock instanceof TorchBlock
                                 || foundBlock instanceof AbstractSignBlock
-                                || foundBlock instanceof LeverBlock
                                 || foundBlock instanceof AbstractButtonBlock
                                 || foundBlock instanceof BedBlock
                                 || foundBlock instanceof CarpetBlock

diff --git a/src/main/java/com/wuest/prefab/structures/config/enums/ModerateFarmOptions.java b/src/main/java/com/wuest/prefab/structures/config/enums/ModerateFarmOptions.java
@@ -41,12 +41,13 @@ public class ModerateFarmOptions extends BaseOption{
             false,
             true);
 
-    public static ModerateFarmOptions MushroomFarm = new ModerateFarmOptions(
+    // This is for 1.17 and later
+/*    public static ModerateFarmOptions MushroomFarm = new ModerateFarmOptions(
             "prefab.gui.starter.farm.mushroom",
             "assets/prefab/structures/mushroom_farm.zip",
             "textures/gui/mushroom_farm_topdown.png",
             false,
-            false);
+            false);*/
 
     protected ModerateFarmOptions(String translationString,
                                   String assetLocation,

diff --git a/src/main/java/com/wuest/prefab/structures/events/StructureEventHandler.java b/src/main/java/com/wuest/prefab/structures/events/StructureEventHandler.java
@@ -15,6 +15,7 @@
 import net.minecraft.entity.item.HangingEntity;
 import net.minecraft.entity.item.ItemFrameEntity;
 import net.minecraft.entity.item.PaintingEntity;
+import net.minecraft.entity.item.minecart.AbstractMinecartEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -417,6 +418,10 @@ private static void processStructureEntities() {
                         entity = StructureEventHandler.setItemFrameFacingAndRotation((ItemFrameEntity) entity, buildEntity, entityPos, structure);
                     } else if (entity instanceof PaintingEntity) {
                         entity = StructureEventHandler.setPaintingFacingAndRotation((PaintingEntity) entity, buildEntity, entityPos, structure);
+                    }  else if (entity instanceof AbstractMinecartEntity) {
+                        // Minecarts need to be slightly higher to account for the rails; otherwise they will fall through the rail and the block below the rail.
+                        buildEntity.entityYAxisOffset = buildEntity.entityYAxisOffset + .2;
+                        entity = StructureEventHandler.setEntityFacingAndRotation(entity, buildEntity, entityPos, structure);
                     } else {
                         // All other entities
                         entity = StructureEventHandler.setEntityFacingAndRotation(entity, buildEntity, entityPos, structure);

diff --git a/src/main/resources/assets/prefab/structures/automated_bamboo_farm.zip b/src/main/resources/assets/prefab/structures/automated_bamboo_farm.zip