From bec8887a7681727f20366cbf34f1795a35a6cad5 Mon Sep 17 00:00:00 2001
From: Raycoms <ray.neiheiser@gmail.com>
Date: Thu, 31 Jan 2019 10:23:51 -0200
Subject: [PATCH 1/4] Increment structurize, improve citizen home assignment

---
 build.properties                              |  2 +-
 .../api/util/constant/WindowConstants.java    | 35 +++++++++
 .../client/gui/WindowAssignCitizen.java       | 74 +++++++++----------
 .../messages/AssignUnassignMessage.java       | 10 ++-
 .../minecolonies/gui/windowassigncitizen.xml  |  9 ++-
 .../assets/minecolonies/lang/en_us.lang       |  8 +-
 .../models/block/blockhutbaker.json           |  2 +-
 7 files changed, 92 insertions(+), 48 deletions(-)

diff --git a/build.properties b/build.properties
index 950953e6416..4c49bd2c96f 100644
--- a/build.properties
+++ b/build.properties
@@ -13,4 +13,4 @@ tinker_version=2.10.0.+
 dynamic_tree_version=0.7.+
 jei_version=4.8.5.147
 c_b_version=14.0.128
-structurize_version=0.10.44-ALPHA
+structurize_version=0.10.45-ALPHA
diff --git a/src/api/java/com/minecolonies/api/util/constant/WindowConstants.java b/src/api/java/com/minecolonies/api/util/constant/WindowConstants.java
index 0b85dd3f81a..ba63fc074d4 100644
--- a/src/api/java/com/minecolonies/api/util/constant/WindowConstants.java
+++ b/src/api/java/com/minecolonies/api/util/constant/WindowConstants.java
@@ -1090,6 +1090,41 @@ public final class WindowConstants
     public static final String INPUT_QTY    = "qty";
     public static final String BUTTON_REQUEST = "request";
 
+    /**
+     * Id of the done button in the GUI.
+     */
+    public static final String BUTTON_DONE = "done";
+
+    /**
+     * Id of the citizen name in the GUI.
+     */
+    public static final String CITIZEN_LABEL = "citizen";
+
+    /**
+     * Id of the citizen list in the GUI.
+     */
+    public static final String CITIZEN_LIST = "unassigned";
+
+    /**
+     * Assign button of the gui.
+     */
+    public static final String CITIZEN_DONE = "done";
+
+    /**
+     * Link to the xml file of the window.
+     */
+    public static final String ASSIGN_CITIZEN_RESOURCE_SUFFIX = ":gui/windowAssignCitizen.xml";
+
+    /**
+     * Id of the job label in the GUI.
+     */
+    public static final String CITIZEN_JOB = "job";
+
+    /**
+     * Id of the job label in the GUI.
+     */
+    public static final String CITIZEN_LIVING = "living";
+
     /**
      * public constructor to hide implicit public one.
      */
diff --git a/src/main/java/com/minecolonies/coremod/client/gui/WindowAssignCitizen.java b/src/main/java/com/minecolonies/coremod/client/gui/WindowAssignCitizen.java
index 8bb9c437eab..895589497d3 100644
--- a/src/main/java/com/minecolonies/coremod/client/gui/WindowAssignCitizen.java
+++ b/src/main/java/com/minecolonies/coremod/client/gui/WindowAssignCitizen.java
@@ -1,5 +1,6 @@
 package com.minecolonies.coremod.client.gui;
 
+import com.minecolonies.api.util.BlockPosUtil;
 import com.minecolonies.api.util.LanguageHandler;
 import com.minecolonies.api.util.constant.Constants;
 import com.minecolonies.blockout.Pane;
@@ -11,6 +12,7 @@
 import com.minecolonies.coremod.MineColonies;
 import com.minecolonies.coremod.colony.CitizenDataView;
 import com.minecolonies.coremod.colony.ColonyView;
+import com.minecolonies.coremod.colony.buildings.workerbuildings.BuildingBarracksTower;
 import com.minecolonies.coremod.colony.buildings.workerbuildings.BuildingHome;
 import com.minecolonies.coremod.colony.buildings.views.AbstractBuildingView;
 import com.minecolonies.coremod.network.messages.AssignUnassignMessage;
