make waypoints render when buildtool open

src/main/java/com/minecolonies/blockout/views/DropDownList.java

@@ -1,16 +1,16 @@
 package com.minecolonies.blockout.views;
 
+import com.minecolonies.blockout.OverlayView;
+import com.minecolonies.blockout.Pane;
+import com.minecolonies.blockout.PaneParams;
 import com.minecolonies.blockout.View;
 import com.minecolonies.blockout.controls.Button;
 import com.minecolonies.blockout.controls.ButtonVanilla;
 import com.minecolonies.blockout.controls.Label;
-import com.minecolonies.blockout.views.ScrollingList;
-import com.minecolonies.blockout.OverlayView;
-import com.minecolonies.blockout.Pane;
-import com.minecolonies.blockout.PaneParams;
-import java.util.function.Consumer;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.Consumer;
+
 /**
  * A DropDownList is a Button which when click display a ScrollingList below it.
  */

src/main/java/com/minecolonies/coremod/client/gui/DialogDoneCancel.java

@@ -1,13 +1,14 @@
 package com.minecolonies.coremod.client.gui;
 
+import com.minecolonies.blockout.Loader;
+import com.minecolonies.blockout.OverlayView;
 import com.minecolonies.blockout.controls.Button;
 import com.minecolonies.blockout.controls.Label;
 import com.minecolonies.blockout.controls.Text;
-import com.minecolonies.blockout.Loader;
 import com.minecolonies.blockout.views.Window;
 import com.minecolonies.coremod.lib.Constants;
-import com.minecolonies.blockout.OverlayView;
 import com.minecolonies.coremod.util.Log;
+
 import java.util.function.ObjIntConsumer;
 
 /**

src/main/java/com/minecolonies/coremod/colony/CitizenDataView.java

@@ -183,7 +183,7 @@ public int getCharisma()
 
     /**
      * Get the saturation of the citizen.
-     * @return
+     * @return the saturation a double.
      */
     public double getSaturation()
     {

src/main/java/com/minecolonies/coremod/colony/Colony.java

@@ -1237,7 +1237,7 @@ else if(averageSaturation > WELL_SATURATED_LIMIT)
             increaseOverallHappiness((averageSaturation - WELL_SATURATED_LIMIT) * HAPPINESS_FACTOR);
         }
 
-        int relation = guards/workers;
+        int relation = workers/guards;
 
         if(relation > 1)
         {
@@ -1265,6 +1265,7 @@ private void updateWayPoints()
                 if (world != null && world.getBlockState(key).getBlock() != (value.getBlock()))
                 {
                     wayPoints.remove(key);
+                    markDirty();
                 }
             }
         }
@@ -1820,6 +1821,7 @@ public void removeField(final BlockPos pos)
     public void addWayPoint(final BlockPos point, IBlockState block)
     {
         wayPoints.put(point, block);
+        markDirty();
     }
 
     /**
@@ -1896,4 +1898,13 @@ public Map<BlockPos, AbstractBuilding> getBuildings()
     {
         return Collections.unmodifiableMap(buildings);
     }
+
+    /**
+     * Get all the waypoints of the colony.
+     * @return copy of hashmap.
+     */
+    public Map<BlockPos, IBlockState> getWayPoints()
+    {
+        return new HashMap<>(wayPoints);
+    }
 }

src/main/java/com/minecolonies/coremod/colony/ColonyView.java

@@ -64,6 +64,14 @@ public final class ColonyView implements IColony
      */
     private Set<Block> freeBlocks = new HashSet<>();
 
