Minecraft/mc-server
Archived
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/event' into proto_1.12.2

Browse Source 
# Conflicts:
#	core/src/main/java/mc/core/GameLoop.java
#	proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java
This commit is contained in:
DmitriyMX
2018-08-26 15:44:21 +03:00
parent 5b542913b9 ab08a72317
commit 6e004d37fd
16 changed files with 116 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java
View File

@@ -14,7 +14,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.util.AttributeKey;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import mc.core.events.EventBusGetter;
import mc.core.eventbus.EventBusGetter;
import mc.core.network.Server;
import mc.core.network.StartServerException;
import mc.core.network.proto_1_12_2.State;
@@ -64,7 +64,7 @@ public class NettyServer implements Server {
public void start() throws StartServerException {
log.info("Use protocol {}", StatusResponsePacket.NAME);
EventBusGetter.INSTANCE.register(new PlayerEventListener());
EventBusGetter.getInstance().register(new PlayerEventListener());
bossGroup = new NioEventLoopGroup(1);
workerGroup = new NioEventLoopGroup(workerGroupCount);

7
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java
View File

@@ -2,16 +2,15 @@ package mc.core.network.proto_1_12_2.netty;
import com.google.common.eventbus.Subscribe;
import lombok.extern.slf4j.Slf4j;
import mc.core.events.SC_ChunkLoadEvent;
import mc.core.events.SC_ChunkUnloadEvent;
import mc.core.events.SC_PlayerMoveEvent;
import mc.core.eventbus.events.SC_ChunkLoadEvent;
import mc.core.eventbus.events.SC_ChunkUnloadEvent;
import mc.core.eventbus.events.SC_PlayerMoveEvent;
import mc.core.network.proto_1_12_2.TeleportManager;
import mc.core.network.proto_1_12_2.packets.ChunkDataPacket;
import mc.core.network.proto_1_12_2.packets.PlayerPositionAndLookPacket;
import mc.core.network.proto_1_12_2.packets.UnloadChunkPacket;
import mc.core.utils.CompactedCoords;
import mc.core.world.chunk.Chunk;
import mc.core.world.chunk.ChunkSection;
@Slf4j
class PlayerEventListener {

6
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
View File

@@ -6,8 +6,8 @@ package mc.core.network.proto_1_12_2.netty.handlers;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFutureListener;
import mc.core.events.CS_PlayerMoveEvent;
import mc.core.events.EventBusGetter;
import mc.core.eventbus.events.CS_PlayerMoveEvent;
import mc.core.eventbus.EventBusGetter;
import mc.core.network.proto_1_12_2.State;
import mc.core.network.proto_1_12_2.TeleportManager;
import mc.core.network.proto_1_12_2.netty.wrappers.WrapperNetChannel;
@@ -140,7 +140,7 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
CS_PlayerMoveEvent event = new CS_PlayerMoveEvent(player, player.getLocation());
event.setNewLocation(player.getLocation());
event.setRecalcChunk(true);
EventBusGetter.INSTANCE.post(event);
EventBusGetter.getInstance().post(event);
}
}
}

6
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java
View File

@@ -8,8 +8,8 @@ import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
import mc.core.EntityLocation;
import mc.core.chat.ChatProcessor;
import mc.core.events.CS_PlayerMoveEvent;
import mc.core.events.EventBusGetter;
import mc.core.eventbus.events.CS_PlayerMoveEvent;
import mc.core.eventbus.EventBusGetter;
import mc.core.network.proto_1_12_2.TeleportManager;
import mc.core.network.proto_1_12_2.packets.*;
import mc.core.player.Player;
@@ -85,7 +85,7 @@ public class PlayHandler extends AbstractStateHandler implements PlayStateHandle
player.getLocation().getPitch(),
player.getLocation().getWorld()
));
EventBusGetter.INSTANCE.post(event);
EventBusGetter.getInstance().post(event);
}
@Handler