Skip to content

Commit 67eb0ef

Browse files
TwoTenPvPTwoTenPvP
committed
Removed BitWriter & BitWriter Deprecated References
1 parent 6154170 commit 67eb0ef

21 files changed

+152
-151
lines changed

‎MLAPI.Tests/NetworkingManagerComponents/Binary/BitWriterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class BitWriterTest
1212
[Test]
1313
public void TestWritingTrue()
1414
{
15-
BitWriterDeprecated bitWriter = BitWriterDeprecated.Get();
15+
BitWriter bitWriter = BitWriter.Get();
1616

1717
bitWriter.WriteBool(true);
1818

‎MLAPI/Data/FieldType.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ internal static bool IsRefType(Type t)
7474
return (!t.IsValueType && t != typeof(string)) || (t.IsArray && IsRefType(t.GetElementType()));
7575
}
7676

77-
internal static void WriteFieldType(BitWriterDeprecated writer, object newValue)
77+
internal static void WriteFieldType(BitWriter writer, object newValue)
7878
{
7979
WriteFieldType(writer, newValue, null);
8080
}
8181

82-
internal static void WriteFieldType(BitWriterDeprecated writer, object newValue, object oldValue)
82+
internal static void WriteFieldType(BitWriter writer, object newValue, object oldValue)
8383
{
8484
oldValue = null;
8585
Type newValueType = newValue.GetType();
@@ -172,12 +172,12 @@ internal static void WriteFieldType(BitWriterDeprecated writer, object newValue,
172172
}
173173
}
174174

175-
internal static object ReadFieldType(BitReaderDeprecated reader, Type type)
175+
internal static object ReadFieldType(BitReader reader, Type type)
176176
{
177177
return ReadFieldType(reader, type, null);
178178
}
179179