+    /**
+     * The Set of waypoints.
+     */
+    private Set<BlockPos> wayPoints = new HashSet<>();
+
+    /**
+     * The overall happiness of the colony.
+     */
     private double overallHappiness = 5;
 
     /**
@@ -107,6 +115,7 @@ public static void serializeNetworkData(@NotNull final Colony colony, @NotNull f
 
         final Set<Block> freeBlocks = colony.getFreeBlocks();
         final Set<BlockPos> freePos = colony.getFreePositions();
+        final Set<BlockPos> waypoints = colony.getWayPoints().keySet();
 
         buf.writeInt(freeBlocks.size());
         for(final Block block : freeBlocks)
@@ -121,6 +130,12 @@ public static void serializeNetworkData(@NotNull final Colony colony, @NotNull f
         }
         buf.writeDouble(colony.getOverallHappiness());
         buf.writeBoolean(colony.hasWarehouse());
+
+        buf.writeInt(waypoints.size());
+        for(final BlockPos block: waypoints)
+        {
+            BlockPosUtil.writeToByteBuf(buf, block);
+        }
         //  Citizens are sent as a separate packet
     }
 
@@ -362,6 +377,7 @@ public IMessage handleColonyViewMessage(@NotNull final ByteBuf buf, final boolea
 
         freePositions = new HashSet<>();
         freeBlocks = new HashSet<>();
+        wayPoints = new HashSet<>();
 
         final int blockListSize = buf.readInt();
         for(int i = 0; i < blockListSize; i++)
@@ -376,6 +392,12 @@ public IMessage handleColonyViewMessage(@NotNull final ByteBuf buf, final boolea
         }
         this.overallHappiness = buf.readDouble();
         this.hasWarehouse = buf.readBoolean();
+
+        final int wayPointListSize = buf.readInt();
+        for(int i = 0; i < wayPointListSize; i++)
+        {
+            wayPoints.add(BlockPosUtil.readFromByteBuf(buf));
+        }
         return null;
     }
 
@@ -569,6 +591,15 @@ public boolean hasTownHall()
         return townHall != null;
     }
 
+    /**
+     * Get a list of all waypoints in the colony view.
+     * @return a copy of the list.
+     */
+    public Set<BlockPos> getWayPoints()
+    {
+        return new HashSet<>(wayPoints);
+    }
+
     /**
      * Returns the ID of the view.
      *

src/main/java/com/minecolonies/coremod/colony/Structures.java

@@ -14,10 +14,13 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.*;
-import java.io.*;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

src/main/java/com/minecolonies/coremod/colony/workorders/WorkOrderBuild.java

@@ -2,10 +2,10 @@
 
 import com.minecolonies.coremod.colony.CitizenData;
 import com.minecolonies.coremod.colony.Colony;
+import com.minecolonies.coremod.colony.Structures;
 import com.minecolonies.coremod.colony.buildings.AbstractBuilding;
 import com.minecolonies.coremod.colony.buildings.BuildingBuilder;
 import com.minecolonies.coremod.colony.jobs.JobBuilder;
-import com.minecolonies.coremod.colony.Structures;
 import com.minecolonies.coremod.util.BlockPosUtil;
 import com.minecolonies.coremod.util.LanguageHandler;
 import com.minecolonies.coremod.util.Log;

src/main/java/com/minecolonies/coremod/entity/EntityCitizen.java

@@ -32,7 +32,10 @@
 import net.minecraft.init.Blocks;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.*;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.datasync.DataParameter;
 import net.minecraft.network.datasync.DataSerializers;

src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIStructure.java

@@ -1,7 +1,6 @@
 package com.minecolonies.coremod.entity.ai.basic;
 
 import com.minecolonies.coremod.blocks.ModBlocks;
-import com.minecolonies.coremod.colony.buildings.AbstractBuilding;
 import com.minecolonies.coremod.colony.jobs.AbstractJob;
 import com.minecolonies.coremod.colony.jobs.AbstractJobStructure;
 import com.minecolonies.coremod.configuration.Configurations;
@@ -12,7 +11,8 @@
 import com.minecolonies.coremod.placementhandlers.IPlacementHandler;
 import com.minecolonies.coremod.placementhandlers.PlacementHandlers;
 import com.minecolonies.coremod.util.*;
-import net.minecraft.block.*;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
@@ -43,7 +43,8 @@
 import java.util.stream.Collectors;
 
 import static com.minecolonies.coremod.entity.ai.util.AIState.*;
-import static com.minecolonies.coremod.placementhandlers.IPlacementHandler.ActionProcessingResult.*;
+import static com.minecolonies.coremod.placementhandlers.IPlacementHandler.ActionProcessingResult.ACCEPT;
+import static com.minecolonies.coremod.placementhandlers.IPlacementHandler.ActionProcessingResult.DENY;
 
 /**
  * This base ai class is used by ai's who need to build entire structures.

src/main/java/com/minecolonies/coremod/entity/ai/citizen/miner/EntityAIStructureMiner.java

@@ -1,7 +1,7 @@
 package com.minecolonies.coremod.entity.ai.citizen.miner;
 
-import com.minecolonies.coremod.colony.buildings.BuildingMiner;
 import com.minecolonies.coremod.colony.Structures;
+import com.minecolonies.coremod.colony.buildings.BuildingMiner;
 import com.minecolonies.coremod.colony.jobs.JobMiner;
 import com.minecolonies.coremod.entity.ai.basic.AbstractEntityAIStructure;
 import com.minecolonies.coremod.entity.ai.util.AIState;

src/main/java/com/minecolonies/coremod/event/ClientEventHandler.java

@@ -1,6 +1,13 @@
 package com.minecolonies.coremod.event;
 
+import com.minecolonies.coremod.colony.Structures;
+import com.minecolonies.coremod.entity.ai.basic.AbstractEntityAIStructure;
 import com.minecolonies.coremod.entity.pathfinding.Pathfinding;
+import com.minecolonies.coremod.util.constants.RenderUtils;
+import com.minecolonies.structures.helpers.Settings;
+import com.minecolonies.structures.helpers.Structure;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.jetbrains.annotations.NotNull;
@@ -12,11 +19,31 @@ public class ClientEventHandler
 {
     /**
      * Used to catch the renderWorldLastEvent in order to draw the debug nodes for pathfinding.
+     *
      * @param event the catched event.
      */
     @SubscribeEvent
     public void renderWorldLastEvent(@NotNull final RenderWorldLastEvent event)
     {
         Pathfinding.debugDraw(event.getPartialTicks());
+
+        final Structure structure = Settings.instance.getActiveStructure();
+        if (structure != null)
+        {
+            final BlockPos position = Settings.instance.getPosition();
+            if (Settings.instance.getStructureName().contains(AbstractEntityAIStructure.WAYPOINT_STRING))
+            {
+                RenderUtils.renderWayPoints(position, Minecraft.getMinecraft().theWorld, event.getPartialTicks());
+            }
+            else
+            {
+                Structures.StructureName name = new Structures.StructureName(Settings.instance.getStructureName());
+                if (name.isHut())
+                {
+                    RenderUtils.renderColonyBorder(position, Minecraft.getMinecraft().theWorld, event.getPartialTicks(), Minecraft.getMinecraft().thePlayer);
+                }
+            }
+        }
+        RenderUtils.colonyBorder.clear();
     }
 }