@@ -22,57 +24,29 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.minecolonies.api.util.constant.WindowConstants.*;
+
 /**
  * Window for the hiring or firing of a worker.
  */
 public class WindowAssignCitizen extends Window implements ButtonHandler
 {
     /**
-     * Id of the done button in the GUI.
-     */
-    private static final String BUTTON_DONE = "done";
-
-    /**
-     * Id of the cancel button in the GUI.
-     */
-    private static final String BUTTON_CANCEL = "cancel";
-
-    /**
-     * Id of the citizen name in the GUI.
-     */
-    private static final String CITIZEN_LABEL = "citizen";
-
-    /**
-     * Id of the citizen list in the GUI.
-     */
-    private static final String CITIZEN_LIST = "unassigned";
-
-    /**
-     * Assign button of the gui.
-     */
-    private static final String CITIZEN_DONE = "done";
-
-    /**
-     * Link to the xml file of the window.
-     */
-    private static final String BUILDING_NAME_RESOURCE_SUFFIX = ":gui/windowAssignCitizen.xml";
-
-    /**
-     * Id of the job label in the GUI.
-     */
-    private static final String CITIZEN_JOB = "job";
-    /**
+     *
      * The view of the current building.
      */
     private final AbstractBuildingView building;
+
     /**
      * List of citizens which can be assigned.
      */
     private final ScrollingList citizenList;
+
     /**
      * The colony.
      */
     private final ColonyView colony;
+
     /**
      * Contains all the citizens.
      */
@@ -86,7 +60,7 @@ public class WindowAssignCitizen extends Window implements ButtonHandler
      */
     public WindowAssignCitizen(final ColonyView c, final BlockPos buildingId)
     {
-        super(Constants.MOD_ID + BUILDING_NAME_RESOURCE_SUFFIX);
+        super(Constants.MOD_ID + ASSIGN_CITIZEN_RESOURCE_SUFFIX);
         this.colony = c;
         building = colony.getBuilding(buildingId);
         citizenList = findPaneOfTypeByID(CITIZEN_LIST, ScrollingList.class);
@@ -103,8 +77,8 @@ private void updateCitizens()
 
         //Removes all citizens which already have a job.
         citizens = colony.getCitizens().values().stream()
-                     .filter(citizen -> citizen.getHomeBuilding() == null).sorted(Comparator.comparing(CitizenDataView::getName))
-                     .collect(Collectors.toList());
+                     .filter(cit -> cit.getHomeBuilding() == null || !(colony.getBuilding(cit.getHomeBuilding()) instanceof BuildingBarracksTower.View) && !cit.getHomeBuilding().equals(building.getID()))
+                     .sorted(Comparator.comparing(CitizenDataView::getName)).collect(Collectors.toList());
     }
 
     /**
@@ -144,7 +118,31 @@ public void updateElement(final int index, @NotNull final Pane rowPane)
                 if (building instanceof BuildingHome.View)
                 {
                     rowPane.findPaneOfTypeByID(CITIZEN_LABEL, Label.class).setLabelText(citizen.getName());
-                    rowPane.findPaneOfTypeByID(CITIZEN_JOB, Label.class).setLabelText(LanguageHandler.format(citizen.getJob()));
+
+                    final BlockPos work = citizen.getWorkBuilding();
+                    String workString = "";
+                    if (work != null)
+                    {
+                        workString = " " + BlockPosUtil.getDistance2D(work, building.getLocation()) + " blocks";
+                    }
+
+                    final BlockPos home = citizen.getHomeBuilding();
+                    String homeString = "";
+                    if (home != null)
+                    {
+                        if (work != null)
+                        {
+                            homeString = LanguageHandler.format("com.minecolonies.coremod.gui.homeHut.currently", BlockPosUtil.getDistance2D(work, home));
+
+                        }
+                        else
+                        {
+                            homeString = LanguageHandler.format("com.minecolonies.coremod.gui.homeHut.current", home.getX(), home.getY(), home.getZ());
+                        }
+                    }
+
+                    rowPane.findPaneOfTypeByID(CITIZEN_JOB, Label.class).setLabelText(LanguageHandler.format(citizen.getJob()) + workString);
+                    rowPane.findPaneOfTypeByID(CITIZEN_LIVING, Label.class).setLabelText(homeString);
 
                     final Button done = rowPane.findPaneOfTypeByID(CITIZEN_DONE, Button.class);
                     if (colony.isManualHousing())
diff --git a/src/main/java/com/minecolonies/coremod/network/messages/AssignUnassignMessage.java b/src/main/java/com/minecolonies/coremod/network/messages/AssignUnassignMessage.java
index 738b55e6a68..1730e6526df 100644
--- a/src/main/java/com/minecolonies/coremod/network/messages/AssignUnassignMessage.java
+++ b/src/main/java/com/minecolonies/coremod/network/messages/AssignUnassignMessage.java
@@ -119,11 +119,15 @@ public void messageOnServerThread(final AssignUnassignMessage message, final Ent
             }
 
             final CitizenData citizen = colony.getCitizenManager().getCitizen(message.citizenID);
-            if (message.assign && !((BuildingHome) building).isFull() && citizen.getHomeBuilding() == null)
+            if (message.assign && !building.isFull() && !building.equals(citizen.getHomeBuilding()))
             {
-                ((BuildingHome) building).assignCitizen(citizen);
+                if (citizen.getHomeBuilding() != null)
+                {
+                    citizen.getHomeBuilding().removeCitizen(citizen);
+                }
+                building.assignCitizen(citizen);
             }
-            else if (((BuildingHome) building).hasAssignedCitizen(citizen))
+            else if (building.hasAssignedCitizen(citizen))
             {
                 building.removeCitizen(citizen);
             }
diff --git a/src/main/resources/assets/minecolonies/gui/windowassigncitizen.xml b/src/main/resources/assets/minecolonies/gui/windowassigncitizen.xml
index e4c0dc01ff2..de917243988 100644
--- a/src/main/resources/assets/minecolonies/gui/windowassigncitizen.xml
+++ b/src/main/resources/assets/minecolonies/gui/windowassigncitizen.xml
@@ -2,12 +2,13 @@
         lightbox="true"
         xsi:noNamespaceSchemaLocation="file:../../../../java/com/minecolonies/blockout/blockOut.xsd">
 
-    <label size="100% 11" pos="0 50" textalign="TOP_MIDDLE" color="white" label="$(com.minecolonies.coremod.gui.hiring.description)"/>
+    <label size="100% 11" pos="0 50" textalign="TOP_MIDDLE" color="white" label="$(com.minecolonies.coremod.gui.assigning.description)"/>
     <list id="unassigned" size="70% 120" pos="60 70" align="TOP_MIDDLE">
-        <view size="70% 30">
+        <view size="70% 40">
             <label id="citizen" size="60 12" pos="5 4" textalign="MIDDLE_LEFT" color="yellow"/>
-            <label id="job" size="60 12" pos="5 14" textalign="MIDDLE_LEFT" color="red"/>
-            <button id="done" size="45 15" pos="125 3" label="$(com.minecolonies.coremod.gui.hiring.buttonHire)"/>
+            <label id="job" size="60 12" pos="5 14" textalign="MIDDLE_LEFT" color="yellow"/>
+            <label id="living" size="60 12" pos="5 24" textalign="MIDDLE_LEFT" color="red"/>
+            <button id="done" size="45 15" pos="125 3" label="$(com.minecolonies.coremod.gui.hiring.buttonAssign)"/>
         </view>
     </list>
     <button id="cancel" size="200 20" pos="110 194" label="$(gui.cancel)"/>
diff --git a/src/main/resources/assets/minecolonies/lang/en_us.lang b/src/main/resources/assets/minecolonies/lang/en_us.lang
index fc3c06f7928..b49a850a4ab 100644
--- a/src/main/resources/assets/minecolonies/lang/en_us.lang
+++ b/src/main/resources/assets/minecolonies/lang/en_us.lang
@@ -155,6 +155,8 @@ com.minecolonies.coremod.gui.citizen.skills.endurance=Endurance: %d
 com.minecolonies.coremod.gui.townHall.rename.title=Rename Your Colony
 com.minecolonies.coremod.gui.workerHuts.information=Information
 com.minecolonies.coremod.gui.hiring.description=Choose a worker for the job.
+com.minecolonies.coremod.gui.assigning.description=Choose a citizen to assign to live here.
+
 com.minecolonies.coremod.gui.townHall.population.deliverymen=Deliverymen: %d
 com.minecolonies.coremod.gui.townHall.population.miners=Miners: %d
 com.minecolonies.coremod.gui.townHall.population.fishermen=Fishermen: %d
@@ -178,6 +180,7 @@ com.minecolonies.coremod.gui.workerHuts.build=Build Building
 com.minecolonies.coremod.gui.workerHuts.buildRepair=Build Options
 com.minecolonies.coremod.gui.workerHuts.lumberjackHut=Lumberjack's Hut
 com.minecolonies.coremod.gui.hiring.buttonHire=Hire
+com.minecolonies.coremod.gui.hiring.buttonAssign=Assign
 com.minecolonies.coremod.gui.townHall.togglespec=Toggle Specialization
 com.minecolonies.coremod.gui.workerHuts.repair=Repair
 com.minecolonies.coremod.gui.citizen.skills.dexterity=Dexterity: %d
@@ -867,4 +870,7 @@ com.minecolonies.coremod.job.StoneSmeltery=Stone Smelter
 com.minecolonies.coremod.job.Blacksmith=Blacksmith
 com.minecolonies.coremod.job.Stonemason=Stonemason
 com.minecolonies.coremod.job.Sawmill=Woodworker
-com.minecolonies.coremod.ai.wrongFood=The food I have is too raw to eat!
\ No newline at end of file
+com.minecolonies.coremod.ai.wrongFood=The food I have is too raw to eat!
+
+com.minecolonies.coremod.gui.homeHut.current=Current home: %d %d %d
+com.minecolonies.coremod.gui.homeHut.currently=Currently: %d blocks
diff --git a/src/main/resources/assets/minecolonies/models/block/blockhutbaker.json b/src/main/resources/assets/minecolonies/models/block/blockhutbaker.json
index 7fb28590457..3da9dd869a5 100644
--- a/src/main/resources/assets/minecolonies/models/block/blockhutbaker.json
+++ b/src/main/resources/assets/minecolonies/models/block/blockhutbaker.json
@@ -3,7 +3,7 @@
   "textures": {
     "4": "minecolonies:blocks/baker/sacksmallflour",
     "5": "minecolonies:blocks/baker/quern",
-    "particle": "minecolonies:blocks/quern"
+    "particle": "minecolonies:blocks/baker/quern"
   },
   "elements": [
     {

From f79fd1ff43759f8c9461ca9bf7af4ee85139dff0 Mon Sep 17 00:00:00 2001
From: Raycoms <ray.neiheiser@gmail.com>
Date: Thu, 31 Jan 2019 11:38:36 -0200
Subject: [PATCH 2/4] increase chiefssword chance

---
 .../minecolonies/loot_tables/entitychiefbarbariandrops.json     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/assets/minecolonies/loot_tables/entitychiefbarbariandrops.json b/src/main/resources/assets/minecolonies/loot_tables/entitychiefbarbariandrops.json
index 6642a2bf6fc..5faf443213e 100644
--- a/src/main/resources/assets/minecolonies/loot_tables/entitychiefbarbariandrops.json
+++ b/src/main/resources/assets/minecolonies/loot_tables/entitychiefbarbariandrops.json
@@ -11,7 +11,7 @@
         },
         {
           "type": "item",
-          "weight": 0.2,
+          "weight": 1,
           "quality": 1,
           "name": "minecolonies:chiefsword"
         },

From f9bcf37b1931e682d112e8cbe544a9a4b0958380 Mon Sep 17 00:00:00 2001
From: Raycoms <ray.neiheiser@gmail.com>
Date: Fri, 1 Feb 2019 16:59:13 -0200
Subject: [PATCH 3/4] Allow composter to obtain dirt from compost bins

---
 .../api/configuration/Configurations.java     |   9 +-
 .../minecolonies/coremod/MineColonies.java    |   1 +
 .../client/gui/WindowHutComposter.java        |  65 +++++++++++
 .../workerbuildings/BuildingComposter.java    |  81 +++++++++++---
 .../composter/EntityAIWorkComposter.java      |  12 +-
 .../messages/ComposterRetrievalMessage.java   | 105 ++++++++++++++++++
 6 files changed, 251 insertions(+), 22 deletions(-)
 create mode 100644 src/main/java/com/minecolonies/coremod/network/messages/ComposterRetrievalMessage.java

diff --git a/src/api/java/com/minecolonies/api/configuration/Configurations.java b/src/api/java/com/minecolonies/api/configuration/Configurations.java
index 694d9540836..db0c65d8537 100644
--- a/src/api/java/com/minecolonies/api/configuration/Configurations.java
+++ b/src/api/java/com/minecolonies/api/configuration/Configurations.java
@@ -109,16 +109,10 @@ public static class Gameplay
 
         @Config.Comment("Should players be allowed to build their colonies over existing villages?")
         public boolean protectVillages         = false;
-        /* schematics usage */
-        @Config.Comment("Should the default schematics be ignored (from the jar)?")
-        public boolean ignoreSchematicsFromJar = false;
 
         @Config.Comment("Should player made schematics be allowed")
         public boolean allowPlayerSchematics = false;
 
-        @Config.Comment("Max amount of schematics to be cached on the server")
-        public int maxCachedSchematics = 100;
-
         @Config.Comment("Should players be allowed to change names? -1 for false, 0 for specific groups, 1 for true")
         public int allowGlobalNameChanges = 1;
 
@@ -272,6 +266,9 @@ public static class Gameplay
 
         @Config.Comment("AI Update rate, increase to improve performance. Default: 1")
         public int updateRate = 1;
+
+        @Config.Comment("Quantity of dirt per Compost filling. Default: 1")
+        public int dirtFromCompost = 1;
     }
 
     public static class Compatibility
