Fix one definition rule violations

src/Generating/VerticalLimit.cpp

@@ -30,6 +30,8 @@ If a_LogWarnings is true, outputs failure reasons to console.
 The range is returned in a_Min and a_Max.
 If no value is in the string, both values are left unchanged.
 If only the minimum is in the string, it is assigned to both a_Min and a_Max. */
+namespace VerticalLimit
+{
 	static bool ParseRange(const AString & a_Params, int & a_Min, int & a_Max, bool a_LogWarnings)
 	{
 		auto params = StringSplitAndTrim(a_Params, "|");
@@ -61,6 +63,7 @@ static bool ParseRange(const AString & a_Params, int & a_Min, int & a_Max, bool
 		}
 		return true;
 	}
+}
 
 
 
@@ -144,7 +147,7 @@ public:
 		// Parameters: "<MinBlocksAbove>|<MaxBlocksAbove>", both optional
 		m_MinBlocksAbove = 0;
 		m_MaxBlocksAbove = 0;
-		return ParseRange(a_Params, m_MinBlocksAbove, m_MaxBlocksAbove, a_LogWarnings);
+		return VerticalLimit::ParseRange(a_Params, m_MinBlocksAbove, m_MaxBlocksAbove, a_LogWarnings);
 	}
 
 
@@ -191,7 +194,7 @@ public:
 		// Parameters: "<MinBlocksAbove>|<MaxBlocksAbove>", both optional
 		m_MinBlocksAbove = 0;
 		m_MaxBlocksAbove = 0;
-		return ParseRange(a_Params, m_MinBlocksAbove, m_MaxBlocksAbove, a_LogWarnings);
+		return VerticalLimit::ParseRange(a_Params, m_MinBlocksAbove, m_MaxBlocksAbove, a_LogWarnings);
 	}
 
 
@@ -275,7 +278,7 @@ public:
 		// Parameters: "<MinBlocksBelow>|<MaxBlocksBelow>", both optional
 		m_MinBlocksBelow = 0;
 		m_MaxBlocksBelow = 0;
-		return ParseRange(a_Params, m_MinBlocksBelow, m_MaxBlocksBelow, a_LogWarnings);
+		return VerticalLimit::ParseRange(a_Params, m_MinBlocksBelow, m_MaxBlocksBelow, a_LogWarnings);
 	}
 
 
@@ -321,7 +324,7 @@ public:
 		// Parameters: "<MinBlocksBelow>|<MaxBlocksBelow>", both optional
 		m_MinBlocksBelow = 0;
 		m_MaxBlocksBelow = 0;
-		return ParseRange(a_Params, m_MinBlocksBelow, m_MaxBlocksBelow, a_LogWarnings);
+		return VerticalLimit::ParseRange(a_Params, m_MinBlocksBelow, m_MaxBlocksBelow, a_LogWarnings);
 	}
 
 

src/Generating/VerticalStrategy.cpp

@@ -38,6 +38,8 @@ static const int SEED_OFFSET = 135;
 Returns true if successful, false on failure.
 If a_LogWarnings is true, outputs failure reasons to console.
 The range is returned in a_Min and a_Range, they are left unchanged if the range value is not present in the string. */
+namespace VerticalStrategy
+{
 	static bool ParseRange(const AString & a_Params, int & a_Min, int & a_Range, bool a_LogWarnings)
 	{
 		auto params = StringSplitAndTrim(a_Params, "|");
@@ -70,6 +72,7 @@ static bool ParseRange(const AString & a_Params, int & a_Min, int & a_Range, boo
 		a_Range = maxHeight - a_Min + 1;
 		return true;
 	}
+}
 
 
 
@@ -202,7 +205,7 @@ public:
 		// Params: "<MinRelativeHeight>|<MaxRelativeHeight>", all optional
 		m_MinRelHeight = 0;
 		m_RelHeightRange = 1;
-		return ParseRange(a_Params, m_MinRelHeight, m_RelHeightRange, a_LogWarnings);
+		return VerticalStrategy::ParseRange(a_Params, m_MinRelHeight, m_RelHeightRange, a_LogWarnings);
 	}
 
 
