Fix code mistakes

HttpMarco · Sep 27, 2024 · 7548216 · 7548216
1 parent 3845376
commit 7548216
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 95 deletions.
diff --git a/api/src/main/java/dev/httpmarco/polocloud/api/CloudAPI.java b/api/src/main/java/dev/httpmarco/polocloud/api/CloudAPI.java
@@ -1,12 +1,8 @@
 package dev.httpmarco.polocloud.api;
 
-import dev.httpmarco.polocloud.api.config.ConfigProvider;
 import dev.httpmarco.polocloud.api.event.EventProvider;
 import dev.httpmarco.polocloud.api.groups.ClusterGroupProvider;
-import dev.httpmarco.polocloud.api.groups.GroupProperties;
-import dev.httpmarco.polocloud.api.players.ClusterPlayer;
 import dev.httpmarco.polocloud.api.players.ClusterPlayerProvider;
-import dev.httpmarco.polocloud.api.properties.PropertyRegister;
 import dev.httpmarco.polocloud.api.services.ClusterServiceProvider;
 import lombok.Getter;
 import lombok.experimental.Accessors;
@@ -29,6 +25,4 @@ public CloudAPI() {
 
  public abstract ClusterPlayerProvider playerProvider();
 
- public abstract ConfigProvider configProvider();
-
 }
diff --git a/api/src/main/java/dev/httpmarco/polocloud/api/config/ConfigProvider.java b/api/src/main/java/dev/httpmarco/polocloud/api/config/ConfigProvider.java
diff --git a/api/src/main/java/dev/httpmarco/polocloud/api/services/ClusterService.java b/api/src/main/java/dev/httpmarco/polocloud/api/services/ClusterService.java
@@ -23,6 +23,8 @@ public interface ClusterService extends Named, Detail, ChannelAppender {
 
  String hostname();
 
+ int port();
+
  String runningNode();
 
  void shutdown();

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ allprojects {
  apply(plugin = "maven-publish")
 
  group = "dev.httpmarco.polocloud.node"
- version = "1.0.0-SNAPSHOT"
+ version = "1.0.0-alpha-2"
 
  repositories {
  mavenCentral()

diff --git a/instance/src/main/java/dev/httpmarco/polocloud/instance/ClusterInstance.java b/instance/src/main/java/dev/httpmarco/polocloud/instance/ClusterInstance.java
@@ -7,7 +7,6 @@
 import dev.httpmarco.polocloud.api.players.ClusterPlayerProvider;
 import dev.httpmarco.polocloud.api.services.ClusterService;
 import dev.httpmarco.polocloud.api.services.ClusterServiceProvider;
-import dev.httpmarco.polocloud.instance.config.ConfigProviderImpl;
 import dev.httpmarco.polocloud.instance.events.EventProviderImpl;
 import dev.httpmarco.polocloud.instance.groups.ClusterInstanceGroupProvider;
 import dev.httpmarco.polocloud.instance.players.ClusterPlayerProviderImpl;
@@ -29,7 +28,6 @@ public final class ClusterInstance extends CloudAPI {
  private ClusterService selfService;
 
  private final EventProviderImpl eventProvider;
- private final ConfigProviderImpl configProvider;
  private final ClusterInstanceGroupProvider groupProvider = new ClusterInstanceGroupProvider();
  private final ClusterServiceProvider serviceProvider = new ClusterInstanceServiceProvider();
  private final ClusterPlayerProvider playerProvider = new ClusterPlayerProviderImpl();
@@ -45,7 +43,6 @@ public ClusterInstance(String[] args) {
  Runtime.getRuntime().addShutdownHook(new Thread(ClusterInstanceShutdown::shutdown));
 
  this.eventProvider = new EventProviderImpl();
- this.configProvider = new ConfigProviderImpl();
 
  this.client.clientAction(CommunicationClientAction.CONNECTED, transmit -> {
  transmit.sendPacket(new ServiceConnectPacket(selfServiceId));

diff --git a/instance/src/main/java/dev/httpmarco/polocloud/instance/config/ConfigProviderImpl.java b/instance/src/main/java/dev/httpmarco/polocloud/instance/config/ConfigProviderImpl.java
diff --git a/...e/src/main/java/dev/httpmarco/polocloud/instance/services/ClusterInstanceServiceImpl.java b/...e/src/main/java/dev/httpmarco/polocloud/instance/services/ClusterInstanceServiceImpl.java
@@ -90,6 +90,6 @@ public void sendPacket(Packet packet) {
  ClusterInstance.instance().client().call(packet, null);
  return;
  }
- ClusterInstance.instance().client().sendPacket(new RedirectPacket(packet));
+ ClusterInstance.instance().client().sendPacket(new RedirectPacket(id, packet));
  }
 }
diff --git a/node/src/main/java/dev/httpmarco/polocloud/node/Node.java b/node/src/main/java/dev/httpmarco/polocloud/node/Node.java
@@ -23,7 +23,6 @@
 import dev.httpmarco.polocloud.node.terminal.commands.ServiceCommand;
 import dev.httpmarco.polocloud.node.util.Configurations;
 import dev.httpmarco.polocloud.node.util.StringUtils;
-import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.experimental.Accessors;
 import lombok.extern.log4j.Log4j2;

diff --git a/node/src/main/java/dev/httpmarco/polocloud/node/services/ClusterServiceImpl.java b/node/src/main/java/dev/httpmarco/polocloud/node/services/ClusterServiceImpl.java
@@ -96,6 +96,6 @@ public NodeEndpoint node() {
  @Override
  public void sendPacket(Packet packet) {
  // we know that this is not a local service, so we need to redirect the packet to the correct node
- node().transmit().sendPacket(new RedirectPacket(packet));
+ node().transmit().sendPacket(new RedirectPacket(id, packet));
  }
 }