Skip to content

Commit f852aeb

Browse files
automated code cleanup
1 parent 771cc52 commit f852aeb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1441
-1441
lines changed
Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
using System.Collections;
22
using System.Collections.Generic;
3-
using UnityEngine;
43
using TMPro;
4+
using UnityEngine;
55

66
public class ChatHistoryManager : MonoBehaviour
77
{
8-
private static TMP_Text _chatText;
9-
private static readonly Queue<string> _messages = new Queue<string>();
10-
public const int MaxMessages = 8;
11-
public void Awake()
12-
{
13-
_chatText = GetComponent<TMP_Text>();
14-
ClearHistory();
15-
}
8+
private static TMP_Text _chatText;
9+
private static readonly Queue<string> _messages = new Queue<string>();
10+
public const int MaxMessages = 8;
11+
public void Awake()
12+
{
13+
_chatText = GetComponent<TMP_Text>();
14+
ClearHistory();
15+
}
1616

17-
/// <summary>
18-
/// Use this method to add to the chat history window, text can be in rich text format.
19-
/// </summary>
20-
/// <param name="message">The message to add, can be rich text.</param>
21-
public static void AddMessage(string message)
22-
{
23-
_messages.Enqueue(message);
24-
if (_messages.Count > MaxMessages)
25-
_messages.Dequeue();
26-
RewriteToUI();
27-
}
17+
/// <summary>
18+
/// Use this method to add to the chat history window, text can be in rich text format.
19+
/// </summary>
20+
/// <param name="message">The message to add, can be rich text.</param>
21+
public static void AddMessage(string message)
22+
{
23+
_messages.Enqueue(message);
24+
if (_messages.Count > MaxMessages)
25+
_messages.Dequeue();
26+
RewriteToUI();
27+
}
2828

29-
/// <summary>
30-
/// Clears the chat history, and adds "Chat History Ready"
31-
/// </summary>
32-
public static void ClearHistory()
33-
{
34-
_messages.Clear();
35-
AddMessage("Chat History Ready");
36-
RewriteToUI();
37-
}
29+
/// <summary>
30+
/// Clears the chat history, and adds "Chat History Ready"
31+
/// </summary>
32+
public static void ClearHistory()
33+
{
34+
_messages.Clear();
35+
AddMessage("Chat History Ready");
36+
RewriteToUI();
37+
}
3838

39-
private static void RewriteToUI()
40-
{
41-
_chatText.text = "";
42-
foreach (string entry in _messages)
43-
{
44-
_chatText.text += (_chatText.text.Length != 0 ? "\n" : "");
45-
_chatText.text += entry;
46-
}
47-
}
39+
private static void RewriteToUI()
40+
{
41+
_chatText.text = "";
42+
foreach (string entry in _messages)
43+
{
44+
_chatText.text += (_chatText.text.Length != 0 ? "\n" : "");
45+
_chatText.text += entry;
46+
}
47+
}
4848
}

Minecraft Client/Assets/_Project/Scripts/Chat/ChatMessage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections;
22
using System.Collections.Generic;
3-
using UnityEngine;
43
using Newtonsoft.Json;
4+
using UnityEngine;
55

66
/// <summary>
77
/// Represents a chat message from the server. Uses <see cref="ChatComponent"/> for formatting and styling
@@ -12,11 +12,11 @@ public class ChatMessage
1212
/// Gets the message with no styling information
1313
/// </summary>
1414
public string PlaintextMessage { get; }
15-
15+
1616
/// <summary>
1717
/// For use in TextMeshPro dialogs
1818
/// </summary>
19-
public string HtmlFormattedMessage { get; }
19+
public string HtmlFormattedMessage { get; }
2020

2121
/// <summary>
2222
/// The position of the message on the screen

Minecraft Client/Assets/_Project/Scripts/Chat/ChatTranslation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ public static string TranslateString(string key, string[] insertions)
2424
if (_translationTable.ContainsKey(key))
2525
return string.Format(_translationTable[key], insertions);
2626
else
27-
return $"{key}: \"{(string.Join("\", \"", insertions))}\"";// chat.type.text: "PlayerName", "message here"
27+
return $"{key}: \"{(string.Join("\", \"", insertions))}\""; // chat.type.text: "PlayerName", "message here"
2828
}
2929
}