180-
internal static object ReadFieldType(BitReaderDeprecated reader, Type type, object oldObject)
180+
internal static object ReadFieldType(BitReader reader, Type type, object oldObject)
181181
{
182182
CheckForReferenceTypes(type);
183183
if (type.IsArray)

‎MLAPI/Data/NetworkConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private void Sort()
173173
public string ToBase64()
174174
{
175175
NetworkConfig config = this;
176-
using (BitWriterDeprecated writer = BitWriterDeprecated.Get())
176+
using (BitWriter writer = BitWriter.Get())
177177
{
178178
writer.WriteUShort(config.ProtocolVersion);
179179
writer.WriteBits((byte)config.Transport, 5);
@@ -238,7 +238,7 @@ public void FromBase64(string base64, bool createDummyObject = false)
238238
{
239239
NetworkConfig config = this;
240240
byte[] binary = Convert.FromBase64String(base64);
241-
using (BitReaderDeprecated reader = BitReaderDeprecated.Get(binary))
241+
using (BitReader reader = BitReader.Get(binary))
242242
{
243243
config.ProtocolVersion = reader.ReadUShort();
244244
config.Transport = (DefaultTransport)reader.ReadBits(5);
@@ -330,7 +330,7 @@ public ulong GetConfig(bool cache = true)
330330

331331
Sort();
332332

333-
using (BitWriterDeprecated writer = BitWriterDeprecated.Get())
333+
using (BitWriter writer = BitWriter.Get())
334334
{
335335
writer.WriteUShort(ProtocolVersion);
336336
for (int i = 0; i < Channels.Count; i++)

‎MLAPI/Data/NetworkedCollections/NetworkedDictionary.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public string GetChannel()
7575
}
7676

7777
/// <inheritdoc />
78-
public void ReadDelta(BitReaderDeprecated reader)
78+
public void ReadDelta(BitReader reader)
7979
{
8080
ushort deltaCount = reader.ReadUShort();
8181
for (int i = 0; i < deltaCount; i++)
@@ -124,7 +124,7 @@ public void ReadDelta(BitReaderDeprecated reader)
124124
}
125125

126126
/// <inheritdoc />
127-
public void ReadField(BitReaderDeprecated reader)
127+
public void ReadField(BitReader reader)
128128
{
129129
dictionary.Clear();
130130
ushort entryCount = reader.ReadUShort();
@@ -149,7 +149,7 @@ public bool TryGetValue(TKey key, out TValue value)
149149
}
150150

151151
/// <inheritdoc />
152-
public void WriteDelta(BitWriterDeprecated writer)
152+
public void WriteDelta(BitWriter writer)
153153
{
154154
writer.WriteUShort((ushort)dirtyEvents.Count);
155155
for (int i = 0; i < dirtyEvents.Count; i++)
@@ -192,7 +192,7 @@ public void WriteDelta(BitWriterDeprecated writer)
192192
}
193193

194194
/// <inheritdoc />
195-
public void WriteField(BitWriterDeprecated writer)
195+
public void WriteField(BitWriter writer)
196196
{
197197
writer.WriteUShort((ushort)dictionary.Count);
198198
foreach (KeyValuePair<TKey, TValue> pair in dictionary)

‎MLAPI/Data/NetworkedCollections/NetworkedList.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public bool CanClientRead(uint clientId)
126126
}
127127

128128
/// <inheritdoc />
129-
public void WriteDelta(BitWriterDeprecated writer)
129+
public void WriteDelta(BitWriter writer)
130130
{
131131
writer.WriteUShort((ushort)dirtyEvents.Count);
132132
for (int i = 0; i < dirtyEvents.Count; i++)
@@ -173,7 +173,7 @@ public void WriteDelta(BitWriterDeprecated writer)
173173
}
174174

175175
/// <inheritdoc />
176-
public void WriteField(BitWriterDeprecated writer)
176+
public void WriteField(BitWriter writer)
177177
{
178178
writer.WriteUShort((ushort)list.Count);
179179
for (int i = 0; i < list.Count; i++)
@@ -183,7 +183,7 @@ public void WriteField(BitWriterDeprecated writer)
183183
}
184184

185185
/// <inheritdoc />
186-
public void ReadField(BitReaderDeprecated reader)
186+
public void ReadField(BitReader reader)
187187
{
188188
list.Clear();
189189
ushort count = reader.ReadUShort();
@@ -194,7 +194,7 @@ public void ReadField(BitReaderDeprecated reader)
194194
}
195195

196196
/// <inheritdoc />
197-
public void ReadDelta(BitReaderDeprecated reader)
197+
public void ReadDelta(BitReader reader)
198198
{
199199
ushort deltaCount = reader.ReadUShort();
200200
for (int i = 0; i < deltaCount; i++)

‎MLAPI/Data/NetworkedVar.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public bool CanClientRead(uint clientId)
117117
/// Writes the variable to the writer
118118
/// </summary>
119119
/// <param name="writer">The writer to write the value to</param>
120-
public void WriteDelta(BitWriterDeprecated writer) => WriteField(writer); //The NetworkedVar is built for simple data types and has no delta.
120+
public void WriteDelta(BitWriter writer) => WriteField(writer); //The NetworkedVar is built for simple data types and has no delta.
121121

122122
/// <inheritdoc />
123123
public bool CanClientWrite(uint clientId)
@@ -144,7 +144,7 @@ public bool CanClientWrite(uint clientId)
144144
/// Reads value from the reader and applies it
145145
/// </summary>
146146
/// <param name="reader">The reader to read the value from</param>
147-
public void ReadDelta(BitReaderDeprecated reader) => ReadField(reader); //The NetworkedVar is built for simple data types and has no delta.
147+
public void ReadDelta(BitReader reader) => ReadField(reader); //The NetworkedVar is built for simple data types and has no delta.
148148

149149
/// <inheritdoc />
150150
public void SetNetworkedBehaviour(NetworkedBehaviour behaviour)
@@ -153,7 +153,7 @@ public void SetNetworkedBehaviour(NetworkedBehaviour behaviour)
153153
}
154154

155155
/// <inheritdoc />
156-
public void ReadField(BitReaderDeprecated reader)
156+
public void ReadField(BitReader reader)
157157
{
158158
T previousValue = InternalValue;
159159
InternalValue = reader.ReadValueTypeOrString<T>();
@@ -162,7 +162,7 @@ public void ReadField(BitReaderDeprecated reader)
162162
}
163163

164164
/// <inheritdoc />
165-
public void WriteField(BitWriterDeprecated writer)
165+
public void WriteField(BitWriter writer)
166166
{
167167
writer.WriteValueTypeOrString(InternalValue);
168168
}

‎MLAPI/Data/NetworkedVarMeta.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ public interface INetworkedVar
3939
/// Writes the dirty changes, that is, the changes since the variable was last dirty, to the writer
4040
/// </summary>
4141
/// <param name="writer">The writer to write the dirty changes to</param>
42-
void WriteDelta(BitWriterDeprecated writer);
42+
void WriteDelta(BitWriter writer);
4343
/// <summary>
4444
/// Writes the complete state of the variable to the writer
4545
/// </summary>
4646
/// <param name="writer">The writer to write the state to</param>
47-
void WriteField(BitWriterDeprecated writer);
47+
void WriteField(BitWriter writer);
4848
/// <summary>
4949
/// Reads the complete state from the reader and applies it
5050
/// </summary>
5151
/// <param name="reader">The reader to read the state from</param>
52-
void ReadField(BitReaderDeprecated reader);
52+
void ReadField(BitReader reader);
5353
/// <summary>
5454
/// Reads delta from the reader and applies them to the internal value
5555
/// </summary>
5656
/// <param name="reader">The reader to read the delta from</param>
57-
void ReadDelta(BitReaderDeprecated reader);
57+
void ReadDelta(BitReader reader);
5858
/// <summary>
5959
/// Sets NetworkedBehaviour the container belongs to.
6060
/// </summary>

0 commit comments

Comments
 (0)