@@ -258,7 +261,7 @@ public:
 		// Params: "<MinRelativeHeight>|<MaxRelativeHeight>", all optional
 		m_MinRelHeight = 0;
 		m_RelHeightRange = 1;
-		return ParseRange(a_Params, m_MinRelHeight, m_RelHeightRange, a_LogWarnings);
+		return VerticalStrategy::ParseRange(a_Params, m_MinRelHeight, m_RelHeightRange, a_LogWarnings);
 	}
 
 

src/Protocol/Protocol_1_11.cpp

@@ -58,9 +58,9 @@ Implements the 1.11 protocol classes:
 	#pragma clang diagnostic ignored "-Wduplicate-enum"
 #endif
 
-namespace Metadata
+namespace Metadata_1_11
 {
-	enum Metadata_Index
+	enum MetadataIndex
 	{
 		// Entity
 		ENTITY_FLAGS,
@@ -653,7 +653,7 @@ void cProtocol_1_11_0::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer)
 
 void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_Entity)
 {
-	using namespace Metadata;
+	using namespace Metadata_1_11;
 
 	// Common metadata:
 	Int8 Flags = 0;
@@ -860,7 +860,7 @@ void cProtocol_1_11_0::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity &
 
 void cProtocol_1_11_0::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob)
 {
-	using namespace Metadata;
+	using namespace Metadata_1_11;
 
 	// Living Enitiy Metadata
 	if (a_Mob.HasCustomName())

src/Protocol/Protocol_1_12.cpp

@@ -42,9 +42,9 @@ Implements the 1.12 protocol classes:
 #pragma clang diagnostic ignored "-Wduplicate-enum"
 #endif
 
-namespace Metadata
+namespace Metadata_1_12
 {
-	enum Metadata_Index
+	enum MetadataIndex
 	{
 		// Entity
 		ENTITY_FLAGS,
@@ -372,7 +372,7 @@ void cProtocol_1_12::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer)
 
 void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_Entity)
 {
-	using namespace Metadata;
+	using namespace Metadata_1_12;
 
 	// Common metadata:
 	Int8 Flags = 0;
@@ -579,7 +579,7 @@ void cProtocol_1_12::WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_
 
 void cProtocol_1_12::WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob)
 {
-	using namespace Metadata;
+	using namespace Metadata_1_12;
 
 	// Living Enitiy Metadata
 	if (a_Mob.HasCustomName())

src/Protocol/Protocol_1_8.cpp

@@ -54,13 +54,6 @@ Implements the 1.8 protocol classes:
 
 
 
-/** The slot number that the client uses to indicate "outside the window". */
-static const Int16 SLOT_NUM_OUTSIDE = -999;
-
-
-
-
-
 #define HANDLE_READ(ByteBuf, Proc, Type, Var) \
 	Type Var; \
 	do { \
@@ -2825,6 +2818,9 @@ void cProtocol_1_8_0::HandlePacketWindowClick(cByteBuffer & a_ByteBuffer)
 	cItem Item;
 	ReadItem(a_ByteBuffer, Item);
 
+	/** The slot number that the client uses to indicate "outside the window". */
+	static const Int16 SLOT_NUM_OUTSIDE = -999;
+
 	// Convert Button, Mode, SlotNum and HeldItem into eClickAction:
 	eClickAction Action;
 	switch ((Mode << 8) | Button)

src/Protocol/Protocol_1_9.cpp

@@ -58,9 +58,6 @@ Implements the 1.9 protocol classes:
 
 
 
-/** The slot number that the client uses to indicate "outside the window". */
-static const Int16 SLOT_NUM_OUTSIDE = -999;
-
 /** Value for main hand in Hand parameter for Protocol 1.9. */
 static const UInt32 MAIN_HAND = 0;
 static const UInt32 OFF_HAND = 1;
@@ -1034,6 +1031,9 @@ void cProtocol_1_9_0::HandlePacketWindowClick(cByteBuffer & a_ByteBuffer)
 	cItem Item;
 	ReadItem(a_ByteBuffer, Item);
 
+	/** The slot number that the client uses to indicate "outside the window". */
+	static const Int16 SLOT_NUM_OUTSIDE = -999;
+
 	// Convert Button, Mode, SlotNum and HeldItem into eClickAction:
 	eClickAction Action;
 	switch ((Mode << 8) | Button)