Address review

GeyserMC · Oct 25, 2024 · fbe4b47 · fbe4b47
1 parent 1b7b876
commit fbe4b47
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/ArmorStandEntity.java
@@ -25,8 +25,6 @@
 
 package org.geysermc.geyser.entity.type.living;
 
-import java.util.Optional;
-import java.util.UUID;
 import lombok.Getter;
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -49,6 +47,9 @@
 import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
 import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
 
+import java.util.Optional;
+import java.util.UUID;
+
 public class ArmorStandEntity extends LivingEntity {
 
     // These are used to store the state of the armour stand for use when handling invisibility

diff --git a/...eysermc/geyser/translator/protocol/java/entity/player/JavaPlayerInfoUpdateTranslator.java b/...eysermc/geyser/translator/protocol/java/entity/player/JavaPlayerInfoUpdateTranslator.java
@@ -25,10 +25,6 @@
 
 package org.geysermc.geyser.translator.protocol.java.entity.player;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.protocol.bedrock.packet.PlayerListPacket;
@@ -43,6 +39,11 @@
 import org.geysermc.mcprotocollib.protocol.data.game.PlayerListEntryAction;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundPlayerInfoUpdatePacket;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
 @Translator(packet = ClientboundPlayerInfoUpdatePacket.class)
 public class JavaPlayerInfoUpdateTranslator extends PacketTranslator<ClientboundPlayerInfoUpdatePacket> {
     @Override

diff --git a/core/src/test/java/org/geysermc/geyser/scoreboard/network/ScoreboardIssueTests.java b/core/src/test/java/org/geysermc/geyser/scoreboard/network/ScoreboardIssueTests.java
@@ -33,9 +33,6 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.EnumSet;
-import java.util.Optional;
-import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
 import org.cloudburstmc.protocol.bedrock.packet.AddEntityPacket;
@@ -74,6 +71,10 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetPlayerTeamPacket;
 import org.junit.jupiter.api.Test;
 
+import java.util.EnumSet;
+import java.util.Optional;
+import java.util.UUID;
+
 /**
  * Tests for issues reported on GitHub.
  */
@@ -213,7 +214,7 @@ void nameNotUpdating() {
                 assertEquals("minecraft:armor_stand", packet.getIdentifier());
             });
 
-            // invisible, custom name, custom name visible
+            // metadata set: invisible, custom name, custom name visible
             context.translate(setEntityDataTranslator, new ClientboundSetEntityDataPacket(1298, new EntityMetadata[]{
                 new ByteEntityMetadata(0, MetadataType.BYTE, (byte) 0x20),
                 new ObjectEntityMetadata<>(2, MetadataType.OPTIONAL_CHAT, Optional.of(Component.text("tesss"))),