diff --git a/src/main/java/com/minecolonies/coremod/MineColonies.java b/src/main/java/com/minecolonies/coremod/MineColonies.java
index b024519685f..c5130ab7add 100644
--- a/src/main/java/com/minecolonies/coremod/MineColonies.java
+++ b/src/main/java/com/minecolonies/coremod/MineColonies.java
@@ -263,6 +263,7 @@ private static synchronized void initializeNetwork()
         getNetwork().registerMessage(RestartCitizenMessage.class, RestartCitizenMessage.class, ++id, Side.SERVER);
         getNetwork().registerMessage(SortWarehouseMessage.class, SortWarehouseMessage.class, ++id, Side.SERVER);
         getNetwork().registerMessage(PostBoxRequestMessage.class, PostBoxRequestMessage.class, ++id, Side.SERVER);
+        getNetwork().registerMessage(ComposterRetrievalMessage.class, ComposterRetrievalMessage.class, ++id, Side.SERVER);
 
         //Client side only
         getNetwork().registerMessage(BlockParticleEffectMessage.class, BlockParticleEffectMessage.class, ++id, Side.CLIENT);
diff --git a/src/main/java/com/minecolonies/coremod/client/gui/WindowHutComposter.java b/src/main/java/com/minecolonies/coremod/client/gui/WindowHutComposter.java
index ae60f86342a..7ed4c796a91 100644
--- a/src/main/java/com/minecolonies/coremod/client/gui/WindowHutComposter.java
+++ b/src/main/java/com/minecolonies/coremod/client/gui/WindowHutComposter.java
@@ -2,19 +2,40 @@
 
 import com.minecolonies.api.crafting.ItemStorage;
 import com.minecolonies.api.util.LanguageHandler;
