Move around stuff

AlexProgrammerDE · Nov 18, 2024 · 06ac78e · 06ac78e
1 parent aac99ce
commit 06ac78e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 40 deletions.
diff --git a/server/src/main/java/com/soulfiremc/server/plugins/AntiAFK.java b/server/src/main/java/com/soulfiremc/server/plugins/AntiAFK.java
@@ -47,8 +47,8 @@ public AntiAFK() {
       "1.0.0",
       "Automatically moves x amount of blocks in a random direction to prevent being kicked for being AFK",
       "AlexProgrammerDE",
-            "GPL-3.0",
-            "https://soulfiremc.com"));
+      "GPL-3.0",
+      "https://soulfiremc.com"));
   }
 
   @EventHandler

diff --git a/server/src/main/java/com/soulfiremc/server/plugins/ModLoaderSupport.java b/server/src/main/java/com/soulfiremc/server/plugins/ModLoaderSupport.java
@@ -63,6 +63,14 @@ public ModLoaderSupport() {
     ));
   }
 
+  private static String createFMLAddress(String initialHostname) {
+    return initialHostname + HOSTNAME_SEPARATOR + "FML" + HOSTNAME_SEPARATOR;
+  }
+
+  private static String createFML2Address(String initialHostname) {
+    return initialHostname + HOSTNAME_SEPARATOR + "FML2" + HOSTNAME_SEPARATOR;
+  }
+
   @Override
   public boolean isAvailable() {
     return Boolean.getBoolean("sf.mod_support");
@@ -73,14 +81,6 @@ public void onSettingsRegistryInit(InstanceSettingsRegistryInitEvent event) {
     event.settingsRegistry().addClass(ModLoaderSettings.class, "Mod Loader Support", this, "package");
   }
 
-  private static String createFMLAddress(String initialHostname) {
-    return initialHostname + HOSTNAME_SEPARATOR + "FML" + HOSTNAME_SEPARATOR;
-  }
-
-  private static String createFML2Address(String initialHostname) {
-    return initialHostname + HOSTNAME_SEPARATOR + "FML2" + HOSTNAME_SEPARATOR;
-  }
-
   @EventHandler
   public void onPacket(SFPacketSendingEvent event) {
     if (!(event.packet() instanceof ClientIntentionPacket handshake)) {

diff --git a/server/src/main/java/com/soulfiremc/server/plugins/POVServer.java b/server/src/main/java/com/soulfiremc/server/plugins/POVServer.java
@@ -168,11 +168,6 @@ public POVServer() {
     ));
   }
 
-  @EventHandler
-  public void onSettingsRegistryInit(InstanceSettingsRegistryInitEvent event) {
-    event.settingsRegistry().addClass(POVServerSettings.class, "POV Server", this, "view");
-  }
-
   private static GameProfile getFakePlayerListEntry(Component text) {
     return new GameProfile(UUID.randomUUID(), LegacyComponentSerializer.legacySection().serialize(text));
   }
@@ -348,31 +343,6 @@ public void sessionRemoved(SessionRemovedEvent event) {
     server.bind();
   }
 
-  @EventHandler
-  public void onAttackStart(AttackStartEvent event) {
-    var instanceManager = event.instanceManager();
-    var settingsSource = instanceManager.settingsSource();
-    if (!settingsSource.get(POVServerSettings.ENABLED)) {
-      return;
-    }
-
-    var freePort =
-      PortHelper.getAvailablePort(settingsSource.get(POVServerSettings.PORT_START));
-    startPOVServer(settingsSource, freePort, instanceManager);
-  }
-
-  @EventHandler
-  public void onAttackEnded(AttackEndedEvent event) {
-    var instanceManager = event.instanceManager();
-    var currentInstance = instanceManager.metadata().getAndRemove(TCP_SERVER);
-    if (currentInstance == null) {
-      return;
-    }
-
-    log.info("Stopping POV server for attack {}", instanceManager.id());
-    currentInstance.close();
-  }
-
   private static <T> T awaitReceived(Session session, Class<T> clazz) {
     var future = new CompletableFuture<T>();
 
@@ -806,6 +776,36 @@ public int getId() {
     }
   }
 
+  @EventHandler
+  public void onSettingsRegistryInit(InstanceSettingsRegistryInitEvent event) {
+    event.settingsRegistry().addClass(POVServerSettings.class, "POV Server", this, "view");
+  }
+
+  @EventHandler
+  public void onAttackStart(AttackStartEvent event) {
+    var instanceManager = event.instanceManager();
+    var settingsSource = instanceManager.settingsSource();
+    if (!settingsSource.get(POVServerSettings.ENABLED)) {
+      return;
+    }
+
+    var freePort =
+      PortHelper.getAvailablePort(settingsSource.get(POVServerSettings.PORT_START));
+    startPOVServer(settingsSource, freePort, instanceManager);
+  }
+
+  @EventHandler
+  public void onAttackEnded(AttackEndedEvent event) {
+    var instanceManager = event.instanceManager();
+    var currentInstance = instanceManager.metadata().getAndRemove(TCP_SERVER);
+    if (currentInstance == null) {
+      return;
+    }
+
+    log.info("Stopping POV server for attack {}", instanceManager.id());
+    currentInstance.close();
+  }
+
   @RequiredArgsConstructor
   private static class POVClientSessionAdapter extends SessionAdapter {
     private final InstanceManager instanceManager;