Minecraft Client/Assets/_Project/Scripts/Entity/Entity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected virtual void Start()
8989
Collider = Physical.GetComponent<BoxCollider>();
9090
Rigidbody = GetComponent<Rigidbody>();
9191

92-
Rigidbody.useGravity = false;// don't use gravity by default for entities
92+
Rigidbody.useGravity = false; // don't use gravity by default for entities
9393
}
9494

9595
public void SetRotation(float pitch, float yaw)

Minecraft Client/Assets/_Project/Scripts/Entity/EntityManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ public void DestroyAllEntities()
206206
_entities.Clear();
207207
}
208208

209-
public void HandleEntityMetadataPacket(EntityMetadataPacket packet)
210-
{
211-
throw new NotImplementedException("Not yet implemented");
212-
}
209+
public void HandleEntityMetadataPacket(EntityMetadataPacket packet)
210+
{
211+
throw new NotImplementedException("Not yet implemented");
212+
}
213213
}

Minecraft Client/Assets/_Project/Scripts/Entity/Particle.cs

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -6,101 +6,101 @@
66

77
public struct Particle
88
{
9-
public ParticleType UsedParticleType { get; }
9+
public ParticleType UsedParticleType { get; }
1010

11-
public int BlockState { get; }
11+
public int BlockState { get; }
1212

13-
public float Red { get; }
14-
public float Green { get; }
15-
public float Blue { get; }
16-
public float Scale { get; }
13+
public float Red { get; }
14+
public float Green { get; }
15+
public float Blue { get; }
16+
public float Scale { get; }
1717

18-
public SlotData slotData;
18+
public SlotData slotData;
1919

20-
public Particle(BinaryReader reader)
21-
{
22-
int particleType = PacketReader.ReadVarInt(reader);
23-
UsedParticleType = (ParticleType)particleType;
20+
public Particle(BinaryReader reader)
21+
{
22+
int particleType = PacketReader.ReadVarInt(reader);
23+
UsedParticleType = (ParticleType)particleType;
2424

25-
BlockState = 0;
25+
BlockState = 0;
2626

27-
Red = 0;
28-
Green = 0;
29-
Blue = 0;
30-
Scale = 0;
27+
Red = 0;
28+
Green = 0;
29+
Blue = 0;
30+
Scale = 0;
3131

32-
slotData = new SlotData();
32+
slotData = new SlotData();
3333

34-
switch (UsedParticleType)
35-
{
36-
case ParticleType.MinecraftBlock:
37-
case ParticleType.MinecraftFallingDust:
38-
BlockState = PacketReader.ReadVarInt(reader);
39-
break;
40-
case ParticleType.MinecraftDust:
41-
Red = PacketReader.ReadSingle(reader);
42-
Green = PacketReader.ReadSingle(reader);
43-
Blue = PacketReader.ReadSingle(reader);
44-
Scale = PacketReader.ReadSingle(reader);
45-
break;
46-
case ParticleType.MinecraftItem:
47-
//ReadSlotData(reader, out slotData);
48-
throw new NotImplementedException("Particle: SlotData is not yet handled");
49-
//break;
50-
}
51-
}
34+
switch (UsedParticleType)
35+
{
36+
case ParticleType.MinecraftBlock:
37+
case ParticleType.MinecraftFallingDust:
38+
BlockState = PacketReader.ReadVarInt(reader);
39+
break;
40+
case ParticleType.MinecraftDust:
41+
Red = PacketReader.ReadSingle(reader);
42+
Green = PacketReader.ReadSingle(reader);
43+
Blue = PacketReader.ReadSingle(reader);
44+
Scale = PacketReader.ReadSingle(reader);
45+
break;
46+
case ParticleType.MinecraftItem:
47+
//ReadSlotData(reader, out slotData);
48+
throw new NotImplementedException("Particle: SlotData is not yet handled");
49+
//break;
50+
}
51+
}
5252

53-
public enum ParticleType
54-
{
55-
MinecraftAmbientEntityEffect = 0,
56-
MinecraftAngryVillager = 1,
57-
MinecraftBarrier = 2,
58-
MinecraftBlock = 3, // Uses blockState
59-
MinecraftBubble = 4,
60-
MinecraftCloud = 5,
61-
MinecraftCrit = 6,
62-
MinecraftDamageIndicator = 7,
63-
MinecraftDragonBreath = 8,
64-
MinecraftDrippingLava = 9,
65-
MinecraftDrippingWater = 10,
66-
MinecraftDust = 11, // Uses red, green, blue, and scale
67-
MinecraftEffect = 12,
68-
MinecraftElderGuardian = 13,
69-
MinecraftEnchantedHit = 14,
70-
MinecraftEnchant = 15,
71-
MinecraftEndRod = 16,
72-
MinecraftEntityEffect = 17,
73-
MinecraftExplosionEmitter = 18,
74-
MinecraftExplosion = 19,
75-
MinecraftFallingDust = 20, // Uses blockState
76-
MinecraftFirework = 21,
77-
MinecraftFishing = 22,
78-
MinecraftFlame = 23,
79-
MinecraftHappyVillager = 24,
80-
MinecraftHeart = 25,
81-
MinecraftInstantEffect = 26,
82-
MinecraftItem = 27, // Uses slotData
83-
MinecraftItemSlime = 28,
84-
MinecraftItemSnowball = 29,
85-
MinecraftLargeSmoke = 30,
86-
MinecraftLava = 31,
87-
MinecraftMycelium = 32,
88-
MinecraftNote = 33,
89-
MinecraftPoof = 34,
90-
MinecraftPortal = 35,
91-
MinecraftRain = 36,
92-
MinecraftSmoke = 37,
93-
MinecraftSpit = 38,
94-
MinecraftSquidInk = 39,
95-
MinecraftSweepAttack = 40,
96-
MinecraftTotemOfUndying = 41,
97-
MinecraftUnderwater = 42,
98-
MinecraftSplash = 43,
99-
MinecraftWitch = 44,
100-
MinecraftBubblePop = 45,
101-
MinecraftCurrentDown = 46,
102-
MinecraftBubbleColumnUp = 47,
103-
MinecraftNautilus = 48,
104-
MinecraftDolphin = 49
105-
}
53+
public enum ParticleType
54+
{
55+
MinecraftAmbientEntityEffect = 0,
56+
MinecraftAngryVillager = 1,
57+
MinecraftBarrier = 2,
58+
MinecraftBlock = 3, // Uses blockState
59+
MinecraftBubble = 4,
60+
MinecraftCloud = 5,
61+
MinecraftCrit = 6,
62+
MinecraftDamageIndicator = 7,
63+
MinecraftDragonBreath = 8,
64+
MinecraftDrippingLava = 9,
65+
MinecraftDrippingWater = 10,
66+
MinecraftDust = 11, // Uses red, green, blue, and scale
67+
MinecraftEffect = 12,
68+
MinecraftElderGuardian = 13,
69+
MinecraftEnchantedHit = 14,
70+
MinecraftEnchant = 15,
71+
MinecraftEndRod = 16,
72+
MinecraftEntityEffect = 17,
73+
MinecraftExplosionEmitter = 18,
74+
MinecraftExplosion = 19,
75+
MinecraftFallingDust = 20, // Uses blockState
76+
MinecraftFirework = 21,
77+
MinecraftFishing = 22,
78+
MinecraftFlame = 23,
79+
MinecraftHappyVillager = 24,
80+
MinecraftHeart = 25,
81+
MinecraftInstantEffect = 26,
82+
MinecraftItem = 27, // Uses slotData
83+
MinecraftItemSlime = 28,
84+
MinecraftItemSnowball = 29,
85+
MinecraftLargeSmoke = 30,
86+
MinecraftLava = 31,
87+
MinecraftMycelium = 32,
88+
MinecraftNote = 33,
89+
MinecraftPoof = 34,
90+
MinecraftPortal = 35,
91+
MinecraftRain = 36,
92+
MinecraftSmoke = 37,
93+
MinecraftSpit = 38,
94+
MinecraftSquidInk = 39,
95+
MinecraftSweepAttack = 40,
96+
MinecraftTotemOfUndying = 41,
97+
MinecraftUnderwater = 42,
98+
MinecraftSplash = 43,
99+
MinecraftWitch = 44,
100+
MinecraftBubblePop = 45,
101+
MinecraftCurrentDown = 46,
102+
MinecraftBubbleColumnUp = 47,
103+
MinecraftNautilus = 48,
104+
MinecraftDolphin = 49
105+
}
106106
}

