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

Merge branch 'proto_1.12.2' into world

Browse Source
This commit is contained in:
DmitriyMX
2018-10-08 14:06:25 +03:00
parent bddda59b78 52e5c46f8b
commit bb9e38ee72
10 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/mc/core/embedded/FakePlayerManager.java
View File

@@ -12,7 +12,6 @@ import mc.core.world.World;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
public class FakePlayerManager implements PlayerManager {
public static class FakeNetChannet implements NetChannel {

4
core/src/main/java/mc/core/world/block/BlockLocation.java
View File

@@ -1,6 +1,8 @@
package mc.core.world.block;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor

5
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java
View File

@@ -4,7 +4,10 @@
*/
package mc.core.network.proto_1_12_2.packets;
import lombok.*;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import mc.core.network.NetOutputStream;
import mc.core.network.SCPacket;
import mc.core.network.proto_1_12_2.serializers.TextMapper;

4
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerBlockPlacementPacket.java
View File

@@ -2,11 +2,11 @@ package mc.core.network.proto_1_12_2.packets;
import lombok.Getter;
import lombok.ToString;
import mc.core.network.proto_1_12_2.serializers.BlockLocationSerializer;
import mc.core.world.block.BlockLocation;
import mc.core.network.CSPacket;
import mc.core.network.NetInputStream;
import mc.core.network.proto_1_12_2.Direction;
import mc.core.network.proto_1_12_2.serializers.BlockLocationSerializer;
import mc.core.world.block.BlockLocation;
@Getter
@ToString

4
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerDiggingPacket.java
View File

@@ -3,11 +3,11 @@ package mc.core.network.proto_1_12_2.packets;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.ToString;
import mc.core.network.proto_1_12_2.serializers.BlockLocationSerializer;
import mc.core.world.block.BlockLocation;
import mc.core.network.CSPacket;
import mc.core.network.NetInputStream;
import mc.core.network.proto_1_12_2.Direction;
import mc.core.network.proto_1_12_2.serializers.BlockLocationSerializer;
import mc.core.world.block.BlockLocation;
import java.util.Arrays;

2
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TabCompletePacket.java
View File

@@ -4,9 +4,9 @@
*/
package mc.core.network.proto_1_12_2.packets;
import mc.core.world.block.BlockLocation;
import mc.core.network.CSPacket;
import mc.core.network.NetInputStream;
import mc.core.world.block.BlockLocation;
public class TabCompletePacket implements CSPacket {
private String text;

1
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/KeepAliveThread.java
View File

@@ -1,6 +1,5 @@
package mc.core.network.proto_1_12_2.netty;
import lombok.Getter;
import lombok.Setter;
import mc.core.network.proto_1_12_2.packets.KeepAlivePacket;
import mc.core.player.PlayerManager;

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

@@ -2,8 +2,8 @@ package mc.core.network.proto_1_12_2.netty.handlers;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFutureListener;
import mc.core.eventbus.events.CS_PlayerMoveEvent;
import mc.core.eventbus.EventBusGetter;
import mc.core.eventbus.events.CS_PlayerMoveEvent;
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.KeepAliveThread;

2
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.eventbus.events.CS_PlayerMoveEvent;
import mc.core.eventbus.EventBusGetter;
import mc.core.eventbus.events.CS_PlayerMoveEvent;
import mc.core.network.proto_1_12_2.TeleportManager;
import mc.core.network.proto_1_12_2.packets.*;
import mc.core.player.Player;

3
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java
View File

@@ -10,14 +10,11 @@ import mc.core.chat.MessageType;
import mc.core.network.NetChannel;
import mc.core.network.SCPacket;
import mc.core.network.proto_1_12_2.packets.ChatMessageServerPacket;
import mc.core.network.proto_1_12_2.packets.KeepAlivePacket;
import mc.core.network.proto_1_12_2.packets.TimeUpdatePacket;
import mc.core.network.proto_1_12_2.packets.TitlePacket;
import mc.core.text.Text;
import mc.core.text.Title;
import java.util.Random;
@RequiredArgsConstructor
public class WrapperNetChannel implements NetChannel {
private final Channel channel;