From a143e79c25f06b3c1be1b7efdd38b36fe0df102a Mon Sep 17 00:00:00 2001 From: Bixilon Date: Fri, 2 Oct 2020 21:51:11 +0200 Subject: [PATCH] reformat code --- src/main/java/de/bixilon/minosoft/config/Configuration.java | 1 - .../modding/event/events/BlockBreakAnimationEvent.java | 1 - .../bixilon/minosoft/protocol/network/netty/NettyNetwork.java | 1 - .../bixilon/minosoft/protocol/network/netty/PacketDecoder.java | 1 - .../bixilon/minosoft/protocol/network/netty/PacketEncoder.java | 1 - .../protocol/packets/clientbound/play/PacketParticle.java | 1 - .../packets/clientbound/play/PacketScoreboardObjective.java | 3 --- .../de/bixilon/minosoft/protocol/protocol/InByteBuffer.java | 1 - src/main/java/de/bixilon/minosoft/util/ChunkUtil.java | 3 --- 9 files changed, 13 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/config/Configuration.java b/src/main/java/de/bixilon/minosoft/config/Configuration.java index afb53e4da..476ecab0f 100644 --- a/src/main/java/de/bixilon/minosoft/config/Configuration.java +++ b/src/main/java/de/bixilon/minosoft/config/Configuration.java @@ -151,7 +151,6 @@ public class Configuration { config.getAsJsonObject("servers").getAsJsonObject("entries").remove(String.valueOf(server.getId())); } - public void saveToFile() { thread.interrupt(); } diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/BlockBreakAnimationEvent.java b/src/main/java/de/bixilon/minosoft/modding/event/events/BlockBreakAnimationEvent.java index f06cb0291..face6d2d8 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/BlockBreakAnimationEvent.java +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/BlockBreakAnimationEvent.java @@ -24,7 +24,6 @@ public class BlockBreakAnimationEvent extends CancelableEvent { private final BlockPosition position; private final byte stage; - public BlockBreakAnimationEvent(Connection connection, int entityId, BlockPosition position, byte stage) { super(connection); this.entityId = entityId; diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/netty/NettyNetwork.java b/src/main/java/de/bixilon/minosoft/protocol/network/netty/NettyNetwork.java index 989009233..4b744846d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/netty/NettyNetwork.java +++ b/src/main/java/de/bixilon/minosoft/protocol/network/netty/NettyNetwork.java @@ -45,7 +45,6 @@ public class NettyNetwork implements Network { .channel(NioSocketChannel.class) .handler(new TCPClientChannelInitializer(connection, this)); - try { ChannelFuture channelFuture = clientBootstrap.connect(address.getHostname(), address.getPort()).sync(); if (channelFuture.isSuccess()) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/netty/PacketDecoder.java b/src/main/java/de/bixilon/minosoft/protocol/network/netty/PacketDecoder.java index eb9754d44..8e2898683 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/netty/PacketDecoder.java +++ b/src/main/java/de/bixilon/minosoft/protocol/network/netty/PacketDecoder.java @@ -13,7 +13,6 @@ package de.bixilon.minosoft.protocol.network.netty; - import de.bixilon.minosoft.logging.Log; import de.bixilon.minosoft.logging.LogLevels; import de.bixilon.minosoft.protocol.network.Connection; diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/netty/PacketEncoder.java b/src/main/java/de/bixilon/minosoft/protocol/network/netty/PacketEncoder.java index 35223b810..009aa7643 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/netty/PacketEncoder.java +++ b/src/main/java/de/bixilon/minosoft/protocol/network/netty/PacketEncoder.java @@ -13,7 +13,6 @@ package de.bixilon.minosoft.protocol.network.netty; - import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.packets.ServerboundPacket; import de.bixilon.minosoft.protocol.packets.serverbound.login.PacketEncryptionResponse; diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java index ad2fbc743..aafedbe28 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java @@ -36,7 +36,6 @@ public class PacketParticle implements ClientboundPacket { @Override public boolean read(InByteBuffer buffer) { if (buffer.getProtocolId() < 569) { - if (buffer.getProtocolId() < 17) { particleType = buffer.getConnection().getMapping().getParticleByIdentifier(buffer.readString()); } else { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardObjective.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardObjective.java index ce6db2437..4d8a50d9d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardObjective.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardObjective.java @@ -33,13 +33,10 @@ public class PacketScoreboardObjective implements ClientboundPacket { } action = ScoreboardObjectiveActions.byId(buffer.readByte()); if (action == ScoreboardObjectiveActions.CREATE || action == ScoreboardObjectiveActions.UPDATE) { - if (buffer.getProtocolId() >= 7) { // ToDo value = buffer.readTextComponent(); - } if (buffer.getProtocolId() >= 12) { - if (buffer.getProtocolId() >= 346 && buffer.getProtocolId() < 349) { // got removed in these 3 versions return true; diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.java index 7c3896c56..ba49c63d4 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.java @@ -309,7 +309,6 @@ public class InByteBuffer { public Slot readSlot() { if (protocolId < 402) { - short id = readShort(); if (id == -1) { return null; diff --git a/src/main/java/de/bixilon/minosoft/util/ChunkUtil.java b/src/main/java/de/bixilon/minosoft/util/ChunkUtil.java index a61606332..9dc88caa6 100644 --- a/src/main/java/de/bixilon/minosoft/util/ChunkUtil.java +++ b/src/main/java/de/bixilon/minosoft/util/ChunkUtil.java @@ -54,13 +54,11 @@ public final class ChunkUtil { HashMap nibbleMap = new HashMap<>(); for (byte c = 0; c < 16; c++) { // max sections per chunks in chunk column if (BitByte.isBitSet(sectionBitMask, c)) { - HashMap blockMap = new HashMap<>(); for (int nibbleY = 0; nibbleY < 16; nibbleY++) { for (int nibbleZ = 0; nibbleZ < 16; nibbleZ++) { for (int nibbleX = 0; nibbleX < 16; nibbleX++) { - short singeBlockId = (short) (blockTypes[arrayPos] & 0xFF); byte singleMeta; // get block meta and shift and add (merge) id if needed @@ -159,7 +157,6 @@ public final class ChunkUtil { for (int nibbleY = 0; nibbleY < 16; nibbleY++) { for (int nibbleZ = 0; nibbleZ < 16; nibbleZ++) { for (int nibbleX = 0; nibbleX < 16; nibbleX++) { - int blockNumber = (((nibbleY * 16) + nibbleZ) * 16) + nibbleX; int startLong = (blockNumber * palette.getBitsPerBlock()) / 64; int startOffset = (blockNumber * palette.getBitsPerBlock()) % 64;