diff --git a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/ACProtocol/AnotherStarAntiCheat.java b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/ACProtocol/AnotherStarAntiCheat.java index 3b149eb..d63307e 100644 --- a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/ACProtocol/AnotherStarAntiCheat.java +++ b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/ACProtocol/AnotherStarAntiCheat.java @@ -58,7 +58,7 @@ public class AnotherStarAntiCheat { private byte[] stcDecode(ByteBuf buf) { try { CompoundTag nbt = (CompoundTag) NBTIO.readTag(new DataInputStream(new ByteBufInputStream(buf))); - return ((ByteArrayTag) nbt.get("salt")).getValue(); + return ((ByteArrayTag) nbt.get("salt")).getValue(); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/CatAntiCheat/CatAntiCheat.java b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/CatAntiCheat/CatAntiCheat.java index 11e73ac..a443d90 100644 --- a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/CatAntiCheat/CatAntiCheat.java +++ b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/CatAntiCheat/CatAntiCheat.java @@ -40,7 +40,8 @@ public class CatAntiCheat { out.writeBytes(new byte[]{sendPacketID, 0, clientVersion, salt}); // LogUtil.doLog(0,"发送PluginMessage: " + "CatAntiCheat" + " | " + Arrays.toString(buf.toByteArray()), "CatAntiCheat"); session.send(new ClientPluginMessagePacket("CatAntiCheat", buf.toByteArray())); - } catch (IOException ignored) {} + } catch (IOException ignored) { + } break; case 1: // File Check packet reply @@ -87,7 +88,7 @@ public class CatAntiCheat { out.writeByte(sendPacketID); out.writeShort(foundClassList.size()); - for (String s:foundClassList) { + for (String s : foundClassList) { writeUTF8String(out, s); } @@ -156,7 +157,7 @@ public class CatAntiCheat { public static List getFileHashList(File filesDir) { List fileHashList = new ArrayList<>(); - for (File file: Objects.requireNonNull(filesDir.listFiles())) { + for (File file : Objects.requireNonNull(filesDir.listFiles())) { fileHashList.add(getFileHash(file)); } @@ -168,7 +169,8 @@ public class CatAntiCheat { try (InputStream in = Files.newInputStream(file.toPath())) { return calcHash(in) + "\0" + file.getName(); } - } catch (IOException ignored) { } + } catch (IOException ignored) { + } return null; } @@ -198,7 +200,7 @@ public class CatAntiCheat { } public static void writeVarInt(StreamNetOutput to, int toWrite) throws IOException { - while((toWrite & -128) != 0) { + while ((toWrite & -128) != 0) { to.writeByte(toWrite & 127 | 128); toWrite >>>= 7; } @@ -214,7 +216,8 @@ public class CatAntiCheat { ImageIO.write(bufferedImage, "png", gzipOutputStream); gzipOutputStream.flush(); gzipOutputStream.close(); - } catch (Exception ignored) {} + } catch (Exception ignored) { + } return out.toByteArray(); } diff --git a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForge.java b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForge.java index 58ae1e4..5a958c2 100644 --- a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForge.java +++ b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForge.java @@ -47,17 +47,17 @@ public class MCForge { public void handle(ServerPluginMessagePacket packet) { switch (packet.getChannel()) { - case "FML|HS": - this.handshake.handle(packet); - break; - case "REGISTER": - case "minecraft:register": // 1.13 - this.session.send(new ClientPluginMessagePacket(packet.getChannel(), packet.getData())); - break; - case "MC|Brand": - case "minecraft:brand": // 1.13 - this.session.send(new ClientPluginMessagePacket(packet.getChannel(), "fml,forge".getBytes())); - break; + case "FML|HS": + this.handshake.handle(packet); + break; + case "REGISTER": + case "minecraft:register": // 1.13 + this.session.send(new ClientPluginMessagePacket(packet.getChannel(), packet.getData())); + break; + case "MC|Brand": + case "minecraft:brand": // 1.13 + this.session.send(new ClientPluginMessagePacket(packet.getChannel(), "fml,forge".getBytes())); + break; } } diff --git a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShake.java b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShake.java index 6a8cc32..ec6fd03 100644 --- a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShake.java +++ b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShake.java @@ -10,5 +10,6 @@ public abstract class MCForgeHandShake { } public abstract void handle(Packet recvPacket); + public abstract String getFMLVersion(); } diff --git a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShakeV1.java b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShakeV1.java index 188de74..fc141ab 100644 --- a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShakeV1.java +++ b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShakeV1.java @@ -22,46 +22,46 @@ public class MCForgeHandShakeV1 extends MCForgeHandShake { int packetID = data[0]; switch (packetID) { - case 0: // Hello - sendPluginMessage(session, packet.getChannel(), new byte[] { 0x01, 0x02 }); + case 0: // Hello + sendPluginMessage(session, packet.getChannel(), new byte[]{0x01, 0x02}); - // ModList - ByteArrayOutputStream buf = new ByteArrayOutputStream(); - StreamNetOutput out = new StreamNetOutput(buf); - try { - out.writeVarInt(2); - out.writeByte(forge.modList.size()); - forge.modList.forEach((k, v) -> { - try { - out.writeString(k); - out.writeString(v); - } catch (IOException e) { - e.printStackTrace(); - } - }); - } catch (IOException e) { - e.printStackTrace(); - } - sendPluginMessage(session, packet.getChannel(), buf.toByteArray()); - break; - case 2: // ModList - sendPluginMessage(session, packet.getChannel(), new byte[] { -0x1, 0x02 }); // ACK(WAITING SERVER DATA) - break; - case 3: // RegistryData - sendPluginMessage(session, packet.getChannel(), new byte[] { -0x1, 0x03 }); // ACK(WAITING SERVER COMPLETE) - break; - case -1: // HandshakeAck - int ackID = data[1]; - switch (ackID) { - case 2: // WAITING CACK - sendPluginMessage(session, packet.getChannel(), new byte[] { -0x1, 0x04 }); // PENDING COMPLETE + // ModList + ByteArrayOutputStream buf = new ByteArrayOutputStream(); + StreamNetOutput out = new StreamNetOutput(buf); + try { + out.writeVarInt(2); + out.writeByte(forge.modList.size()); + forge.modList.forEach((k, v) -> { + try { + out.writeString(k); + out.writeString(v); + } catch (IOException e) { + e.printStackTrace(); + } + }); + } catch (IOException e) { + e.printStackTrace(); + } + sendPluginMessage(session, packet.getChannel(), buf.toByteArray()); break; - case 3: // COMPLETE - sendPluginMessage(session, packet.getChannel(), new byte[] { -0x1, 0x05 }); // COMPLETE + case 2: // ModList + sendPluginMessage(session, packet.getChannel(), new byte[]{-0x1, 0x02}); // ACK(WAITING SERVER DATA) break; + case 3: // RegistryData + sendPluginMessage(session, packet.getChannel(), new byte[]{-0x1, 0x03}); // ACK(WAITING SERVER COMPLETE) + break; + case -1: // HandshakeAck + int ackID = data[1]; + switch (ackID) { + case 2: // WAITING CACK + sendPluginMessage(session, packet.getChannel(), new byte[]{-0x1, 0x04}); // PENDING COMPLETE + break; + case 3: // COMPLETE + sendPluginMessage(session, packet.getChannel(), new byte[]{-0x1, 0x05}); // COMPLETE + break; + default: + } default: - } - default: } } diff --git a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShakeV2.java b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShakeV2.java index 59214b5..e317367 100644 --- a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShakeV2.java +++ b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeHandShakeV2.java @@ -124,7 +124,9 @@ public class MCForgeHandShakeV2 extends MCForgeHandShake { private String targetNetworkReceiver; private byte[] payload; - public LoginWrapper() {} + public LoginWrapper() { + } + public LoginWrapper(String targetNetworkReceiver, byte[] payload) { this.targetNetworkReceiver = targetNetworkReceiver; this.payload = payload; diff --git a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeMOTD.java b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeMOTD.java index 1659f0b..42dba21 100644 --- a/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeMOTD.java +++ b/AdvanceModule/src/cn/serendipityr/EndMinecraftPlusV2/AdvanceModule/MCForge/MCForgeMOTD.java @@ -18,7 +18,7 @@ public class MCForgeMOTD { Socket socket = new Socket(); try { socket.connect(new InetSocketAddress(ip, port)); - if(socket.isConnected()) { + if (socket.isConnected()) { DataOutputStream out = new DataOutputStream(socket.getOutputStream()); ByteArrayOutputStream packet = new ByteArrayOutputStream(); @@ -62,7 +62,8 @@ public class MCForgeMOTD { try { if (socket.isConnected()) socket.close(); - } catch (IOException ignored) {} + } catch (IOException ignored) { + } } return modList; } diff --git a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ConfigUtil.java b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ConfigUtil.java index 99edc88..640a41a 100644 --- a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ConfigUtil.java +++ b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ConfigUtil.java @@ -145,7 +145,7 @@ public class ConfigUtil { if (ReadFromFiles) { ForgeModList.putAll(readModInfo("mods")); } - for (String modInfo:config.getStringList("AdvancedSettings.ForgeSupport.ModList")) { + for (String modInfo : config.getStringList("AdvancedSettings.ForgeSupport.ModList")) { String modName = modInfo.split(":")[0]; String modVersion = modInfo.split(":")[1]; ForgeModList.put(modName, modVersion); @@ -234,7 +234,7 @@ public class ConfigUtil { return 0; } - LogUtil.doLog(0, "任务完成。转换前编码: " + currentCharset + " | 转换后编码: " + getFileCharset(configFile) , "CFGUtil"); + LogUtil.doLog(0, "任务完成。转换前编码: " + currentCharset + " | 转换后编码: " + getFileCharset(configFile), "CFGUtil"); } loadConfig(cfgVer); @@ -308,13 +308,13 @@ public class ConfigUtil { return charset; } - public static int convertFileCharset(File inputFile, File outputFile,String currentCharset ,String targetCharset) { + public static int convertFileCharset(File inputFile, File outputFile, String currentCharset, String targetCharset) { try { - InputStreamReader isr = new InputStreamReader(Files.newInputStream(inputFile.toPath()) ,currentCharset); - OutputStreamWriter osw = new OutputStreamWriter(Files.newOutputStream(outputFile.toPath()) ,targetCharset); + InputStreamReader isr = new InputStreamReader(Files.newInputStream(inputFile.toPath()), currentCharset); + OutputStreamWriter osw = new OutputStreamWriter(Files.newOutputStream(outputFile.toPath()), targetCharset); int len; - while((len = isr.read())!=-1){ + while ((len = isr.read()) != -1) { osw.write(len); } @@ -379,10 +379,10 @@ public class ConfigUtil { if (attribute != null) { String[] re = attribute.get().toString().split(" ", 4); LogUtil.doLog(0, "=============================================================", "CheckSRV"); - LogUtil.doLog(0,"域名: " + AttackAddress, "CheckSRV"); - LogUtil.doLog(0,"源地址: " + re[3], "CheckSRV"); - LogUtil.doLog(0,"源端口: " + re[2], "CheckSRV"); - LogUtil.doLog(-1,"检测到服务器存在SRV记录,是否替换地址为SRV解析记录?[y/n]: ", "CheckSRV"); + LogUtil.doLog(0, "域名: " + AttackAddress, "CheckSRV"); + LogUtil.doLog(0, "源地址: " + re[3], "CheckSRV"); + LogUtil.doLog(0, "源端口: " + re[2], "CheckSRV"); + LogUtil.doLog(-1, "检测到服务器存在SRV记录,是否替换地址为SRV解析记录?[y/n]: ", "CheckSRV"); Scanner scanner = new Scanner(System.in); String cmd = scanner.nextLine(); @@ -391,7 +391,8 @@ public class ConfigUtil { AttackPort = Integer.parseInt(re[2]); } } - } catch (Exception ignored) {} + } catch (Exception ignored) { + } } public static HashMap readModInfo(String directoryPath) { diff --git a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/DataUtil.java b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/DataUtil.java index 14a3676..d41baa2 100644 --- a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/DataUtil.java +++ b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/DataUtil.java @@ -12,7 +12,7 @@ import java.util.Scanner; public class DataUtil { public static boolean notModify = false; public static List botRegPasswords; - public static HashMap botRegPasswordsMap = new HashMap<>(); + public static HashMap botRegPasswordsMap = new HashMap<>(); public static void loadData() { File dataFile = new File("data.yml"); @@ -59,30 +59,31 @@ public class DataUtil { switch (ConfigUtil.RandomFlag) { case 2: - newBotName = ConfigUtil.BotName.replace("$rnd", OtherUtils.getRandomString_Ili(ConfigUtil.RandomMinLength,ConfigUtil.RandomMaxLength)); + newBotName = ConfigUtil.BotName.replace("$rnd", OtherUtils.getRandomString_Ili(ConfigUtil.RandomMinLength, ConfigUtil.RandomMaxLength)); break; case 3: - newBotName = ConfigUtil.BotName.replace("$rnd", OtherUtils.getRandomString_Abc(ConfigUtil.RandomMinLength,ConfigUtil.RandomMaxLength)); + newBotName = ConfigUtil.BotName.replace("$rnd", OtherUtils.getRandomString_Abc(ConfigUtil.RandomMinLength, ConfigUtil.RandomMaxLength)); break; case 4: - newBotName = ConfigUtil.BotName.replace("$rnd", OtherUtils.getRandomString_123(ConfigUtil.RandomMinLength,ConfigUtil.RandomMaxLength)); + newBotName = ConfigUtil.BotName.replace("$rnd", OtherUtils.getRandomString_123(ConfigUtil.RandomMinLength, ConfigUtil.RandomMaxLength)); break; case 1: default: - newBotName = ConfigUtil.BotName.replace("$rnd", OtherUtils.getRandomString(ConfigUtil.RandomMinLength,ConfigUtil.RandomMaxLength)); + newBotName = ConfigUtil.BotName.replace("$rnd", OtherUtils.getRandomString(ConfigUtil.RandomMinLength, ConfigUtil.RandomMaxLength)); break; } - String newBotPwd = OtherUtils.getRandomString(8,10); + String newBotPwd = OtherUtils.getRandomString(8, 10); botRegPasswords.add(newBotName + "@" + newBotPwd); } } - for (String PwdData:botRegPasswords) { + for (String PwdData : botRegPasswords) { try { String[] aPwdData = PwdData.split("@"); botRegPasswordsMap.put(aPwdData[0], aPwdData[1]); - } catch (Exception ignored) {} + } catch (Exception ignored) { + } } updateData(botRegPasswords); diff --git a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/OtherUtils.java b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/OtherUtils.java index afda034..d98e3c3 100644 --- a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/OtherUtils.java +++ b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/OtherUtils.java @@ -71,11 +71,11 @@ public class OtherUtils { } public static Integer getRandomInt(int min, int max) { - return (int)(Math.random()*(max-min+1)+min); + return (int) (Math.random() * (max - min + 1) + min); } public static float getRandomFloat(double min, double max) { - return (float) (Math.random()*(max-min)+min); + return (float) (Math.random() * (max - min) + min); } public static String getRandomUser(boolean isDoubleAttack) { diff --git a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/SetTitle.java b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/SetTitle.java index e16fc44..e6a5b37 100644 --- a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/SetTitle.java +++ b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/SetTitle.java @@ -6,5 +6,6 @@ import com.sun.jna.Platform; public interface SetTitle extends Library { SetTitle INSTANCE = Native.loadLibrary((Platform.isWindows() ? "kernel32" : "c"), SetTitle.class); + boolean SetConsoleTitleA(String title); } \ No newline at end of file diff --git a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotHandler.java b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotHandler.java index 50b9a53..d616eff 100644 --- a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotHandler.java +++ b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotHandler.java @@ -20,6 +20,7 @@ public interface BotHandler { boolean hasClientFlag(Object client, String flag); void setClientFlag(Object client, String flag, Object value); + Object getClientFlag(Object client, String flag); void setClientTimeout(Object client, int timeout); diff --git a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java index cdbd725..01d0dff 100644 --- a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java +++ b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java @@ -232,7 +232,7 @@ public class BotManager { @Override public void run() { - if (botHandler.hasClientFlag(client, "activity") && botHandler.getClientFlag(client,"activity").equals(true)) { + if (botHandler.hasClientFlag(client, "activity") && botHandler.getClientFlag(client, "activity").equals(true)) { return; } diff --git a/VersionSupport-P1_12_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_12_2/PacketHandler.java b/VersionSupport-P1_12_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_12_2/PacketHandler.java index c5cf36c..1106c08 100644 --- a/VersionSupport-P1_12_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_12_2/PacketHandler.java +++ b/VersionSupport-P1_12_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_12_2/PacketHandler.java @@ -181,7 +181,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl public boolean checkSpawnPlayerName(Object packet, String checkName) { ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet; - for (EntityMetadata metadata:playerPacket.getMetadata()) { + for (EntityMetadata metadata : playerPacket.getMetadata()) { if (metadata.getValue().toString().contains(checkName)) { return true; } @@ -347,7 +347,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -376,7 +376,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { Session session = ((Client) client).getSession(); ItemStack item = (ItemStack) itemStack; ClientWindowActionPacket windowActionPacket = new ClientWindowActionPacket(windowId, 6, slot, item, WindowAction.CLICK_ITEM, ClickItemParam.RIGHT_CLICK); diff --git a/VersionSupport-P1_13_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_13_X/PacketHandler.java b/VersionSupport-P1_13_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_13_X/PacketHandler.java index 38f9f3f..f9160f2 100644 --- a/VersionSupport-P1_13_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_13_X/PacketHandler.java +++ b/VersionSupport-P1_13_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_13_X/PacketHandler.java @@ -177,7 +177,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl public boolean checkSpawnPlayerName(Object packet, String checkName) { ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet; - for (EntityMetadata metadata:playerPacket.getMetadata()) { + for (EntityMetadata metadata : playerPacket.getMetadata()) { if (metadata.getValue().toString().contains(checkName)) { return true; } @@ -343,7 +343,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -372,7 +372,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { Session session = ((Client) client).getSession(); ItemStack item = (ItemStack) itemStack; ClientWindowActionPacket windowActionPacket = new ClientWindowActionPacket(windowId, 6, slot, item, WindowAction.CLICK_ITEM, ClickItemParam.RIGHT_CLICK); diff --git a/VersionSupport-P1_14_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_14_X/PacketHandler.java b/VersionSupport-P1_14_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_14_X/PacketHandler.java index 5be53d6..b098cde 100644 --- a/VersionSupport-P1_14_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_14_X/PacketHandler.java +++ b/VersionSupport-P1_14_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_14_X/PacketHandler.java @@ -170,7 +170,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl public boolean checkSpawnPlayerName(Object packet, String checkName) { ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet; - for (EntityMetadata metadata:playerPacket.getMetadata()) { + for (EntityMetadata metadata : playerPacket.getMetadata()) { if (metadata.getValue().toString().contains(checkName)) { return true; } @@ -335,7 +335,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -364,7 +364,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { Session session = ((Client) client).getSession(); ItemStack item = (ItemStack) itemStack; ClientWindowActionPacket windowActionPacket = new ClientWindowActionPacket(windowId, 6, slot, item, WindowAction.CLICK_ITEM, ClickItemParam.RIGHT_CLICK); diff --git a/VersionSupport-P1_15_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_15_X/PacketHandler.java b/VersionSupport-P1_15_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_15_X/PacketHandler.java index 88548eb..e061981 100644 --- a/VersionSupport-P1_15_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_15_X/PacketHandler.java +++ b/VersionSupport-P1_15_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_15_X/PacketHandler.java @@ -319,7 +319,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -348,7 +348,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { Session session = ((Client) client).getSession(); ItemStack item = (ItemStack) itemStack; ClientWindowActionPacket windowActionPacket = new ClientWindowActionPacket(windowId, 6, slot, item, WindowAction.CLICK_ITEM, ClickItemParam.RIGHT_CLICK); diff --git a/VersionSupport-P1_16_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_16_X/PacketHandler.java b/VersionSupport-P1_16_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_16_X/PacketHandler.java index 5ad49d9..983df3d 100644 --- a/VersionSupport-P1_16_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_16_X/PacketHandler.java +++ b/VersionSupport-P1_16_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_16_X/PacketHandler.java @@ -315,7 +315,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -344,7 +344,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { Session session = ((Client) client).getSession(); ItemStack item = (ItemStack) itemStack; ClientWindowActionPacket windowActionPacket = new ClientWindowActionPacket(windowId, 6, slot, item, WindowAction.CLICK_ITEM, ClickItemParam.RIGHT_CLICK); diff --git a/VersionSupport-P1_17_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_17_X/PacketHandler.java b/VersionSupport-P1_17_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_17_X/PacketHandler.java index 88183aa..451d24e 100644 --- a/VersionSupport-P1_17_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_17_X/PacketHandler.java +++ b/VersionSupport-P1_17_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_17_X/PacketHandler.java @@ -316,7 +316,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -345,7 +345,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { TcpClientSession session = (TcpClientSession) client; ItemStack item = (ItemStack) itemStack; ClientWindowActionPacket windowActionPacket = new ClientWindowActionPacket(windowId, 6, slot, WindowAction.CLICK_ITEM, ClickItemParam.RIGHT_CLICK, item, new HashMap<>()); diff --git a/VersionSupport-P1_18_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_18_X/PacketHandler.java b/VersionSupport-P1_18_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_18_X/PacketHandler.java index 48eef2c..6cb59f5 100644 --- a/VersionSupport-P1_18_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_18_X/PacketHandler.java +++ b/VersionSupport-P1_18_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_18_X/PacketHandler.java @@ -319,7 +319,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -348,7 +348,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { TcpClientSession session = (TcpClientSession) client; ItemStack item = (ItemStack) itemStack; ServerboundContainerClickPacket windowActionPacket = new ServerboundContainerClickPacket(windowId, 6, slot, ContainerActionType.CLICK_ITEM, ClickItemAction.RIGHT_CLICK, item, new HashMap<>()); @@ -356,7 +356,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void handleOtherPacket(Object packet) {} + public void handleOtherPacket(Object packet) { + } @Override public void sendChatPacket(Object client, String text) { diff --git a/VersionSupport-P1_19/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19/PacketHandler.java b/VersionSupport-P1_19/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19/PacketHandler.java index 21b601c..ce6ef3a 100644 --- a/VersionSupport-P1_19/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19/PacketHandler.java +++ b/VersionSupport-P1_19/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19/PacketHandler.java @@ -318,7 +318,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -347,7 +347,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { TcpClientSession session = (TcpClientSession) client; ItemStack item = (ItemStack) itemStack; ServerboundContainerClickPacket windowActionPacket = new ServerboundContainerClickPacket(windowId, 6, slot, ContainerActionType.CLICK_ITEM, ClickItemAction.RIGHT_CLICK, item, new HashMap<>()); diff --git a/VersionSupport-P1_19_1_1_19_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_1_1_19_2/PacketHandler.java b/VersionSupport-P1_19_1_1_19_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_1_1_19_2/PacketHandler.java index 25cc3c2..9763958 100644 --- a/VersionSupport-P1_19_1_1_19_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_1_1_19_2/PacketHandler.java +++ b/VersionSupport-P1_19_1_1_19_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_1_1_19_2/PacketHandler.java @@ -319,7 +319,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -348,7 +348,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { TcpClientSession session = (TcpClientSession) client; ItemStack item = (ItemStack) itemStack; ServerboundContainerClickPacket windowActionPacket = new ServerboundContainerClickPacket(windowId, 6, slot, ContainerActionType.CLICK_ITEM, ClickItemAction.RIGHT_CLICK, item, new HashMap<>()); diff --git a/VersionSupport-P1_19_3_1_20_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_3_1_20_1/PacketHandler.java b/VersionSupport-P1_19_3_1_20_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_3_1_20_1/PacketHandler.java index 1e373cd..d884f93 100644 --- a/VersionSupport-P1_19_3_1_20_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_3_1_20_1/PacketHandler.java +++ b/VersionSupport-P1_19_3_1_20_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_3_1_20_1/PacketHandler.java @@ -319,7 +319,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -348,7 +348,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { TcpClientSession session = (TcpClientSession) client; ItemStack item = (ItemStack) itemStack; ServerboundContainerClickPacket windowActionPacket = new ServerboundContainerClickPacket(windowId, 6, slot, ContainerActionType.CLICK_ITEM, ClickItemAction.RIGHT_CLICK, item, new HashMap<>()); diff --git a/VersionSupport-P1_20_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_20_X/PacketHandler.java b/VersionSupport-P1_20_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_20_X/PacketHandler.java index dc98f84..3394efd 100644 --- a/VersionSupport-P1_20_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_20_X/PacketHandler.java +++ b/VersionSupport-P1_20_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_20_X/PacketHandler.java @@ -332,7 +332,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } List itemLore = ((ListTag) hashMap.get("Lore")).getValue(); List loreList = new ArrayList<>(); - for (Tag tag:itemLore) { + for (Tag tag : itemLore) { loreList.add((String) tag.getValue()); } return loreList; @@ -361,7 +361,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl } @Override - public void sendRightClickWindowItemPacket(Object client,int windowId, int slot, Object itemStack) { + public void sendRightClickWindowItemPacket(Object client, int windowId, int slot, Object itemStack) { TcpClientSession session = (TcpClientSession) client; ItemStack item = (ItemStack) itemStack; ServerboundContainerClickPacket windowActionPacket = new ServerboundContainerClickPacket(windowId, 6, slot, ContainerActionType.CLICK_ITEM, ClickItemAction.RIGHT_CLICK, item, new HashMap<>()); diff --git a/VersionSupport-P1_8_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_8_X/PacketHandler.java b/VersionSupport-P1_8_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_8_X/PacketHandler.java index b5792f7..3bfe8af 100644 --- a/VersionSupport-P1_8_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_8_X/PacketHandler.java +++ b/VersionSupport-P1_8_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_8_X/PacketHandler.java @@ -189,7 +189,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl public List getSpawnPlayerMetadata(Object packet) { ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet; List metaData = new ArrayList<>(); - for (EntityMetadata metadata:playerPacket.getMetadata()) { + for (EntityMetadata metadata : playerPacket.getMetadata()) { metaData.add(metadata.getValue()); } return metaData; diff --git a/VersionSupport-P1_9_X-1_12_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_9_X_1_12_1/PacketHandler.java b/VersionSupport-P1_9_X-1_12_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_9_X_1_12_1/PacketHandler.java index 78ef665..b9b345d 100644 --- a/VersionSupport-P1_9_X-1_12_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_9_X_1_12_1/PacketHandler.java +++ b/VersionSupport-P1_9_X-1_12_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_9_X_1_12_1/PacketHandler.java @@ -122,6 +122,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl Session session = ((Client) client).getSession(); ServerPlayerPositionRotationPacket positionRotationPacket = (ServerPlayerPositionRotationPacket) recvPacket; session.setFlag("location", new double[]{positionRotationPacket.getX(), positionRotationPacket.getY(), positionRotationPacket.getZ(), positionRotationPacket.getYaw(), positionRotationPacket.getPitch()}); + if (ConfigUtil.PacketHandlerMove) { sendClientPlayerMovementPacket(session, true); ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(positionRotationPacket.getTeleportId());