+import com.minecolonies.api.util.constant.Constants;
+import com.minecolonies.blockout.controls.Button;
+import com.minecolonies.blockout.controls.ButtonImage;
+import com.minecolonies.blockout.views.View;
+import com.minecolonies.coremod.MineColonies;
 import com.minecolonies.coremod.colony.ColonyManager;
 import com.minecolonies.coremod.colony.buildings.workerbuildings.BuildingComposter;
+import com.minecolonies.coremod.items.ModItems;
+import com.minecolonies.coremod.network.messages.ComposterRetrievalMessage;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 import java.util.Collection;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static com.minecolonies.coremod.client.gui.WindowTownHall.BLACK;
+
 /**
  * Composter window class. Specifies the extras the composter has for its list.
  */
 public class WindowHutComposter extends WindowFilterableList<BuildingComposter.View>
 {
+    /**
+     * Id of the button to toggle replant of saplings
+     */
+    private static final String BUTTON_TOGGLE_RETRIEVE_DIRT = "retrieveDirt";
+
+    /**
+     * View containing the list.
+     */
+    private static final String PAGE_ITEMS_VIEW = "pageItems";
+
     /**
      * Constructor for the window of the worker building.
      *
@@ -31,6 +52,50 @@ public Collection<? extends ItemStorage> getBlockList(final Predicate<ItemStack>
         return ColonyManager.getCompatibilityManager().getCopyOfCompostableItems().stream().filter(storage -> filterPredicate.test(storage.getItemStack())).collect(Collectors.toList());
     }
 
+    @Override
+    public void onOpened()
+    {
+        super.onOpened();
+        final ButtonImage button = new ButtonImage();
+        button.setImage(new ResourceLocation(Constants.MOD_ID, "textures/gui/builderhut/builder_button_medium.png"));
+        button.setPosition(50, 193);
+        button.setSize(86, 17);
+        button.setID(BUTTON_TOGGLE_RETRIEVE_DIRT);
+        button.setTextColor(BLACK);
+        setupRetrieveDirtButton(button);
+
+        findPaneOfTypeByID(PAGE_ITEMS_VIEW, View.class).addChild(button);
+        registerButton(BUTTON_TOGGLE_RETRIEVE_DIRT, this::switchReplant);
+    }
+
+    /**
+     * Setup replant button with correct string.
+     *
+     * @param button the button to setup.
+     */
+    private void setupRetrieveDirtButton(final Button button)
+    {
+        if (((BuildingComposter.View) building).retrieveDirtFromCompostBin)
+        {
+            button.setLabel(LanguageHandler.format(Blocks.DIRT.getLocalizedName()));
+        }
+        else
+        {
+            button.setLabel(LanguageHandler.format(ModItems.compost.getItemStackDisplayName(new ItemStack(ModItems.compost))));
+        }
+    }
+
+    /**
+     * Method to send the message to switch the toggle to the server, then updates button
+     */
+    private void switchReplant(final Button retrieve)
+    {
+        final BuildingComposter.View composter = (BuildingComposter.View) building;
+        composter.retrieveDirtFromCompostBin = !composter.retrieveDirtFromCompostBin;
+        setupRetrieveDirtButton(retrieve);
+        MineColonies.getNetwork().sendToServer(new ComposterRetrievalMessage(composter, composter.retrieveDirtFromCompostBin));
+    }
+
     @Override
     public String getBuildingName()
     {
diff --git a/src/main/java/com/minecolonies/coremod/colony/buildings/workerbuildings/BuildingComposter.java b/src/main/java/com/minecolonies/coremod/colony/buildings/workerbuildings/BuildingComposter.java
index f29aa3d8fcc..d71c5c31bc9 100644
--- a/src/main/java/com/minecolonies/coremod/colony/buildings/workerbuildings/BuildingComposter.java
+++ b/src/main/java/com/minecolonies/coremod/colony/buildings/workerbuildings/BuildingComposter.java
@@ -4,7 +4,6 @@
 import com.minecolonies.api.crafting.ItemStorage;
 import com.minecolonies.blockout.views.Window;
 import com.minecolonies.coremod.blocks.ModBlocks;
-import com.minecolonies.coremod.client.gui.WindowFilterableList;
 import com.minecolonies.coremod.client.gui.WindowHutComposter;
 import com.minecolonies.coremod.colony.CitizenData;
 import com.minecolonies.coremod.colony.Colony;
@@ -13,6 +12,7 @@
 import com.minecolonies.coremod.colony.buildings.views.FilterableListView;
 import com.minecolonies.coremod.colony.jobs.AbstractJob;
 import com.minecolonies.coremod.colony.jobs.JobComposter;
+import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -32,12 +32,12 @@ public class BuildingComposter extends AbstractFilterableListBuilding
     /**
      * Description of the job for this building
      */
-    private static final String COMPOSTER         = "Composter";
+    private static final String COMPOSTER = "Composter";
 
     /**
-     * Maxiimum building level
+     * Maximum building level
      */
-    private static final int MAX_BUILDING_LEVEL   = 5;
+    private static final int MAX_BUILDING_LEVEL = 5;
 
     /**
      * Tag to store the barrel position.
@@ -49,6 +49,16 @@ public class BuildingComposter extends AbstractFilterableListBuilding
      */
     private static final String TAG_BARRELS = "barrels";
 
+    /**
+     * Tag to store the if dirt should be retrieved.
+     */
+    private static final String TAG_DIRT = "dirt";
+
+    /**
+     * If the composter should retrieve dirt from his compost bin.
+     */
+    private boolean retrieveDirtFromCompostBin = false;
+
     /**
      * List of registered barrels.
      */
@@ -106,7 +116,7 @@ public int getMaxBuildingLevel()
     public void registerBlockPosition(@NotNull final Block block, @NotNull final BlockPos pos, @NotNull final World world)
     {
         super.registerBlockPosition(block, pos, world);
-        if(block == ModBlocks.blockBarrel && !barrels.contains(pos))
+        if (block == ModBlocks.blockBarrel && !barrels.contains(pos))
         {
             barrels.add(pos);
         }
@@ -116,34 +126,71 @@ public void registerBlockPosition(@NotNull final Block block, @NotNull final Blo
     public void writeToNBT(@NotNull final NBTTagCompound compound)
     {
         super.writeToNBT(compound);
-        @NotNull final NBTTagList furnacesTagList = new NBTTagList();
+        @NotNull final NBTTagList compostBinTagList = new NBTTagList();
         for (@NotNull final BlockPos entry : barrels)
         {
-            @NotNull final NBTTagCompound furnaceCompound = new NBTTagCompound();
-            furnaceCompound.setTag(TAG_POS, NBTUtil.createPosTag(entry));
-            furnacesTagList.appendTag(furnaceCompound);
+            @NotNull final NBTTagCompound compostBinCompound = new NBTTagCompound();
+            compostBinCompound.setTag(TAG_POS, NBTUtil.createPosTag(entry));
+            compostBinTagList.appendTag(compostBinCompound);
         }
-        compound.setTag(TAG_BARRELS, furnacesTagList);
+        compound.setTag(TAG_BARRELS, compostBinTagList);
+        compound.setBoolean(TAG_DIRT, retrieveDirtFromCompostBin);
     }
 
     @Override
     public void readFromNBT(@NotNull final NBTTagCompound compound)
     {
         super.readFromNBT(compound);
-        final NBTTagList furnaceTagList = compound.getTagList(TAG_BARRELS, Constants.NBT.TAG_COMPOUND);
-        for (int i = 0; i < furnaceTagList.tagCount(); ++i)
+        final NBTTagList compostBinTagList = compound.getTagList(TAG_BARRELS, Constants.NBT.TAG_COMPOUND);
+        for (int i = 0; i < compostBinTagList.tagCount(); ++i)
+        {
+            barrels.add(NBTUtil.getPosFromTag(compostBinTagList.getCompoundTagAt(i).getCompoundTag(TAG_POS)));
+        }
+        if (compound.hasKey(TAG_DIRT))
         {
-            barrels.add(NBTUtil.getPosFromTag(furnaceTagList.getCompoundTagAt(i).getCompoundTag(TAG_POS)));
+            retrieveDirtFromCompostBin = compound.getBoolean(TAG_DIRT);
         }
     }
 
+    @Override
+    public void serializeToView(@NotNull final ByteBuf buf)
+    {
+        super.serializeToView(buf);
+        buf.writeBoolean(retrieveDirtFromCompostBin);
+    }
+
+    /**
+     * If the composter should retrieve dirt and not compost from the compost bin.
+     * @return true if so.
+     */
+    public boolean shouldRetrieveDirtFromCompostBin()
+    {
+        return retrieveDirtFromCompostBin;
+    }
+
+    /**
+     * Set if the composter should retrieve dirt and not compost from the compost bin.
+     * @param shouldRetrieveDirt whether or not to retrieve dirt..
+     */
+    public void setShouldRetrieveDirtFromCompostBin(final boolean shouldRetrieveDirt)
+    {
+        this.retrieveDirtFromCompostBin = shouldRetrieveDirt;
+        markDirty();
+    }
+
     /**
      * The client side representation of the building.
      */
     public static class View extends FilterableListView
     {
+        /**
+         * If the composter should retrieve dirt from his compost bin.
+         */
+        public boolean retrieveDirtFromCompostBin = false;
+
         /**
          * Instantiates the view of the building.
+         *
          * @param c the colonyView.
          * @param l the location of the block.
          */
@@ -152,6 +199,13 @@ public View(final ColonyView c, final BlockPos l)
             super(c, l);
         }
 
+        @Override
+        public void deserialize(@NotNull final ByteBuf buf)
+        {
+            super.deserialize(buf);
+            retrieveDirtFromCompostBin = buf.readBoolean();
+        }
+
         @NotNull
         @Override
         public Window getWindow()
@@ -173,5 +227,4 @@ public Skill getSecondarySkill()
             return Skill.STRENGTH;
         }
     }
-
 }
diff --git a/src/main/java/com/minecolonies/coremod/entity/ai/citizen/composter/EntityAIWorkComposter.java b/src/main/java/com/minecolonies/coremod/entity/ai/citizen/composter/EntityAIWorkComposter.java
index e40fc214fa9..ad2e6653802 100644
--- a/src/main/java/com/minecolonies/coremod/entity/ai/citizen/composter/EntityAIWorkComposter.java
+++ b/src/main/java/com/minecolonies/coremod/entity/ai/citizen/composter/EntityAIWorkComposter.java
@@ -1,6 +1,7 @@
 package com.minecolonies.coremod.entity.ai.citizen.composter;
 
 import com.minecolonies.api.colony.requestsystem.requestable.StackList;
+import com.minecolonies.api.configuration.Configurations;
 import com.minecolonies.api.crafting.ItemStorage;
 import com.minecolonies.api.util.InventoryUtils;
 import com.minecolonies.api.util.ItemStackUtils;
@@ -11,6 +12,7 @@
 import com.minecolonies.coremod.entity.ai.statemachine.states.IAIState;
 import com.minecolonies.coremod.tileentities.TileEntityBarrel;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumHand;
@@ -259,10 +261,16 @@ private IAIState harvestBarrels()
             worker.getCitizenItemHandler().hitBlockWithToolInHand(currentTarget);
 
             final TileEntityBarrel te = (TileEntityBarrel) world.getTileEntity(currentTarget);
-
             final ItemStack compost = te.retrieveCompost(getLootMultiplier(new Random()));
 
-            InventoryUtils.addItemStackToItemHandler(new InvWrapper(worker.getInventoryCitizen()), compost);
+            if (getOwnBuilding(BuildingComposter.class).shouldRetrieveDirtFromCompostBin())
+            {
+                InventoryUtils.addItemStackToItemHandler(new InvWrapper(worker.getInventoryCitizen()), new ItemStack(Blocks.DIRT, Configurations.gameplay.dirtFromCompost));
+            }
+            else
+            {
+                InventoryUtils.addItemStackToItemHandler(new InvWrapper(worker.getInventoryCitizen()), compost);
+            }
 
             worker.getCitizenExperienceHandler().addExperience(BASE_XP_GAIN);
             this.incrementActionsDoneAndDecSaturation();
diff --git a/src/main/java/com/minecolonies/coremod/network/messages/ComposterRetrievalMessage.java b/src/main/java/com/minecolonies/coremod/network/messages/ComposterRetrievalMessage.java
new file mode 100644
index 00000000000..31c0c94636f
--- /dev/null
+++ b/src/main/java/com/minecolonies/coremod/network/messages/ComposterRetrievalMessage.java
@@ -0,0 +1,105 @@
+package com.minecolonies.coremod.network.messages;
+
+import com.minecolonies.api.colony.permissions.Action;
+import com.minecolonies.api.util.BlockPosUtil;
+import com.minecolonies.coremod.colony.Colony;
+import com.minecolonies.coremod.colony.ColonyManager;
+import com.minecolonies.coremod.colony.buildings.AbstractBuildingWorker;
+import com.minecolonies.coremod.colony.buildings.workerbuildings.BuildingComposter;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.util.math.BlockPos;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Class used for setting whether dirt or compost should be retrived from the bin.
+ */
+public class ComposterRetrievalMessage extends AbstractMessage<ComposterRetrievalMessage, IMessage>
+{
+    /**
+     * The colony id
+     */
+    private int colonyId;
+
+    /**
+     * The composter's building id.
+     */
+    private BlockPos buildingId;
+
+    /**
+     * Whether the composter should retrieve dirt or not.
+     */
+    private boolean retrieveDirt;
+
+    /**
+     * The dimension of the message.
+     */
+    private int dimension;
+
+    /**
+     * Empty standard constructor.
+     */
+    public ComposterRetrievalMessage()
+    {
+        super();
+        /*
+         * Intentionally left empty.
+         */
+    }
+
+    /**
+     * Creates a message which will be sent to set the retrieval setting in the composter.
+     *
+     * @param building      the building view of the composter
+     * @param retrieve whether or not dirt should be retrieved.
+     */
+    public ComposterRetrievalMessage(final BuildingComposter.View building, final boolean retrieve)
+    {
+        super();
+        this.colonyId = building.getColony().getID();
+        this.buildingId = building.getID();
+        this.retrieveDirt = retrieve;
+        this.dimension = building.getColony().getDimension();
+    }
+
+    @Override
+    public void fromBytes(@NotNull final ByteBuf buf)
+    {
+        colonyId = buf.readInt();
+        buildingId = BlockPosUtil.readFromByteBuf(buf);
+        retrieveDirt = buf.readBoolean();
+        dimension = buf.readInt();
+    }
+
+    @Override
+    public void toBytes(@NotNull final ByteBuf buf)
+    {
+        buf.writeInt(colonyId);
+        BlockPosUtil.writeToByteBuf(buf, buildingId);
+        buf.writeBoolean(retrieveDirt);
+        buf.writeInt(dimension);
+    }
+
+    @Override
+    public void messageOnServerThread(final ComposterRetrievalMessage message, final EntityPlayerMP player)
+    {
+        final Colony colony = ColonyManager.getColonyByDimension(message.colonyId, message.dimension);
+        if (colony != null)
+        {
+            //Verify player has permission to change this hut's settings
+            if (!colony.getPermissions().hasPermission(player, Action.MANAGE_HUTS))
+            {
+                return;
+            }
+
+            @Nullable final AbstractBuildingWorker building = colony.getBuildingManager().getBuilding(message.buildingId, AbstractBuildingWorker.class);
+            if (building instanceof BuildingComposter)
+            {
+                ((BuildingComposter) building).setShouldRetrieveDirtFromCompostBin(message.retrieveDirt);
+            }
+
+        }
+    }
+}

From 1aa20ce59994031f0a1a85c2a9ae1c4437566f01 Mon Sep 17 00:00:00 2001
From: Raycoms <ray.neiheiser@gmail.com>
Date: Sat, 2 Feb 2019 15:43:33 -0200
Subject: [PATCH 4/4] Random chance of lucky ore on miner mining.

---
 .../compatibility/CompatibilityManager.java   | 95 ++++++++++++++++++-
 .../compatibility/ICompatibilityManager.java  | 13 +++
 .../api/configuration/Configurations.java     | 25 ++++-
 .../ai/basic/AbstractEntityAIInteract.java    | 41 ++++----
 .../citizen/miner/EntityAIStructureMiner.java | 11 +++
 5 files changed, 161 insertions(+), 24 deletions(-)

diff --git a/src/api/java/com/minecolonies/api/compatibility/CompatibilityManager.java b/src/api/java/com/minecolonies/api/compatibility/CompatibilityManager.java
index 0f7f32af55e..1d606617b8f 100644
--- a/src/api/java/com/minecolonies/api/compatibility/CompatibilityManager.java
+++ b/src/api/java/com/minecolonies/api/compatibility/CompatibilityManager.java
@@ -14,6 +14,7 @@
 import net.minecraft.block.BlockRedstoneOre;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
@@ -26,13 +27,11 @@
 import net.minecraftforge.oredict.OreDictionary;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Spliterator;
-import java.util.Spliterators;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import static com.minecolonies.api.util.constant.Constants.ONE_HUNDRED_PERCENT;
 import static com.minecolonies.api.util.constant.Constants.ORE_STRING;
 import static com.minecolonies.api.util.constant.Constants.SAPLINGS;
 import static com.minecolonies.api.util.constant.NbtTagConstants.TAG_SAP_LEAF;
@@ -64,11 +63,21 @@ public class CompatibilityManager implements ICompatibilityManager
      */
     private final List<ItemStorage> compostableItems = new ArrayList<>();
 
+    /**
+     * List of lucky ores which get dropped by the miner.
+     */
+    private final List<ItemStorage> luckyOres = new ArrayList<>();
+
     /**
      * If discovery is finished already.
      */
     private boolean discoveredAlready = false;
 
+    /**
+     * Random obj.
+     */
+    private static final Random random = new Random();
+
     /**
      * Instantiates the compatibilityManager.
      */
@@ -90,6 +99,7 @@ public void discover()
         }
         Log.getLogger().info("Finished discovering ores");
         discoverCompostableItems();
