diff --git a/server/src/main/java/mc/server/Main.java b/server/src/main/java/mc/server/Main.java index 32035f3..22b1eb9 100644 --- a/server/src/main/java/mc/server/Main.java +++ b/server/src/main/java/mc/server/Main.java @@ -67,9 +67,9 @@ public class Main { //endregion ServerComponent serverComponent = DaggerServerComponent.builder() - .processorModule(new ProcessorModule(configComponent.getConfig())) + .processorModule(new ScenarioModule(configComponent.getConfig())) .build(); - serverComponent.getProcessors().forEach(processor -> processor.setup(serverComponent.getProtocolHandlersBus())); + serverComponent.getPacketScenarios().forEach(scenario -> scenario.setup(serverComponent.getProtocolHandlersBus())); NettyServer server = serverComponent.getNettyServer(); diff --git a/server/src/main/java/mc/server/di/ProcessorModule.java b/server/src/main/java/mc/server/di/ScenarioModule.java similarity index 51% rename from server/src/main/java/mc/server/di/ProcessorModule.java rename to server/src/main/java/mc/server/di/ScenarioModule.java index 734860f..bf50e8f 100644 --- a/server/src/main/java/mc/server/di/ProcessorModule.java +++ b/server/src/main/java/mc/server/di/ScenarioModule.java @@ -7,42 +7,42 @@ import dagger.multibindings.IntoSet; import lombok.RequiredArgsConstructor; import mc.protocol.world.World; import mc.server.PlayerManager; -import mc.server.processor.*; +import mc.server.scenario.*; import javax.inject.Singleton; import java.util.Random; @Module @RequiredArgsConstructor -public class ProcessorModule { +public class ScenarioModule { private final Config config; @Provides @IntoSet @Singleton - PacketProcessor provideProcessorHadshake() { - return new ProcessorHandshake(); + PacketScenario provideProcessorHadshake() { + return new ScenarioHandshake(); } @Provides @IntoSet @Singleton - PacketProcessor provideProcessorStatus() { - return new ProcessorStatus(config); + PacketScenario provideProcessorStatus() { + return new ScenarioStatus(config); } @Provides @IntoSet @Singleton - PacketProcessor provideProcessorLogin(PlayerManager playerManager, World world) { - return new ProcessorLogin(playerManager, new Random(System.currentTimeMillis()), config, world); + PacketScenario provideProcessorLogin(PlayerManager playerManager, World world) { + return new ScenarioLogin(playerManager, new Random(System.currentTimeMillis()), config, world); } @Provides @IntoSet @Singleton - PacketProcessor provideProcessorPlay() { - return new ProcessorPlay(); + PacketScenario provideProcessorPlay() { + return new ScenarioPlay(); } } diff --git a/server/src/main/java/mc/server/di/ServerComponent.java b/server/src/main/java/mc/server/di/ServerComponent.java index 996feb0..816a338 100644 --- a/server/src/main/java/mc/server/di/ServerComponent.java +++ b/server/src/main/java/mc/server/di/ServerComponent.java @@ -3,13 +3,13 @@ package mc.server.di; import dagger.Component; import mc.protocol.handler.ProtocolHandlersBus; import mc.server.NettyServer; -import mc.server.processor.PacketProcessor; +import mc.server.scenario.PacketScenario; import javax.inject.Singleton; import java.util.Set; @Component(modules = { - ServerModule.class, ProcessorModule.class, PlayerManagerModule.class, + ServerModule.class, ScenarioModule.class, PlayerManagerModule.class, WorldModule.class }) @Singleton @@ -17,5 +17,5 @@ public interface ServerComponent { ProtocolHandlersBus getProtocolHandlersBus(); NettyServer getNettyServer(); - Set getProcessors(); + Set getPacketScenarios(); } diff --git a/server/src/main/java/mc/server/processor/PacketProcessor.java b/server/src/main/java/mc/server/scenario/PacketScenario.java similarity index 62% rename from server/src/main/java/mc/server/processor/PacketProcessor.java rename to server/src/main/java/mc/server/scenario/PacketScenario.java index aa6fcf2..40c273b 100644 --- a/server/src/main/java/mc/server/processor/PacketProcessor.java +++ b/server/src/main/java/mc/server/scenario/PacketScenario.java @@ -1,8 +1,8 @@ -package mc.server.processor; +package mc.server.scenario; import mc.protocol.handler.ProtocolHandlersBus; -public interface PacketProcessor { +public interface PacketScenario { void setup(ProtocolHandlersBus protocolHandlersBus); } diff --git a/server/src/main/java/mc/server/processor/ProcessorHandshake.java b/server/src/main/java/mc/server/scenario/ScenarioHandshake.java similarity index 86% rename from server/src/main/java/mc/server/processor/ProcessorHandshake.java rename to server/src/main/java/mc/server/scenario/ScenarioHandshake.java index 145a2ec..974b20c 100644 --- a/server/src/main/java/mc/server/processor/ProcessorHandshake.java +++ b/server/src/main/java/mc/server/scenario/ScenarioHandshake.java @@ -1,4 +1,4 @@ -package mc.server.processor; +package mc.server.scenario; import io.netty.channel.ChannelHandlerContext; import mc.protocol.ProtocolAttributes; @@ -6,7 +6,7 @@ import mc.protocol.State; import mc.protocol.handler.ProtocolHandlersBus; import mc.protocol.packets.handshaking.client.HandshakePacket; -public class ProcessorHandshake implements PacketProcessor { +public class ScenarioHandshake implements PacketScenario { @Override public void setup(ProtocolHandlersBus protocolHandlersBus) { diff --git a/server/src/main/java/mc/server/processor/ProcessorLogin.java b/server/src/main/java/mc/server/scenario/ScenarioLogin.java similarity index 98% rename from server/src/main/java/mc/server/processor/ProcessorLogin.java rename to server/src/main/java/mc/server/scenario/ScenarioLogin.java index 980bebe..c5f81ba 100644 --- a/server/src/main/java/mc/server/processor/ProcessorLogin.java +++ b/server/src/main/java/mc/server/scenario/ScenarioLogin.java @@ -1,4 +1,4 @@ -package mc.server.processor; +package mc.server.scenario; import com.typesafe.config.Config; import io.netty.channel.ChannelHandlerContext; @@ -24,7 +24,7 @@ import mc.server.util.LocationUtils; import java.util.Random; @RequiredArgsConstructor -public class ProcessorLogin implements PacketProcessor { +public class ScenarioLogin implements PacketScenario { private final PlayerManager playerManager; private final Random random; diff --git a/server/src/main/java/mc/server/processor/ProcessorPlay.java b/server/src/main/java/mc/server/scenario/ScenarioPlay.java similarity index 89% rename from server/src/main/java/mc/server/processor/ProcessorPlay.java rename to server/src/main/java/mc/server/scenario/ScenarioPlay.java index 39d2fb6..58a21d4 100644 --- a/server/src/main/java/mc/server/processor/ProcessorPlay.java +++ b/server/src/main/java/mc/server/scenario/ScenarioPlay.java @@ -1,4 +1,4 @@ -package mc.server.processor; +package mc.server.scenario; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; @@ -9,7 +9,7 @@ import mc.protocol.packets.KeepAlivePacket; import java.util.concurrent.TimeUnit; @Slf4j -public class ProcessorPlay implements PacketProcessor { +public class ScenarioPlay implements PacketScenario { @Override public void setup(ProtocolHandlersBus protocolHandlersBus) { diff --git a/server/src/main/java/mc/server/processor/ProcessorStatus.java b/server/src/main/java/mc/server/scenario/ScenarioStatus.java similarity index 95% rename from server/src/main/java/mc/server/processor/ProcessorStatus.java rename to server/src/main/java/mc/server/scenario/ScenarioStatus.java index 687dcfb..6db3749 100644 --- a/server/src/main/java/mc/server/processor/ProcessorStatus.java +++ b/server/src/main/java/mc/server/scenario/ScenarioStatus.java @@ -1,4 +1,4 @@ -package mc.server.processor; +package mc.server.scenario; import com.typesafe.config.Config; import io.netty.channel.ChannelHandlerContext; @@ -16,7 +16,7 @@ import mc.protocol.packets.status.server.StatusServerResponse; import java.util.Collections; @RequiredArgsConstructor -public class ProcessorStatus implements PacketProcessor { +public class ScenarioStatus implements PacketScenario { private final Config config;