diff --git a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserBootstrap.java b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserBootstrap.java index 0b70df58..284d9407 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserBootstrap.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserBootstrap.java @@ -50,7 +50,7 @@ public class GeyserBootstrap implements IGeyserBootstrap { public void onEnable() { geyserLogger = new GeyserLogger(); - Util.checkLoopback(geyserLogger); + LoopbackUtil.checkLoopback(geyserLogger); try { File configFile = FileUtils.fileOrCopiedFromResource("config.yml", (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString())); diff --git a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/Util.java b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/LoopbackUtil.java similarity index 91% rename from bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/Util.java rename to bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/LoopbackUtil.java index 753b3b24..20a81072 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/Util.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/LoopbackUtil.java @@ -5,9 +5,10 @@ import java.nio.file.Files; import java.nio.file.OpenOption; import java.nio.file.Paths; +import org.geysermc.common.ChatColor; import org.geysermc.platform.standalone.console.GeyserLogger; -public class Util { +public class LoopbackUtil { private static final String checkExemption = "powershell -Command \"CheckNetIsolation LoopbackExempt -s\""; // Java's Exec feature runs as CMD, NetIsolation is only accessible from PowerShell. private static final String loopbackCommand = "powershell -Command \"CheckNetIsolation LoopbackExempt -a -n='Microsoft.MinecraftUWP_8wekyb3d8bbwe'\""; private static final String startScript = "powershell -Command \"Start-Process 'cmd' -ArgumentList /c,%temp%/loopback_minecraft.bat -Verb runAs\""; @@ -31,7 +32,7 @@ public class Util { Files.write(Paths.get(System.getenv("temp") + "/loopback_minecraft.bat"), loopbackCommand.getBytes(), new OpenOption[0]); process = Runtime.getRuntime().exec(startScript); - geyserLogger.warning("Added loopback exemption to Windows!"); + geyserLogger.info(ChatColor.AQUA + "Added loopback exemption to Windows!"); } } catch (Exception e) { e.printStackTrace(); diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/Translators.java b/connector/src/main/java/org/geysermc/connector/network/translators/Translators.java index c87cab3c..d4e5dae8 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/Translators.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/Translators.java @@ -71,78 +71,6 @@ public class Translators { @SuppressWarnings("unchecked") public static void start() { - /*Registry.registerJava(LoginPluginRequestPacket.class, new JavaLoginPluginMessageTranslator()); - - Registry.registerJava(ServerJoinGamePacket.class, new JavaJoinGameTranslator()); - Registry.registerJava(ServerPluginMessagePacket.class, new JavaPluginMessageTranslator()); - Registry.registerJava(ServerChatPacket.class, new JavaChatTranslator()); - Registry.registerJava(ServerTitlePacket.class, new JavaTitleTranslator()); - Registry.registerJava(ServerUpdateTimePacket.class, new JavaUpdateTimeTranslator()); - Registry.registerJava(ServerRespawnPacket.class, new JavaRespawnTranslator()); - Registry.registerJava(ServerSpawnPositionPacket.class, new JavaSpawnPositionTranslator()); - Registry.registerJava(ServerDifficultyPacket.class, new JavaDifficultyTranslator()); - - Registry.registerJava(ServerEntityAnimationPacket.class, new JavaEntityAnimationTranslator()); - Registry.registerJava(ServerEntityPositionPacket.class, new JavaEntityPositionTranslator()); - Registry.registerJava(ServerEntityPositionRotationPacket.class, new JavaEntityPositionRotationTranslator()); - Registry.registerJava(ServerEntityTeleportPacket.class, new JavaEntityTeleportTranslator()); - Registry.registerJava(ServerEntityVelocityPacket.class, new JavaEntityVelocityTranslator()); - Registry.registerJava(ServerEntityPropertiesPacket.class, new JavaEntityPropertiesTranslator()); - Registry.registerJava(ServerEntityRotationPacket.class, new JavaEntityRotationTranslator()); - Registry.registerJava(ServerEntityHeadLookPacket.class, new JavaEntityHeadLookTranslator()); - Registry.registerJava(ServerEntityMetadataPacket.class, new JavaEntityMetadataTranslator()); - Registry.registerJava(ServerEntityStatusPacket.class, new JavaEntityStatusTranslator()); - Registry.registerJava(ServerEntityEquipmentPacket.class, new JavaEntityEquipmentTranslator()); - Registry.registerJava(ServerEntityEffectPacket.class, new JavaEntityEffectTranslator()); - Registry.registerJava(ServerEntityRemoveEffectPacket.class, new JavaEntityRemoveEffectTranslator()); - Registry.registerJava(ServerBossBarPacket.class, new JavaBossBarTranslator()); - - Registry.registerJava(ServerSpawnExpOrbPacket.class, new JavaSpawnExpOrbTranslator()); - Registry.registerJava(ServerSpawnGlobalEntityPacket.class, new JavaSpawnGlobalEntityTranslator()); - Registry.registerJava(ServerSpawnMobPacket.class, new JavaSpawnMobTranslator()); - Registry.registerJava(ServerSpawnObjectPacket.class, new JavaSpawnObjectTranslator()); - Registry.registerJava(ServerSpawnPaintingPacket.class, new JavaSpawnPaintingTranslator()); - Registry.registerJava(ServerSpawnPlayerPacket.class, new JavaSpawnPlayerTranslator()); - Registry.registerJava(ServerPlayerListEntryPacket.class, new JavaPlayerListEntryTranslator()); - - Registry.registerJava(ServerPlayerPositionRotationPacket.class, new JavaPlayerPositionRotationTranslator()); - Registry.registerJava(ServerPlayerSetExperiencePacket.class, new JavaPlayerSetExperienceTranslator()); - Registry.registerJava(ServerPlayerHealthPacket.class, new JavaPlayerHealthTranslator()); - Registry.registerJava(ServerPlayerActionAckPacket.class, new JavaPlayerActionAckTranslator()); - - Registry.registerJava(ServerPlayerAbilitiesPacket.class, new JavaPlayerAbilitiesTranslator()); - - Registry.registerJava(ServerNotifyClientPacket.class, new JavaNotifyClientTranslator()); - Registry.registerJava(ServerChunkDataPacket.class, new JavaChunkDataTranslator()); - Registry.registerJava(ServerEntityDestroyPacket.class, new JavaEntityDestroyTranslator()); - Registry.registerJava(ServerWindowItemsPacket.class, new JavaWindowItemsTranslator()); - Registry.registerJava(ServerOpenWindowPacket.class, new JavaOpenWindowTranslator()); - Registry.registerJava(ServerSetSlotPacket.class, new JavaSetSlotTranslator()); - Registry.registerJava(ServerScoreboardObjectivePacket.class, new JavaScoreboardObjectiveTranslator()); - Registry.registerJava(ServerDisplayScoreboardPacket.class, new JavaDisplayScoreboardTranslator()); - Registry.registerJava(ServerUpdateScorePacket.class, new JavaUpdateScoreTranslator()); - Registry.registerJava(ServerTeamPacket.class, new JavaTeamTranslator()); - Registry.registerJava(ServerBlockChangePacket.class, new JavaBlockChangeTranslator()); - Registry.registerJava(ServerMultiBlockChangePacket.class, new JavaMultiBlockChangeTranslator()); - Registry.registerJava(ServerUnloadChunkPacket.class, new JavaUnloadChunkTranslator()); - - Registry.registerJava(ServerUpdateViewPositionPacket.class, new JavaUpdateViewPositionTranslator()); - Registry.registerJava(ServerUpdateViewDistancePacket.class, new JavaUpdateViewDistanceTranslator()); - - Registry.registerJava(ServerOpenWindowPacket.class, new OpenWindowPacketTranslator()); - - Registry.registerBedrock(AnimatePacket.class, new BedrockAnimateTranslator()); - Registry.registerBedrock(CommandRequestPacket.class, new BedrockCommandRequestTranslator()); - Registry.registerBedrock(InventoryTransactionPacket.class, new BedrockInventoryTransactionTranslator()); - Registry.registerBedrock(MobEquipmentPacket.class, new BedrockMobEquipmentTranslator()); - Registry.registerBedrock(MovePlayerPacket.class, new BedrockMovePlayerTranslator()); - Registry.registerBedrock(PlayerActionPacket.class, new BedrockActionTranslator()); - Registry.registerBedrock(SetLocalPlayerAsInitializedPacket.class, new BedrockPlayerInitializedTranslator()); - Registry.registerBedrock(InteractPacket.class, new BedrockInteractTranslator()); - Registry.registerBedrock(TextPacket.class, new BedrockTextTranslator()); - Registry.registerBedrock(RespawnPacket.class, new BedrockRespawnTranslator()); - Registry.registerBedrock(ShowCreditsPacket.class, new BedrockShowCreditsTranslator());*/ - Reflections ref = new Reflections("org.geysermc.connector.network.translators"); for (Class clazz : ref.getTypesAnnotatedWith(Translator.class)) {