+        discoverLuckyOres();
 
         discoveredAlready = true;
     }
@@ -119,6 +129,31 @@ public boolean isCompost(final ItemStack itemStack)
         return false;
     }
 
+    @Override
+    public boolean isLuckyBlock(final ItemStack itemStack)
+    {
+        if (itemStack.isEmpty())
+        {
+            return false;
+        }
+
+        for (final String string : Configurations.gameplay.luckyBlocks)
+        {
+            if (itemStack.getItem().getRegistryName().toString().equals(string))
+            {
+                return true;
+            }
+            for (final int id : OreDictionary.getOreIDs(itemStack))
+            {
+                if (OreDictionary.getOreName(id).equals(string))
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     @Override
     public IBlockState getLeafForSapling(final ItemStack stack)
     {
@@ -216,6 +251,17 @@ public boolean isDiscoveredAlready()
         return discoveredAlready;
     }
 
+    @Override
+    public ItemStack getRandomLuckyOre()
+    {
+        if (random.nextInt(ONE_HUNDRED_PERCENT) <= Configurations.gameplay.luckyBlockChance)
+        {
+            Collections.shuffle(luckyOres);
+            return luckyOres.get(0).getItemStack().copy();
+        }
+        return ItemStack.EMPTY;
+    }
+
     //------------------------------- Private Utility Methods -------------------------------//
 
     private void discoverOres(final String string)
@@ -308,6 +354,47 @@ private void discoverCompostableItems()
         Log.getLogger().info("Finished discovering compostables");
     }
 
+    /**
+     * Run through all blocks and check if they match one of our lucky ores.
+     */
+    private void discoverLuckyOres()
+    {
+        if (luckyOres.isEmpty())
+        {
+            for (final String ore : Configurations.gameplay.luckyOres)
+            {
+                final String[] split = ore.split("!");
+                if (split.length < 2)
+                {
+                    Log.getLogger().warn("Wrong configured ore: " +  ore);
+                    continue;
+                }
+
+                final Item item = Item.getByNameOrId(split[0]);
+                if (item == null || item == Items.AIR)
+                {
+                    Log.getLogger().warn("Invalid lucky block: " + ore);
+                    continue;
+                }
+
+                final ItemStack stack = new ItemStack(item, 1);
+                try
+                {
+                    final int rarity = Integer.parseInt(split[1]);
+                    for (int i = 0; i < rarity; i++)
+                    {
+                        luckyOres.add(new ItemStorage(stack));
+                    }
+                }
+                catch (final NumberFormatException ex)
+                {
+                    Log.getLogger().warn("Ore has invalid rarity: " + ore);
+                }
+            }
+        }
+        Log.getLogger().info("Finished discovering lucky ores");
+    }
+
     private static NBTTagCompound writeLeafSaplingEntryToNBT(final IBlockState state, final ItemStorage storage)
     {
         final NBTTagCompound compound = new NBTTagCompound();
diff --git a/src/api/java/com/minecolonies/api/compatibility/ICompatibilityManager.java b/src/api/java/com/minecolonies/api/compatibility/ICompatibilityManager.java
index cc16dfd17c4..038e6b85535 100644
--- a/src/api/java/com/minecolonies/api/compatibility/ICompatibilityManager.java
+++ b/src/api/java/com/minecolonies/api/compatibility/ICompatibilityManager.java
@@ -92,4 +92,17 @@ public interface ICompatibilityManager
      * @return true if so.
      */
     boolean isDiscoveredAlready();
+
+    /**
+     * If an itemStack is a lucky block which can result in an extra ore drop.
+     * @param itemStack the stack to check.
+     * @return true if so.
+     */
+    boolean isLuckyBlock(final ItemStack itemStack);
+
+    /**
+     * Get a random lucky ore from a luckyblock.
+     * @return the lucky ore.
+     */
+    ItemStack getRandomLuckyOre();
 }
diff --git a/src/api/java/com/minecolonies/api/configuration/Configurations.java b/src/api/java/com/minecolonies/api/configuration/Configurations.java
index db0c65d8537..71a4a2879fb 100644
--- a/src/api/java/com/minecolonies/api/configuration/Configurations.java
+++ b/src/api/java/com/minecolonies/api/configuration/Configurations.java
@@ -183,9 +183,6 @@ public static class Gameplay
         @Config.Comment("Min distance from world spawn")
         public int minDistanceFromWorldSpawn = 512;
 
-        @Config.Comment("Should the dman create resources out of hot air (Not implemented)")
-        public boolean deliverymanInfiniteResources = false;
-
         @Config.Comment("Amount of initial citizens")
         public int maxCitizens = 4;
 
@@ -269,6 +266,28 @@ public static class Gameplay
 
         @Config.Comment("Quantity of dirt per Compost filling. Default: 1")
         public int dirtFromCompost = 1;
+
+        @Config.Comment("Chance to get a lucky block in percent. Default: 1")
+        public int luckyBlockChance = 1;
+
+        @Config.Comment("The blocks where the miner has a chance to get a random ore.")
+        public String[] luckyBlocks = new String[]
+                                                {
+                                                  "minecraft:stone",
+                                                  "minecraft:cobblestone",
+                                                };
+
+        @Config.Comment("The random ores the miner can get separated by ! for rarity")
+        public String[] luckyOres = new String[]
+                                              {
+                                                "minecraft:coal_ore!64",
+                                                "minecraft:iron_ore!32",
+                                                "minecraft:gold_ore!16",
+                                                "minecraft:redstone_ore!8",
+                                                "minecraft:lapis_ore!4",
+                                                "minecraft:diamond_ore!2",
+                                                "minecraft:emerald_ore!1"
+                                              };
     }
 
     public static class Compatibility
diff --git a/src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java b/src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java
index e1c1cb59cba..45359a778e0 100644
--- a/src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java
+++ b/src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java
@@ -3,6 +3,7 @@
 import com.minecolonies.api.configuration.Configurations;
 import com.minecolonies.api.util.*;
 import com.minecolonies.coremod.colony.jobs.AbstractJob;
+import com.minecolonies.coremod.colony.managers.interfaces.IStatisticAchievementManager;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.item.EntityItem;
@@ -210,7 +211,7 @@ protected final boolean mineBlock(
             }
         }
         //if block in statistic then increment that statistic.