Minecraft Client/Assets/_Project/Scripts/GameManager.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void Awake()
5656
Debug.Log("Unity profiler enabled");
5757
#endif
5858

59-
PlayerLibrary.Initialize();
59+
PlayerLibrary.Initialize();
6060
}
6161

6262
// Update is called once per frame
@@ -129,7 +129,7 @@ public IEnumerator ConnectToServerCoroutine(string hostname, int port)
129129
{
130130
// disable main menu controller
131131
//GetComponent<MainMenuController>().enabled = false;
132-
132+
133133
// open loading screen
134134
AsyncOperation loadLoadingScreenTask = SceneManager.LoadSceneAsync("LoadingScreen", LoadSceneMode.Additive);
135135
while (!loadLoadingScreenTask.isDone)
@@ -141,7 +141,7 @@ public IEnumerator ConnectToServerCoroutine(string hostname, int port)
141141
SceneManager.MoveGameObjectToScene(gameObject, SceneManager.GetSceneByName("LoadingScreen"));
142142
AsyncOperation unloadMainMenuTask = SceneManager.UnloadSceneAsync("MainMenu");
143143

144-
while (!unloadMainMenuTask?.isDone ?? false)// if main menu isn't loaded in the first place, asyncoperation is null
144+
while (!unloadMainMenuTask?.isDone ?? false) // if main menu isn't loaded in the first place, asyncoperation is null
145145
yield return null;
146146

147147
Debug.Log("Closed main menu");
@@ -321,21 +321,21 @@ private void HandlePacket(PacketData data)
321321
EntityManager.HandleEntityHeadLook(new EntityHeadLookPacket(data));
322322
break;
323323
case ClientboundIDs.PlayerInfo:
324-
PlayerInfoPacket playerInfo = new PlayerInfoPacket(data);
325-
PlayerLibrary.HandleUpdatePacket(playerInfo);
324+
PlayerInfoPacket playerInfo = new PlayerInfoPacket(data);
325+
PlayerLibrary.HandleUpdatePacket(playerInfo);
326326
break;
327327
case ClientboundIDs.ChatMessage:
328-
ChatMessage chatMsg = new ChatMessage(new ChatMessagePacket(data));
329-
ChatHistoryManager.AddMessage(chatMsg.PlaintextMessage);
328+
ChatMessage chatMsg = new ChatMessage(new ChatMessagePacket(data));
329+
ChatHistoryManager.AddMessage(chatMsg.PlaintextMessage);
330330
break;
331-
/*
332-
case ClientboundIDs.ENTITY_METADATA:
333-
EntityMetadataPacket metadata = new EntityMetadataPacket(data);
331+
/*
332+
case ClientboundIDs.ENTITY_METADATA:
333+
EntityMetadataPacket metadata = new EntityMetadataPacket(data);
334334
335-
Debug.Log(metadata.ToString());
336-
break;*/
335+
Debug.Log(metadata.ToString());
336+
break;*/
337337
default:
338-
//Debug.Log($"Case {data.ID} is not handled!");
338+
//Debug.Log($"Case {data.ID} is not handled!");
339339
break;
340340
}
341341
}

0 commit comments

Comments
 (0)