Random code cleanup

Author: FlorianMichael

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/model/VirtualHologramEntity.java

@@ -36,6 +36,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+// Close this class file while you still can, because it's about to get ugly
 public class VirtualHologramEntity {
 	private final List<Metadata> metadataTracker = new ArrayList<>();
 	private double locX, locY, locZ;
@@ -46,7 +47,6 @@ public class VirtualHologramEntity {
 
 	private int[] entityIds = null;
 	private State currentState = null;
-	private boolean invisible = false;
 	private String name = null;
 	private float yaw, pitch;
 	private float headYaw;
@@ -123,7 +123,7 @@ public void updateState() {
 				armorStandFlags = ((Number) metadata.getValue()).byteValue();
 			}
 		}
-		invisible = (flags & 0x20) != 0;
+		final boolean invisible = (flags & 0x20) != 0;
 		small = (armorStandFlags & 0x01) != 0;
 		marker = (armorStandFlags & 0x10) != 0;
 

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/ScoreboardPackets.java

@@ -34,10 +34,6 @@
 public class ScoreboardPackets {
 
 	public static void register(Protocol1_7_6_10To1_8 protocol) {
-
-		/*  OUTGOING  */
-
-		//Scoreboard Objective
 		protocol.registerClientbound(ClientboundPackets1_8.SCOREBOARD_OBJECTIVE, new PacketHandlers() {
 			@Override
 			public void register() {
@@ -95,7 +91,6 @@ public void register() {
 			}
 		});
 
-		//Update Score
 		protocol.registerClientbound(ClientboundPackets1_8.UPDATE_SCORE, new PacketHandlers() {
 			@Override
 			public void register() {
@@ -225,30 +220,29 @@ public void register() {
 						String[] entries = packetWrapper.read(Type.STRING_ARRAY);
 						List<String> entryList = new ArrayList<>();
 
-						for (int i = 0; i < entries.length; i++) {
-							String entry = entries[i];
-							String username = packetWrapper.user().getProtocolInfo().getUsername();
+                        for (String entry : entries) {
+                            String username = packetWrapper.user().getProtocolInfo().getUsername();
 
-							if (mode == 4) {
-								if (!scoreboard.isPlayerInTeam(entry, team)) continue;
-								scoreboard.removePlayerFromTeam(entry, team);
-								if (entry.equals(username)) {
-									PacketWrapper sidebarPacket = packetWrapper.create(0x3D);
-									sidebarPacket.write(Type.BYTE, (byte) 1);
-									sidebarPacket.write(Type.STRING, scoreboard.getColorIndependentSidebar() == null ? "" : scoreboard.getColorIndependentSidebar());
-									PacketUtil.sendPacket(sidebarPacket, Protocol1_7_6_10To1_8.class);
-								}
-							} else {
-								scoreboard.addPlayerToTeam(entry, team);
-								if (entry.equals(username) && scoreboard.getColorDependentSidebar().containsKey(color)) {
-									PacketWrapper displayObjective = packetWrapper.create(0x3D);
-									displayObjective.write(Type.BYTE, (byte) 1);
-									displayObjective.write(Type.STRING, scoreboard.getColorDependentSidebar().get(color));
-									PacketUtil.sendPacket(displayObjective, Protocol1_7_6_10To1_8.class);
-								}
-							}
-							entryList.add(entry);
-						}
+                            if (mode == 4) {
+                                if (!scoreboard.isPlayerInTeam(entry, team)) continue;
+                                scoreboard.removePlayerFromTeam(entry, team);
+                                if (entry.equals(username)) {
+                                    PacketWrapper sidebarPacket = packetWrapper.create(0x3D);
+                                    sidebarPacket.write(Type.BYTE, (byte) 1);
+                                    sidebarPacket.write(Type.STRING, scoreboard.getColorIndependentSidebar() == null ? "" : scoreboard.getColorIndependentSidebar());
+                                    PacketUtil.sendPacket(sidebarPacket, Protocol1_7_6_10To1_8.class);
+                                }
+                            } else {
+                                scoreboard.addPlayerToTeam(entry, team);
+                                if (entry.equals(username) && scoreboard.getColorDependentSidebar().containsKey(color)) {
+                                    PacketWrapper displayObjective = packetWrapper.create(0x3D);
+                                    displayObjective.write(Type.BYTE, (byte) 1);
+                                    displayObjective.write(Type.STRING, scoreboard.getColorDependentSidebar().get(color));
+                                    PacketUtil.sendPacket(displayObjective, Protocol1_7_6_10To1_8.class);
+                                }
+                            }
+                            entryList.add(entry);
+                        }
 
 						packetWrapper.write(Type.SHORT, (short) entryList.size());
 						for (String entry : entryList) {

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/WorldPackets.java

@@ -164,7 +164,8 @@ public void register() {
 						if (id >= 256 && id <= 422 || id >= 2256 && id <= 2267) {  //item
 							particle = ParticleIndex1_7_6_10.ICON_CRACK;
 						} else if (id >= 0 && id <= 164 || id >= 170 && id <= 175) {
-							if (particle == ParticleIndex1_7_6_10.ICON_CRACK) particle = ParticleIndex1_7_6_10.BLOCK_CRACK;
+							if (particle == ParticleIndex1_7_6_10.ICON_CRACK)
+								particle = ParticleIndex1_7_6_10.BLOCK_CRACK;
 						} else {
 							wrapper.cancel();
 							return;
@@ -262,7 +263,7 @@ public void register() {
 					final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_DATA, wrapper.user());
 					mapData.write(Type.VAR_INT, id); // map id
 					mapData.write(Type.SHORT, (short) 2); // data length
-					mapData.write(new FixedByteArrayType(2), new byte[]{ 2, scale }); // data
+					mapData.write(new FixedByteArrayType(2), new byte[]{2, scale}); // data
 
 					mapData.send(Protocol1_7_6_10To1_8.class, true);
 				});