From a2e086dac727bad7949340439fa21f522dad854a Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 16:31:46 +0300 Subject: [PATCH 01/15] =?UTF-8?q?gradle:=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82?= =?UTF-8?q?=D0=B0-=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B0=20=D0=B2=20deploy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 23f2b689fe5c3d25e0f65dde662d0e8b5313dddb) --- build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 676a480..6d1adf3 100644 --- a/build.gradle +++ b/build.gradle @@ -110,8 +110,6 @@ subprojects { Files.copy(jar.archivePath.toPath(), target) } - - def libsDir = System.getProperty("libs", deployDir+File.separator+"libs") if (Files.notExists(Paths.get(libsDir))) { (new File(libsDir)).mkdirs() @@ -125,6 +123,12 @@ subprojects { Files.copy(libFile.toPath(), target) } } + + if (Boolean.valueOf(System.getProperty("createRunScript", "false"))) { + def runnerSh = new File(deployDir, "run.sh") + runnerSh.write "java -cp \"${project(':core').jar.archiveName};" + runnerSh << "./libs/*;./log-impl/*\" mc.core.Main\n" + } } } } From 3e9a86e97f9b015bac5039ca7ce245fda41bdc04 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 16:32:46 +0300 Subject: [PATCH 02/15] =?UTF-8?q?gradle:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B0=D1=87=D0=B0=20System=20properties=20=D0=B2=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=D0=B5=D0=BC=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e7516edc57becb3eefe8747966b200e695b173c8) --- build.gradle | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 6d1adf3..446eab8 100644 --- a/build.gradle +++ b/build.gradle @@ -137,11 +137,8 @@ subprojects { * Запуск сервера. * Для указания рабочей папки, указываем JVM параметр * -DworkDir=path\to\workdir - * Если используется отдельная папка для имплементации логгера, то указываем + * Если используется отдельная папка для имплементации логгера, то указываем * -DlogImplDir=path\to\logimpldir - * Если необходимо передать дополнительные JVM параметры серверу, то указываем их с двойной "D", например: - * -DDspringConfig=spring.xml - * -DDlog4j.configurationFile=log4j2.xml */ task runServer(type: JavaExec) { main = 'mc.core.Main' @@ -153,14 +150,19 @@ task runServer(type: JavaExec) { } if (System.getProperty("logImplDir") != null) { - classpath += files(fileTree(dir: new File(System.getProperty("logImplDir")))) + def logImplDir = new File(System.getProperty("logImplDir")) + + if (logImplDir.isAbsolute()) { + classpath += files(fileTree(dir: logImplDir)) + } else { + classpath += files(fileTree(dir: new File(workingDir, logImplDir.getPath()))) + } } else { classpath += files(fileTree(dir: new File(workingDir, "log-impl"))) } - System.getProperties().stringPropertyNames().stream() - .filter{propName -> propName.startsWith("D")} - .forEach{propName -> jvmArgs += "-D" + propName.substring(1) + "=" + System.getProperty(propName)} + systemProperties System.properties + systemProperties.put("user.dir", workingDir) ignoreExitValue = true } From b3fd91c614fd1c7e388840a1bd14b8537f776275 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 16:33:58 +0300 Subject: [PATCH 03/15] =?UTF-8?q?gradle:=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0dddfc39cf42149b6e4e053dac50094bfc8d4320) --- build.gradle | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 446eab8..fb10065 100644 --- a/build.gradle +++ b/build.gradle @@ -24,14 +24,6 @@ plugins { } allprojects { - apply plugin: 'java' - - compileJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - options.encoding = 'UTF-8' - } - repositories { mavenCentral() maven { url 'https://oss.sonatype.org/content/groups/public/' } @@ -39,6 +31,14 @@ allprojects { } subprojects { + apply plugin: 'java' + + compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + options.encoding = 'UTF-8' + } + group 'mc' ext { @@ -110,7 +110,7 @@ subprojects { Files.copy(jar.archivePath.toPath(), target) } - def libsDir = System.getProperty("libs", deployDir+File.separator+"libs") + def libsDir = System.getProperty("libs", deployDir + File.separator + "libs") if (Files.notExists(Paths.get(libsDir))) { (new File(libsDir)).mkdirs() } @@ -127,7 +127,7 @@ subprojects { if (Boolean.valueOf(System.getProperty("createRunScript", "false"))) { def runnerSh = new File(deployDir, "run.sh") runnerSh.write "java -cp \"${project(':core').jar.archiveName};" - runnerSh << "./libs/*;./log-impl/*\" mc.core.Main\n" + runnerSh << "${libsDir}/*;./log-impl/*\" mc.core.Main\n" } } } @@ -151,7 +151,7 @@ task runServer(type: JavaExec) { if (System.getProperty("logImplDir") != null) { def logImplDir = new File(System.getProperty("logImplDir")) - + if (logImplDir.isAbsolute()) { classpath += files(fileTree(dir: logImplDir)) } else { From fe940747d603251af11388b0473fce33063c6c58 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 17:12:12 +0300 Subject: [PATCH 04/15] fix: anvil biome --- anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java b/anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java index a0a985d..9810f9e 100644 --- a/anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java +++ b/anvil-loader/src/main/java/mc/world/anvil/AnvilChunk.java @@ -127,7 +127,7 @@ public class AnvilChunk implements Chunk { @Override public Biome getBiome(int x, int z) { - return Biome.getById(biomes.get((z >> 4) << 4 | (x >> 4)) & 255); + return Biome.getById(biomes.get(((z & 31) >> 4) << 4 | ((x & 31) >> 4)) & 255); } @Override From 5c91122b0837f22f4712fb46964b532e7500f336 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 17:14:07 +0300 Subject: [PATCH 05/15] =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C=20Vanilla=20comma?= =?UTF-8?q?nds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.gradle | 1 - vanilla_commands/build.gradle | 6 -- .../main/java/mc/commands/HelpCommand.java | 70 ------------------- .../main/java/mc/commands/ListCommand.java | 60 ---------------- 4 files changed, 137 deletions(-) delete mode 100644 vanilla_commands/build.gradle delete mode 100644 vanilla_commands/src/main/java/mc/commands/HelpCommand.java delete mode 100644 vanilla_commands/src/main/java/mc/commands/ListCommand.java diff --git a/settings.gradle b/settings.gradle index 6e2132d..4559862 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,6 @@ rootProject.name = 'mc-server' include('core') // Core include('simple_world') include('h2_playermanager') -include('vanilla_commands') include('proto_1.12.2') // Protocol 1.12.2 include('proto_1.12.2_netty') // Protocol 1.12.2 (Netty impl.) include('anvil-loader') // Vanilla world loader (aka Anvil) diff --git a/vanilla_commands/build.gradle b/vanilla_commands/build.gradle deleted file mode 100644 index 6d1bcee..0000000 --- a/vanilla_commands/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -version '1.0-SNAPSHOT' - -dependencies { - /* Core */ - compile_excludeCopy project(':core') -} diff --git a/vanilla_commands/src/main/java/mc/commands/HelpCommand.java b/vanilla_commands/src/main/java/mc/commands/HelpCommand.java deleted file mode 100644 index c3d466e..0000000 --- a/vanilla_commands/src/main/java/mc/commands/HelpCommand.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * DmitriyMX - * 2018-05-23 - */ -package mc.commands; - -import lombok.extern.slf4j.Slf4j; -import mc.core.chat.CommandExecutor; -import mc.core.chat.CommanderChatProcessor; -import mc.core.chat.MessageType; -import mc.core.player.Player; -import mc.core.text.Text; -import mc.core.text.TextColor; -import mc.core.text.TextTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; - -import java.util.Optional; - -@Slf4j -public class HelpCommand implements CommandExecutor { - private static final TextTemplate messageFormat = TextTemplate.builder() - .arg("command", TextColor.RED) - .append(Text.of(TextColor.GRAY, " - ")) - .arg("description", TextColor.WHITE) - .build(); - - @Autowired - private ApplicationContext applicationContext; - private CommanderChatProcessor commanderChatProcessor; - - @Override - public String getName() { - return "help"; - } - - @Override - public Optional getAliases() { - return Optional.of(new String[]{"?"}); - } - - @Override - public Optional getUsage() { - return Optional.empty(); - } - - @Override - public String getDescription() { - return "shows this message"; - } - - @Override - public void execute(Player sender, String... args) { - if (commanderChatProcessor == null) { - commanderChatProcessor = applicationContext.getBean(CommanderChatProcessor.class); - if (commanderChatProcessor == null) { - log.error("Error get bean of type \"CommanderChatProcessor\". WTF?!"); - sender.getChannel().sendChatMessage(Text.of(TextColor.RED, "!!-Server error-!!")); - return; - } - } - - commanderChatProcessor.getAllCommands().forEach(commandExecutor -> { - Text message = messageFormat.apply( - "command", commandExecutor.getUsage().orElse(commandExecutor.getName()), - "description", commandExecutor.getDescription()); - sender.getChannel().sendChatMessage(message, MessageType.SYSTEM_MESSAGE); - }); - } -} diff --git a/vanilla_commands/src/main/java/mc/commands/ListCommand.java b/vanilla_commands/src/main/java/mc/commands/ListCommand.java deleted file mode 100644 index 82411a6..0000000 --- a/vanilla_commands/src/main/java/mc/commands/ListCommand.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * DmitriyMX - * 2018-05-23 - */ -package mc.commands; - -import mc.core.chat.CommandExecutor; -import mc.core.chat.MessageType; -import mc.core.player.Player; -import mc.core.player.PlayerManager; -import mc.core.text.Text; -import mc.core.text.TextColor; -import mc.core.text.TextTemplate; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Optional; -import java.util.StringJoiner; - -public class ListCommand implements CommandExecutor { - private static final TextTemplate messageFormat = TextTemplate.builder() - .append(Text.of(TextColor.GREEN, "Online(")) - .arg("count") - .append(Text.of(TextColor.GREEN, "): ")) - .arg("players", TextColor.DARK_GREEN) - .build(); - - @Autowired - private PlayerManager playerManager; - - @Override - public String getName() { - return "list"; - } - - @Override - public Optional getAliases() { - return Optional.empty(); - } - - @Override - public Optional getUsage() { - return Optional.empty(); - } - - @Override - public String getDescription() { - return "lists all currently connected players"; - } - - @Override - public void execute(Player sender, String... args) { - StringJoiner sj = new StringJoiner(", "); - playerManager.getPlayers().forEach(pl -> sj.add(pl.getName())); - - Text message = messageFormat.apply( - "count", playerManager.getCountPlayers(), - "players", sj.toString()); - sender.getChannel().sendChatMessage(message, MessageType.SYSTEM_MESSAGE); - } -} From 00d536710a9e58f88f7546fa5755a4c94d101e88 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 18:16:20 +0300 Subject: [PATCH 06/15] optimize --- .../main/java/mc/world/anvil/AnvilBlock.java | 10 +---- .../mc/world/anvil/AnvilChunkSection.java | 3 +- .../main/java/mc/core/utils/NibbleArray.java | 4 -- .../java/mc/core/world/block/BlockType.java | 37 +++++++++++-------- proto_1.12.2/build.gradle | 1 - .../proto_1_12_2/packets/ChunkDataPacket.java | 26 +++++-------- 6 files changed, 34 insertions(+), 47 deletions(-) diff --git a/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java b/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java index 990e6e9..0bdf259 100644 --- a/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java +++ b/anvil-loader/src/main/java/mc/world/anvil/AnvilBlock.java @@ -31,15 +31,7 @@ public class AnvilBlock implements Block { public BlockType getType() { final byte id = chunkSection.getBlocks().get((location.getY() << 8) + (location.getZ() << 4) + location.getX()); final int meta = chunkSection.getBlocksMeta().get(location); - BlockType type = BlockType.getByIdMeta(id & 0xFF, meta); - if (type.equals(BlockType.BEDROCK) && id != 7) { - log.warn("ChunkSection: {},{},{} | Block: {}", - chunkSection.getParent().getX(), - chunkSection.getY(), - chunkSection.getParent().getZ(), - location.toString()); - } - return type; + return BlockType.getByIdMeta(id & 0xFF, meta); } @Override diff --git a/anvil-loader/src/main/java/mc/world/anvil/AnvilChunkSection.java b/anvil-loader/src/main/java/mc/world/anvil/AnvilChunkSection.java index 1892e57..c4115ce 100644 --- a/anvil-loader/src/main/java/mc/world/anvil/AnvilChunkSection.java +++ b/anvil-loader/src/main/java/mc/world/anvil/AnvilChunkSection.java @@ -1,6 +1,7 @@ package mc.world.anvil; import gnu.trove.list.TByteList; +import gnu.trove.list.array.TByteArrayList; import gnu.trove.list.linked.TByteLinkedList; import lombok.Getter; import lombok.Setter; @@ -17,7 +18,7 @@ public class AnvilChunkSection implements ChunkSection { @Setter private int y; - private TByteList blocks = new TByteLinkedList(); + private TByteList blocks = new TByteArrayList(); @Setter private NibbleArray blocksMeta; @Setter diff --git a/core/src/main/java/mc/core/utils/NibbleArray.java b/core/src/main/java/mc/core/utils/NibbleArray.java index e8514f7..63b936d 100644 --- a/core/src/main/java/mc/core/utils/NibbleArray.java +++ b/core/src/main/java/mc/core/utils/NibbleArray.java @@ -41,10 +41,6 @@ public class NibbleArray { return isLowerNibble(idx) ? this.data[ni] & 0x0F : this.data[ni] >> 4 & 0x0F; } - public void set(BlockLocation location, int value) { - set(location.getX(), location.getY(), location.getZ(), value); - } - public void set(int x, int y, int z, int value) { if (value < 0) value = 0; else if (value > 15) value = 15; diff --git a/core/src/main/java/mc/core/world/block/BlockType.java b/core/src/main/java/mc/core/world/block/BlockType.java index 13eb1e6..2eecead 100644 --- a/core/src/main/java/mc/core/world/block/BlockType.java +++ b/core/src/main/java/mc/core/world/block/BlockType.java @@ -1,10 +1,13 @@ package mc.core.world.block; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import java.util.Arrays; +import java.util.Optional; import java.util.stream.Stream; @Slf4j @@ -491,25 +494,29 @@ public enum BlockType { this.namedId = null; } - public static BlockType getByIdMeta(int id, int meta) { - if (id < 0) { - log.warn("Incorrect id \"{}\"", id); - return BEDROCK; - } - - Stream stream = Arrays.stream(BlockType.values()); - return stream.filter(blockType -> blockType.id == id && blockType.meta == meta) - .findFirst() - .orElseGet(() -> { - log.warn("Unknow block type: {}:{}", id, meta); - return BEDROCK; - }); - } - @Getter private final int id; @Getter private final int meta; @Getter private final String namedId; + + private static final Table typeTable = HashBasedTable.create(); + + static { + Arrays.stream(BlockType.values()) + .forEach(blockType -> typeTable.put(blockType.id, blockType.meta, blockType)); + } + + public static BlockType getByIdMeta(int id, int meta) { + if (id < 0) { + log.warn("Incorrect id \"{}\"", id); + return BEDROCK; + } + + return Optional.ofNullable(typeTable.get(id, meta)).orElseGet(() -> { + log.warn("Unknow block type: {}:{}", id, meta); + return BEDROCK; + }); + } } diff --git a/proto_1.12.2/build.gradle b/proto_1.12.2/build.gradle index 7c71711..8e3a7e2 100644 --- a/proto_1.12.2/build.gradle +++ b/proto_1.12.2/build.gradle @@ -6,5 +6,4 @@ dependencies { /* Components */ compile (group: 'com.google.code.gson', name: 'gson', version: '2.8.5') - compile (group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3') } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java index 9be81ac..9f19bf1 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java @@ -1,8 +1,6 @@ package mc.core.network.proto_1_12_2.packets; import com.flowpowered.nbt.CompoundTag; -import gnu.trove.list.TIntList; -import gnu.trove.list.array.TIntArrayList; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -11,7 +9,6 @@ import mc.core.network.SCPacket; import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream; import mc.core.utils.NibbleArray; import mc.core.world.block.Block; -import mc.core.world.block.BlockLocation; import mc.core.world.block.BlockType; import mc.core.world.chunk.Chunk; import mc.core.world.chunk.ChunkSection; @@ -208,15 +205,11 @@ public class ChunkDataPacket implements SCPacket { } private class PalettedChunkSection { - private TIntList palette = new TIntArrayList(); + private List palette = new ArrayList<>(); private byte[] blocks = new byte[4096]; private NibbleArray blockLight = new NibbleArray(); private NibbleArray skyLight = new NibbleArray(); - private int coordsToIndex(BlockLocation location) { - return coordsToIndex(location.getX(), location.getY(), location.getZ()); - } - private int coordsToIndex(int x, int y, int z) { return y << 8 | z << 4 | x; } @@ -238,14 +231,13 @@ public class ChunkDataPacket implements SCPacket { } void addBlock(Block block, int skyLight) { - BlockLocation location = new BlockLocation( - block.getLocation().getX() - ((block.getLocation().getX() >> 4) << 4), - block.getLocation().getY() - ((block.getLocation().getY() >> 4) << 4), - block.getLocation().getZ() - ((block.getLocation().getZ() >> 4) << 4) - ); - blocks[coordsToIndex(location)] = addBlockType(block.getType()); - blockLight.set(location, block.getLight()); - this.skyLight.set(location, skyLight); + final int bx = block.getLocation().getX() - ((block.getLocation().getX() >> 4) << 4); + final int by = block.getLocation().getY() - ((block.getLocation().getY() >> 4) << 4); + final int bz = block.getLocation().getZ() - ((block.getLocation().getZ() >> 4) << 4); + + blocks[coordsToIndex(bx, by, bz)] = addBlockType(block.getType()); + blockLight.set(bx, by, bz, block.getLight()); + this.skyLight.set(bx, by, bz, skyLight); } void writeToNetStream(final NetOutputStream netOutputStream) { @@ -264,7 +256,7 @@ public class ChunkDataPacket implements SCPacket { // netOutputStream.writeUnsignedByte(bitsPerBlock); // Bits Per Block netOutputStream.writeVarInt(palette.size()); // Size of palette - palette.forEach(value -> { netOutputStream.writeVarInt(value); return true; }); // Palette + palette.forEach(netOutputStream::writeVarInt); // Palette // // final int dataLength = (4096/*16*16*16*/ * bitsPerBlock) / 64/*size of long in bits*/; From 329f9ac14288aa68091690e8cb0b23ac7e82a3a9 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 22:14:19 +0300 Subject: [PATCH 07/15] =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/mc/world/anvil/LevelInfo.java | 26 ----- .../java/mc/core/chat/CommandExecutor.java | 17 ---- .../mc/core/chat/CommanderChatProcessor.java | 94 ------------------- .../network/proto_1_12_2/package-info.java | 32 ------- 4 files changed, 169 deletions(-) delete mode 100644 anvil-loader/src/main/java/mc/world/anvil/LevelInfo.java delete mode 100644 core/src/main/java/mc/core/chat/CommandExecutor.java delete mode 100644 core/src/main/java/mc/core/chat/CommanderChatProcessor.java delete mode 100644 proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/package-info.java diff --git a/anvil-loader/src/main/java/mc/world/anvil/LevelInfo.java b/anvil-loader/src/main/java/mc/world/anvil/LevelInfo.java deleted file mode 100644 index a2da8ba..0000000 --- a/anvil-loader/src/main/java/mc/world/anvil/LevelInfo.java +++ /dev/null @@ -1,26 +0,0 @@ -package mc.world.anvil; - -import com.flowpowered.nbt.*; -import lombok.Getter; -import lombok.ToString; -import mc.core.world.block.BlockLocation; - -@Getter -@ToString -class LevelInfo { - private long seed; - private BlockLocation spawn; - private int version; - - LevelInfo(CompoundTag levelDatTag) { - CompoundMap dataMapTag = ((CompoundTag) levelDatTag.getValue().get("Data")).getValue(); - - seed = ((LongTag) dataMapTag.get("RandomSeed")).getValue(); - spawn = new BlockLocation( - ((IntTag) dataMapTag.get("SpawnX")).getValue(), - ((IntTag) dataMapTag.get("SpawnY")).getValue(), - ((IntTag) dataMapTag.get("SpawnZ")).getValue() - ); - version = ((IntTag) dataMapTag.get("version")).getValue(); - } -} diff --git a/core/src/main/java/mc/core/chat/CommandExecutor.java b/core/src/main/java/mc/core/chat/CommandExecutor.java deleted file mode 100644 index e0d6e66..0000000 --- a/core/src/main/java/mc/core/chat/CommandExecutor.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * DmitriyMX - * 2018-05-22 - */ -package mc.core.chat; - -import mc.core.player.Player; - -import java.util.Optional; - -public interface CommandExecutor { - String getName(); - Optional getAliases(); - Optional getUsage(); - String getDescription(); - void execute(Player sender, String... args); -} diff --git a/core/src/main/java/mc/core/chat/CommanderChatProcessor.java b/core/src/main/java/mc/core/chat/CommanderChatProcessor.java deleted file mode 100644 index f497a58..0000000 --- a/core/src/main/java/mc/core/chat/CommanderChatProcessor.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * DmitriyMX - * 2018-05-23 - */ -package mc.core.chat; - -import lombok.extern.slf4j.Slf4j; -import mc.core.player.Player; -import mc.core.text.Text; -import mc.core.text.TextColor; -import mc.core.text.TextTemplate; -import org.slf4j.Marker; -import org.slf4j.helpers.BasicMarkerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; - -import javax.annotation.PostConstruct; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -@Slf4j -public class CommanderChatProcessor extends SimpleChatProcessor { - private static final Marker COMMAND_MARKER = new BasicMarkerFactory().getMarker("Command"); - private static final TextTemplate UNKNOW_COMMAND_MSG = TextTemplate.builder() - .append(Text.of("Unknown command \"", TextColor.RED)) - .arg("command", TextColor.WHITE) - .append(Text.of("\"", TextColor.RED)) - .build(); - @Autowired - private ApplicationContext applicationContext; - private Map commands = new HashMap<>(); - - @PostConstruct - public void init() { - Map beans = applicationContext.getBeansOfType(CommandExecutor.class); - beans.values().forEach(commandExecutor -> { - log.trace("Add command \"{}\" ({})", commandExecutor.getName(), commandExecutor.getClass().getName()); - if (commands.containsKey(commandExecutor.getName())) { - log.warn("Override command \"{}\"", commandExecutor.getName()); - log.debug("{} -> {}", - commands.get(commandExecutor.getName()).getClass().getName(), - commandExecutor.getClass().getName() - ); - } - commands.put(commandExecutor.getName(), commandExecutor); - - if (commandExecutor.getAliases().isPresent()) { - Arrays.stream(commandExecutor.getAliases().get()).forEach(aliase -> { - log.trace("Add aliase \"{}\" ({})", aliase, commandExecutor.getClass().getName()); - if (commands.containsKey(aliase)) { - log.warn("Override aliase \"{}\"", aliase); - log.debug("{} -> {}", - commands.get(aliase).getClass().getName(), - commandExecutor.getClass().getName() - ); - } - commands.put(aliase, commandExecutor); - }); - } - }); - - log.debug("Load {} commands", commands.size()); - } - - @Override - public void process(Player player, String message) { - if (message.startsWith("/")) { - log.info(COMMAND_MARKER, "<{}> {}", player.getName(), message); - - int idx = message.indexOf(' '); - if (idx == -1) { - idx = message.length(); - } - - String command = message.substring(1, idx).toLowerCase(); - if (commands.containsKey(command)) { - String[] args = message.substring(idx).split(" "); - commands.get(command).execute(player, args); - } else { - player.getChannel().sendChatMessage( - UNKNOW_COMMAND_MSG.apply("command", command), - MessageType.SYSTEM_MESSAGE); - } - } else { - super.process(player, message); - } - } - - public Collection getAllCommands() { - return commands.values(); - } -} diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/package-info.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/package-info.java deleted file mode 100644 index d6207e6..0000000 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/package-info.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Протокол Minecraft версии 1.12.2 (номер версии протокола - 340) - * - * - * Типы данных. - * - * (см. http://wiki.vg/Protocol#Data_types) - * - * - * Формат пакетов. - * - * Есть два варианта: без использования сжатия и с использованием. - * Регулируется это пакетом {@link mc.core.network.proto_1_12_2.packets.SetCompressionPacket} - * - * Формат без использования сжатия: - * - * +---------------+------------+--------------------+ - * | Название | Тип | Комментарий | - * +---------------+------------+--------------------+ - * | Размер пакета | VarInt | ID пакета + данные | - * +---------------+------------+--------------------+ - * | ID пакета | VarInt | | - * +---------------+------------+--------------------+ - * | Данные | Byte Array | | - * +---------------+------------+--------------------+ - * - * Формат с использованием сжатия: - * - * (см. http://wiki.vg/Protocol#With_compression) - */ - -package mc.core.network.proto_1_12_2; \ No newline at end of file From 0e6fd759005fcc63fc81ae6623d81cb579427d9b Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 22:22:35 +0300 Subject: [PATCH 08/15] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BB?= =?UTF-8?q?=D0=B0=D1=81=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/core/network/proto_1_12_2/packets/BossBarPacket.java | 4 ++-- .../proto_1_12_2/packets/ChatMessageServerPacket.java | 4 ++-- .../core/network/proto_1_12_2/packets/DisconnectPacket.java | 4 ++-- .../packets/PlayerListHeaderAndFooterPacket.java | 6 +++--- .../network/proto_1_12_2/packets/PlayerListItemPacket.java | 4 ++-- .../mc/core/network/proto_1_12_2/packets/TitlePacket.java | 4 ++-- .../serializers/{Mapper.java => Converter.java} | 2 +- .../{TextMapper.java => TextToStringConverter.java} | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/{Mapper.java => Converter.java} (70%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/{TextMapper.java => TextToStringConverter.java} (92%) diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java index 7339c11..803d925 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java @@ -10,7 +10,7 @@ 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; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; import java.util.UUID; @@ -98,7 +98,7 @@ public class BossBarPacket implements SCPacket { } if (action == Action.ADD || action == Action.UPDATE_TITLE) { - netStream.writeString(TextMapper.getInstance().mapping(barData.title)); + netStream.writeString(TextToStringConverter.getInstance().mapping(barData.title)); } if (action == Action.ADD || action == Action.UPDATE_HEALTH) { diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java index 903e61c..305ec8a 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java @@ -11,7 +11,7 @@ import lombok.ToString; import mc.core.chat.MessageType; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextMapper; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; @AllArgsConstructor @@ -24,7 +24,7 @@ public class ChatMessageServerPacket implements SCPacket { @Override public void writeSelf(NetOutputStream netStream) { - netStream.writeString(TextMapper.getInstance().mapping(text)); + netStream.writeString(TextToStringConverter.getInstance().mapping(text)); netStream.writeByte(type.getId()); } } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java index 96f83f7..2f811ac 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextMapper; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; @AllArgsConstructor @@ -20,6 +20,6 @@ public class DisconnectPacket implements SCPacket { @Override public void writeSelf(NetOutputStream netStream) { - netStream.writeString(TextMapper.getInstance().mapping(reason)); + netStream.writeString(TextToStringConverter.getInstance().mapping(reason)); } } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java index 20872c5..21f1a2e 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java @@ -8,7 +8,7 @@ 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; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; @Setter @@ -23,13 +23,13 @@ public class PlayerListHeaderAndFooterPacket implements SCPacket { if (header == null) { netStream.writeString("{\"translate\":\"\"}"); } else { - netStream.writeString(TextMapper.getInstance().mapping(header)); + netStream.writeString(TextToStringConverter.getInstance().mapping(header)); } if (footer == null) { netStream.writeString("{\"translate\":\"\"}"); } else { - netStream.writeString(TextMapper.getInstance().mapping(footer)); + netStream.writeString(TextToStringConverter.getInstance().mapping(footer)); } } } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java index 9eb85d3..b2766fc 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java @@ -8,7 +8,7 @@ import lombok.*; import lombok.extern.slf4j.Slf4j; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextMapper; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.player.PlayerMode; import mc.core.text.Text; @@ -76,7 +76,7 @@ public class PlayerListItemPacket implements SCPacket { if (action == Action.ADD_PLAYER || action == Action.UPDATE_DISPLAY_NAME) { netStream.writeBoolean(playerData.hasDisplayName); if (playerData.hasDisplayName) { - netStream.writeString(TextMapper.getInstance().mapping(playerData.displayName)); + netStream.writeString(TextToStringConverter.getInstance().mapping(playerData.displayName)); } } } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java index 9b357a8..a85045a 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java @@ -10,7 +10,7 @@ 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; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; @RequiredArgsConstructor @@ -106,7 +106,7 @@ public class TitlePacket implements SCPacket { case SET_TITLE: case SET_SUBTITLE: case SET_ACTION_BAR: - netStream.writeString(TextMapper.getInstance().mapping(this.text)); + netStream.writeString(TextToStringConverter.getInstance().mapping(this.text)); break; case SET_DISPLAY_TIME: netStream.writeInt(this.fadeInTime); diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Mapper.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Converter.java similarity index 70% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Mapper.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Converter.java index 167dc43..95a73a6 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Mapper.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Converter.java @@ -1,5 +1,5 @@ package mc.core.network.proto_1_12_2.serializers; -public interface Mapper { +public interface Converter { T mapping(F fromObject); } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextMapper.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java similarity index 92% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextMapper.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java index 2590d2f..2629f2e 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextMapper.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java @@ -9,9 +9,9 @@ import com.google.gson.JsonObject; import lombok.Getter; import mc.core.text.Text; -public class TextMapper implements Mapper { +public class TextToStringConverter implements Converter { @Getter - private static TextMapper instance = new TextMapper(); + private static TextToStringConverter instance = new TextToStringConverter(); private JsonObject serialize(Text text) { JsonObject jsonObject = new JsonObject(); From 06b1b5aeae5fc4b8d09034d5be9e7bad4b810ffb Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 22:36:22 +0300 Subject: [PATCH 09/15] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B8=D0=BB=D0=B8=20=D1=81=D0=B5=D1=82=D0=B5=D0=B2=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B=20=D0=BF=D0=BE=20java?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/mc/core/network/proto_1_12_2/State.java | 6 ++---- .../packets/{ => clientside}/AnimationPacket.java | 2 +- .../packets/{ => clientside}/ChatMessageClientPacket.java | 6 +----- .../packets/{ => clientside}/ClientSettingsPacket.java | 6 +----- .../packets/{ => clientside}/EntityActionPacket.java | 2 +- .../packets/{ => clientside}/HandshakePacket.java | 6 +----- .../packets/{ => clientside}/HeldItemChangePacket.java | 6 +----- .../packets/{ => clientside}/LoginStartPacket.java | 6 +----- .../{ => clientside}/PlayerBlockPlacementPacket.java | 2 +- .../packets/{ => clientside}/PlayerDiggingPacket.java | 2 +- .../packets/{ => clientside}/PlayerLookPacket.java | 2 +- .../packets/{ => clientside}/PlayerPositionPacket.java | 2 +- .../packets/{ => clientside}/StatusRequestPacket.java | 6 +----- .../packets/{ => clientside}/TabCompletePacket.java | 2 +- .../packets/{ => clientside}/TeleportConfirmPacket.java | 6 +----- .../packets/{ => serverside}/BossBarPacket.java | 6 +----- .../packets/{ => serverside}/ChangeGameState.java | 6 +----- .../packets/{ => serverside}/ChatMessageServerPacket.java | 6 +----- .../packets/{ => serverside}/ChunkDataPacket.java | 2 +- .../packets/{ => serverside}/DisconnectPacket.java | 6 +----- .../packets/{ => serverside}/EncryptionRequestPacket.java | 6 +----- .../packets/{ => serverside}/JoinGamePacket.java | 6 +----- .../packets/{ => serverside}/LoginSuccessPacket.java | 6 +----- .../{ => serverside}/PlayerListHeaderAndFooterPacket.java | 6 +----- .../packets/{ => serverside}/PlayerListItemPacket.java | 6 +----- .../packets/{ => serverside}/SpawnPositionPacket.java | 2 +- .../packets/{ => serverside}/StatusResponsePacket.java | 6 +----- .../packets/{ => serverside}/TimeUpdatePacket.java | 6 +----- .../proto_1_12_2/packets/{ => serverside}/TitlePacket.java | 6 +----- .../packets/{ => serverside}/UnloadChunkPacket.java | 2 +- .../network/proto_1_12_2/packets/ChunkDataPacketTest.java | 1 + .../mc/core/network/proto_1_12_2/netty/NettyServer.java | 2 +- .../mc/core/network/proto_1_12_2/netty/PacketDecoder.java | 2 +- .../network/proto_1_12_2/netty/PlayerEventListener.java | 4 ++-- .../proto_1_12_2/netty/handlers/HandshakeHandler.java | 2 +- .../network/proto_1_12_2/netty/handlers/LoginHandler.java | 2 ++ .../network/proto_1_12_2/netty/handlers/PlayHandler.java | 1 + .../network/proto_1_12_2/netty/handlers/StatusHandler.java | 4 ++-- .../proto_1_12_2/netty/wrappers/WrapperNetChannel.java | 6 +++--- 39 files changed, 45 insertions(+), 119 deletions(-) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/AnimationPacket.java (85%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/ChatMessageClientPacket.java (77%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/ClientSettingsPacket.java (92%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/EntityActionPacket.java (96%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/HandshakePacket.java (87%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/HeldItemChangePacket.java (72%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/LoginStartPacket.java (77%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/PlayerBlockPlacementPacket.java (94%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/PlayerDiggingPacket.java (96%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/PlayerLookPacket.java (89%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/PlayerPositionPacket.java (90%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/StatusRequestPacket.java (70%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/TabCompletePacket.java (94%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => clientside}/TeleportConfirmPacket.java (77%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/BossBarPacket.java (96%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/ChangeGameState.java (91%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/ChatMessageServerPacket.java (87%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/ChunkDataPacket.java (99%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/DisconnectPacket.java (84%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/EncryptionRequestPacket.java (87%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/JoinGamePacket.java (89%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/LoginSuccessPacket.java (84%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/PlayerListHeaderAndFooterPacket.java (90%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/PlayerListItemPacket.java (96%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/SpawnPositionPacket.java (93%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/StatusResponsePacket.java (93%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/TimeUpdatePacket.java (83%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/TitlePacket.java (97%) rename proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/{ => serverside}/UnloadChunkPacket.java (85%) diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java index a548a3d..b49e602 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-08 - */ package mc.core.network.proto_1_12_2; import com.google.common.collect.ImmutableMap; @@ -11,6 +7,8 @@ import lombok.extern.slf4j.Slf4j; import mc.core.network.CSPacket; import mc.core.network.SCPacket; import mc.core.network.proto_1_12_2.packets.*; +import mc.core.network.proto_1_12_2.packets.clientside.*; +import mc.core.network.proto_1_12_2.packets.serverside.*; import java.util.Map; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/AnimationPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java similarity index 85% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/AnimationPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java index be82f07..27899bb 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/AnimationPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-06-17 */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import mc.core.network.CSPacket; import mc.core.network.NetInputStream; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageClientPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ChatMessageClientPacket.java similarity index 77% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageClientPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ChatMessageClientPacket.java index 70aa84a..2388a18 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageClientPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ChatMessageClientPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-17 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.ToString; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ClientSettingsPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ClientSettingsPacket.java similarity index 92% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ClientSettingsPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ClientSettingsPacket.java index 6cb98bd..19588cb 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ClientSettingsPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/ClientSettingsPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EntityActionPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java similarity index 96% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EntityActionPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java index 0e02a01..ed53d63 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EntityActionPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java @@ -1,4 +1,4 @@ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HandshakePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HandshakePacket.java similarity index 87% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HandshakePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HandshakePacket.java index a0a2ab2..5d8ba26 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HandshakePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HandshakePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HeldItemChangePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HeldItemChangePacket.java similarity index 72% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HeldItemChangePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HeldItemChangePacket.java index ca9f073..99ea558 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/HeldItemChangePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/HeldItemChangePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-17 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import mc.core.network.CSPacket; import mc.core.network.NetInputStream; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginStartPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/LoginStartPacket.java similarity index 77% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginStartPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/LoginStartPacket.java index e3654c7..7c98c8f 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginStartPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/LoginStartPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.ToString; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerBlockPlacementPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java similarity index 94% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerBlockPlacementPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java index b9c2a2e..8715253 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerBlockPlacementPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java @@ -1,4 +1,4 @@ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.ToString; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerDiggingPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java similarity index 96% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerDiggingPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java index 341ca67..469dbe7 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerDiggingPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java @@ -1,4 +1,4 @@ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerLookPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerLookPacket.java similarity index 89% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerLookPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerLookPacket.java index b21e14b..a607038 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerLookPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerLookPacket.java @@ -1,4 +1,4 @@ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import mc.core.network.CSPacket; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerPositionPacket.java similarity index 90% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerPositionPacket.java index 986af29..78b18e1 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerPositionPacket.java @@ -1,4 +1,4 @@ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import mc.core.network.CSPacket; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusRequestPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/StatusRequestPacket.java similarity index 70% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusRequestPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/StatusRequestPacket.java index b57c56a..ab96afc 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusRequestPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/StatusRequestPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.ToString; import mc.core.network.CSPacket; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TabCompletePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java similarity index 94% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TabCompletePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java index 4e1082e..a14d28f 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TabCompletePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-06-17 */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import mc.core.network.CSPacket; import mc.core.network.NetInputStream; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TeleportConfirmPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TeleportConfirmPacket.java similarity index 77% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TeleportConfirmPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TeleportConfirmPacket.java index 356b6a3..6eb009e 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TeleportConfirmPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TeleportConfirmPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-12 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.clientside; import lombok.Getter; import lombok.ToString; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/BossBarPacket.java similarity index 96% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/BossBarPacket.java index 803d925..5eef306 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/BossBarPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-07-12 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChangeGameState.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java similarity index 91% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChangeGameState.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java index e4d1169..0a3c1cf 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChangeGameState.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-07-27 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChatMessageServerPacket.java similarity index 87% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChatMessageServerPacket.java index 305ec8a..bb465a5 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChatMessageServerPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-24 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChunkDataPacket.java similarity index 99% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChunkDataPacket.java index 9f19bf1..55d0d7a 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChunkDataPacket.java @@ -1,4 +1,4 @@ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import com.flowpowered.nbt.CompoundTag; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/DisconnectPacket.java similarity index 84% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/DisconnectPacket.java index 2f811ac..aa9d0a6 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/DisconnectPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EncryptionRequestPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java similarity index 87% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EncryptionRequestPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java index 33a2f54..d5ad7d4 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/EncryptionRequestPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/JoinGamePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/JoinGamePacket.java similarity index 89% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/JoinGamePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/JoinGamePacket.java index 6000085..2772287 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/JoinGamePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/JoinGamePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginSuccessPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/LoginSuccessPacket.java similarity index 84% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginSuccessPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/LoginSuccessPacket.java index 376d7a1..62faf07 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/LoginSuccessPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/LoginSuccessPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListHeaderAndFooterPacket.java similarity index 90% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListHeaderAndFooterPacket.java index 21f1a2e..3d9780a 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListHeaderAndFooterPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-07-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.Setter; import lombok.ToString; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListItemPacket.java similarity index 96% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListItemPacket.java index b2766fc..6699865 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/PlayerListItemPacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-07-11 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.*; import lombok.extern.slf4j.Slf4j; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/SpawnPositionPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/SpawnPositionPacket.java similarity index 93% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/SpawnPositionPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/SpawnPositionPacket.java index 2b3eb6e..0aa379f 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/SpawnPositionPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/SpawnPositionPacket.java @@ -1,4 +1,4 @@ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusResponsePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/StatusResponsePacket.java similarity index 93% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusResponsePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/StatusResponsePacket.java index 3505581..15a4352 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/StatusResponsePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/StatusResponsePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-10 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import com.google.gson.JsonObject; import lombok.Setter; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TimeUpdatePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TimeUpdatePacket.java similarity index 83% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TimeUpdatePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TimeUpdatePacket.java index e17160e..dedda2e 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TimeUpdatePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TimeUpdatePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-24 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TitlePacket.java similarity index 97% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TitlePacket.java index a85045a..f829b5a 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/TitlePacket.java @@ -1,8 +1,4 @@ -/* - * DmitriyMX - * 2018-06-24 - */ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/UnloadChunkPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/UnloadChunkPacket.java similarity index 85% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/UnloadChunkPacket.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/UnloadChunkPacket.java index 5bcfe15..4fdbea5 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/UnloadChunkPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/UnloadChunkPacket.java @@ -1,4 +1,4 @@ -package mc.core.network.proto_1_12_2.packets; +package mc.core.network.proto_1_12_2.packets.serverside; import lombok.Setter; import mc.core.network.NetOutputStream; diff --git a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java index 5f4e772..0089bc7 100644 --- a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java +++ b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java @@ -4,6 +4,7 @@ import com.flowpowered.nbt.*; import javafx.util.Pair; import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream; import mc.core.network.proto_1_12_2.packets.DumbChunkData.DumbChunkSection; +import mc.core.network.proto_1_12_2.packets.serverside.ChunkDataPacket; import mc.core.world.Biome; import mc.core.world.block.*; import mc.core.world.chunk.Chunk; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java index d17cba5..44590c4 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/NettyServer.java @@ -15,7 +15,7 @@ import mc.core.eventbus.EventBus; import mc.core.network.Server; import mc.core.network.StartServerException; import mc.core.network.proto_1_12_2.State; -import mc.core.network.proto_1_12_2.packets.StatusResponsePacket; +import mc.core.network.proto_1_12_2.packets.serverside.StatusResponsePacket; import mc.core.player.Player; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketDecoder.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketDecoder.java index 585a88d..2e0ee69 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketDecoder.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketDecoder.java @@ -47,7 +47,7 @@ public class PacketDecoder extends ReplayingDecoder { Class packetClass = state.getClientSidePacket(packetId); if (packetClass == null) { - log.warn("Unknown packet: {}:0x{}", state.name(), hexPacketId); + log.warn("Unknown packet: {}:0x{}", state.name(), hexPacketId); //TODO in.skipBytes(leftDataPacket); } else { netStream.setDataSize(leftDataPacket); diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java index 5602221..927ac82 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java @@ -7,9 +7,9 @@ import mc.core.eventbus.events.SC_ChunkUnloadEvent; import mc.core.eventbus.events.SC_PlayerMoveEvent; import mc.core.network.NetChannel; 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.serverside.ChunkDataPacket; import mc.core.network.proto_1_12_2.packets.PlayerPositionAndLookPacket; -import mc.core.network.proto_1_12_2.packets.UnloadChunkPacket; +import mc.core.network.proto_1_12_2.packets.serverside.UnloadChunkPacket; import mc.core.utils.CompactedCoords; import mc.core.world.chunk.Chunk; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java index 3ff9af1..b9d441f 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java @@ -7,7 +7,7 @@ package mc.core.network.proto_1_12_2.netty.handlers; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import mc.core.network.proto_1_12_2.State; -import mc.core.network.proto_1_12_2.packets.HandshakePacket; +import mc.core.network.proto_1_12_2.packets.clientside.HandshakePacket; import org.springframework.stereotype.Component; import static mc.core.network.proto_1_12_2.netty.NettyServer.ATTR_STATE; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java index c0ced7f..897e195 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java @@ -9,6 +9,8 @@ import mc.core.network.proto_1_12_2.TeleportManager; import mc.core.network.proto_1_12_2.netty.KeepAliveThread; import mc.core.network.proto_1_12_2.netty.wrappers.WrapperNetChannel; import mc.core.network.proto_1_12_2.packets.*; +import mc.core.network.proto_1_12_2.packets.clientside.LoginStartPacket; +import mc.core.network.proto_1_12_2.packets.serverside.*; import mc.core.player.Player; import mc.core.player.PlayerManager; import mc.core.player.PlayerMode; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java index c1675ba..90c4ce5 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayHandler.java @@ -8,6 +8,7 @@ import mc.core.eventbus.EventBus; 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.network.proto_1_12_2.packets.clientside.*; import mc.core.player.Player; import mc.core.player.PlayerSettings; import org.springframework.beans.factory.annotation.Autowired; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java index 10c48fc..ede6451 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java @@ -7,8 +7,8 @@ package mc.core.network.proto_1_12_2.netty.handlers; import io.netty.channel.Channel; import mc.core.Config; import mc.core.network.proto_1_12_2.packets.PingPacket; -import mc.core.network.proto_1_12_2.packets.StatusRequestPacket; -import mc.core.network.proto_1_12_2.packets.StatusResponsePacket; +import mc.core.network.proto_1_12_2.packets.clientside.StatusRequestPacket; +import mc.core.network.proto_1_12_2.packets.serverside.StatusResponsePacket; import mc.core.player.PlayerManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java index 960297a..fd1b837 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java @@ -9,9 +9,9 @@ import lombok.RequiredArgsConstructor; 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.TimeUpdatePacket; -import mc.core.network.proto_1_12_2.packets.TitlePacket; +import mc.core.network.proto_1_12_2.packets.serverside.ChatMessageServerPacket; +import mc.core.network.proto_1_12_2.packets.serverside.TimeUpdatePacket; +import mc.core.network.proto_1_12_2.packets.serverside.TitlePacket; import mc.core.text.Text; import mc.core.text.Title; From 500b52e83a46c27c49a72516567df1f25a9907f3 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 22:30:51 +0300 Subject: [PATCH 10/15] =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BD=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D0=B5=20=D0=BF=D0=B0=D0=BA=D0=B5?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/core/network/proto_1_12_2/State.java | 6 -- .../packets/clientside/AnimationPacket.java | 17 ------ .../clientside/EntityActionPacket.java | 45 --------------- .../PlayerBlockPlacementPacket.java | 30 ---------- .../clientside/PlayerDiggingPacket.java | 55 ------------------- .../packets/clientside/TabCompletePacket.java | 33 ----------- .../packets/serverside/ChangeGameState.java | 32 ----------- .../serverside/EncryptionRequestPacket.java | 28 ---------- 8 files changed, 246 deletions(-) delete mode 100644 proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java delete mode 100644 proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java delete mode 100644 proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java delete mode 100644 proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java delete mode 100644 proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java delete mode 100644 proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java delete mode 100644 proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java index b49e602..152dfcb 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/State.java @@ -70,7 +70,6 @@ public enum State { PLAY(3, ImmutableMap.>builder() .put(0x00, TeleportConfirmPacket.class) - .put(0x01, TabCompletePacket.class) .put(0x02, ChatMessageClientPacket.class) .put(0x04, ClientSettingsPacket.class) .put(0x09, PluginMessagePacket.class) @@ -79,18 +78,13 @@ public enum State { .put(0x0E, PlayerPositionAndLookPacket.class) .put(0x0F, PlayerLookPacket.class) .put(0x13, PlayerAbilitiesPacket.class) - .put(0x14, PlayerDiggingPacket.class) - .put(0x15, EntityActionPacket.class) .put(0x1A, HeldItemChangePacket.class) - .put(0x1D, AnimationPacket.class) - .put(0x1F, PlayerBlockPlacementPacket.class) .build(), ImmutableMap., Integer>builder() .put(BossBarPacket.class, 0x0C) .put(ChatMessageServerPacket.class, 0x0F) .put(PluginMessagePacket.class, 0x18) .put(UnloadChunkPacket.class, 0x1D) - .put(ChangeGameState.class, 0x1E) .put(KeepAlivePacket.class, 0x1F) .put(ChunkDataPacket.class, 0x20) .put(JoinGamePacket.class, 0x23) diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java deleted file mode 100644 index 27899bb..0000000 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/AnimationPacket.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * DmitriyMX - * 2018-06-17 - */ -package mc.core.network.proto_1_12_2.packets.clientside; - -import mc.core.network.CSPacket; -import mc.core.network.NetInputStream; - -public class AnimationPacket implements CSPacket { - private int handAnimation; - - @Override - public void readSelf(NetInputStream netStream) { - this.handAnimation = netStream.readVarInt(); - } -} diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java deleted file mode 100644 index ed53d63..0000000 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/EntityActionPacket.java +++ /dev/null @@ -1,45 +0,0 @@ -package mc.core.network.proto_1_12_2.packets.clientside; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import mc.core.network.CSPacket; -import mc.core.network.NetInputStream; - -import java.util.Arrays; - -@Getter -public class EntityActionPacket implements CSPacket { - @RequiredArgsConstructor - public enum Action { - START_SNEAKING(0), - STOP_SNEAKING(1), - LEAVE_BED(2), // Leave bed is only sent when the “Leave Bed” button is clicked on the sleep GUI, not when waking up due today time. - START_SPRINTING(3), - STOP_SPRINTING(4), - START_JUMP_WITH_HORSE(5), - STOP_JUMP_WITH_HORSE(6), - OPEN_HORSE_INVENTORY(7), // Open horse inventory is only sent when pressing the inventory key (default: E) while on a horse — all other methods of opening a horse's inventory (involving right-clicking or shift-right-clicking it) do not use this packet. - START_FLYING_WITH_ELYTRA(8); - - public static Action getById(final int id) { - return Arrays.stream(Action.values()) - .filter(action -> action.id == id) - .findFirst() - .orElse(null); - } - - @Getter - private final int id; - } - - private int entityId; - private Action action; - private int jumpBoost; // Only used by the “start jump with horse” action, in which case it ranges from 0 to 100. In all other cases it is 0. - - @Override - public void readSelf(NetInputStream netStream) { - entityId = netStream.readVarInt(); - action = Action.getById(netStream.readVarInt()); - jumpBoost = netStream.readVarInt(); - } -} diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java deleted file mode 100644 index 8715253..0000000 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerBlockPlacementPacket.java +++ /dev/null @@ -1,30 +0,0 @@ -package mc.core.network.proto_1_12_2.packets.clientside; - -import lombok.Getter; -import lombok.ToString; -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 -public class PlayerBlockPlacementPacket implements CSPacket { - private BlockLocation location; - private Direction face; - /** true - main hand; false - off hand */ - private boolean hand; - private float cursorX, cursorY, cursorZ; - - @Override - public void readSelf(NetInputStream netStream) { - long compactedCoords = netStream.readLong(); - location = BlockLocationSerializer.fromLong(compactedCoords); - face = Direction.getById(netStream.readVarInt()); - hand = (netStream.readVarInt() == 1); - cursorX = netStream.readFloat(); - cursorY = netStream.readFloat(); - cursorZ = netStream.readFloat(); - } -} diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java deleted file mode 100644 index 469dbe7..0000000 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/PlayerDiggingPacket.java +++ /dev/null @@ -1,55 +0,0 @@ -package mc.core.network.proto_1_12_2.packets.clientside; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.ToString; -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; - -@Getter -@ToString -public class PlayerDiggingPacket implements CSPacket { - @RequiredArgsConstructor - public enum Status { - STARTED_DIGGING(0), - CANCELLED_DIGGING(1), - FINISHED_DIGGING(2), - DROP_ITEM_STACK(3), - DROP_ITEM(4), - /* Indicates that the currently held item should have its - * state updated such as eating food, pulling back bows, - * using buckets, etc. Location is always set to 0/0/0, - * Face is always set to -Y. - */ - SHOOT_ARROW(5), - FINISH_EATING(5), - SWAP_ITEM_IN_HAND(6); - - public static Status getById(final int id) { - return Arrays.stream(Status.values()) - .filter(status -> status.id == id) - .findFirst() - .orElse(null); - } - - @Getter - private final int id; - } - - private Status status; - private BlockLocation location; - private Direction face; - - @Override - public void readSelf(NetInputStream netStream) { - status = Status.getById(netStream.readVarInt()); - long compactCoord = netStream.readLong(); - location = BlockLocationSerializer.fromLong(compactCoord); - face = Direction.getById(netStream.readByte()); - } -} diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java deleted file mode 100644 index a14d28f..0000000 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/clientside/TabCompletePacket.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * DmitriyMX - * 2018-06-17 - */ -package mc.core.network.proto_1_12_2.packets.clientside; - -import mc.core.network.CSPacket; -import mc.core.network.NetInputStream; -import mc.core.world.block.BlockLocation; - -public class TabCompletePacket implements CSPacket { - private String text; - private boolean assumeCommand; - private boolean hasPosition; - private BlockLocation location; - - @Override - public void readSelf(NetInputStream netStream) { - this.text = netStream.readString(); - this.assumeCommand = netStream.readBoolean(); - this.hasPosition = netStream.readBoolean(); - - if (this.hasPosition) { - long compactValue = netStream.readLong(); - - double x = compactValue >> 38; - double y = (compactValue >> 26) & 0xFFF; - double z = compactValue << 38 >> 38; // is normal? - - this.location = new BlockLocation((int)x, (int)y, (int)z); //FIXME - } - } -} diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java deleted file mode 100644 index 0a3c1cf..0000000 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/ChangeGameState.java +++ /dev/null @@ -1,32 +0,0 @@ -package mc.core.network.proto_1_12_2.packets.serverside; - -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import mc.core.network.NetOutputStream; -import mc.core.network.SCPacket; - -@Setter -public class ChangeGameState implements SCPacket { - @RequiredArgsConstructor - public enum Reason { - INVALID_BED(0), // Would be used to switch between messages, but the only used message is 0 for invalid bed (wat?) - RAINING_END(1), - RAINING_BEGIN(2), - CHANGE_GAMEMODE(3), // 0: Survival, 1: Creative, 2: Adventure, 3: Spectator - ARROW_HITTING_PLAYER(6), // Appears to be played when an arrow strikes another player in Multiplayer - FADE_VALUE(7), // The current darkness value. 1 = Dark, 0 = Bright, Setting the value higher causes the game to change color and freeze - FADE_TIME(8), // Time in ticks for the sky to fade - GUARDIAN_APPEARANCE(10); // Play elder guardian mob appearance (effect and sound) - - private final int id; - } - - private Reason reason; - private float value; - - @Override - public void writeSelf(NetOutputStream netStream) { - netStream.writeUnsignedByte(reason.id); - netStream.writeFloat(value); - } -} diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java deleted file mode 100644 index d5ad7d4..0000000 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/serverside/EncryptionRequestPacket.java +++ /dev/null @@ -1,28 +0,0 @@ -package mc.core.network.proto_1_12_2.packets.serverside; - -import lombok.AllArgsConstructor; -import lombok.NoArgsConstructor; -import lombok.Setter; -import mc.core.network.NetOutputStream; -import mc.core.network.SCPacket; - -import java.security.PublicKey; - -@AllArgsConstructor -@NoArgsConstructor -@Setter -public class EncryptionRequestPacket implements SCPacket { - private String serverId; - private PublicKey publicKey; - private byte[] verifyToken; - - @Override - public void writeSelf(NetOutputStream netStream) { - netStream.writeString(serverId); - byte[] bytes = publicKey.getEncoded(); - netStream.writeVarInt(bytes.length); - netStream.writeBytes(bytes); - netStream.writeVarInt(verifyToken.length); - netStream.writeBytes(verifyToken); - } -} From 7c20c5b3436595746b41fed4fb11bb46e0232458 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 22:44:47 +0300 Subject: [PATCH 11/15] =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/mc/core/GameLoop.java | 2 +- .../mc/core/network/proto_1_12_2/netty/KeepAliveThread.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java index 7838fee..e5ad26d 100644 --- a/core/src/main/java/mc/core/GameLoop.java +++ b/core/src/main/java/mc/core/GameLoop.java @@ -22,7 +22,7 @@ public class GameLoop extends Thread { private TimeProcessor gameTimer; public GameLoop() { - super(); + super("Game Loop Thread"); setTps(20); setPercentWarnLowTps(5); } diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/KeepAliveThread.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/KeepAliveThread.java index 97fd7c4..9e02708 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/KeepAliveThread.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/KeepAliveThread.java @@ -14,6 +14,10 @@ public class KeepAliveThread extends Thread { @Setter private int interval = 10; + public KeepAliveThread() { + super("Keep-Alive Thread"); + } + public void notifyLock() { synchronized (lock) { lock.notify(); From b39c2dd56e185b7981a40130df89ecb8c2359abe Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 29 Jan 2019 23:23:09 +0300 Subject: [PATCH 12/15] fix: join player --- .../src/main/java/mc/core/h2db/H2PlayerManager.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/h2_playermanager/src/main/java/mc/core/h2db/H2PlayerManager.java b/h2_playermanager/src/main/java/mc/core/h2db/H2PlayerManager.java index 7db2b42..b22699c 100644 --- a/h2_playermanager/src/main/java/mc/core/h2db/H2PlayerManager.java +++ b/h2_playermanager/src/main/java/mc/core/h2db/H2PlayerManager.java @@ -15,10 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; +import java.util.*; @Slf4j @Component @@ -26,7 +23,7 @@ public class H2PlayerManager implements PlayerManager { @Setter @Autowired private H2PlayerService h2PlayerService; - private List playerList = Collections.synchronizedList(new ArrayList<>()); + private Set playerList = Collections.synchronizedSet(new HashSet<>()); @Override public Player createPlayer(String name, EntityLocation location, World world) { From 0c0bdffe397f146886addc26f1f161c9aff4ee22 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 30 Jan 2019 00:06:28 +0300 Subject: [PATCH 13/15] =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anvil-loader/build.gradle | 3 +-- core/build.gradle | 2 +- h2_playermanager/build.gradle | 2 +- proto_1.12.2/build.gradle | 2 +- proto_1.12.2_netty/build.gradle | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/anvil-loader/build.gradle b/anvil-loader/build.gradle index 2328060..eb29847 100644 --- a/anvil-loader/build.gradle +++ b/anvil-loader/build.gradle @@ -1,5 +1,4 @@ -group 'mc' -version '1.0-SNAPSHOT' +version '0.1' dependencies { /* Core */ diff --git a/core/build.gradle b/core/build.gradle index 1b923c1..dba539c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,4 +1,4 @@ -version '1.0-SNAPSHOT' +version '0.2' apply plugin: 'maven' apply plugin: 'application' diff --git a/h2_playermanager/build.gradle b/h2_playermanager/build.gradle index acdbf0c..8a27a2e 100644 --- a/h2_playermanager/build.gradle +++ b/h2_playermanager/build.gradle @@ -1,4 +1,4 @@ -version '1.0-SNAPSHOT' +version '0.1' ext { spring_data_version = '2.1.0.RELEASE' diff --git a/proto_1.12.2/build.gradle b/proto_1.12.2/build.gradle index 8e3a7e2..d443034 100644 --- a/proto_1.12.2/build.gradle +++ b/proto_1.12.2/build.gradle @@ -1,4 +1,4 @@ -version '1.0-SNAPSHOT' +version '0.1' dependencies { /* Core */ diff --git a/proto_1.12.2_netty/build.gradle b/proto_1.12.2_netty/build.gradle index 0e9cbf0..cfefd73 100644 --- a/proto_1.12.2_netty/build.gradle +++ b/proto_1.12.2_netty/build.gradle @@ -1,4 +1,4 @@ -version '1.0-SNAPSHOT' +version '0.1' ext { netty_version = '4.1.22.Final' From 03944e29003219d2cc5c2c7cc396fbd283ab65aa Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 30 Jan 2019 00:22:46 +0300 Subject: [PATCH 14/15] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20co?= =?UTF-8?q?pyright's?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/mc/core/Config.java | 4 ---- core/src/main/java/mc/core/GameLoop.java | 4 ---- core/src/main/java/mc/core/Main.java | 4 ---- core/src/main/java/mc/core/TpsWatcher.java | 4 ---- core/src/main/java/mc/core/chat/ChatProcessor.java | 4 ---- core/src/main/java/mc/core/chat/MessageType.java | 4 ---- core/src/main/java/mc/core/chat/SimpleChatProcessor.java | 4 ---- core/src/main/java/mc/core/embedded/ConfigFromSpring.java | 4 ---- core/src/main/java/mc/core/embedded/FakeServer.java | 4 ---- core/src/main/java/mc/core/network/BroadcastNetChannel.java | 4 ---- core/src/main/java/mc/core/network/CSPacket.java | 4 ---- core/src/main/java/mc/core/network/NetChannel.java | 4 ---- core/src/main/java/mc/core/network/SCPacket.java | 4 ---- core/src/main/java/mc/core/network/Server.java | 4 ---- core/src/main/java/mc/core/network/StartServerException.java | 4 ---- core/src/main/java/mc/core/player/Player.java | 4 ---- core/src/main/java/mc/core/player/PlayerMode.java | 4 ---- core/src/main/java/mc/core/player/PlayerSettings.java | 4 ---- core/src/main/java/mc/core/text/TextColor.java | 4 ---- core/src/main/java/mc/core/text/TextStyle.java | 4 ---- core/src/main/java/mc/core/text/TextTemplate.java | 4 ---- core/src/main/java/mc/core/text/Title.java | 4 ---- core/src/main/java/mc/core/time/AbstractTimeProcessor.java | 4 ---- core/src/main/java/mc/core/time/IdleTime.java | 4 ---- core/src/main/java/mc/core/time/RealTime.java | 4 ---- core/src/main/java/mc/core/time/TimePerTick.java | 4 ---- core/src/main/java/mc/core/time/TimeProcessor.java | 4 ---- .../java/mc/core/network/proto_1_12_2/TeleportManager.java | 4 ---- .../mc/core/network/proto_1_12_2/packets/KeepAlivePacket.java | 4 ---- .../java/mc/core/network/proto_1_12_2/packets/PingPacket.java | 4 ---- .../network/proto_1_12_2/packets/PlayerAbilitiesPacket.java | 4 ---- .../proto_1_12_2/packets/PlayerPositionAndLookPacket.java | 4 ---- .../network/proto_1_12_2/packets/PluginMessagePacket.java | 4 ---- .../proto_1_12_2/serializers/TextToStringConverter.java | 4 ---- .../mc/core/network/proto_1_12_2/netty/PacketEncoder.java | 4 ---- .../mc/core/network/proto_1_12_2/netty/PacketHandler.java | 4 ---- .../proto_1_12_2/netty/handlers/AbstractStateHandler.java | 4 ---- .../network/proto_1_12_2/netty/handlers/HandshakeHandler.java | 4 ---- .../proto_1_12_2/netty/handlers/HandshakeStateHandler.java | 4 ---- .../proto_1_12_2/netty/handlers/LoginStateHandler.java | 4 ---- .../network/proto_1_12_2/netty/handlers/PlayStateHandler.java | 4 ---- .../network/proto_1_12_2/netty/handlers/StateHandler.java | 4 ---- .../network/proto_1_12_2/netty/handlers/StatusHandler.java | 4 ---- .../proto_1_12_2/netty/handlers/StatusStateHandler.java | 4 ---- .../proto_1_12_2/netty/wrappers/WrapperNetChannel.java | 4 ---- 45 files changed, 180 deletions(-) diff --git a/core/src/main/java/mc/core/Config.java b/core/src/main/java/mc/core/Config.java index 9e67fdc..d26aeed 100644 --- a/core/src/main/java/mc/core/Config.java +++ b/core/src/main/java/mc/core/Config.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-04-08 - */ package mc.core; public interface Config { diff --git a/core/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java index e5ad26d..be568e1 100644 --- a/core/src/main/java/mc/core/GameLoop.java +++ b/core/src/main/java/mc/core/GameLoop.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-04-21 - */ package mc.core; import lombok.Setter; diff --git a/core/src/main/java/mc/core/Main.java b/core/src/main/java/mc/core/Main.java index 211f210..19dcbb4 100644 --- a/core/src/main/java/mc/core/Main.java +++ b/core/src/main/java/mc/core/Main.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-03-25 - */ package mc.core; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/mc/core/TpsWatcher.java b/core/src/main/java/mc/core/TpsWatcher.java index 25c43e7..51d477b 100644 --- a/core/src/main/java/mc/core/TpsWatcher.java +++ b/core/src/main/java/mc/core/TpsWatcher.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-12 - */ package mc.core; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/mc/core/chat/ChatProcessor.java b/core/src/main/java/mc/core/chat/ChatProcessor.java index b4d6a36..fed5fbf 100644 --- a/core/src/main/java/mc/core/chat/ChatProcessor.java +++ b/core/src/main/java/mc/core/chat/ChatProcessor.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-05-06 - */ package mc.core.chat; import mc.core.player.Player; diff --git a/core/src/main/java/mc/core/chat/MessageType.java b/core/src/main/java/mc/core/chat/MessageType.java index c100632..667e45e 100644 --- a/core/src/main/java/mc/core/chat/MessageType.java +++ b/core/src/main/java/mc/core/chat/MessageType.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-24 - */ package mc.core.chat; import lombok.Getter; diff --git a/core/src/main/java/mc/core/chat/SimpleChatProcessor.java b/core/src/main/java/mc/core/chat/SimpleChatProcessor.java index 6964f16..7742cf6 100644 --- a/core/src/main/java/mc/core/chat/SimpleChatProcessor.java +++ b/core/src/main/java/mc/core/chat/SimpleChatProcessor.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-05-06 - */ package mc.core.chat; import lombok.extern.slf4j.Slf4j; diff --git a/core/src/main/java/mc/core/embedded/ConfigFromSpring.java b/core/src/main/java/mc/core/embedded/ConfigFromSpring.java index 86680f8..a91c9ae 100644 --- a/core/src/main/java/mc/core/embedded/ConfigFromSpring.java +++ b/core/src/main/java/mc/core/embedded/ConfigFromSpring.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-04-08 - */ package mc.core.embedded; import lombok.Getter; diff --git a/core/src/main/java/mc/core/embedded/FakeServer.java b/core/src/main/java/mc/core/embedded/FakeServer.java index 99e296f..4b288d5 100644 --- a/core/src/main/java/mc/core/embedded/FakeServer.java +++ b/core/src/main/java/mc/core/embedded/FakeServer.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-29 - */ package mc.core.embedded; import mc.core.network.Server; diff --git a/core/src/main/java/mc/core/network/BroadcastNetChannel.java b/core/src/main/java/mc/core/network/BroadcastNetChannel.java index ed15fab..46e4da5 100644 --- a/core/src/main/java/mc/core/network/BroadcastNetChannel.java +++ b/core/src/main/java/mc/core/network/BroadcastNetChannel.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-04-21 - */ package mc.core.network; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/mc/core/network/CSPacket.java b/core/src/main/java/mc/core/network/CSPacket.java index 4e8bb79..a5e4afa 100644 --- a/core/src/main/java/mc/core/network/CSPacket.java +++ b/core/src/main/java/mc/core/network/CSPacket.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-04-08 - */ package mc.core.network; /** diff --git a/core/src/main/java/mc/core/network/NetChannel.java b/core/src/main/java/mc/core/network/NetChannel.java index bfd6899..9714a02 100644 --- a/core/src/main/java/mc/core/network/NetChannel.java +++ b/core/src/main/java/mc/core/network/NetChannel.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-04-13 - */ package mc.core.network; import mc.core.chat.MessageType; diff --git a/core/src/main/java/mc/core/network/SCPacket.java b/core/src/main/java/mc/core/network/SCPacket.java index 2265331..f2d63e5 100644 --- a/core/src/main/java/mc/core/network/SCPacket.java +++ b/core/src/main/java/mc/core/network/SCPacket.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-04-08 - */ package mc.core.network; /** diff --git a/core/src/main/java/mc/core/network/Server.java b/core/src/main/java/mc/core/network/Server.java index c419e65..5ff2178 100644 --- a/core/src/main/java/mc/core/network/Server.java +++ b/core/src/main/java/mc/core/network/Server.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-03-25 - */ package mc.core.network; public interface Server { diff --git a/core/src/main/java/mc/core/network/StartServerException.java b/core/src/main/java/mc/core/network/StartServerException.java index 5657ee6..f1b7fdc 100644 --- a/core/src/main/java/mc/core/network/StartServerException.java +++ b/core/src/main/java/mc/core/network/StartServerException.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-03-25 - */ package mc.core.network; public class StartServerException extends Exception { diff --git a/core/src/main/java/mc/core/player/Player.java b/core/src/main/java/mc/core/player/Player.java index eefe499..43b0dc3 100644 --- a/core/src/main/java/mc/core/player/Player.java +++ b/core/src/main/java/mc/core/player/Player.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-04-13 - */ package mc.core.player; import mc.core.EntityLocation; diff --git a/core/src/main/java/mc/core/player/PlayerMode.java b/core/src/main/java/mc/core/player/PlayerMode.java index cd6d1ed..8927b80 100644 --- a/core/src/main/java/mc/core/player/PlayerMode.java +++ b/core/src/main/java/mc/core/player/PlayerMode.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-05-06 - */ package mc.core.player; import lombok.Getter; diff --git a/core/src/main/java/mc/core/player/PlayerSettings.java b/core/src/main/java/mc/core/player/PlayerSettings.java index 8a7c03c..02b60d7 100644 --- a/core/src/main/java/mc/core/player/PlayerSettings.java +++ b/core/src/main/java/mc/core/player/PlayerSettings.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.player; import lombok.Getter; diff --git a/core/src/main/java/mc/core/text/TextColor.java b/core/src/main/java/mc/core/text/TextColor.java index 98c3214..56e3b16 100644 --- a/core/src/main/java/mc/core/text/TextColor.java +++ b/core/src/main/java/mc/core/text/TextColor.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-11 - */ package mc.core.text; import lombok.Getter; diff --git a/core/src/main/java/mc/core/text/TextStyle.java b/core/src/main/java/mc/core/text/TextStyle.java index f0afe98..9c5faca 100644 --- a/core/src/main/java/mc/core/text/TextStyle.java +++ b/core/src/main/java/mc/core/text/TextStyle.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-11 - */ package mc.core.text; import lombok.Getter; diff --git a/core/src/main/java/mc/core/text/TextTemplate.java b/core/src/main/java/mc/core/text/TextTemplate.java index 1e9600f..87d4a70 100644 --- a/core/src/main/java/mc/core/text/TextTemplate.java +++ b/core/src/main/java/mc/core/text/TextTemplate.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-13 - */ package mc.core.text; import com.google.common.collect.ImmutableList; diff --git a/core/src/main/java/mc/core/text/Title.java b/core/src/main/java/mc/core/text/Title.java index 7715b4c..2a116fd 100644 --- a/core/src/main/java/mc/core/text/Title.java +++ b/core/src/main/java/mc/core/text/Title.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-24 - */ package mc.core.text; import lombok.Getter; diff --git a/core/src/main/java/mc/core/time/AbstractTimeProcessor.java b/core/src/main/java/mc/core/time/AbstractTimeProcessor.java index cff6079..09d7e9b 100644 --- a/core/src/main/java/mc/core/time/AbstractTimeProcessor.java +++ b/core/src/main/java/mc/core/time/AbstractTimeProcessor.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-24 - */ package mc.core.time; public abstract class AbstractTimeProcessor implements TimeProcessor { diff --git a/core/src/main/java/mc/core/time/IdleTime.java b/core/src/main/java/mc/core/time/IdleTime.java index b4be15d..e3bbacc 100644 --- a/core/src/main/java/mc/core/time/IdleTime.java +++ b/core/src/main/java/mc/core/time/IdleTime.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-05-01 - */ package mc.core.time; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/mc/core/time/RealTime.java b/core/src/main/java/mc/core/time/RealTime.java index 5b5158f..cd56518 100644 --- a/core/src/main/java/mc/core/time/RealTime.java +++ b/core/src/main/java/mc/core/time/RealTime.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-05-01 - */ package mc.core.time; import java.util.Calendar; diff --git a/core/src/main/java/mc/core/time/TimePerTick.java b/core/src/main/java/mc/core/time/TimePerTick.java index 02dc756..0871b62 100644 --- a/core/src/main/java/mc/core/time/TimePerTick.java +++ b/core/src/main/java/mc/core/time/TimePerTick.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-05-01 - */ package mc.core.time; public class TimePerTick extends AbstractTimeProcessor { diff --git a/core/src/main/java/mc/core/time/TimeProcessor.java b/core/src/main/java/mc/core/time/TimeProcessor.java index 93f5547..31f3bba 100644 --- a/core/src/main/java/mc/core/time/TimeProcessor.java +++ b/core/src/main/java/mc/core/time/TimeProcessor.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-05-01 - */ package mc.core.time; public interface TimeProcessor { diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/TeleportManager.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/TeleportManager.java index ba9cd07..50a15da 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/TeleportManager.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/TeleportManager.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2; import lombok.AllArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/KeepAlivePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/KeepAlivePacket.java index bb4ed23..4febdd3 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/KeepAlivePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/KeepAlivePacket.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.packets; import lombok.AllArgsConstructor; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PingPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PingPacket.java index 3f63723..c567838 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PingPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PingPacket.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-10 - */ package mc.core.network.proto_1_12_2.packets; import lombok.ToString; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerAbilitiesPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerAbilitiesPacket.java index 6258bc5..dbb8b74 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerAbilitiesPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerAbilitiesPacket.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-11 - */ package mc.core.network.proto_1_12_2.packets; import lombok.Getter; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionAndLookPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionAndLookPacket.java index 3c783a7..99b11df 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionAndLookPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionAndLookPacket.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-11 - */ package mc.core.network.proto_1_12_2.packets; import lombok.Getter; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PluginMessagePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PluginMessagePacket.java index cef386f..fe8763c 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PluginMessagePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PluginMessagePacket.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-11 - */ package mc.core.network.proto_1_12_2.packets; import lombok.*; diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java index 2629f2e..68b2897 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-11 - */ package mc.core.network.proto_1_12_2.serializers; import com.google.gson.JsonArray; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java index 9dbc4a9..5198f01 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-10 - */ package mc.core.network.proto_1_12_2.netty; import io.netty.buffer.ByteBuf; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketHandler.java index 01b44ca..46a6549 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketHandler.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-10 - */ package mc.core.network.proto_1_12_2.netty; import com.google.common.collect.ImmutableList; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/AbstractStateHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/AbstractStateHandler.java index 5cb51d4..637e440 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/AbstractStateHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/AbstractStateHandler.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.netty.handlers; import com.google.common.collect.ImmutableMap; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java index b9d441f..58de87b 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeHandler.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.netty.handlers; import io.netty.channel.Channel; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeStateHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeStateHandler.java index 1bf92e7..d36b7d8 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeStateHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/HandshakeStateHandler.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.netty.handlers; /** diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginStateHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginStateHandler.java index a51a626..60af6cc 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginStateHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginStateHandler.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.netty.handlers; /** diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayStateHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayStateHandler.java index 8f05c0f..d4486fb 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayStateHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/PlayStateHandler.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.netty.handlers; /** diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StateHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StateHandler.java index c853d62..45c00e1 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StateHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StateHandler.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.netty.handlers; import io.netty.channel.Channel; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java index ede6451..7afc730 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusHandler.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.netty.handlers; import io.netty.channel.Channel; diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusStateHandler.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusStateHandler.java index 38d77f2..b306f6d 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusStateHandler.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/StatusStateHandler.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.netty.handlers; /** diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java index fd1b837..f1c5af4 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/wrappers/WrapperNetChannel.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2018-06-23 - */ package mc.core.network.proto_1_12_2.netty.wrappers; import io.netty.channel.Channel; From 5bf1ac1b84b76a4f51381782a8fe74b5ec1e63b2 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 30 Jan 2019 00:08:07 +0300 Subject: [PATCH 15/15] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 35 +++++++++ anvil-loader/README.MD | 5 ++ anvil-loader/sample-config.xml | 28 ++++++++ core/README.MD | 104 +++++++++++++++++++-------- core/sample-config.xml | 28 ++++++++ h2_playermanager/README.MD | 5 ++ h2_playermanager/sample-config.xml | 39 ++++++++++ proto_1.12.2/README.MD | 3 + proto_1.12.2_netty/README.MD | 7 ++ proto_1.12.2_netty/sample-config.xml | 24 +++++++ 10 files changed, 249 insertions(+), 29 deletions(-) create mode 100644 README.MD create mode 100644 anvil-loader/README.MD create mode 100644 anvil-loader/sample-config.xml create mode 100644 core/sample-config.xml create mode 100644 h2_playermanager/README.MD create mode 100644 h2_playermanager/sample-config.xml create mode 100644 proto_1.12.2/README.MD create mode 100644 proto_1.12.2_netty/README.MD create mode 100644 proto_1.12.2_netty/sample-config.xml diff --git a/README.MD b/README.MD new file mode 100644 index 0000000..4f0e682 --- /dev/null +++ b/README.MD @@ -0,0 +1,35 @@ +# MC-CORE + +![version: v0.2](https://img.shields.io/badge/version-v0.2-000.svg?style=flat) +![codename: LIMBO](https://img.shields.io/badge/codename-LIMBO-B00.svg?style=flat) + +Модульный **Minecraft** сервер. + +## Модули + +* **Core** - ядро сервера +* **Proto 1.12.2** - описание протокола версии [1.12.2 (340)](https://wiki.vg/index.php?title=Protocol&oldid=14204) +* **Proto 1.12.2 Netty** - реализация протокола на сетевом движке [Netty.IO](https://netty.io/) +* **H2 Player manager** - хранение данных игроков в [H2 Database](http://www.h2database.com/) +* **Simple world** - реализация простго генератора плоского (flat) мира +* **Anvil loader** - загрузчик "ванильных" (vanilla, ["Anvil"](https://minecraft.gamepedia.com/Anvil_file_format)) карт Minecraft + +## Сборка + +``` +gradle jar +``` + +Так же можно собрать все необходимые библиотеки в "кучу": + +``` +gradle copyDep +``` + +Или сразу развернув сервер где надо: + +``` +gradle deploy -Ddeploy=path/to/folder -DcreateRunScript=true +``` + +`createRunScript` - указание этого параметра создаст скрипт-запускатор \ No newline at end of file diff --git a/anvil-loader/README.MD b/anvil-loader/README.MD new file mode 100644 index 0000000..a3751b9 --- /dev/null +++ b/anvil-loader/README.MD @@ -0,0 +1,5 @@ +# Anvil loader + +Загрузчик "ванильных" (vanilla, ["Anvil"](https://minecraft.gamepedia.com/Anvil_file_format)) карт Minecraft. + +Пример настройки можно посмотреть в файле `sample-config.xml` diff --git a/anvil-loader/sample-config.xml b/anvil-loader/sample-config.xml new file mode 100644 index 0000000..e2a0636 --- /dev/null +++ b/anvil-loader/sample-config.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/README.MD b/core/README.MD index cd77165..59b1fb7 100644 --- a/core/README.MD +++ b/core/README.MD @@ -1,42 +1,100 @@ # Core -Ядро сервера +Ядро сервера. + +Пример настройки можно посмотреть в файле `sample-config.xml`. ## Spring beans -### ConfigFromSpring +### Разное -Implements: `mc.core.Config` +#### CoreEventListener -Bean: +Стандартный обработчик системных событий. + +**Bean example:** + +```xml + +``` + +#### ConfigFromSpring + +Настройка параметров сервера через конфигурацию "спринга". + +Имеются следующие настройки: +* `descriptionServer` - описание сервера (aka "Motd") +* `favicon` - файл с иконкой сервера +* `maxPlayers` - максимальная вместимость сервера + +**Implements:** `mc.core.Config` + +**Bean example:** ```xml - + ``` -### IdleTime +#### GameLoop -Implements: `mc.core.time.TimeProcessor` +**Bean example:** -Bean: +Доступные параметры: +* `gameTimer` - бин, управляющий ходом времени +* `percentWarnLowTps` - порог "низкого" значения TPS, в процентах + +```xml + + + + +``` + +#### SimpleChatProcessor + +Простой обработчик чата. + +**Implements:** `mc.core.chat.ChatProcessor` + +**Bean example:** + +```xml + +``` + +### Время + +#### IdleTime + +Игровое время суток застывает на указанной отметке. + +Доступные параметры: +* `gameTime` - отметка времени (long) + +**Implements:** `mc.core.time.TimeProcessor` + +**Bean example:** ```xml - + ``` -в качестве параметра конструктора указывается стартовое время. +#### TimePerTick -### TimePerTick +Игровое время суток соответствует игровым тикам (20 tps) -Implements: `mc.core.time.TimeProcessor` +Доступные параметры: +* `startGameTime` - стартовое время (long) -Bean: +**Implements:** `mc.core.time.TimeProcessor` + +**Bean example:** ```xml @@ -44,26 +102,14 @@ Bean: ``` -в качестве параметра указывается стартовое время. +#### RealTime -### RealTime +Игровое время суток соответствует реальному времени -Implements: `mc.core.time.TimeProcessor` +**Implements:** `mc.core.time.TimeProcessor` -Bean: +**Bean example:** ```xml ``` - -### GameLoop - -Bean: - -```xml - - - -``` - -`gameTimer` - бин, управляющий ходом времени diff --git a/core/sample-config.xml b/core/sample-config.xml new file mode 100644 index 0000000..c474d8f --- /dev/null +++ b/core/sample-config.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/h2_playermanager/README.MD b/h2_playermanager/README.MD new file mode 100644 index 0000000..2f6b15c --- /dev/null +++ b/h2_playermanager/README.MD @@ -0,0 +1,5 @@ +# H2 Player manager + +Хранилище данных игроков на базе [H2 Database](http://www.h2database.com/). + +Пример настройки можно посмотреть в файле `sample-config.xml` diff --git a/h2_playermanager/sample-config.xml b/h2_playermanager/sample-config.xml new file mode 100644 index 0000000..2fe46ec --- /dev/null +++ b/h2_playermanager/sample-config.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + org.hibernate.dialect.H2Dialect + false + update + + + + + + + + \ No newline at end of file diff --git a/proto_1.12.2/README.MD b/proto_1.12.2/README.MD new file mode 100644 index 0000000..5b7a85a --- /dev/null +++ b/proto_1.12.2/README.MD @@ -0,0 +1,3 @@ +# Protocol 1.12.2 + +Описание протокола версии [1.12.2 (340)](https://wiki.vg/index.php?title=Protocol&oldid=14204) diff --git a/proto_1.12.2_netty/README.MD b/proto_1.12.2_netty/README.MD new file mode 100644 index 0000000..92e9638 --- /dev/null +++ b/proto_1.12.2_netty/README.MD @@ -0,0 +1,7 @@ +# Protocol 1.12.2: Netty impl. + +Реализация протокола на сетевом движке [Netty.IO](https://netty.io/). + +Пример настройки можно посмотреть в файле `sample-config.xml` + + diff --git a/proto_1.12.2_netty/sample-config.xml b/proto_1.12.2_netty/sample-config.xml new file mode 100644 index 0000000..0ff4b97 --- /dev/null +++ b/proto_1.12.2_netty/sample-config.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file