src/main/java/com/minecolonies/coremod/network/messages/ColonyStylesMessage.java

@@ -10,7 +10,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Class handling the colony styles messages.

src/main/java/com/minecolonies/coremod/network/messages/SchematicSaveMessage.java

@@ -1,9 +1,10 @@
 package com.minecolonies.coremod.network.messages;
 
-import com.minecolonies.coremod.configuration.Configurations;
 import com.minecolonies.coremod.MineColonies;
 import com.minecolonies.coremod.colony.Structures;
-import com.minecolonies.coremod.util.*;
+import com.minecolonies.coremod.configuration.Configurations;
+import com.minecolonies.coremod.util.ClientStructureWrapper;
+import com.minecolonies.coremod.util.Log;
 import com.minecolonies.structures.helpers.Structure;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.util.text.TextComponentString;

src/main/java/com/minecolonies/coremod/network/messages/ServerUUIDMessage.java

@@ -9,7 +9,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.UUID;
 
 /**
  * Class handling the Server UUID Message.

src/main/java/com/minecolonies/coremod/proxy/ClientProxy.java

@@ -31,6 +31,7 @@
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
 
 /**

src/main/java/com/minecolonies/coremod/proxy/CommonProxy.java

@@ -20,9 +20,9 @@
 import net.minecraftforge.fml.common.registry.EntityRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
-import java.io.File;
 
 
 /**

src/main/java/com/minecolonies/coremod/proxy/IProxy.java

@@ -2,8 +2,9 @@
 
 import com.minecolonies.coremod.colony.CitizenDataView;
 import net.minecraft.util.math.BlockPos;
-import java.io.*;
+
 import javax.annotation.Nullable;
+import java.io.File;
 
 /**
  * Basic proxy interface.

src/main/java/com/minecolonies/coremod/proxy/ServerProxy.java

@@ -2,6 +2,7 @@
 
 import com.minecolonies.coremod.lib.Constants;
 import net.minecraftforge.fml.common.FMLCommonHandler;
+
 import java.io.File;
 
 /**

src/main/java/com/minecolonies/coremod/util/ClientStructureWrapper.java

@@ -1,8 +1,8 @@
 package com.minecolonies.coremod.util;
 
 import com.minecolonies.coremod.colony.Structures;
-import com.minecolonies.structures.helpers.Structure;
 import com.minecolonies.structures.helpers.Settings;
+import com.minecolonies.structures.helpers.Structure;
 import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;

src/main/java/com/minecolonies/coremod/util/InventoryUtils.java

@@ -1,7 +1,6 @@
 package com.minecolonies.coremod.util;
 
 import net.minecraft.block.Block;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemPickaxe;
 import net.minecraft.item.ItemStack;

src/main/java/com/minecolonies/coremod/util/SoundUtils.java

@@ -1,7 +1,8 @@
 package com.minecolonies.coremod.util;
 
 import com.minecolonies.coremod.entity.EntityCitizen;
-import com.minecolonies.coremod.sounds.*;
+import com.minecolonies.coremod.sounds.AbstractWorkerSounds;
+import com.minecolonies.coremod.sounds.ModSoundEvents;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.SoundEvent;