Fixed #69 and #70

I decided to revert to #69 based on @johnnywoof's request and fixed another ConcurrentModificationException (sneaky little bastards) discovered by @dernise.
whirvis · Jan 11, 2018 · dd76efe · dd76efe
1 parent a46acc7
commit dd76efe
Show file tree

Hide file tree

Showing 382 changed files with 5,253 additions and 779 deletions.
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>All Classes</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
@@ -43,6 +43,10 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="net/marfgamer/jraknet/example/chat/client/frame/ComboBoxServerChannelListener.html" title="class in net.marfgamer.jraknet.example.chat.client.frame" target="classFrame">ComboBoxServerChannelListener</a></li>
 <li><a href="net/marfgamer/jraknet/example/chat/server/command/Command.html" title="class in net.marfgamer.jraknet.example.chat.server.command" target="classFrame">Command</a></li>
 <li><a href="net/marfgamer/jraknet/example/chat/server/command/CommandHandler.html" title="class in net.marfgamer.jraknet.example.chat.server.command" target="classFrame">CommandHandler</a></li>
+<li><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentByteMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent" target="classFrame">ConcurrentByteMap</a></li>
+<li><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentIntMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent" target="classFrame">ConcurrentIntMap</a></li>
+<li><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentLongMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent" target="classFrame">ConcurrentLongMap</a></li>
+<li><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentShortMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent" target="classFrame">ConcurrentShortMap</a></li>
 <li><a href="net/marfgamer/jraknet/example/chat/server/ConnectedClient.html" title="class in net.marfgamer.jraknet.example.chat.server" target="classFrame">ConnectedClient</a></li>
 <li><a href="net/marfgamer/jraknet/protocol/status/ConnectedPing.html" title="class in net.marfgamer.jraknet.protocol.status" target="classFrame">ConnectedPing</a></li>
 <li><a href="net/marfgamer/jraknet/protocol/status/ConnectedPong.html" title="class in net.marfgamer.jraknet.protocol.status" target="classFrame">ConnectedPong</a></li>

diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>All Classes</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
@@ -43,6 +43,10 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="net/marfgamer/jraknet/example/chat/client/frame/ComboBoxServerChannelListener.html" title="class in net.marfgamer.jraknet.example.chat.client.frame">ComboBoxServerChannelListener</a></li>
 <li><a href="net/marfgamer/jraknet/example/chat/server/command/Command.html" title="class in net.marfgamer.jraknet.example.chat.server.command">Command</a></li>
 <li><a href="net/marfgamer/jraknet/example/chat/server/command/CommandHandler.html" title="class in net.marfgamer.jraknet.example.chat.server.command">CommandHandler</a></li>
+<li><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentByteMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent">ConcurrentByteMap</a></li>
+<li><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentIntMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent">ConcurrentIntMap</a></li>
+<li><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentLongMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent">ConcurrentLongMap</a></li>
+<li><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentShortMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent">ConcurrentShortMap</a></li>
 <li><a href="net/marfgamer/jraknet/example/chat/server/ConnectedClient.html" title="class in net.marfgamer.jraknet.example.chat.server">ConnectedClient</a></li>
 <li><a href="net/marfgamer/jraknet/protocol/status/ConnectedPing.html" title="class in net.marfgamer.jraknet.protocol.status">ConnectedPing</a></li>
 <li><a href="net/marfgamer/jraknet/protocol/status/ConnectedPong.html" title="class in net.marfgamer.jraknet.protocol.status">ConnectedPong</a></li>

diff --git a/doc/constant-values.html b/doc/constant-values.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:20 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:24 CST 2018 -->
 <title>Constant Field Values</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
@@ -2472,6 +2472,84 @@ <h2 title="net.marfgamer">net.marfgamer.*</h2>
 </table>
 </li>
 </ul>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>net.marfgamer.jraknet.util.map.concurrent.<a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentByteMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent">ConcurrentByteMap</a>&lt;<a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentByteMap.html" title="type parameter in ConcurrentByteMap">T</a>&gt;</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="net.marfgamer.jraknet.util.map.concurrent.ConcurrentByteMap.serialVersionUID">
