Changeset 238 for binary-improvements

Timestamp:

Jul 3, 2015, 4:16:11 PM (9 years ago)

Author:

alloc

Message:

Server fixes for A12

Location:

binary-improvements

Files:

• 7dtd-binaries/README.txt (modified) (1 diff)
• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (1 diff)
• 7dtd-server-fixes/ModInfo.xml (modified) (1 diff)
• 7dtd-server-fixes/src/API.cs (modified) (1 diff)
• 7dtd-server-fixes/src/AssemblyInfo.cs (modified) (1 diff)
• 7dtd-server-fixes/src/ChatHookExample.cs (added)
• 7dtd-server-fixes/src/ItemList.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/PersistentData/Inventory.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/PersistentData/PersistentContainer.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/PersistentData/Player.cs (modified) (1 diff)
• AllocsCommands/AllocsCommands.csproj (modified) (1 diff)
• AllocsCommands/Chat.cs (modified) (1 diff)
• AllocsCommands/Commands/ExportItemIcons.cs (added)
• AllocsCommands/Commands/Give.cs (modified) (3 diffs)
• AllocsCommands/Commands/ListKnownPlayers.cs (modified) (1 diff)
• AllocsCommands/Commands/ListLandProtection.cs (modified) (3 diffs)
• AllocsCommands/Commands/RemoveLandProtection.cs (modified) (2 diffs)
• AllocsCommands/Commands/Reply.cs (modified) (1 diff)
• AllocsCommands/Commands/SayToPlayer.cs (modified) (1 diff)
• AllocsCommands/Commands/ShowInventory.cs (modified) (1 diff)
• AllocsCommands/Commands/TeleportPlayer.cs (modified) (2 diffs)
• AllocsCommands/ModInfo.xml (modified) (1 diff)
• MapRendering/MapRendering/MapRenderBlockBuffer.cs (modified) (1 diff)
• MapRendering/MapRendering/MapRendering.cs (modified) (8 diffs)
• MapRendering/ModInfo.xml (modified) (1 diff)
• MapRendering/Web/API/GetLandClaims.cs (modified) (2 diffs)
• MapRendering/Web/ItemIconHandler.cs (added)
• MapRendering/Web/Web.cs (modified) (1 diff)
• MapRendering/WebAndMapRendering.csproj (modified) (1 diff)
• bundle_creation/makefile (modified) (3 diffs)
• server-fixes.userprefs (modified) (2 diffs)

binary-improvements/7dtd-binaries/README.txt

@@ -1 @@
-Put the Assembly-CSharp.deobf.dll renamed to Assembly-CSharp.dll (output of
-the Deobfuscator [1]), Assembly-CSharp-firstpass.dll, LogLibrary.dll, mscorlib.dll,
-System.dll and UnityEngine.dll in this folder.
+Put the Assembly-CSharp.dll, Assembly-CSharp-firstpass.dll, LogLibrary.dll, mscorlib.dll,
+System.dll and UnityEngine.dll from your dedicated server in this folder.
 
-[1]: https://github.com/DerPopo/deobfuscate-7dtd

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -85 +85 @@
     <Compile Include="src\FileCache\MapTileCache.cs" />
     <Compile Include="src\API.cs" />
+    <Compile Include="src\ChatHookExample.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/7dtd-server-fixes/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Common functions" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="2" />
+                <Version value="4" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/7dtd-server-fixes/src/API.cs

@@ -28 +28 @@
                 }
 
+                public override bool ChatMessage (ClientInfo _cInfo, string _message, string _playerName) {
+                        return ChatHookExample.Hook (_cInfo, _message, _playerName);
+                }
         }
 }

binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs

