Worldgen & crop fixes (#10609)

* Improve structures loottables etc * don't spawn error
ldtteam · Jan 20, 2025 · e5f06a0 · e5f06a0
1 parent 13d7447
commit e5f06a0
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/com/minecolonies/core/items/ItemCrop.java b/src/main/java/com/minecolonies/core/items/ItemCrop.java
@@ -4,7 +4,9 @@
 import com.minecolonies.api.util.MessageUtils;
 import com.minecolonies.api.util.constant.TranslationConstants;
 import com.minecolonies.core.blocks.MinecoloniesCropBlock;
+import com.minecolonies.core.blocks.MinecoloniesFarmland;
 import net.minecraft.ChatFormatting;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.network.chat.Component;
 import net.minecraft.tags.TagKey;
@@ -16,6 +18,7 @@
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.FarmBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import org.jetbrains.annotations.NotNull;
@@ -52,7 +55,9 @@ protected boolean canPlace(BlockPlaceContext ctx, @NotNull BlockState state)
         Player player = ctx.getPlayer();
         if (!player.isCreative())
         {
-            if (ctx.getLevel().isClientSide)
+            final BlockPos clickedPos = ctx.getClickedPos().below();
+            final BlockState worldState = ctx.getLevel().getBlockState(clickedPos);
+            if (ctx.getLevel().isClientSide && (worldState.getBlock() instanceof MinecoloniesFarmland || worldState.getBlock() instanceof FarmBlock))
             {
                 MessageUtils.format(Component.translatable("com.minecolonies.core.crop.cantplant")).sendTo(player);
             }

diff --git a/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_boss.nbt b/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_boss.nbt
diff --git a/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_boss2.nbt b/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_boss2.nbt
diff --git a/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_ladder.nbt b/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_ladder.nbt
diff --git a/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_pyramid.nbt b/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_pyramid.nbt
diff --git a/...esources/data/minecolonies/structures/camps/amazon/amazon_jungle_ruined_spawner_shaft.nbt b/...esources/data/minecolonies/structures/camps/amazon/amazon_jungle_ruined_spawner_shaft.nbt
diff --git a/.../data/minecolonies/structures/camps/amazon/amazon_jungle_ruined_spawner_shaft_deadend.nbt b/.../data/minecolonies/structures/camps/amazon/amazon_jungle_ruined_spawner_shaft_deadend.nbt
diff --git a/...esources/data/minecolonies/structures/camps/amazon/amazon_jungle_spawner_intersection.nbt b/...esources/data/minecolonies/structures/camps/amazon/amazon_jungle_spawner_intersection.nbt
diff --git a/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_spawner_shaft.nbt b/src/main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_spawner_shaft.nbt
diff --git a/...main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_trapped_corner.nbt b/...main/resources/data/minecolonies/structures/camps/amazon/amazon_jungle_trapped_corner.nbt
diff --git a/src/main/resources/data/minecolonies/structures/camps/big_amazon_pyramid.nbt b/src/main/resources/data/minecolonies/structures/camps/big_amazon_pyramid.nbt
diff --git a/src/main/resources/data/minecolonies/structures/camps/desert_camp.nbt b/src/main/resources/data/minecolonies/structures/camps/desert_camp.nbt
diff --git a/src/main/resources/data/minecolonies/structures/camps/large_barbarian_camp.nbt b/src/main/resources/data/minecolonies/structures/camps/large_barbarian_camp.nbt
diff --git a/src/main/resources/data/minecolonies/structures/camps/small_barbarian_camp.nbt b/src/main/resources/data/minecolonies/structures/camps/small_barbarian_camp.nbt
diff --git a/src/main/resources/data/minecolonies/structures/ships/large_norse_ship.nbt b/src/main/resources/data/minecolonies/structures/ships/large_norse_ship.nbt
diff --git a/src/main/resources/data/minecolonies/structures/ships/large_pirate_ship.nbt b/src/main/resources/data/minecolonies/structures/ships/large_pirate_ship.nbt
diff --git a/src/main/resources/data/minecolonies/structures/ships/medium_norse_ship.nbt b/src/main/resources/data/minecolonies/structures/ships/medium_norse_ship.nbt
diff --git a/src/main/resources/data/minecolonies/structures/ships/medium_pirate_ship.nbt b/src/main/resources/data/minecolonies/structures/ships/medium_pirate_ship.nbt
diff --git a/src/main/resources/data/minecolonies/structures/ships/small_norse_ship.nbt b/src/main/resources/data/minecolonies/structures/ships/small_norse_ship.nbt
diff --git a/src/main/resources/data/minecolonies/structures/ships/small_pirate_ship.nbt b/src/main/resources/data/minecolonies/structures/ships/small_pirate_ship.nbt
diff --git a/src/main/resources/data/minecolonies/worldgen/template_pool/amazon_camp.json b/src/main/resources/data/minecolonies/worldgen/template_pool/amazon_camp.json
@@ -10,6 +10,15 @@
         "projection": "rigid",
         "element_type": "minecraft:single_pool_element"
       }
+    },
+    {
+      "weight": 1,
+      "element": {
+        "location": "minecolonies:camps/big_amazon_pyramid",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
     }
   ]
 }