+<!--   -->
+</a><code>private&nbsp;static&nbsp;final&nbsp;long</code></td>
+<th class="colSecond" scope="row"><code><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentByteMap.html#serialVersionUID">serialVersionUID</a></code></th>
+<td class="colLast"><code>4324132003573381634L</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>net.marfgamer.jraknet.util.map.concurrent.<a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentIntMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent">ConcurrentIntMap</a>&lt;<a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentIntMap.html" title="type parameter in ConcurrentIntMap">T</a>&gt;</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="net.marfgamer.jraknet.util.map.concurrent.ConcurrentIntMap.serialVersionUID">
+<!--   -->
+</a><code>private&nbsp;static&nbsp;final&nbsp;long</code></td>
+<th class="colSecond" scope="row"><code><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentIntMap.html#serialVersionUID">serialVersionUID</a></code></th>
+<td class="colLast"><code>4324132003573381634L</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>net.marfgamer.jraknet.util.map.concurrent.<a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentLongMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent">ConcurrentLongMap</a>&lt;<a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentLongMap.html" title="type parameter in ConcurrentLongMap">T</a>&gt;</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="net.marfgamer.jraknet.util.map.concurrent.ConcurrentLongMap.serialVersionUID">
+<!--   -->
+</a><code>private&nbsp;static&nbsp;final&nbsp;long</code></td>
+<th class="colSecond" scope="row"><code><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentLongMap.html#serialVersionUID">serialVersionUID</a></code></th>
+<td class="colLast"><code>4324132003573381634L</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>net.marfgamer.jraknet.util.map.concurrent.<a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentShortMap.html" title="class in net.marfgamer.jraknet.util.map.concurrent">ConcurrentShortMap</a>&lt;<a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentShortMap.html" title="type parameter in ConcurrentShortMap">T</a>&gt;</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="net.marfgamer.jraknet.util.map.concurrent.ConcurrentShortMap.serialVersionUID">
+<!--   -->
+</a><code>private&nbsp;static&nbsp;final&nbsp;long</code></td>
+<th class="colSecond" scope="row"><code><a href="net/marfgamer/jraknet/util/map/concurrent/ConcurrentShortMap.html#serialVersionUID">serialVersionUID</a></code></th>
+<td class="colLast"><code>4324132003573381634L</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">

diff --git a/doc/deprecated-list.html b/doc/deprecated-list.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>Deprecated List</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="script.js"></script>

diff --git a/doc/help-doc.html b/doc/help-doc.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>API Help</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="script.js"></script>

diff --git a/doc/index-files/index-1.html b/doc/index-files/index-1.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:22 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>A-Index</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>

diff --git a/doc/index-files/index-10.html b/doc/index-files/index-10.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>J-Index</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>

diff --git a/doc/index-files/index-11.html b/doc/index-files/index-11.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>K-Index</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>

diff --git a/doc/index-files/index-12.html b/doc/index-files/index-12.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>L-Index</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>

diff --git a/doc/index-files/index-13.html b/doc/index-files/index-13.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>M-Index</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>

diff --git a/doc/index-files/index-14.html b/doc/index-files/index-14.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>N-Index</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
@@ -151,6 +151,8 @@ <h2 class="title">N</h2>
 <dd>&nbsp;</dd>
 <dt><a href="../net/marfgamer/jraknet/util/map/package-summary.html">net.marfgamer.jraknet.util.map</a> - package net.marfgamer.jraknet.util.map</dt>
 <dd>&nbsp;</dd>
+<dt><a href="../net/marfgamer/jraknet/util/map/concurrent/package-summary.html">net.marfgamer.jraknet.util.map.concurrent</a> - package net.marfgamer.jraknet.util.map.concurrent</dt>
+<dd>&nbsp;</dd>
 <dt><a href="../net/marfgamer/jraknet/client/NettyHandlerException.html" title="class in net.marfgamer.jraknet.client"><span class="typeNameLink">NettyHandlerException</span></a> - Exception in <a href="../net/marfgamer/jraknet/client/package-summary.html">net.marfgamer.jraknet.client</a></dt>
 <dd>
 <div class="block">Signals that a <code>Throwable</code> was caught by the

diff --git a/doc/index-files/index-15.html b/doc/index-files/index-15.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (9) on Thu Nov 23 19:07:23 CST 2017 -->
+<!-- Generated by javadoc (9) on Wed Jan 10 20:16:26 CST 2018 -->
 <title>O-Index</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="date" content="2017-11-23">
+<meta name="date" content="2018-01-10">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>