-        triggerMinedBlock(blockToMine);
+        triggerMinedBlock(curBlockState);
 
         if (blockBreakAction == null)
         {
@@ -271,32 +272,38 @@ private boolean checkMiningLocation(@NotNull final BlockPos blockToMine, @NotNul
         return hasNotDelayed(getBlockMiningDelay(curBlock, blockToMine));
     }
 
-    private void triggerMinedBlock(@NotNull final BlockPos blockToMine)
+    /**
+     * Trigger that a block was succesfully mined.
+     * @param blockToMine the mined blockState.
+     */
+    protected void triggerMinedBlock(@NotNull final IBlockState blockToMine)
     {
-        if (world.getBlockState(blockToMine).getBlock() == (Blocks.COAL_ORE)
-              || world.getBlockState(blockToMine).getBlock() == (Blocks.IRON_ORE)
-              || world.getBlockState(blockToMine).getBlock() == (Blocks.LAPIS_ORE)
-              || world.getBlockState(blockToMine).getBlock() == (Blocks.GOLD_ORE)
-              || world.getBlockState(blockToMine).getBlock() == (Blocks.REDSTONE_ORE)
-              || world.getBlockState(blockToMine).getBlock() == (Blocks.EMERALD_ORE))
+        final IStatisticAchievementManager statsManager = this.getOwnBuilding().getColony().getStatsManager();
+        final Block block = blockToMine.getBlock();
+        if (block == (Blocks.COAL_ORE)
+              || block == (Blocks.IRON_ORE)
+              || block == (Blocks.LAPIS_ORE)
+              || block == (Blocks.GOLD_ORE)
+              || block == (Blocks.REDSTONE_ORE)
+              || block == (Blocks.EMERALD_ORE))
         {
-            this.getOwnBuilding().getColony().getStatsManager().incrementStatistic("ores");
+            statsManager.incrementStatistic("ores");
         }
-        if (world.getBlockState(blockToMine).getBlock().equals(Blocks.DIAMOND_ORE))
+        if (block == Blocks.DIAMOND_ORE)
         {
-            this.getOwnBuilding().getColony().getStatsManager().incrementStatistic("diamonds");
+            statsManager.incrementStatistic("diamonds");
         }
-        if (world.getBlockState(blockToMine).getBlock().equals(Blocks.CARROTS))
+        if (block == Blocks.CARROTS)
         {
-            this.getOwnBuilding().getColony().getStatsManager().incrementStatistic("carrots");
+            statsManager.incrementStatistic("carrots");
         }
-        if (world.getBlockState(blockToMine).getBlock().equals(Blocks.POTATOES))
+        if (block == Blocks.POTATOES)
         {
-            this.getOwnBuilding().getColony().getStatsManager().incrementStatistic("potatoes");
+            statsManager.incrementStatistic("potatoes");
         }
-        if (world.getBlockState(blockToMine).getBlock().equals(Blocks.WHEAT))
+        if (block == Blocks.WHEAT)
         {
-            this.getOwnBuilding().getColony().getStatsManager().incrementStatistic("wheat");
+            statsManager.incrementStatistic("wheat");
         }
     }
 
diff --git a/src/main/java/com/minecolonies/coremod/entity/ai/citizen/miner/EntityAIStructureMiner.java b/src/main/java/com/minecolonies/coremod/entity/ai/citizen/miner/EntityAIStructureMiner.java
index ef3f43f7fa0..ea38b8a0bfd 100644
--- a/src/main/java/com/minecolonies/coremod/entity/ai/citizen/miner/EntityAIStructureMiner.java
+++ b/src/main/java/com/minecolonies/coremod/entity/ai/citizen/miner/EntityAIStructureMiner.java
@@ -1,5 +1,6 @@
 package com.minecolonies.coremod.entity.ai.citizen.miner;
 
+import com.minecolonies.api.util.InventoryUtils;
 import com.minecolonies.api.util.Log;
 import com.minecolonies.api.util.Vec2i;
 import com.minecolonies.coremod.colony.Colony;
@@ -350,6 +351,16 @@ private IAIState doShaftMining()
         return MINER_MINING_SHAFT;
     }
 
+    @Override
+    protected void triggerMinedBlock(@NotNull final IBlockState blockToMine)
+    {
+        super.triggerMinedBlock(blockToMine);
+        if (ColonyManager.getCompatibilityManager().isLuckyBlock(new ItemStack(blockToMine.getBlock())))
+        {
+            InventoryUtils.transferItemStackIntoNextBestSlotInItemHandler(ColonyManager.getCompatibilityManager().getRandomLuckyOre(), new InvWrapper(worker.getInventoryCitizen()));
+        }
+    }
+
     private IAIState advanceLadder(final IAIState state)
     {
         if (getOwnBuilding().getStartingLevelShaft() >= 4)