[Omnibus] Several PRs at once. (ldtteam#5326)

grundyboy34 · Jul 2, 2020 · d1ebb34 · d1ebb34
1 parent 6ccb5d7
commit d1ebb34
Show file tree

Hide file tree

Showing 6,970 changed files with 232,401 additions and 45,563 deletions.
diff --git a/.github/CONTRIBUTING b/.github/CONTRIBUTING
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
diff --git a/.github/workflows/translation.yml b/.github/workflows/translation.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.phraseapp.yml b/.phraseapp.yml
diff --git a/.pullapprove.yml b/.pullapprove.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/ABOUT.md b/ABOUT.md
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/build.gradle b/build.gradle
@@ -128,7 +128,7 @@ minecraft {
             workingDirectory project.file('runClient')
 
             // Recommended logging data for a userdev environment
-            //property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.markers', 'SCAN'
 
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'info'

diff --git a/build.properties b/build.properties
diff --git a/config/PMD/pmd.xml b/config/PMD/pmd.xml
diff --git a/config/checkstyle/checkstyle-noframes-sorted.xsl b/config/checkstyle/checkstyle-noframes-sorted.xsl
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
diff --git a/crowdin.yml b/crowdin.yml
diff --git a/documentation/eclipse/checkstyle.MD b/documentation/eclipse/checkstyle.MD
diff --git a/documentation/eclipse/log4j2.xml b/documentation/eclipse/log4j2.xml
diff --git a/documentation/eclipse/logging.MD b/documentation/eclipse/logging.MD
diff --git a/documentation/eclipse/setup.MD b/documentation/eclipse/setup.MD
diff --git a/documentation/formatter/intellij/Minecolonies.xml b/documentation/formatter/intellij/Minecolonies.xml
diff --git a/documentation/inspections/Minecolonies.xml b/documentation/inspections/Minecolonies.xml
diff --git a/documentation/sonar/suppressing.MD b/documentation/sonar/suppressing.MD
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/resources/minecolonies.png b/resources/minecolonies.png
diff --git a/runData/config/fml.toml b/runData/config/fml.toml
diff --git a/scripts/server.properties b/scripts/server.properties
diff --git a/scripts/users.json b/scripts/users.json
diff --git a/settings.gradle b/settings.gradle
diff --git a/sonar.json b/sonar.json
diff --git a/src/api/java/com/minecolonies/api/IMinecoloniesAPI.java b/src/api/java/com/minecolonies/api/IMinecoloniesAPI.java
@@ -22,7 +22,8 @@
 public interface IMinecoloniesAPI
 {
 
-    static IMinecoloniesAPI getInstance() {
+    static IMinecoloniesAPI getInstance()
+    {
         return MinecoloniesAPIProxy.getInstance();
     }
 

diff --git a/src/api/java/com/minecolonies/api/MinecoloniesAPIProxy.java b/src/api/java/com/minecolonies/api/MinecoloniesAPIProxy.java
diff --git a/src/api/java/com/minecolonies/api/advancements/AbstractCriterionTrigger.java b/src/api/java/com/minecolonies/api/advancements/AbstractCriterionTrigger.java
@@ -13,9 +13,9 @@
 
 public abstract class AbstractCriterionTrigger<T extends CriterionListeners<U>, U extends ICriterionInstance> implements ICriterionTrigger<U>
 {
-    private final ResourceLocation id;
+    private final ResourceLocation                id;
     private final Function<PlayerAdvancements, T> createNew;
-    private final Map<PlayerAdvancements, T> listeners = Maps.newHashMap();
+    private final Map<PlayerAdvancements, T>      listeners = Maps.newHashMap();
 
     protected AbstractCriterionTrigger(ResourceLocation id, Function<PlayerAdvancements, T> createNew)
     {

diff --git a/src/api/java/com/minecolonies/api/advancements/AdvancementTriggers.java b/src/api/java/com/minecolonies/api/advancements/AdvancementTriggers.java
@@ -13,15 +13,15 @@
 
 public class AdvancementTriggers
 {
-    public static final PlaceSupplyTrigger PLACE_SUPPLY = new PlaceSupplyTrigger();
-    public static final PlaceStructureTrigger PLACE_STRUCTURE = new PlaceStructureTrigger();
-    public static final CreateBuildRequestTrigger CREATE_BUILD_REQUEST = new CreateBuildRequestTrigger();
-    public static final OpenGuiWindowTrigger OPEN_GUI_WINDOW = new OpenGuiWindowTrigger();
-    public static final ClickGuiButtonTrigger CLICK_GUI_BUTTON = new ClickGuiButtonTrigger();
-    public static final CitizenEatFoodTrigger CITIZEN_EAT_FOOD = new CitizenEatFoodTrigger();
-    public static final BuildingAddRecipeTrigger BUILDING_ADD_RECIPE = new BuildingAddRecipeTrigger();
+    public static final PlaceSupplyTrigger          PLACE_SUPPLY           = new PlaceSupplyTrigger();
+    public static final PlaceStructureTrigger       PLACE_STRUCTURE        = new PlaceStructureTrigger();
+    public static final CreateBuildRequestTrigger   CREATE_BUILD_REQUEST   = new CreateBuildRequestTrigger();
+    public static final OpenGuiWindowTrigger        OPEN_GUI_WINDOW        = new OpenGuiWindowTrigger();
+    public static final ClickGuiButtonTrigger       CLICK_GUI_BUTTON       = new ClickGuiButtonTrigger();
+    public static final CitizenEatFoodTrigger       CITIZEN_EAT_FOOD       = new CitizenEatFoodTrigger();
+    public static final BuildingAddRecipeTrigger    BUILDING_ADD_RECIPE    = new BuildingAddRecipeTrigger();
     public static final CompleteBuildRequestTrigger COMPLETE_BUILD_REQUEST = new CompleteBuildRequestTrigger();
-    public static final ColonyPopulationTrigger COLONY_POPULATION = new ColonyPopulationTrigger();
+    public static final ColonyPopulationTrigger     COLONY_POPULATION      = new ColonyPopulationTrigger();
 
     public static void preInit()
     {
@@ -35,5 +35,4 @@ public static void preInit()
         CriteriaTriggers.register(COMPLETE_BUILD_REQUEST);
         CriteriaTriggers.register(COLONY_POPULATION);
     }
-
 }
diff --git a/src/api/java/com/minecolonies/api/advancements/CriterionListeners.java b/src/api/java/com/minecolonies/api/advancements/CriterionListeners.java
@@ -12,7 +12,7 @@
 
 public class CriterionListeners<T extends ICriterionInstance>
 {
-    private final PlayerAdvancements playerAdvancements;
+    private final PlayerAdvancements                 playerAdvancements;
     private final Set<ICriterionTrigger.Listener<T>> listeners = Sets.newHashSet();
 
     public CriterionListeners(PlayerAdvancements playerAdvancements)

diff --git a/...minecolonies/api/advancements/building_add_recipe/BuildingAddRecipeCriterionInstance.java b/...minecolonies/api/advancements/building_add_recipe/BuildingAddRecipeCriterionInstance.java
@@ -9,7 +9,7 @@
 public class BuildingAddRecipeCriterionInstance extends CriterionInstance
 {
     private ItemPredicate[] outputItemPredicates;
-    private int craftingSize = -1;
+    private int             craftingSize = -1;
 
     public BuildingAddRecipeCriterionInstance()
     {

diff --git a/...ava/com/minecolonies/api/advancements/building_add_recipe/BuildingAddRecipeListeners.java b/...ava/com/minecolonies/api/advancements/building_add_recipe/BuildingAddRecipeListeners.java
diff --git a/.../java/com/minecolonies/api/advancements/building_add_recipe/BuildingAddRecipeTrigger.java b/.../java/com/minecolonies/api/advancements/building_add_recipe/BuildingAddRecipeTrigger.java
@@ -11,7 +11,6 @@
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
-
 public class BuildingAddRecipeTrigger extends AbstractCriterionTrigger<BuildingAddRecipeListeners, BuildingAddRecipeCriterionInstance>
 {
     public BuildingAddRecipeTrigger()

diff --git a/...a/com/minecolonies/api/advancements/citizen_eat_food/CitizenEatFoodCriterionInstance.java b/...a/com/minecolonies/api/advancements/citizen_eat_food/CitizenEatFoodCriterionInstance.java
diff --git a/src/api/java/com/minecolonies/api/advancements/citizen_eat_food/CitizenEatFoodListeners.java b/src/api/java/com/minecolonies/api/advancements/citizen_eat_food/CitizenEatFoodListeners.java
diff --git a/src/api/java/com/minecolonies/api/advancements/citizen_eat_food/CitizenEatFoodTrigger.java b/src/api/java/com/minecolonies/api/advancements/citizen_eat_food/CitizenEatFoodTrigger.java
@@ -10,7 +10,6 @@
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
-
 public class CitizenEatFoodTrigger extends AbstractCriterionTrigger<CitizenEatFoodListeners, CitizenEatFoodCriterionInstance>
 {
     public CitizenEatFoodTrigger()

diff --git a/...a/com/minecolonies/api/advancements/click_gui_button/ClickGuiButtonCriterionInstance.java b/...a/com/minecolonies/api/advancements/click_gui_button/ClickGuiButtonCriterionInstance.java
diff --git a/src/api/java/com/minecolonies/api/advancements/click_gui_button/ClickGuiButtonListeners.java b/src/api/java/com/minecolonies/api/advancements/click_gui_button/ClickGuiButtonListeners.java
diff --git a/src/api/java/com/minecolonies/api/advancements/click_gui_button/ClickGuiButtonTrigger.java b/src/api/java/com/minecolonies/api/advancements/click_gui_button/ClickGuiButtonTrigger.java
@@ -9,7 +9,6 @@
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
-
 public class ClickGuiButtonTrigger extends AbstractCriterionTrigger<ClickGuiButtonListeners, ClickGuiButtonCriterionInstance>
 {
     public ClickGuiButtonTrigger()

diff --git a/...om/minecolonies/api/advancements/colony_population/ColonyPopulationCriterionInstance.java b/...om/minecolonies/api/advancements/colony_population/ColonyPopulationCriterionInstance.java
diff --git a/...i/java/com/minecolonies/api/advancements/colony_population/ColonyPopulationListeners.java b/...i/java/com/minecolonies/api/advancements/colony_population/ColonyPopulationListeners.java
diff --git a/...api/java/com/minecolonies/api/advancements/colony_population/ColonyPopulationTrigger.java b/...api/java/com/minecolonies/api/advancements/colony_population/ColonyPopulationTrigger.java
@@ -9,7 +9,6 @@
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
-
 public class ColonyPopulationTrigger extends AbstractCriterionTrigger<ColonyPopulationListeners, ColonyPopulationCriterionInstance>
 {
     public ColonyPopulationTrigger()

diff --git a/...lonies/api/advancements/complete_build_request/CompleteBuildRequestCriterionInstance.java b/...lonies/api/advancements/complete_build_request/CompleteBuildRequestCriterionInstance.java
@@ -7,9 +7,9 @@
 
 public class CompleteBuildRequestCriterionInstance extends CriterionInstance
 {
-    private String hutName;
+    private String        hutName;
     private StructureName structureName;
-    private int level = -1;
+    private int           level = -1;
 
     public CompleteBuildRequestCriterionInstance()
     {

diff --git a/...m/minecolonies/api/advancements/complete_build_request/CompleteBuildRequestListeners.java b/...m/minecolonies/api/advancements/complete_build_request/CompleteBuildRequestListeners.java
diff --git a/...com/minecolonies/api/advancements/complete_build_request/CompleteBuildRequestTrigger.java b/...com/minecolonies/api/advancements/complete_build_request/CompleteBuildRequestTrigger.java
@@ -10,7 +10,6 @@
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
-
 public class CompleteBuildRequestTrigger extends AbstractCriterionTrigger<CompleteBuildRequestListeners, CompleteBuildRequestCriterionInstance>
 {
     public CompleteBuildRequestTrigger()

diff --git a/...necolonies/api/advancements/create_build_request/CreateBuildRequestCriterionInstance.java b/...necolonies/api/advancements/create_build_request/CreateBuildRequestCriterionInstance.java
@@ -7,9 +7,9 @@
 
 public class CreateBuildRequestCriterionInstance extends CriterionInstance
 {
-    private String hutName;
+    private String        hutName;
     private StructureName structureName;
-    private int level = -1;
+    private int           level = -1;
 
     public CreateBuildRequestCriterionInstance()
     {

diff --git a/...a/com/minecolonies/api/advancements/create_build_request/CreateBuildRequestListeners.java b/...a/com/minecolonies/api/advancements/create_build_request/CreateBuildRequestListeners.java
diff --git a/...ava/com/minecolonies/api/advancements/create_build_request/CreateBuildRequestTrigger.java b/...ava/com/minecolonies/api/advancements/create_build_request/CreateBuildRequestTrigger.java
@@ -10,7 +10,6 @@
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
-
 public class CreateBuildRequestTrigger extends AbstractCriterionTrigger<CreateBuildRequestListeners, CreateBuildRequestCriterionInstance>
 {
     public CreateBuildRequestTrigger()

diff --git a/...ava/com/minecolonies/api/advancements/open_gui_window/OpenGuiWindowCriterionInstance.java b/...ava/com/minecolonies/api/advancements/open_gui_window/OpenGuiWindowCriterionInstance.java
diff --git a/src/api/java/com/minecolonies/api/advancements/open_gui_window/OpenGuiWindowListeners.java b/src/api/java/com/minecolonies/api/advancements/open_gui_window/OpenGuiWindowListeners.java
diff --git a/src/api/java/com/minecolonies/api/advancements/open_gui_window/OpenGuiWindowTrigger.java b/src/api/java/com/minecolonies/api/advancements/open_gui_window/OpenGuiWindowTrigger.java
@@ -9,7 +9,6 @@
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
-
 public class OpenGuiWindowTrigger extends AbstractCriterionTrigger<OpenGuiWindowListeners, OpenGuiWindowCriterionInstance>
 {
     public OpenGuiWindowTrigger()

diff --git a/...va/com/minecolonies/api/advancements/place_structure/PlaceStructureCriterionInstance.java b/...va/com/minecolonies/api/advancements/place_structure/PlaceStructureCriterionInstance.java
@@ -7,7 +7,7 @@
 
 public class PlaceStructureCriterionInstance extends CriterionInstance
 {
-    private String hutName;
+    private String        hutName;
     private StructureName structureName;
 
     public PlaceStructureCriterionInstance()

diff --git a/src/api/java/com/minecolonies/api/advancements/place_structure/PlaceStructureListeners.java b/src/api/java/com/minecolonies/api/advancements/place_structure/PlaceStructureListeners.java
diff --git a/src/api/java/com/minecolonies/api/advancements/place_structure/PlaceStructureTrigger.java b/src/api/java/com/minecolonies/api/advancements/place_structure/PlaceStructureTrigger.java
@@ -10,7 +10,6 @@
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
-
 public class PlaceStructureTrigger extends AbstractCriterionTrigger<PlaceStructureListeners, PlaceStructureCriterionInstance>
 {
     public PlaceStructureTrigger()

diff --git a/...api/java/com/minecolonies/api/advancements/place_supply/PlaceSupplyCriterionInstance.java b/...api/java/com/minecolonies/api/advancements/place_supply/PlaceSupplyCriterionInstance.java
diff --git a/src/api/java/com/minecolonies/api/advancements/place_supply/PlaceSupplyListeners.java b/src/api/java/com/minecolonies/api/advancements/place_supply/PlaceSupplyListeners.java
diff --git a/src/api/java/com/minecolonies/api/advancements/place_supply/PlaceSupplyTrigger.java b/src/api/java/com/minecolonies/api/advancements/place_supply/PlaceSupplyTrigger.java
@@ -8,7 +8,6 @@
 import net.minecraft.util.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 
-
 public class PlaceSupplyTrigger extends AbstractCriterionTrigger<PlaceSupplyListeners, PlaceSupplyCriterionInstance>
 {
     public PlaceSupplyTrigger()

diff --git a/src/api/java/com/minecolonies/api/blocks/AbstractBlockBarrel.java b/src/api/java/com/minecolonies/api/blocks/AbstractBlockBarrel.java
@@ -15,7 +15,7 @@ public abstract class AbstractBlockBarrel<B extends AbstractBlockBarrel<B>> exte
     /**
      * The position it faces.
      */
-    public static final DirectionProperty        FACING  = HorizontalBlock.HORIZONTAL_FACING;
+    public static final DirectionProperty FACING = HorizontalBlock.HORIZONTAL_FACING;
 
     public AbstractBlockBarrel(final Properties properties)
     {
@@ -28,23 +28,23 @@ public static BlockState changeStateOverFullness(@NotNull final AbstractTileEnti
          * 12.8 -> the number of items needed to go up on a state (having 6 filling states)
          * So items/12.8 -> meta of the state we should get
          */
-        BarrelType type = BarrelType.byMetadata((int) Math.round(te.getItems()/12.8));
+        BarrelType type = BarrelType.byMetadata((int) Math.round(te.getItems() / 12.8));
 
         /*
          * We check if the barrel is marked as empty but it have items inside. If so, means that it
          * does not have all the items needed to go on TWENTY state, but we need to mark it so the player
          * knows it have some items inside
          */
 
-        if(type.equals(BarrelType.ZERO) && te.getItems() > 0)
+        if (type.equals(BarrelType.ZERO) && te.getItems() > 0)
         {
             type = BarrelType.TWENTY;
         }
         else if (te.getItems() == AbstractTileEntityBarrel.MAX_ITEMS)
         {
             type = BarrelType.WORKING;
         }
-        if(te.isDone())
+        if (te.isDone())
         {
             type = BarrelType.DONE;
         }

diff --git a/src/api/java/com/minecolonies/api/blocks/AbstractBlockHut.java b/src/api/java/com/minecolonies/api/blocks/AbstractBlockHut.java
@@ -221,11 +221,11 @@ public void onBlockPlacedBy(@NotNull final World worldIn, @NotNull final BlockPo
         final TileEntity tileEntity = worldIn.getTileEntity(pos);
         if (tileEntity instanceof TileEntityColonyBuilding)
         {
-            if (((TileEntityColonyBuilding) tileEntity).getBuildingName() != getBuildingEntry().getRegistryName())
+            @NotNull final TileEntityColonyBuilding hut = (TileEntityColonyBuilding) tileEntity;
+            if (hut.getBuildingName() != getBuildingEntry().getRegistryName())
             {
-                ((TileEntityColonyBuilding) tileEntity).registryName = getBuildingEntry().getRegistryName();
+                hut.registryName = getBuildingEntry().getRegistryName();
             }
-            @NotNull final AbstractTileEntityColonyBuilding hut = (AbstractTileEntityColonyBuilding) tileEntity;
             @Nullable final IColony colony = IColonyManager.getInstance().getColonyByPosFromWorld(worldIn, hut.getPosition());
 
             if (colony != null)

diff --git a/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecolonies.java b/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecolonies.java
@@ -27,6 +27,7 @@ public B registerBlock(final IForgeRegistry<Block> registry)
         registry.register(this);
         return (B) this;
     }
+
     /**
      * Registery block at gameregistry.
      *

diff --git a/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecoloniesContainer.java b/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecoloniesContainer.java
diff --git a/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecoloniesFalling.java b/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecoloniesFalling.java
@@ -2,7 +2,8 @@
 
 import com.minecolonies.api.blocks.interfaces.IBlockMinecolonies;
 import com.minecolonies.api.util.constant.Suppression;
-import net.minecraft.block.*;
+import net.minecraft.block.Block;
+import net.minecraft.block.FallingBlock;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraftforge.registries.IForgeRegistry;
@@ -27,6 +28,7 @@ public B registerBlock(final IForgeRegistry<Block> registry)
         registry.register(this);
         return (B) this;
     }
+
     /**
      * Registery block at gameregistry.
      *

diff --git a/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecoloniesHorizontal.java b/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecoloniesHorizontal.java
diff --git a/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecoloniesRack.java b/src/api/java/com/minecolonies/api/blocks/AbstractBlockMinecoloniesRack.java
diff --git a/src/api/java/com/minecolonies/api/blocks/ModBlocks.java b/src/api/java/com/minecolonies/api/blocks/ModBlocks.java
@@ -5,8 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Class to create the modBlocks.
- * References to the blocks can be made here
+ * Class to create the modBlocks. References to the blocks can be made here
  * <p>
  * We disabled the following finals since we are neither able to mark the items as final, nor do we want to provide public accessors.
  */
@@ -67,13 +66,13 @@ public final class ModBlocks
      * Utility blocks.
      */
     public static AbstractBlockMinecoloniesConstructionTape<? extends AbstractBlockMinecoloniesConstructionTape<?>> blockConstructionTape;
-    public static AbstractBlockMinecoloniesRack<? extends AbstractBlockMinecoloniesRack<?>> blockRack;
-    public static AbstractBlockMinecolonies<? extends AbstractBlockMinecolonies<?>> blockWayPoint;
-    public static AbstractBlockBarrel<? extends AbstractBlockBarrel<?>> blockBarrel;
-    public static AbstractBlockMinecoloniesHorizontal<? extends AbstractBlockMinecoloniesHorizontal<?>> blockDecorationPlaceholder;
-    public static AbstractBlockMinecoloniesDefault<? extends AbstractBlockMinecoloniesDefault<?>> blockScarecrow;
-    public static AbstractBlockMinecolonies<? extends AbstractBlockMinecolonies<?>> blockBarracksTowerSubstitution;
-    public static AbstractBlockMinecolonies<? extends AbstractBlockMinecolonies<?>> blockCompostedDirt;
+    public static AbstractBlockMinecoloniesRack<? extends AbstractBlockMinecoloniesRack<?>>                         blockRack;
+    public static AbstractBlockMinecolonies<? extends AbstractBlockMinecolonies<?>>                                 blockWayPoint;
+    public static AbstractBlockBarrel<? extends AbstractBlockBarrel<?>>                                             blockBarrel;
+    public static AbstractBlockMinecoloniesHorizontal<? extends AbstractBlockMinecoloniesHorizontal<?>>             blockDecorationPlaceholder;
+    public static AbstractBlockMinecoloniesDefault<? extends AbstractBlockMinecoloniesDefault<?>>                   blockScarecrow;
+    public static AbstractBlockMinecolonies<? extends AbstractBlockMinecolonies<?>>                                 blockBarracksTowerSubstitution;
+    public static AbstractBlockMinecolonies<? extends AbstractBlockMinecolonies<?>>                                 blockCompostedDirt;
 
     /**
      * Private constructor to hide the implicit public one.
@@ -127,6 +126,7 @@ public static AbstractBlockHut<?>[] getHuts()
           blockHutTavern,
           blockHutRabbitHutch,
           blockHutConcreteMixer,
-          blockHutBeekeeper};
+          blockHutBeekeeper,
+          blockHutFlorist};
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ public B registerBlock(final IForgeRegistry<Block> registry) @@
             registry.register(this);
             return (B) this;
         }
         /**
          * Registery block at gameregistry.
          *
@@ Expand Down @@