@@ -18 +18 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.11.6.0")]
+[assembly: AssemblyVersion("0.12.0.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 

binary-improvements/7dtd-server-fixes/src/ItemList.cs

@@ -45 +45 @@
                 {
                         NGuiInvGridCreativeMenu cm = new NGuiInvGridCreativeMenu ();
-                        foreach (InventoryField invF in cm.GetAllItems()) {
-                                ItemBase ib = ItemBase.list [invF.itemValue.type];
+                        foreach (ItemStack invF in cm.GetAllItems()) {
+                                ItemClass ib = ItemClass.list [invF.itemValue.type];
                                 string name = ib.GetItemName ();
                                 if (name != null && name.Length > 0) {
@@ -56 +56 @@
                                 }
                         }
-                        foreach (InventoryField invF in cm.GetAllBlocks()) {
-                                ItemBase ib = ItemBase.list [invF.itemValue.type];
+                        foreach (ItemStack invF in cm.GetAllBlocks()) {
+                                ItemClass ib = ItemClass.list [invF.itemValue.type];
                                 string name = ib.GetItemName ();
                                 if (name != null && name.Length > 0) {

binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs

@@ -25 +25 @@
                 }
 
-                private void ProcessInv (List<InvItem> target, InventoryField[] sourceFields, int id)
+                private void ProcessInv (List<InvItem> target, ItemStack[] sourceFields, int id)
                 {
                         lock (target) {
@@ -32 +32 @@
                                         if (sourceFields [i].count > 0) {
                                                 int count = sourceFields [i].count;
-                                                int maxAllowed = ItemBase.list [sourceFields [i].itemValue.type].Stacknumber.Value;
-                                                string name = ItemBase.list [sourceFields [i].itemValue.type].GetItemName ();
+                                                int maxAllowed = ItemClass.list [sourceFields [i].itemValue.type].Stacknumber.Value;
+                                                string name = ItemClass.list [sourceFields [i].itemValue.type].GetItemName ();
 
                                                 if (count > maxAllowed)

binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs

@@ -36 +36 @@
                 public void Save ()
                 {
-                        Stream stream = File.Open (StaticDirectories.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Create);
+                        Stream stream = File.Open (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Create);
                         BinaryFormatter bFormatter = new BinaryFormatter ();
                         bFormatter.Serialize (stream, this);
@@ -44 +44 @@
                 public static bool Load ()
                 {
-                        if (File.Exists (StaticDirectories.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
+                        if (File.Exists (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
                                 try {
                                         PersistentContainer obj;
-                                        Stream stream = File.Open (StaticDirectories.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
+                                        Stream stream = File.Open (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
                                         BinaryFormatter bFormatter = new BinaryFormatter ();
                                         obj = (PersistentContainer)bFormatter.Deserialize (stream);

binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs

@@ -135 +135 @@
                         name = ci.playerName;
                         ip = ci.ip;
+                        lastOnline = DateTime.Now;
                 }
 

binary-improvements/AllocsCommands/AllocsCommands.csproj

@@ -52 +52 @@
     <Compile Include="Chat.cs" />
     <Compile Include="Commands\ListItems.cs" />
-    <Compile Include="Commands\GenerateItemIcons.cs" />
+    <Compile Include="Commands\ExportItemIcons.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/AllocsCommands/Chat.cs

@@ -13 +13 @@
                                 senderName = "Server";
                         }
-                        _receiver.SendPackage (new NetPackage_GameInfoMessage (_message, senderName + " (PM)"));
+                        _receiver.SendPackage (new NetPackageGameMessage (_message, senderName + " (PM)"));
                         string receiverName = _receiver.playerName;
                         SdtdConsole.Instance.Output ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + senderName + "\"");

binary-improvements/AllocsCommands/Commands/Give.cs

@@ -12 +12 @@
                 }
 
+                public override string GetHelp () {
+                        return "Give an item to a player by dropping it in front of that player\n" +
+                                   "Usage:\n" +
+                                   "   give <name / entity id> <item name> <amount>\n" +
+                                   "Either pass the full name of a player or his entity id (given by e.g. \"lpi\").\n" +
+                                   "Item name has to be the exact name of an item as listed by \"listitems\".\n" +
+                                   "Amount is the number of instances of this item to drop (as a single stack).";
+                }
+
                 public override string[] GetCommands ()
                 {
@@ -21 +30 @@
                         try {
                                 if (_params.Count != 3) {
-                                        SdtdConsole.Instance.Output ("Usage: give <playername|entityid> <itemname> <amount>");
+                                        SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3, found " + _params.Count + ".");
                                         return;
                                 }
@@ -46 +55 @@
                                 EntityPlayer p = GameManager.Instance.World.Players.dict [ci.entityId];
 
-                                InventoryField invField = new InventoryField (iv, n);
+                                ItemStack invField = new ItemStack (iv, n);
 
                                 GameManager.Instance.ItemDropServer (invField, p.GetPosition (), Vector3.zero, -1, 50);

binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs

@@ -9 +9 @@
                 public override string GetDescription ()
                 {
-                        return "lists all players that were ever online (optionally filtered)";
+                        return "lists all players that were ever online";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "  1. listknownplayers\n" +
+                                   "  2. listknownplayers -online\n" +
+                                   "  3. listknownplayers -notbanned\n" +
+                                   "  4. listknownplayers <player name>\n" +
+                                   "1. Lists all players that have ever been online\n" +
+                                   "2. Lists only the players that are currently online\n" +
+                                   "3. Lists only the players that are not banned\n" +
+                                        "4. Lists all players whose name contains the given string";
                 }
 

binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

@@ -9 +9 @@
                 {
                         return "lists all land protection blocks and owners";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "  1. listlandprotection summary\n" +
+                                   "  2. listlandprotection <steam id>\n" +
+                                   "  3. listlandprotection <player name / entity id>\n" +
+                                   "  4. listlandprotection nearby\n" +
+                                   "  5. listlandprotection nearby <radius>\n" +
+                                   "1. Lists only players that own claimstones, the number they own and the protection status\n" +
+                                   "2. Lists only the claims of the player given by his SteamID including the individual claim positions\n" +
+                                   "3. Same as 2 but player given by his player name or entity id (as given by e.g. \"lpi\")\n" +
+                                   "4. Lists claims in a square with edge length of 64 around the executing player\n" +
+                                   "5. Same as 4 but square edge length can be specified";
                 }
 
@@ -72 +86 @@
                                 }
 
-                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.positionToLPBlockOwner;
+                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.m_lpBlockMap;
                                 if (d != null) {
                                         Dictionary<PersistentPlayerData, List<Vector3i>> owners = new Dictionary<PersistentPlayerData, List<Vector3i>> ();
@@ -93 +107 @@
                                                         name += " (" + kvp.Key.PlayerId + ")";
 
-                                                        SdtdConsole.Instance.Output (String.Format ("Player \"{0}\" owns {3} keystones (protected: {1}, current hardness multiplier: {2})", name, w.LandClaimIsActive (kvp.Key), w.LandClaimPower (kvp.Key), kvp.Value.Count));
+                                                        SdtdConsole.Instance.Output (String.Format ("Player \"{0}\" owns {3} keystones (protected: {1}, current hardness multiplier: {2})", name, w.IsLandProtectionValidForPlayer (kvp.Key), w.GetLandProtectionHardnessModifierForPlayer (kvp.Key), kvp.Value.Count));
                                                         if (!summaryOnly) {
                                                                 foreach (Vector3i v in kvp.Value) {

binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs

@@ -9 +9 @@
                 {
                         return "removes the association of a land protection block to the owner";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:" +
+                                   "  1. removelandprotection <steamid>\n" +
+                                   "  2. removelandprotection <x> <y> <z>\n" +
+                                   "1. Remove all land claims owned by the user with the given SteamID\n" +
+                                   "2. Remove only the claim block on the exactly given block position";
                 }
 
@@ -65 +73 @@
                                 PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList ();
 
-                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.positionToLPBlockOwner;
+                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.m_lpBlockMap;
                                 if (d == null || !d.ContainsKey (v)) {
                                         SdtdConsole.Instance.Output ("No land protection block at the given position or not a valid position. Use \"listlandprotection\" to get a list of keystones.");

binary-improvements/AllocsCommands/Commands/Reply.cs

@@ -9 +9 @@
                 {
                         return "send a message to  the player who last sent you a PM";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "   reply <message>\n" +
+                                   "Send the given message to the user you last received a PM from.";
                 }
 

binary-improvements/AllocsCommands/Commands/SayToPlayer.cs

@@ -9 +9 @@
                 {
                         return "send a message to a single player";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "   pm <player name / steam id / entity id> <message>\n" +
+                                   "Send a PM to the player given by the player name or entity id (as given by e.g. \"lpi\").";
                 }
 

binary-improvements/AllocsCommands/Commands/ShowInventory.cs

@@ -9 +9 @@
                 public override string GetDescription ()
                 {
-                        return "list inventory of a given player (steam id, entity id or name)";
+                        return "list inventory of a given player";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "   showinventory <steam id / player name / entity id>\n" +
+                                   "Show the inventory of the player given by his SteamID, player name or\n" +
+                                   "entity id (as given by e.g. \"lpi\")." +
+                                   "Note: This only shows the player's inventory after it was first sent to\n" +
+                                   "the server which happens at least every 30 seconds.";
                 }
 

binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs

@@ -10 +10 @@
                 {
                         return "teleport a player to a given location";
+                }
+
+                public override string GetHelp () {
+                        return "Usage:\n" +
+                                   "  1. teleportplayer <steam id / player name / entity id> <x> <y> <z>\n" +
+                                   "  2. teleportplayer <steam id / player name / entity id> <target steam id / player name / entity id>\n" +
+                                   "1. Teleports the player given by his SteamID, player name or entity id (as given by e.g. \"lpi\")\n" +
+                                   "   to the specified location\n" +
+                                        "2. As 1, but destination given by another player which has to be online";
                 }
 
@@ -61 +70 @@
                                         }
 
-                                        NetPackage_EntityTeleport pkg = new NetPackage_EntityTeleport (ep1);
+                                        NetPackageEntityTeleport pkg = new NetPackageEntityTeleport (ep1);
 
                                         ci1.SendPackage (pkg);

binary-improvements/AllocsCommands/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Additional commands for server operation" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="2" />
+                <Version value="4" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/MapRendering/MapRendering/MapRenderBlockBuffer.cs

@@ -53 +53 @@
                 }
 
-                public void SetPart (Vector2i offset, int partSize, Color[] pixels) {
+                public void SetPart (Vector2i offset, int partSize, Color32[] pixels) {
                         if (offset.x + partSize > blockMap.width || offset.y + partSize > blockMap.height) {
                                 Log.Error (string.Format ("MapBlockBuffer[{0}].SetPart ({1}, {2}, {3}) has blockMap.size ({4}/{5})", zoomLevel, offset, partSize, pixels.Length, blockMap.width, blockMap.height));
                                 return;
                         }
-                        blockMap.SetPixels (offset.x, offset.y, partSize, partSize, pixels);
+                        blockMap.SetPixels32 (offset.x, offset.y, partSize, partSize, pixels);
                 }
 
-                public Color[] GetHalfScaled ()
+                public Color32[] GetHalfScaled ()
                 {
                         zoomBuffer.Resize (Constants.MAP_BLOCK_SIZE, Constants.MAP_BLOCK_SIZE);
-                        zoomBuffer.SetPixels (blockMap.GetPixels ());
+                        zoomBuffer.SetPixels32 (blockMap.GetPixels32 ());
 
                         TextureScale.Point (zoomBuffer, Constants.MAP_BLOCK_SIZE / 2, Constants.MAP_BLOCK_SIZE / 2);
 
-                        return zoomBuffer.GetPixels ();
+                        return zoomBuffer.GetPixels32 ();
                 }
 

binary-improvements/MapRendering/MapRendering/MapRendering.cs

@@ -24 +24 @@
                 private static object lockObject = new object ();
                 private MapRenderBlockBuffer[] zoomLevelBuffers;
-                private Dictionary<Vector2i, Color[]> dirtyChunks = new Dictionary<Vector2i, Color[]> ();
+                private Dictionary<Vector2i, Color32[]> dirtyChunks = new Dictionary<Vector2i, Color32[]> ();
                 private System.Timers.Timer chunkSaveTimer = new System.Timers.Timer (500);
                 private bool renderingFullMap = false;
@@ -37 +37 @@
                 private MapRendering ()
                 {
-                        Constants.MAP_DIRECTORY = StaticDirectories.GetSaveGameDir () + "/map";
+                        Constants.MAP_DIRECTORY = GameUtils.GetSaveGameDir () + "/map";
 
                         lock (lockObject) {
@@ -69 +69 @@
                                                                 ushort[] mapColors = c.GetMapColors ();
                                                                 if (mapColors != null) {
-                                                                        Color[] realColors = new Color[Constants.MAP_CHUNK_SIZE * Constants.MAP_CHUNK_SIZE];
+                                                                        Color32[] realColors = new Color32[Constants.MAP_CHUNK_SIZE * Constants.MAP_CHUNK_SIZE];
                                                                         for (int i_colors = 0; i_colors < mapColors.Length; i_colors++) {
-                                                                                realColors [i_colors] = shortColorToColor (mapColors [i_colors]);
+                                                                                realColors [i_colors] = shortColorToColor32 (mapColors [i_colors]);
                                                                         }
                                                                         Instance.dirtyChunks [cPos2] = realColors;
@@ -91 +91 @@
                         MicroStopwatch microStopwatch = new MicroStopwatch ();
 
-                        string regionSaveDir = StaticDirectories.GetSaveGameRegionDir ();
+                        string regionSaveDir = GameUtils.GetSaveGameRegionDir ();
                         RegionFileManager rfm = new RegionFileManager (regionSaveDir, regionSaveDir, 0, false);
                         Texture2D fullMapTexture = null;
@@ -119 +119 @@
                                 renderingFullMap = true;
 
-                                if (widthPix <= 8000 && heightPix <= 8000)
+                                if (widthPix <= 8192 && heightPix <= 8192)
                                         fullMapTexture = new Texture2D (widthPix, heightPix);
 
@@ -135 +135 @@
                                                                 ushort[] mapColors = c.GetMapColors ();
                                                                 if (mapColors != null) {
-                                                                        Color[] realColors = new Color[Constants.MAP_CHUNK_SIZE * Constants.MAP_CHUNK_SIZE];
+                                                                        Color32[] realColors = new Color32[Constants.MAP_CHUNK_SIZE * Constants.MAP_CHUNK_SIZE];
                                                                         for (int i_colors = 0; i_colors < mapColors.Length; i_colors++) {
-                                                                                realColors [i_colors] = shortColorToColor (mapColors [i_colors]);
+                                                                                realColors [i_colors] = shortColorToColor32 (mapColors [i_colors]);
                                                                         }
                                                                         dirtyChunks [curChunkPos] = realColors;
                                                                         if (fullMapTexture != null)
-                                                                                fullMapTexture.SetPixels (curFullMapPos.x, curFullMapPos.y, Constants.MAP_CHUNK_SIZE, Constants.MAP_CHUNK_SIZE, realColors);
+                                                                                fullMapTexture.SetPixels32 (curFullMapPos.x, curFullMapPos.y, Constants.MAP_CHUNK_SIZE, Constants.MAP_CHUNK_SIZE, realColors);
                                                                 }
                                                         }
@@ -160 +160 @@
                                 byte[] array = fullMapTexture.EncodeToPNG ();
                                 File.WriteAllBytes (Constants.MAP_DIRECTORY + "/map.png", array);
-                                Texture2D.Destroy (fullMapTexture);
+                                UnityEngine.Object.Destroy (fullMapTexture);
                                 fullMapTexture = null;
                         }
@@ -337 +337 @@
                 }
 
+                private static Color32 shortColorToColor32 (ushort col)
+                {
+                        byte r = (byte)(256 * (col >> 10 & 31) / 32);
+                        byte g = (byte)(256 * (col >> 5 & 31) / 32);
+                        byte b = (byte)(256 * (col & 31) / 32);
+                        byte a = 255;
+                        return new Color32 (r, g, b, a);
+                }
         }
 }

binary-improvements/MapRendering/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Render the game map to image map tiles as it is uncovered" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="3" />
+                <Version value="4" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/MapRendering/Web/API/GetLandClaims.cs

@@ -29 +29 @@
                         result.Add ("claimowners", claimOwners);
 
-                        Dictionary<Vector3i, PersistentPlayerData> d = GameManager.Instance.GetPersistentPlayerList ().positionToLPBlockOwner;
+                        Dictionary<Vector3i, PersistentPlayerData> d = GameManager.Instance.GetPersistentPlayerList ().m_lpBlockMap;
                         if (d != null) {
                                 World w = GameManager.Instance.World;
@@ -45 +45 @@
                                         if (steamid.Length == 0 || kvp.Key.PlayerId.Equals (steamid)) {
                                                 string curID = kvp.Key.PlayerId;
-                                                bool isActive = w.LandClaimIsActive (kvp.Key);
+                                                bool isActive = w.IsLandProtectionValidForPlayer (kvp.Key);
 
                                                 JSONObject owner = new JSONObject ();

binary-improvements/MapRendering/Web/Web.cs

@@ -56 +56 @@
 
                                 handlers.Add (
+                                        "/itemicons/",
+                                        new ItemIconHandler (
+                                                "/itemicons/",
+                                                true)
+                                );
+
+                                handlers.Add (
                                         "/map/",
                                         new StaticHandler (
                                                 "/map/",
-                                                StaticDirectories.GetSaveGameDir () + "/map",
+                                                GameUtils.GetSaveGameDir () + "/map",
                                                 MapRendering.MapRendering.GetTileCache (),
                                                 false)

binary-improvements/MapRendering/WebAndMapRendering.csproj

@@ -59 +59 @@
     <Compile Include="Web\API\GetLandClaims.cs" />
     <Compile Include="Commands\webstat.cs" />
+    <Compile Include="Web\ItemIconHandler.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/bundle_creation/makefile

@@ -20 +20 @@
 ${ARCHIVENAME}: CONTENTS
         @echo Creating archive...
-        @tar -czf ${ARCHIVENAME} 7DaysToDie_Data Mods
+        @tar -czf ${ARCHIVENAME} Mods
 
 CONTENTS: SERVERFIXES
@@ -26 +26 @@
 SERVERFIXES:
         @echo Copying server fixes...
-        @rm 7DaysToDie_Data -Rf
         @rm Mods -Rf
-        @mkdir -p 7DaysToDie_Data/Managed
-        @cp ../7dtd-binaries/Assembly-CSharp.dll 7DaysToDie_Data/Managed/Assembly-CSharp.dll
         @mkdir -p Mods
         @cp ../bin/Mods/* Mods/ -R
@@ -39 +36 @@
 clean:
         @echo Cleaning intermediate stuff...
-        @rm -Rf 7DaysToDie_Data Mods server_fixes_v*.tar.gz
+        @rm -Rf Mods server_fixes_v*.tar.gz
 

binary-improvements/server-fixes.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/MapRendering/MapRendering.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/ChatHookExample.cs">
     <Files>
-      <File FileName="MapRendering/MapRendering/MapRenderBlockBuffer.cs" Line="73" Column="54" />
-      <File FileName="MapRendering/MapRendering/MapRendering.cs" Line="89" Column="3" />
+      <File FileName="MapRendering/MapRendering/MapRenderBlockBuffer.cs" Line="66" Column="53" />
+      <File FileName="MapRendering/MapRendering/MapRendering.cs" Line="343" Column="42" />
       <File FileName="MapRendering/MapRendering/Constants.cs" Line="1" Column="1" />
       <File FileName="MapRendering/Web/API/GetPlayersOnline.cs" Line="32" Column="80" />
@@ -10 +10 @@
       <File FileName="MapRendering/Web/API/GetPlayersLocation.cs" Line="18" Column="40" />
       <File FileName="7dtd-server-fixes/src/PersistentData/Players.cs" Line="13" Column="19" />
-      <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="66" Column="1" />
-      <File FileName="AllocsCommands/Chat.cs" Line="15" Column="25" />
-      <File FileName="7dtd-server-fixes/src/API.cs" Line="13" Column="4" />
-      <File FileName="7dtd-server-fixes/src/ItemList.cs" Line="47" Column="22" />
-      <File FileName="MapRendering/Commands/RenderMap.cs" Line="23" Column="58" />
+      <File FileName="7dtd-server-fixes/src/AssemblyInfo.cs" Line="20" Column="35" />
+      <File FileName="7dtd-server-fixes/ModInfo.xml" Line="7" Column="20" />
+      <File FileName="AllocsCommands/ModInfo.xml" Line="7" Column="20" />
+      <File FileName="MapRendering/ModInfo.xml" Line="7" Column="20" />
+      <File FileName="MapRendering/Web/ApiHandler.cs" Line="31" Column="3" />
+      <File FileName="MapRendering/Web/Web.cs" Line="59" Column="19" />
+      <File FileName="MapRendering/Web/ItemIconHandler.cs" Line="27" Column="53" />
+      <File FileName="7dtd-server-fixes/src/ChatHookExample.cs" Line="17" Column="53" />
+      <File FileName="7dtd-server-fixes/src/API.cs" Line="31" Column="28" />
     </Files>
     <Pads>