diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF index a359c89..9954871 100644 --- a/src/META-INF/MANIFEST.MF +++ b/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: me.liuli.ez4h.InitLibs +Main-Class: me.liuli.ez4h.Initialization diff --git a/src/main/java/me/liuli/ez4h/EZ4H.java b/src/main/java/me/liuli/ez4h/EZ4H.java index 0059d6c..f11d065 100644 --- a/src/main/java/me/liuli/ez4h/EZ4H.java +++ b/src/main/java/me/liuli/ez4h/EZ4H.java @@ -8,11 +8,12 @@ import me.liuli.ez4h.managers.command.commands.SayCommand; import me.liuli.ez4h.managers.command.commands.VersionCommand; import me.liuli.ez4h.minecraft.auth.AuthUtils; -import me.liuli.ez4h.minecraft.java.JavaServer; +import me.liuli.ez4h.minecraft.JavaServer; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.JavaTranslator; import me.liuli.ez4h.translators.bedrock.play.TextPacketTranslator; import me.liuli.ez4h.utils.FileUtils; +import me.liuli.ez4h.utils.OtherUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -54,7 +55,7 @@ public static void main(String[] args) { initProtocol(); logger.info("Loading things..."); registerCommands(); - logger.info("Done!("+(new Date().getTime()-InitLibs.launchTime)+" ms)"); + logger.info("Done!("+(new Date().getTime()- Initialization.launchTime)+" ms)"); } private static void registerCommands() { commandManager=new CommandManager(); @@ -77,7 +78,7 @@ private static void initProtocol() { //register translators translatorManager=new TranslatorManager(); { - Reflections reflections = new Reflections("me.liuli.ez4h.translators.bedrockTranslators"); + Reflections reflections = new Reflections("me.liuli.ez4h.translators.bedrock"); Set> subTypes = reflections.getSubTypesOf(BedrockTranslator.class); for (Class translatorClass : subTypes) { try { @@ -89,7 +90,7 @@ private static void initProtocol() { } } { - Reflections reflections = new Reflections("me.liuli.ez4h.translators.javaTranslators"); + Reflections reflections = new Reflections("me.liuli.ez4h.translators.java"); Set> subTypes = reflections.getSubTypesOf(JavaTranslator.class); for (Class translatorClass : subTypes) { try { diff --git a/src/main/java/me/liuli/ez4h/InitLibs.java b/src/main/java/me/liuli/ez4h/Initialization.java similarity index 97% rename from src/main/java/me/liuli/ez4h/InitLibs.java rename to src/main/java/me/liuli/ez4h/Initialization.java index ed55e59..e713ecd 100644 --- a/src/main/java/me/liuli/ez4h/InitLibs.java +++ b/src/main/java/me/liuli/ez4h/Initialization.java @@ -6,7 +6,7 @@ import java.net.URLClassLoader; import java.util.Date; -public class InitLibs { +public class Initialization { public static String VERSION="0.1"; public static long launchTime=0; public static void main(String[] args){ diff --git a/src/main/java/me/liuli/ez4h/managers/CommandManager.java b/src/main/java/me/liuli/ez4h/managers/CommandManager.java index 66a0ba3..3d10eb1 100644 --- a/src/main/java/me/liuli/ez4h/managers/CommandManager.java +++ b/src/main/java/me/liuli/ez4h/managers/CommandManager.java @@ -3,7 +3,7 @@ import lombok.Getter; import me.liuli.ez4h.managers.command.CommandBase; import me.liuli.ez4h.managers.command.commands.HelpCommand; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/me/liuli/ez4h/managers/CommonManager.java b/src/main/java/me/liuli/ez4h/managers/CommonManager.java index 27364e3..6dea070 100644 --- a/src/main/java/me/liuli/ez4h/managers/CommonManager.java +++ b/src/main/java/me/liuli/ez4h/managers/CommonManager.java @@ -3,7 +3,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacketCodec; import com.nukkitx.protocol.bedrock.v422.Bedrock_v422; import lombok.Getter; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/me/liuli/ez4h/managers/ConfigManager.java b/src/main/java/me/liuli/ez4h/managers/ConfigManager.java index d20548a..a2bb8fc 100644 --- a/src/main/java/me/liuli/ez4h/managers/ConfigManager.java +++ b/src/main/java/me/liuli/ez4h/managers/ConfigManager.java @@ -16,7 +16,7 @@ public class ConfigManager { @Getter private final int bedrockPort; @Getter - private final boolean xboxAuth,autoLogin; + private final boolean xboxAuth,autoLogin/*,mojangSkin*/; @Getter private final TextMessage playerList; @Getter @@ -35,5 +35,6 @@ public ConfigManager(JSONObject json){ debugLevel=advanced.getInteger("debug"); autoLogin=advanced.getBoolean("autologin"); xboxAuth=advanced.getBoolean("xbox-auth"); +// mojangSkin=advanced.getBoolean("mojang-skin"); } } diff --git a/src/main/java/me/liuli/ez4h/managers/LoginManager.java b/src/main/java/me/liuli/ez4h/managers/LoginManager.java index d27d074..9bdc7bc 100644 --- a/src/main/java/me/liuli/ez4h/managers/LoginManager.java +++ b/src/main/java/me/liuli/ez4h/managers/LoginManager.java @@ -2,13 +2,15 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.nukkitx.protocol.bedrock.data.skin.SerializedSkin; import com.nukkitx.protocol.bedrock.packet.LoginPacket; import com.nukkitx.protocol.bedrock.util.EncryptionUtils; import io.netty.util.AsciiString; import me.liuli.ez4h.EZ4H; import me.liuli.ez4h.minecraft.auth.AuthUtils; import me.liuli.ez4h.minecraft.auth.Xbox; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; +import me.liuli.ez4h.utils.FileUtils; import me.liuli.ez4h.utils.OtherUtils; import java.nio.charset.StandardCharsets; @@ -173,7 +175,7 @@ public String getSkinData(Client client) throws Exception{ skinData.put("ServerAddress", EZ4H.getConfigManager().getBedrockHost()+":"+EZ4H.getConfigManager().getBedrockPort()); skinData.put("SkinAnimationData", ""); skinData.put("SkinColor", "#0"); - skinData.put("SkinData", "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ll9B/5ZfQf+WX0H/lm9b/6p9Zv+Wb1v/lm9b/4dVO/+WX0H/ll9B/5ZfQf+qfWb/lm9b/6p9Zv+Wb1v/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP9WScz/VknM/1ZJzP9WScz/KCgo/ygoKP8oKCj/KCgo/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AKio/wDMzP8AzMz/AKio/1ExJf9qQDD/UTEl/2pAMP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/VknM/1ZJzP9WScz/VknM/ygoKP8oKCj/KCgo/ygoKP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wDMzP8AzMz/AMzM/wDMzP9RMSX/akAw/1ExJf9qQDD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/1ZJzP9WScz/VknM/1ZJzP8oKCj/KCgo/ygoKP8oKCj/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AqKj/AMzM/wDMzP8AzMz/akAw/1ExJf9qQDD/UTEl/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP9WScz/VknM/1ZJzP9WScz/KCgo/ygoKP8oKCj/KCgo/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AKio/wDMzP8AzMz/AKio/2pAMP9RMSX/akAw/1ExJf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8wKHL/MChy/yYhW/8wKHL/Rjql/0Y6pf9GOqX/Rjql/zAocv8mIVv/MChy/zAocv86MYn/Rjql/0Y6pf9GOqX/AH9//wB/f/8Af3//AH9//wCoqP8Ar6//AKio/wCenv8Af3//AH9//wB/f/8Af3//AK+v/wCvr/8Ar6//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"); + skinData.put("SkinData",getSkinData(client.playerName)); skinData.put("SkinGeometryData", OtherUtils.base64Encode("{\"format_version\":\"1.12.0\",\"minecraft:geometry\":[{\"bones\":[{\"name\":\"body\",\"parent\":\"waist\",\"pivot\":[0,24,0]},{\"name\":\"waist\",\"pivot\":[0,12,0]},{\"cubes\":[{\"origin\":[-5,8,3],\"size\":[10,16,1],\"uv\":[0,0]}],\"name\":\"cape\",\"parent\":\"body\",\"pivot\":[0,24,3],\"rotation\":[0,180,0]}],\"description\":{\"identifier\":\"geometry.cape\",\"texture_height\":32,\"texture_width\":64}},{\"bones\":[{\"name\":\"root\",\"pivot\":[0,0,0]},{\"cubes\":[{\"origin\":[-4,12,-2],\"size\":[8,12,4],\"uv\":[16,16]}],\"name\":\"body\",\"parent\":\"waist\",\"pivot\":[0,24,0]},{\"name\":\"waist\",\"parent\":\"root\",\"pivot\":[0,12,0]},{\"cubes\":[{\"origin\":[-4,24,-4],\"size\":[8,8,8],\"uv\":[0,0]}],\"name\":\"head\",\"parent\":\"body\",\"pivot\":[0,24,0]},{\"name\":\"cape\",\"parent\":\"body\",\"pivot\":[0,24,3]},{\"cubes\":[{\"inflate\":0.5,\"origin\":[-4,24,-4],\"size\":[8,8,8],\"uv\":[32,0]}],\"name\":\"hat\",\"parent\":\"head\",\"pivot\":[0,24,0]},{\"cubes\":[{\"origin\":[4,12,-2],\"size\":[4,12,4],\"uv\":[32,48]}],\"name\":\"leftArm\",\"parent\":\"body\",\"pivot\":[5,22,0]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[4,12,-2],\"size\":[4,12,4],\"uv\":[48,48]}],\"name\":\"leftSleeve\",\"parent\":\"leftArm\",\"pivot\":[5,22,0]},{\"name\":\"leftItem\",\"parent\":\"leftArm\",\"pivot\":[6,15,1]},{\"cubes\":[{\"origin\":[-8,12,-2],\"size\":[4,12,4],\"uv\":[40,16]}],\"name\":\"rightArm\",\"parent\":\"body\",\"pivot\":[-5,22,0]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[-8,12,-2],\"size\":[4,12,4],\"uv\":[40,32]}],\"name\":\"rightSleeve\",\"parent\":\"rightArm\",\"pivot\":[-5,22,0]},{\"locators\":{\"lead_hold\":[-6,15,1]},\"name\":\"rightItem\",\"parent\":\"rightArm\",\"pivot\":[-6,15,1]},{\"cubes\":[{\"origin\":[-0.1,0,-2],\"size\":[4,12,4],\"uv\":[16,48]}],\"name\":\"leftLeg\",\"parent\":\"root\",\"pivot\":[1.9,12,0]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[-0.1,0,-2],\"size\":[4,12,4],\"uv\":[0,48]}],\"name\":\"leftPants\",\"parent\":\"leftLeg\",\"pivot\":[1.9,12,0]},{\"cubes\":[{\"origin\":[-3.9,0,-2],\"size\":[4,12,4],\"uv\":[0,16]}],\"name\":\"rightLeg\",\"parent\":\"root\",\"pivot\":[-1.9,12,0]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[-3.9,0,-2],\"size\":[4,12,4],\"uv\":[0,32]}],\"name\":\"rightPants\",\"parent\":\"rightLeg\",\"pivot\":[-1.9,12,0]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[-4,12,-2],\"size\":[8,12,4],\"uv\":[16,32]}],\"name\":\"jacket\",\"parent\":\"body\",\"pivot\":[0,24,0]}],\"description\":{\"identifier\":\"geometry.humanoid.custom\",\"texture_height\":64,\"texture_width\":64,\"visible_bounds_height\":2,\"visible_bounds_offset\":[0,1,0],\"visible_bounds_width\":1}},{\"bones\":[{\"name\":\"root\",\"pivot\":[0,0,0]},{\"name\":\"waist\",\"parent\":\"root\",\"pivot\":[0,12,0]},{\"cubes\":[{\"origin\":[-4,12,-2],\"size\":[8,12,4],\"uv\":[16,16]}],\"name\":\"body\",\"parent\":\"waist\",\"pivot\":[0,24,0]},{\"cubes\":[{\"origin\":[-4,24,-4],\"size\":[8,8,8],\"uv\":[0,0]}],\"name\":\"head\",\"parent\":\"body\",\"pivot\":[0,24,0]},{\"cubes\":[{\"inflate\":0.5,\"origin\":[-4,24,-4],\"size\":[8,8,8],\"uv\":[32,0]}],\"name\":\"hat\",\"parent\":\"head\",\"pivot\":[0,24,0]},{\"cubes\":[{\"origin\":[-3.9,0,-2],\"size\":[4,12,4],\"uv\":[0,16]}],\"name\":\"rightLeg\",\"parent\":\"root\",\"pivot\":[-1.9,12,0]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[-3.9,0,-2],\"size\":[4,12,4],\"uv\":[0,32]}],\"name\":\"rightPants\",\"parent\":\"rightLeg\",\"pivot\":[-1.9,12,0]},{\"cubes\":[{\"origin\":[-0.1,0,-2],\"size\":[4,12,4],\"uv\":[16,48]}],\"mirror\":true,\"name\":\"leftLeg\",\"parent\":\"root\",\"pivot\":[1.9,12,0]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[-0.1,0,-2],\"size\":[4,12,4],\"uv\":[0,48]}],\"name\":\"leftPants\",\"parent\":\"leftLeg\",\"pivot\":[1.9,12,0]},{\"cubes\":[{\"origin\":[4,11.5,-2],\"size\":[3,12,4],\"uv\":[32,48]}],\"name\":\"leftArm\",\"parent\":\"body\",\"pivot\":[5,21.5,0]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[4,11.5,-2],\"size\":[3,12,4],\"uv\":[48,48]}],\"name\":\"leftSleeve\",\"parent\":\"leftArm\",\"pivot\":[5,21.5,0]},{\"name\":\"leftItem\",\"parent\":\"leftArm\",\"pivot\":[6,14.5,1]},{\"cubes\":[{\"origin\":[-7,11.5,-2],\"size\":[3,12,4],\"uv\":[40,16]}],\"name\":\"rightArm\",\"parent\":\"body\",\"pivot\":[-5,21.5,0]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[-7,11.5,-2],\"size\":[3,12,4],\"uv\":[40,32]}],\"name\":\"rightSleeve\",\"parent\":\"rightArm\",\"pivot\":[-5,21.5,0]},{\"locators\":{\"lead_hold\":[-6,14.5,1]},\"name\":\"rightItem\",\"parent\":\"rightArm\",\"pivot\":[-6,14.5,1]},{\"cubes\":[{\"inflate\":0.25,\"origin\":[-4,12,-2],\"size\":[8,12,4],\"uv\":[16,32]}],\"name\":\"jacket\",\"parent\":\"body\",\"pivot\":[0,24,0]},{\"name\":\"cape\",\"parent\":\"body\",\"pivot\":[0,24,-3]}],\"description\":{\"identifier\":\"geometry.humanoid.customSlim\",\"texture_height\":64,\"texture_width\":64,\"visible_bounds_height\":2,\"visible_bounds_offset\":[0,1,0],\"visible_bounds_width\":1}}]}")); skinData.put("SkinId", client.playerUUID.toString()+ ".Custom");//ok..? :shrug: skinData.put("SkinImageHeight", 64); @@ -191,4 +193,29 @@ public String getSkinData(Client client) throws Exception{ return header + "." + payload + "." + signatureString; } + private String getSkinData(String playerName){ +// if(EZ4H.getConfigManager().isMojangSkin()){ +// try { +// String uuid=OtherUtils.httpGet("https://api.mojang.com/users/profiles/minecraft/"+playerName); +// if(uuid!=null){ +// uuid=JSONObject.parseObject(uuid).getString("id"); +// String profile=OtherUtils.httpGet("https://sessionserver.mojang.com/session/minecraft/profile/"+uuid); +// if(profile!=null){ +// String value=OtherUtils.base64Decode(JSONObject.parseObject(profile).getJSONArray("properties").getJSONObject(0).getString("value")); +// String skinURL=JSONObject.parseObject(value).getJSONObject("textures").getJSONObject("SKIN").getString("url"); +// byte[] skinPng=OtherUtils.httpGetByte(OtherUtils.toHttps(skinURL)); +// System.out.println(OtherUtils.base64Encode(skinPng)); +// return OtherUtils.base64Encode(skinPng); +// }else{ +// EZ4H.getLogger().warn(playerName+"'s profile is broken."); +// } +// }else{ +// EZ4H.getLogger().warn(playerName+" dont have a account on mojang."); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } + return "AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8qHQ3/Kh0N/yQYCP8qHQ3/Kh0N/yQYCP8kGAj/HxAL/3VHL/91Ry//dUcv/3VHL/91Ry//dUcv/3VHL/91Ry//AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/Kh0N/yQYCP8vHw//Lx8P/yodDf8kGAj/JBgI/yQYCP91Ry//akAw/4ZTNP9qQDD/hlM0/4ZTNP91Ry//dUcv/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/yodDf8vHw//Lx8P/yYaCv8qHQ3/JBgI/yQYCP8kGAj/dUcv/2pAMP8jIyP/IyMj/yMjI/8jIyP/akAw/3VHL/8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8kGAj/Lx8P/yodDf8kGAj/Kh0N/yodDf8vHw//Kh0N/3VHL/9qQDD/IyMj/yMjI/8jIyP/IyMj/2pAMP91Ry//AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/Kh0N/y8fD/8qHQ3/JhoK/yYaCv8vHw//Lx8P/yodDf91Ry//akAw/yMjI/8jIyP/IyMj/yMjI/9qQDD/dUcv/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/yodDf8qHQ3/JhoK/yYaCv8vHw//Lx8P/y8fD/8qHQ3/dUcv/2pAMP8jIyP/IyMj/yMjI/8jIyP/Uigm/3VHL/8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8qHQ3/JhoK/y8fD/8pHAz/JhoK/x8QC/8vHw//Kh0N/3VHL/9qQDD/akAw/2pAMP9qQDD/akAw/2pAMP91Ry//AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/Kh0N/ykcDP8mGgr/JhoK/yYaCv8mGgr/Kh0N/yodDf91Ry//dUcv/3VHL/91Ry//dUcv/3VHL/91Ry//dUcv/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8oGwr/KBsK/yYaCv8nGwv/KRwM/zIjEP8tIBD/LSAQ/y8gDf8rHg3/Lx8P/ygcC/8kGAj/JhoK/yseDf8qHQ3/LSAQ/y0gEP8yIxD/KRwM/ycbC/8mGgr/KBsK/ygbCv8qHQ3/Kh0N/yQYCP8qHQ3/Kh0N/yQYCP8kGAj/HxAL/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/KBsK/ygbCv8mGgr/JhoK/yweDv8pHAz/Kx4N/zMkEf8rHg3/Kx4N/yseDf8zJBH/QioS/z8qFf8sHg7/KBwL/zMkEf8rHg3/KRwM/yweDv8mGgr/JhoK/ygbCv8oGwr/Kh0N/yQYCP8vHw//Lx8P/yodDf8kGAj/JBgI/yQYCP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/yweDv8mGAv/JhoK/ykcDP8rHg7/KBsL/yQYCv8pHAz/Kx4N/7aJbP+9jnL/xpaA/72Lcv+9jnT/rHZa/zQlEv8pHAz/JBgK/ygbC/8rHg7/KRwM/yYaCv8mGAv/LB4O/yodDf8vHw//Lx8P/yYaCv8qHQ3/JBgI/yQYCP8kGAj/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8oGwr/KBoN/y0dDv8sHg7/KBsK/ycbC/8sHg7/LyIR/6p9Zv+0hG3/qn1m/62Abf+cclz/u4ly/5xpTP+caUz/LyIR/yweDv8nGwv/KBsK/yweDv8tHQ7/KBoN/ygbCv8kGAj/Lx8P/yodDf8kGAj/Kh0N/yodDf8vHw//Kh0N/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/KBsK/ygbCv8oGwr/JhoM/yMXCf+HWDr/nGNF/zooFP+0hG3//////1I9if+1e2f/u4ly/1I9if//////qn1m/zooFP+cY0X/h1g6/yMXCf8mGgz/KBsK/ygbCv8oGwr/Kh0N/y8fD/8qHQ3/JhoK/yYaCv8vHw//Lx8P/yodDf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/ygbCv8oGwr/KBoN/yYYC/8sHhH/hFIx/5ZfQf+IWjn/nGNG/7N7Yv+3gnL/akAw/2pAMP++iGz/ompH/4BTNP+IWjn/ll9B/4RSMf8sHhH/JhgL/ygaDf8oGwr/KBsK/yodDf8qHQ3/JhoK/yYaCv8vHw//Lx8P/y8fD/8qHQ3/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8sHg7/KBsK/y0dDv9iQy//nWpP/5pjRP+GUzT/dUcv/5BeQ/+WX0D/d0I1/3dCNf93QjX/d0I1/49ePv+BUzn/dUcv/4ZTNP+aY0T/nWpP/2JDL/8tHQ7/KBsK/yweDv8qHQ3/JhoK/y8fD/8pHAz/JhoK/x8QC/8vHw//Kh0N/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/hlM0/4ZTNP+aY0T/hlM0/5xnSP+WX0H/ilk7/3RIL/9vRSz/bUMq/4FTOf+BUzn/ek4z/4NVO/+DVTv/ek4z/3RIL/+KWTv/n2hJ/5xnSP+aZEr/nGdI/5pjRP+GUzT/hlM0/3VHL/8mGgr/JhoK/yYaCv8mGgr/dUcv/4ZTNP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP9WScz/VknM/1ZJzP9WScz/KCgo/ygoKP8oKCj/KCgo/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AMzM/3VHL/91Ry//dUcv/3VHL/91Ry//dUcv/wDMzP8AYGD/AGBg/wBgYP8AYGD/AGBg/wBgYP8AYGD/AGBg/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AKio/wDMzP8AzMz/AKio/2pAMP9RMSX/akAw/1ExJf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/VknM/1ZJzP9WScz/VknM/ygoKP8oKCj/KCgo/ygoKP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wDMzP9qQDD/akAw/2pAMP9qQDD/akAw/2pAMP8AzMz/AGBg/wBgYP8AYGD/AGBg/wBgYP8AYGD/AGBg/wBgYP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wDMzP8AzMz/AMzM/wDMzP9qQDD/UTEl/2pAMP9RMSX/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/1ZJzP9WScz/VknM/1ZJzP8oKCj/KCgo/ygoKP8oKCj/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AzMz/akAw/2pAMP9qQDD/akAw/2pAMP9qQDD/AMzM/wBgYP8AYGD/AGBg/wBgYP8AYGD/AGBg/wBgYP8AYGD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AzMz/AMzM/wDMzP8AqKj/UTEl/2pAMP9RMSX/akAw/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP9WScz/VknM/1ZJzP9WScz/KCgo/ygoKP8oKCj/KCgo/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AMzM/3VHL/91Ry//dUcv/3VHL/91Ry//dUcv/wDMzP8AYGD/AGBg/wBgYP8AYGD/AGBg/wBgYP8AYGD/AGBg/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AKio/wDMzP8AzMz/AKio/1ExJf9qQDD/UTEl/2pAMP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8wKHL/MChy/yYhW/8wKHL/Rjql/0Y6pf9GOqX/Rjql/zAocv8mIVv/MChy/zAocv9GOqX/Rjql/0Y6pf86MYn/AH9//wB/f/8Af3//AFtb/wCZmf8Anp7/gVM5/6JqR/+BUzn/gVM5/wCenv8Anp7/AH9//wB/f/8Af3//AH9//wCenv8AqKj/AKio/wCoqP8Ar6//AK+v/wCoqP8AqKj/AH9//wB/f/8Af3//AH9//wCenv8AqKj/AK+v/wCoqP8Af3//AH9//wB/f/8Af3//AK+v/wCvr/8Ar6//AK+v/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/MChy/yYhW/8mIVv/MChy/0Y6pf9GOqX/Rjql/0Y6pf8wKHL/JiFb/zAocv8wKHL/Rjql/0Y6pf9GOqX/Rjql/wB/f/8AaGj/AGho/wB/f/8AqKj/AKio/wCenv+BUzn/gVM5/wCenv8Ar6//AK+v/wB/f/8AaGj/AGho/wBoaP8AqKj/AK+v/wCvr/8Ar6//AK+v/wCvr/8AqKj/AKio/wBoaP8AaGj/AGho/wB/f/8Ar6//AKio/wCvr/8Anp7/AH9//wBoaP8AaGj/AH9//wCvr/8Ar6//AK+v/wCvr/8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/zAocv8mIVv/MChy/zAocv9GOqX/Rjql/0Y6pf9GOqX/MChy/yYhW/8wKHL/MChy/0Y6pf9GOqX/Rjql/0Y6pf8AaGj/AGho/wBoaP8Af3//AK+v/wCvr/8AqKj/AJ6e/wCZmf8AqKj/AK+v/wCvr/8AaGj/AGho/wBoaP8AaGj/AK+v/wCvr/8Ar6//AK+v/wCvr/8Ar6//AK+v/wCoqP8Af3//AGho/wBoaP8Af3//AKio/wCvr/8Ar6//AK+v/wB/f/8AaGj/AGho/wB/f/8Ar6//AK+v/wCvr/8Ar6//AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8wKHL/JiFb/zAocv8wKHL/Rjql/0Y6pf9GOqX/Rjql/zAocv8mIVv/MChy/zAocv9GOqX/Rjql/0Y6pf9GOqX/AFtb/wBoaP8AaGj/AFtb/wCvr/8Ar6//AK+v/wCenv8AmZn/AK+v/wCvr/8Ar6//AFtb/wBoaP8AaGj/AFtb/wCvr/8Ar6//AJmZ/wCvr/8AqKj/AJmZ/wCvr/8AqKj/AH9//wBoaP8AaGj/AH9//wCenv8Ar6//AK+v/wCenv8Af3//AGho/wBoaP8Af3//AK+v/wCvr/8Ar6//AK+v/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/MChy/yYhW/8wKHL/MChy/0Y6pf9GOqX/Rjql/0Y6pf8wKHL/MChy/yYhW/8wKHL/OjGJ/zoxif86MYn/OjGJ/wBoaP8AW1v/AFtb/wBbW/8AmZn/AJmZ/wCvr/8Ar6//AJmZ/wCvr/8AmZn/AJmZ/wBbW/8AW1v/AFtb/wBbW/8Ar6//AKio/wCZmf8Ar6//AKio/wCZmf8Ar6//AK+v/5ZfQf+WX0H/ll9B/4dVO/+qfWb/qn1m/6p9Zv+qfWb/h1U7/5ZfQf+WX0H/ll9B/6p9Zv+qfWb/qn1m/6p9Zv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/zAocv8mIVv/MChy/zAocv9GOqX/OjGJ/zoxif9GOqX/MChy/yYhW/8mIVv/MChy/zoxif86MYn/OjGJ/zoxif8AW1v/AFtb/wBbW/8AaGj/AJmZ/wCZmf8Ar6//AKio/wCZmf8Ar6//AKio/wCZmf8AaGj/AFtb/wBbW/8AaGj/AK+v/wCZmf8AmZn/AK+v/wCoqP8AmZn/AKio/wCvr/+WX0H/ll9B/5ZfQf+HVTv/qn1m/5ZvW/+qfWb/qn1m/5ZfQf+HVTv/ll9B/5ZfQf+qfWb/qn1m/6p9Zv+qfWb/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8wKHL/JiFb/zAocv8wKHL/Rjql/0Y6pf9GOqX/Rjql/zAocv8mIVv/MChy/zAocv9GOqX/Rjql/0Y6pf9GOqX/AGho/wBbW/8AW1v/AGho/wCZmf8Ar6//AK+v/wCZmf8AqKj/AK+v/wCoqP8AmZn/AGho/wBbW/8AaGj/AGho/wCvr/8AqKj/AJmZ/wCoqP8Ar6//AJmZ/wCZmf8Ar6//h1U7/5ZfQf+WX0H/h1U7/6p9Zv+Wb1v/qn1m/5ZvW/+WX0H/h1U7/5ZfQf+WX0H/qn1m/5ZvW/+Wb1v/qn1m/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/MChy/zAocv8wKHL/MChy/0Y6pf9GOqX/Rjql/0Y6pf8wKHL/JiFb/zAocv8wKHL/Rjql/0Y6pf9GOqX/Rjql/wB/f/8AaGj/AGho/wB/f/8AmZn/AK+v/wCvr/8AmZn/AKio/wCvr/8AqKj/AJmZ/wB/f/8AaGj/AGho/wBoaP8Ar6//AK+v/wCZmf8AqKj/AK+v/wCZmf8AmZn/AK+v/4dVO/+WX0H/ll9B/5ZfQf+qfWb/qn1m/6p9Zv+Wb1v/ll9B/4dVO/+WX0H/h1U7/6p9Zv+qfWb/qn1m/6p9Zv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/zAocv8wKHL/MChy/zAocv9GOqX/Rjql/0Y6pf9GOqX/MChy/zAocv8wKHL/MChy/0Y6pf9GOqX/Rjql/0Y6pf8Af3//AGho/wBoaP8Af3//AK+v/wCvr/8Ar6//AJmZ/wCoqP8Ar6//AK+v/wCZmf8Af3//AGho/wBoaP8Af3//AK+v/wCvr/8Ar6//AK+v/wCvr/8Ar6//AK+v/wCvr/+HVTv/ll9B/4dVO/+WX0H/qn1m/6p9Zv+qfWb/lm9b/5ZfQf+WX0H/ll9B/4dVO/+qfWb/qn1m/6p9Zv+qfWb/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8/Pz//Pz8//zAocv8wKHL/Rjql/0Y6pf9GOqX/Rjql/zAocv8wKHL/Pz8//z8/P/9ra2v/a2tr/2tra/9ra2v/AH9//wBoaP8Af3//AH9//wCZmf8AmZn/AJmZ/wCoqP8Ar6//AKio/wCvr/8AmZn/AH9//wBoaP8AaGj/AH9//wCZmf8AmZn/AJmZ/wCvr/8AmZn/AJmZ/wCvr/8AqKj/ll9B/5ZfQf+HVTv/ll9B/6p9Zv+qfWb/qn1m/6p9Zv+WX0H/ll9B/5ZfQf+WX0H/qn1m/5ZvW/+qfWb/lm9b/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/Pz8//z8/P/8/Pz//Pz8//2tra/9ra2v/a2tr/2tra/8/Pz//Pz8//z8/P/8/Pz//a2tr/2tra/9ra2v/a2tr/zAocv8mIVv/MChy/yYhW/9GOqX/Rjql/0Y6pf9GOqX/Rjql/zoxif8Ar6//AJmZ/wB/f/8mIVv/JiFb/zAocv9GOqX/OjGJ/zoxif8AqKj/AJmZ/wCZmf86MYn/Rjql/5ZfQf+WX0H/h1U7/5ZfQf+qfWb/qn1m/5ZvW/+qfWb/h1U7/5ZfQf+HVTv/ll9B/6p9Zv+Wb1v/qn1m/5ZvW/8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/z8/P/8/Pz//Pz8//z8/P/9ra2v/a2tr/2tra/9ra2v/Pz8//z8/P/8/Pz//Pz8//2tra/9ra2v/a2tr/2tra/8wKHL/JiFb/zAocv8wKHL/Rjql/0Y6pf9GOqX/Rjql/0Y6pf9GOqX/OjGJ/wCZmf8wKHL/JiFb/zAocv8wKHL/Rjql/0Y6pf9GOqX/OjGJ/wCZmf9GOqX/Rjql/0Y6pf+WX0H/ll9B/5ZfQf+WX0H/lm9b/6p9Zv+Wb1v/lm9b/4dVO/+WX0H/ll9B/5ZfQf+qfWb/lm9b/6p9Zv+Wb1v/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP9WScz/VknM/1ZJzP9WScz/KCgo/ygoKP8oKCj/KCgo/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AKio/wDMzP8AzMz/AKio/1ExJf9qQDD/UTEl/2pAMP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/VknM/1ZJzP9WScz/VknM/ygoKP8oKCj/KCgo/ygoKP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wDMzP8AzMz/AMzM/wDMzP9RMSX/akAw/1ExJf9qQDD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/1ZJzP9WScz/VknM/1ZJzP8oKCj/KCgo/ygoKP8oKCj/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AqKj/AMzM/wDMzP8AzMz/akAw/1ExJf9qQDD/UTEl/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP9WScz/VknM/1ZJzP9WScz/KCgo/ygoKP8oKCj/KCgo/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AKio/wDMzP8AzMz/AKio/2pAMP9RMSX/akAw/1ExJf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8wKHL/MChy/yYhW/8wKHL/Rjql/0Y6pf9GOqX/Rjql/zAocv8mIVv/MChy/zAocv86MYn/Rjql/0Y6pf9GOqX/AH9//wB/f/8Af3//AH9//wCoqP8Ar6//AKio/wCenv8Af3//AH9//wB/f/8Af3//AK+v/wCvr/8Ar6//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"; + } } diff --git a/src/main/java/me/liuli/ez4h/managers/TranslatorManager.java b/src/main/java/me/liuli/ez4h/managers/TranslatorManager.java index 34938d2..dceb874 100644 --- a/src/main/java/me/liuli/ez4h/managers/TranslatorManager.java +++ b/src/main/java/me/liuli/ez4h/managers/TranslatorManager.java @@ -3,7 +3,7 @@ import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.protocol.bedrock.BedrockPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.JavaTranslator; diff --git a/src/main/java/me/liuli/ez4h/managers/command/CommandBase.java b/src/main/java/me/liuli/ez4h/managers/command/CommandBase.java index 5bd1bec..b341a27 100644 --- a/src/main/java/me/liuli/ez4h/managers/command/CommandBase.java +++ b/src/main/java/me/liuli/ez4h/managers/command/CommandBase.java @@ -1,6 +1,6 @@ package me.liuli.ez4h.managers.command; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; public interface CommandBase { String getHelpMessage(); diff --git a/src/main/java/me/liuli/ez4h/managers/command/commands/FormCommand.java b/src/main/java/me/liuli/ez4h/managers/command/commands/FormCommand.java index 3fa72bf..40e5c60 100644 --- a/src/main/java/me/liuli/ez4h/managers/command/commands/FormCommand.java +++ b/src/main/java/me/liuli/ez4h/managers/command/commands/FormCommand.java @@ -3,7 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.nukkitx.protocol.bedrock.packet.ModalFormResponsePacket; import me.liuli.ez4h.managers.command.CommandBase; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.cache.Form; public class FormCommand implements CommandBase { diff --git a/src/main/java/me/liuli/ez4h/managers/command/commands/HelpCommand.java b/src/main/java/me/liuli/ez4h/managers/command/commands/HelpCommand.java index 9895d2a..6b71098 100644 --- a/src/main/java/me/liuli/ez4h/managers/command/commands/HelpCommand.java +++ b/src/main/java/me/liuli/ez4h/managers/command/commands/HelpCommand.java @@ -2,7 +2,7 @@ import me.liuli.ez4h.EZ4H; import me.liuli.ez4h.managers.command.CommandBase; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import java.util.Map; import java.util.Set; diff --git a/src/main/java/me/liuli/ez4h/managers/command/commands/SayCommand.java b/src/main/java/me/liuli/ez4h/managers/command/commands/SayCommand.java index 8883a9c..ae3ff98 100644 --- a/src/main/java/me/liuli/ez4h/managers/command/commands/SayCommand.java +++ b/src/main/java/me/liuli/ez4h/managers/command/commands/SayCommand.java @@ -2,7 +2,7 @@ import com.nukkitx.protocol.bedrock.packet.TextPacket; import me.liuli.ez4h.managers.command.CommandBase; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/me/liuli/ez4h/managers/command/commands/VersionCommand.java b/src/main/java/me/liuli/ez4h/managers/command/commands/VersionCommand.java index 9f5d7db..7bc2e33 100644 --- a/src/main/java/me/liuli/ez4h/managers/command/commands/VersionCommand.java +++ b/src/main/java/me/liuli/ez4h/managers/command/commands/VersionCommand.java @@ -1,9 +1,9 @@ package me.liuli.ez4h.managers.command.commands; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.InitLibs; +import me.liuli.ez4h.Initialization; import me.liuli.ez4h.managers.command.CommandBase; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; public class VersionCommand implements CommandBase { @Override @@ -12,6 +12,6 @@ public String getHelpMessage(){ } @Override public void exec(String[] args, Client client) { - client.sendAlert("CURRENT RUNNING EZ4H v"+ InitLibs.VERSION +" for Minecraft:BE v"+EZ4H.getCommonManager().getBedrockCodec().getMinecraftVersion()+"."); + client.sendAlert("CURRENT RUNNING EZ4H v"+ Initialization.VERSION +" for Minecraft:BE v"+EZ4H.getCommonManager().getBedrockCodec().getMinecraftVersion()+"."); } } diff --git a/src/main/java/me/liuli/ez4h/minecraft/bedrock/BedrockBatchHandler.java b/src/main/java/me/liuli/ez4h/minecraft/BedrockBatchHandler.java similarity index 95% rename from src/main/java/me/liuli/ez4h/minecraft/bedrock/BedrockBatchHandler.java rename to src/main/java/me/liuli/ez4h/minecraft/BedrockBatchHandler.java index f43c5fe..1c223b9 100644 --- a/src/main/java/me/liuli/ez4h/minecraft/bedrock/BedrockBatchHandler.java +++ b/src/main/java/me/liuli/ez4h/minecraft/BedrockBatchHandler.java @@ -1,4 +1,4 @@ -package me.liuli.ez4h.minecraft.bedrock; +package me.liuli.ez4h.minecraft; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.BedrockSession; diff --git a/src/main/java/me/liuli/ez4h/minecraft/bedrock/Client.java b/src/main/java/me/liuli/ez4h/minecraft/Client.java similarity index 99% rename from src/main/java/me/liuli/ez4h/minecraft/bedrock/Client.java rename to src/main/java/me/liuli/ez4h/minecraft/Client.java index 23503da..c4026ea 100644 --- a/src/main/java/me/liuli/ez4h/minecraft/bedrock/Client.java +++ b/src/main/java/me/liuli/ez4h/minecraft/Client.java @@ -1,4 +1,4 @@ -package me.liuli.ez4h.minecraft.bedrock; +package me.liuli.ez4h.minecraft; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.packet.ingame.server.ServerChatPacket; diff --git a/src/main/java/me/liuli/ez4h/minecraft/bedrock/ClientStat.java b/src/main/java/me/liuli/ez4h/minecraft/ClientStat.java similarity index 97% rename from src/main/java/me/liuli/ez4h/minecraft/bedrock/ClientStat.java rename to src/main/java/me/liuli/ez4h/minecraft/ClientStat.java index eacc5b7..e94cab0 100644 --- a/src/main/java/me/liuli/ez4h/minecraft/bedrock/ClientStat.java +++ b/src/main/java/me/liuli/ez4h/minecraft/ClientStat.java @@ -1,4 +1,4 @@ -package me.liuli.ez4h.minecraft.bedrock; +package me.liuli.ez4h.minecraft; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode; diff --git a/src/main/java/me/liuli/ez4h/minecraft/java/JavaPacketHandler.java b/src/main/java/me/liuli/ez4h/minecraft/JavaPacketHandler.java similarity index 97% rename from src/main/java/me/liuli/ez4h/minecraft/java/JavaPacketHandler.java rename to src/main/java/me/liuli/ez4h/minecraft/JavaPacketHandler.java index ecdc4ec..469a7ab 100644 --- a/src/main/java/me/liuli/ez4h/minecraft/java/JavaPacketHandler.java +++ b/src/main/java/me/liuli/ez4h/minecraft/JavaPacketHandler.java @@ -1,4 +1,4 @@ -package me.liuli.ez4h.minecraft.java; +package me.liuli.ez4h.minecraft; import com.github.steveice10.mc.auth.data.GameProfile; import com.github.steveice10.mc.protocol.MinecraftConstants; @@ -12,7 +12,6 @@ import com.github.steveice10.packetlib.event.session.SessionAdapter; import com.github.steveice10.packetlib.packet.Packet; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; import me.liuli.ez4h.utils.OtherUtils; public class JavaPacketHandler extends SessionAdapter { diff --git a/src/main/java/me/liuli/ez4h/minecraft/java/JavaServer.java b/src/main/java/me/liuli/ez4h/minecraft/JavaServer.java similarity index 98% rename from src/main/java/me/liuli/ez4h/minecraft/java/JavaServer.java rename to src/main/java/me/liuli/ez4h/minecraft/JavaServer.java index d1be3d6..9034f61 100644 --- a/src/main/java/me/liuli/ez4h/minecraft/java/JavaServer.java +++ b/src/main/java/me/liuli/ez4h/minecraft/JavaServer.java @@ -1,4 +1,4 @@ -package me.liuli.ez4h.minecraft.java; +package me.liuli.ez4h.minecraft; import com.github.steveice10.mc.auth.data.GameProfile; import com.github.steveice10.mc.auth.service.SessionService; @@ -21,7 +21,6 @@ import com.github.steveice10.packetlib.tcp.TcpSessionFactory; import me.liuli.ez4h.EZ4H; import me.liuli.ez4h.minecraft.auth.fakeAuthServer.FakeServer; -import me.liuli.ez4h.minecraft.bedrock.Client; import me.liuli.ez4h.utils.OtherUtils; public class JavaServer { diff --git a/src/main/java/me/liuli/ez4h/minecraft/java/Ping.java b/src/main/java/me/liuli/ez4h/minecraft/Ping.java similarity index 98% rename from src/main/java/me/liuli/ez4h/minecraft/java/Ping.java rename to src/main/java/me/liuli/ez4h/minecraft/Ping.java index 9f6cc65..1c09891 100644 --- a/src/main/java/me/liuli/ez4h/minecraft/java/Ping.java +++ b/src/main/java/me/liuli/ez4h/minecraft/Ping.java @@ -1,4 +1,4 @@ -package me.liuli.ez4h.minecraft.java; +package me.liuli.ez4h.minecraft; import com.github.steveice10.mc.auth.data.GameProfile; import com.github.steveice10.mc.protocol.MinecraftConstants; diff --git a/src/main/java/me/liuli/ez4h/minecraft/java/SmoothWeather.java b/src/main/java/me/liuli/ez4h/minecraft/SmoothWeather.java similarity index 94% rename from src/main/java/me/liuli/ez4h/minecraft/java/SmoothWeather.java rename to src/main/java/me/liuli/ez4h/minecraft/SmoothWeather.java index 794fbcd..33b05a5 100644 --- a/src/main/java/me/liuli/ez4h/minecraft/java/SmoothWeather.java +++ b/src/main/java/me/liuli/ez4h/minecraft/SmoothWeather.java @@ -1,9 +1,8 @@ -package me.liuli.ez4h.minecraft.java; +package me.liuli.ez4h.minecraft; import com.github.steveice10.mc.protocol.data.game.world.notify.ClientNotification; import com.github.steveice10.mc.protocol.data.game.world.notify.RainStrengthValue; import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerNotifyClientPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; public class SmoothWeather { public SmoothWeather(float to, boolean isThunder, Client client){ diff --git a/src/main/java/me/liuli/ez4h/minecraft/auth/Xbox.java b/src/main/java/me/liuli/ez4h/minecraft/auth/Xbox.java index 64e89e0..2bb1fe1 100644 --- a/src/main/java/me/liuli/ez4h/minecraft/auth/Xbox.java +++ b/src/main/java/me/liuli/ez4h/minecraft/auth/Xbox.java @@ -36,7 +36,7 @@ public class Xbox { private String minecraftAuthURL = "https://multiplayer.minecraft.net/authentication"; public Xbox(String accessToken) { - this.accessToken = "EwAIA+pvBAAUKods63Ys1fGlwiccIFJ+qE1hANsAAQNF8exWDpaJDKzbuulrqEIXsj6ir6+qei5UjBO5Ogw29GDBlQDqkDu5QXcIjfhLig9oVg90jNuPfkIzwQ5kpekr86AaS73ISvZiG1UTBtlJEzP7omwBqbLPXvfT1Bz6Vsf/WocI5zaUV55jDbeAKZ9xsk3mSj31hxjcEBYsi46j5XVMc6ebQY6P1Jing0NtrkLguBrI3MvbnXYgbguREpqtxh9Y+1VhbYdrUuedbBwJWXpMOuyLQFkS8CndfUEPxCATrnMJKHi9z1h/O/f2mEszmxx82pUjeUowGP1bK8tWP0FGEEmx0ciwrFBspE86U4HbDHn8Tsu6PfdB24GVAq8DZgAACKrMfq3ux8KK2AEYfZi6rQ98AAf2deIVt4aLNBOtXQWysDWPuBoisW3796MeOZ/O3Y61olvVPnSYjSPsE95nYEefQVcPNpz8tNIBPKTDpHPYtlKWEfrCgBKSxa/skqev91SFAZT4BJcCnvZed4pZV330ag9PGKJWk54Vce0TW4alUyym2qxMRPUtxbNNvEPYLloH5uTKP9B0vCzPlcx0e+SEUan0oa0L6Fc6vdfNPf43qEZFQW595ssvUXxwfS7FaR9uJQOgVpH92Bak/BnDMoWSY/VhAhdh7XSuuHhXAqbPv5JqK4ZmTZ3FEOUVdwOvFSwetA/HmW/kDDUNrRH+65EUe1kEEVmZDk3oYM3y5sPSqerhtRTvdO0sAvVXkuBBtJHg6bh2n7wPN8dzGvuRh2v2muMaZ5gcbCAK8VAZMjDt2I91dQGWEDxaHL42UuoSOJOcMKKS0Nnf+shLOF0eoXwJtdcdXy/qxgBwLQxeJsfTUbw8X8PbwVnLbUB1A2MJw5NyHxdKJJm+TD6FQhLGv19gsXMFW+MNEzSin8M5YE/Vve8DbHp8T8Oj2ZoHOmBgnwjbL8H5xTu8ovAPKQ0qIApX69gXxCHR3bCmg9YeSFfJjZn9QgOnvyp12ifYfvJnQyTXJgI="; + this.accessToken = accessToken; } public String getUserToken(ECPublicKey publicKey, ECPrivateKey privateKey) throws Exception { diff --git a/src/main/java/me/liuli/ez4h/minecraft/auth/XboxLogin.java b/src/main/java/me/liuli/ez4h/minecraft/auth/XboxLogin.java index 0718b1c..15166a5 100644 --- a/src/main/java/me/liuli/ez4h/minecraft/auth/XboxLogin.java +++ b/src/main/java/me/liuli/ez4h/minecraft/auth/XboxLogin.java @@ -1,6 +1,7 @@ package me.liuli.ez4h.minecraft.auth; import com.alibaba.fastjson.JSONObject; +import me.liuli.ez4h.utils.OtherUtils; import javax.net.ssl.HttpsURLConnection; import java.io.ByteArrayOutputStream; @@ -18,7 +19,7 @@ public class XboxLogin { private JSONObject getPreAuthToken() throws Exception{ HttpsURLConnection connection = (HttpsURLConnection) new URL(XBOX_PRE_AUTH_URL).openConnection(); connection.setRequestMethod("GET"); - setBaseHeaders(connection); + OtherUtils.setBaseHeaders(connection); String responce = uncompressGzip(connection.getInputStream()); JSONObject resJson=new JSONObject(); resJson.put("urlPost",findArgs(responce,"urlPost:'")); @@ -38,7 +39,7 @@ public String getAccessToken(String username,String password) throws Exception{ JSONObject preAuthToken=getPreAuthToken(); HttpsURLConnection connection = (HttpsURLConnection) new URL(preAuthToken.getString("urlPost")).openConnection(); connection.setRequestMethod("POST"); - setBaseHeaders(connection); + OtherUtils.setBaseHeaders(connection); connection.setRequestProperty("Content-Type","application/x-www-form-urlencoded"); connection.setRequestProperty("Cookie",preAuthToken.getString("cookie")); @@ -61,6 +62,7 @@ public String getAccessToken(String username,String password) throws Exception{ connection.connect(); InputStream is = connection.getInputStream(); String url=connection.getURL().toString(),hash,access_token=""; + System.out.println(url); hash=url.split("#")[1]; String[] hashes=hash.split("&"); for(String partHash:hashes){ @@ -70,7 +72,7 @@ public String getAccessToken(String username,String password) throws Exception{ } } is.close(); - return access_token; + return access_token.replaceAll("%2b","+"); } private String findArgs(String str,String args){ if(str.contains(args)){ @@ -83,11 +85,6 @@ private String findArgs(String str,String args){ throw new IllegalArgumentException("CANNOT FIND ARGUMENT"); } } - private void setBaseHeaders(HttpsURLConnection connection){ - connection.setRequestProperty("Accept-encoding","gzip"); - connection.setRequestProperty("Accept-Language","en-US"); - connection.setRequestProperty("User-Agent","Mozilla/5.0 (XboxReplay; XboxLiveAuth/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"); - } private String uncompressGzip(InputStream inputStream) throws IOException { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); GZIPInputStream gZIPInputStream = new GZIPInputStream(inputStream); diff --git a/src/main/java/me/liuli/ez4h/translators/BedrockTranslator.java b/src/main/java/me/liuli/ez4h/translators/BedrockTranslator.java index a05c749..ab58561 100644 --- a/src/main/java/me/liuli/ez4h/translators/BedrockTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/BedrockTranslator.java @@ -1,7 +1,7 @@ package me.liuli.ez4h.translators; import com.nukkitx.protocol.bedrock.BedrockPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; public interface BedrockTranslator { void translate(BedrockPacket inPacket, Client client); diff --git a/src/main/java/me/liuli/ez4h/translators/JavaTranslator.java b/src/main/java/me/liuli/ez4h/translators/JavaTranslator.java index 3662ef4..7f19065 100644 --- a/src/main/java/me/liuli/ez4h/translators/JavaTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/JavaTranslator.java @@ -2,7 +2,7 @@ import com.github.steveice10.mc.protocol.packet.MinecraftPacket; import com.github.steveice10.packetlib.packet.Packet; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; public interface JavaTranslator { void translate(Packet inPacket, Client client); diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/connect/DisconnectPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/connect/DisconnectPacketTranslator.java index 341d449..b2b949e 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/connect/DisconnectPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/connect/DisconnectPacketTranslator.java @@ -2,7 +2,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.DisconnectPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class DisconnectPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ResourcePackStackPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ResourcePackStackPacketTranslator.java index fbe3511..50a5760 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ResourcePackStackPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ResourcePackStackPacketTranslator.java @@ -3,7 +3,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.ResourcePackClientResponsePacket; import com.nukkitx.protocol.bedrock.packet.ResourcePackStackPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class ResourcePackStackPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ResourcePacksInfoPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ResourcePacksInfoPacketTranslator.java index c804055..b3bb87a 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ResourcePacksInfoPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ResourcePacksInfoPacketTranslator.java @@ -3,7 +3,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.ResourcePackClientResponsePacket; import com.nukkitx.protocol.bedrock.packet.ResourcePacksInfoPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class ResourcePacksInfoPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ServerToClientHandshakePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ServerToClientHandshakePacketTranslator.java index a5e1f96..9ae04f8 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ServerToClientHandshakePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/connect/ServerToClientHandshakePacketTranslator.java @@ -5,7 +5,7 @@ import com.nukkitx.protocol.bedrock.packet.ClientToServerHandshakePacket; import com.nukkitx.protocol.bedrock.packet.ServerToClientHandshakePacket; import com.nukkitx.protocol.bedrock.util.EncryptionUtils; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import javax.crypto.SecretKey; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddEntityPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddEntityPacketTranslator.java index 598abed..cd3f4d4 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddEntityPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddEntityPacketTranslator.java @@ -16,7 +16,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.AddEntityPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.cache.EntityInfo; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddItemEntityPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddItemEntityPacketTranslator.java index 5759798..cd09b38 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddItemEntityPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddItemEntityPacketTranslator.java @@ -9,7 +9,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.AddItemEntityPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.cache.EntityInfo; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddPlayerPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddPlayerPacketTranslator.java index 6657fa4..4e8562c 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddPlayerPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AddPlayerPacketTranslator.java @@ -16,7 +16,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.packet.AddPlayerPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.cache.EntityInfo; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AnimatePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AnimatePacketTranslator.java index 0a40212..8097c68 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AnimatePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/AnimatePacketTranslator.java @@ -4,7 +4,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityAnimationPacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.AnimatePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class AnimatePacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/EntityEventPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/EntityEventPacketTranslator.java index 0e67faa..9720ad0 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/EntityEventPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/EntityEventPacketTranslator.java @@ -4,7 +4,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityAnimationPacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.EntityEventPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class EntityEventPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobArmorEquipmentPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobArmorEquipmentPacketTranslator.java index dc8c60f..b7f61b7 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobArmorEquipmentPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobArmorEquipmentPacketTranslator.java @@ -5,7 +5,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.MobArmorEquipmentPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.converters.ItemConverter; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobEffectPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobEffectPacketTranslator.java index da262d6..e25a8bf 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobEffectPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobEffectPacketTranslator.java @@ -9,7 +9,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.MobEffectPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.utils.FileUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobEquipmentPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobEquipmentPacketTranslator.java index 6cd222a..bdaf3b6 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobEquipmentPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MobEquipmentPacketTranslator.java @@ -5,7 +5,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.MobEquipmentPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class MobEquipmentPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MoveEntityAbsolutePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MoveEntityAbsolutePacketTranslator.java index d513e47..d825ee6 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MoveEntityAbsolutePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MoveEntityAbsolutePacketTranslator.java @@ -6,7 +6,7 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.MoveEntityAbsolutePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.cache.EntityInfo; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MovePlayerPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MovePlayerPacketTranslator.java index bfda974..b97c4c8 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MovePlayerPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/MovePlayerPacketTranslator.java @@ -7,7 +7,7 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.cache.EntityInfo; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/RemoveEntityPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/RemoveEntityPacketTranslator.java index 7273383..4765870 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/RemoveEntityPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/RemoveEntityPacketTranslator.java @@ -3,7 +3,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityDestroyPacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.RemoveEntityPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class RemoveEntityPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/RemoveObjectivePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/RemoveObjectivePacketTranslator.java index bdb763e..8db6cb2 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/RemoveObjectivePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/RemoveObjectivePacketTranslator.java @@ -3,7 +3,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.scoreboard.ServerScoreboardObjectivePacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.RemoveObjectivePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class RemoveObjectivePacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/SetEntityDataPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/SetEntityDataPacketTranslator.java index af027a8..eecec0a 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/SetEntityDataPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/SetEntityDataPacketTranslator.java @@ -3,7 +3,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.SetEntityDataPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class SetEntityDataPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/SetEntityMotionPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/SetEntityMotionPacketTranslator.java index d110ced..8e31ebd 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/SetEntityMotionPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/SetEntityMotionPacketTranslator.java @@ -4,7 +4,7 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.SetEntityMotionPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class SetEntityMotionPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/TakeItemEntityPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/TakeItemEntityPacketTranslator.java index a21e819..134a846 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/entity/TakeItemEntityPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/entity/TakeItemEntityPacketTranslator.java @@ -4,7 +4,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityDestroyPacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.TakeItemEntityPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class TakeItemEntityPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/AdventureSettingsPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/AdventureSettingsPacketTranslator.java index 86fece2..caa8c6c 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/AdventureSettingsPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/AdventureSettingsPacketTranslator.java @@ -5,7 +5,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.data.AdventureSetting; import com.nukkitx.protocol.bedrock.packet.AdventureSettingsPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class AdventureSettingsPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/ModalFormRequestPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/ModalFormRequestPacketTranslator.java index 8e5ffd5..700cdac 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/ModalFormRequestPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/ModalFormRequestPacketTranslator.java @@ -3,7 +3,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.ModalFormRequestPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class ModalFormRequestPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/PlayerListPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/PlayerListPacketTranslator.java index c7e5382..5af929e 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/PlayerListPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/PlayerListPacketTranslator.java @@ -8,7 +8,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.ServerPlayerListEntryPacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.PlayerListPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/RespawnPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/RespawnPacketTranslator.java index 263cdcc..ca1298b 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/RespawnPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/RespawnPacketTranslator.java @@ -9,7 +9,7 @@ import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket; import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket; import com.nukkitx.protocol.bedrock.packet.RespawnPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class RespawnPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetDisplayObjectivePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetDisplayObjectivePacketTranslator.java index 6aaa557..95b9a9e 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetDisplayObjectivePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetDisplayObjectivePacketTranslator.java @@ -7,7 +7,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.scoreboard.ServerScoreboardObjectivePacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.SetDisplayObjectivePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetPlayerGameTypePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetPlayerGameTypePacketTranslator.java index f2af201..d36746b 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetPlayerGameTypePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetPlayerGameTypePacketTranslator.java @@ -5,7 +5,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.data.GameType; import com.nukkitx.protocol.bedrock.packet.SetPlayerGameTypePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetScorePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetScorePacketTranslator.java index 68a9351..c861a64 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetScorePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetScorePacketTranslator.java @@ -4,7 +4,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.data.ScoreInfo; import com.nukkitx.protocol.bedrock.packet.SetScorePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetTimePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetTimePacketTranslator.java index c8b61a5..2eb6168 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetTimePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetTimePacketTranslator.java @@ -3,7 +3,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerUpdateTimePacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.SetTimePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class SetTimePacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetTitlePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetTitlePacketTranslator.java index 92c2af1..77093e9 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetTitlePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/SetTitlePacketTranslator.java @@ -4,7 +4,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.ServerTitlePacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.SetTitlePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class SetTitlePacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/StartGamePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/StartGamePacketTranslator.java index a101d75..3ed7191 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/StartGamePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/StartGamePacketTranslator.java @@ -16,8 +16,8 @@ import com.nukkitx.protocol.bedrock.packet.SetLocalPlayerAsInitializedPacket; import com.nukkitx.protocol.bedrock.packet.StartGamePacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; -import me.liuli.ez4h.minecraft.java.Ping; +import me.liuli.ez4h.minecraft.Client; +import me.liuli.ez4h.minecraft.Ping; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/TextPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/TextPacketTranslator.java index 9d65ca8..9a6b418 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/TextPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/TextPacketTranslator.java @@ -5,7 +5,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.ServerChatPacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.TextPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class TextPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/UpdateAttributesPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/UpdateAttributesPacketTranslator.java index e875d6d..f54537c 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/UpdateAttributesPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/UpdateAttributesPacketTranslator.java @@ -11,7 +11,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.data.AttributeData; import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import java.util.ArrayList; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/play/UpdatePlayerGameTypePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/play/UpdatePlayerGameTypePacketTranslator.java index ec13ca6..15a1913 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/play/UpdatePlayerGameTypePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/play/UpdatePlayerGameTypePacketTranslator.java @@ -4,7 +4,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerNotifyClientPacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.UpdatePlayerGameTypePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/window/ContainerClosePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/window/ContainerClosePacketTranslator.java index 40ea79d..5b87442 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/window/ContainerClosePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/window/ContainerClosePacketTranslator.java @@ -3,7 +3,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.window.ServerCloseWindowPacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.ContainerClosePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class ContainerClosePacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/window/ContainerOpenPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/window/ContainerOpenPacketTranslator.java index f5f02ef..2b9c80d 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/window/ContainerOpenPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/window/ContainerOpenPacketTranslator.java @@ -3,7 +3,7 @@ import com.github.steveice10.mc.protocol.data.game.window.WindowType; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.cache.ChestData; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/window/InventoryContentPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/window/InventoryContentPacketTranslator.java index 85b3832..1534641 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/window/InventoryContentPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/window/InventoryContentPacketTranslator.java @@ -7,7 +7,7 @@ import com.nukkitx.protocol.bedrock.data.inventory.ItemData; import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.cache.ChestData; import me.liuli.ez4h.translators.converters.ItemConverter; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/window/InventorySlotPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/window/InventorySlotPacketTranslator.java index 60e652e..b3eb85c 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/window/InventorySlotPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/window/InventorySlotPacketTranslator.java @@ -3,7 +3,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.converters.ItemConverter; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/world/BlockEntityDataPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/world/BlockEntityDataPacketTranslator.java index 1fd1c56..ddffc8a 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/world/BlockEntityDataPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/world/BlockEntityDataPacketTranslator.java @@ -8,7 +8,7 @@ import com.nukkitx.nbt.NbtMap; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class BlockEntityDataPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/world/BlockEventPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/world/BlockEventPacketTranslator.java index b03b034..9e1675a 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/world/BlockEventPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/world/BlockEventPacketTranslator.java @@ -7,7 +7,7 @@ import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.BlockEventPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; public class BlockEventPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/world/BossEventPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/world/BossEventPacketTranslator.java index 57a81d7..0c8b692 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/world/BossEventPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/world/BossEventPacketTranslator.java @@ -7,7 +7,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.ServerBossBarPacket; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.BossEventPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.utils.BedrockUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/world/LevelChunkPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/world/LevelChunkPacketTranslator.java index 778d0d7..9198240 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/world/LevelChunkPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/world/LevelChunkPacketTranslator.java @@ -12,7 +12,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.converters.BlockConverter; import me.liuli.ez4h.utils.nukkit.BitArray; diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/world/LevelEventPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/world/LevelEventPacketTranslator.java index 05a198d..2fefcd9 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/world/LevelEventPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/world/LevelEventPacketTranslator.java @@ -6,8 +6,8 @@ import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.LevelEventPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; -import me.liuli.ez4h.minecraft.java.SmoothWeather; +import me.liuli.ez4h.minecraft.Client; +import me.liuli.ez4h.minecraft.SmoothWeather; import me.liuli.ez4h.translators.BedrockTranslator; public class LevelEventPacketTranslator implements BedrockTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/bedrock/world/UpdateBlockPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/bedrock/world/UpdateBlockPacketTranslator.java index 61c3cd2..0f29e12 100644 --- a/src/main/java/me/liuli/ez4h/translators/bedrock/world/UpdateBlockPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/bedrock/world/UpdateBlockPacketTranslator.java @@ -7,7 +7,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket; import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.BedrockTranslator; import me.liuli.ez4h.translators.converters.BlockConverter; diff --git a/src/main/java/me/liuli/ez4h/translators/converters/FormConverter.java b/src/main/java/me/liuli/ez4h/translators/converters/FormConverter.java index cacf54b..8285f18 100644 --- a/src/main/java/me/liuli/ez4h/translators/converters/FormConverter.java +++ b/src/main/java/me/liuli/ez4h/translators/converters/FormConverter.java @@ -3,7 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.steveice10.mc.protocol.packet.ingame.server.ServerPluginMessagePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.cache.Form; import me.liuli.ez4h.utils.OtherUtils; diff --git a/src/main/java/me/liuli/ez4h/translators/converters/ItemConverter.java b/src/main/java/me/liuli/ez4h/translators/converters/ItemConverter.java index 61feb59..7b672d2 100644 --- a/src/main/java/me/liuli/ez4h/translators/converters/ItemConverter.java +++ b/src/main/java/me/liuli/ez4h/translators/converters/ItemConverter.java @@ -11,13 +11,16 @@ import java.util.Map; public class ItemConverter { - private JSONObject BEDROCK_ID2NAME,JAVA_NAME2ID,JAVA_ENCH,BEDROCK_ENCH; + private final JSONObject BedrockItemMap; + private final JSONObject JavaItemMap; + private final JSONObject BedrockEnchantMap; + private final JSONObject JavaEnchantMap; public ItemConverter(JSONObject bedrock,JSONObject java,JSONObject enchant){ - BEDROCK_ID2NAME=bedrock; - JAVA_NAME2ID=java; - BEDROCK_ENCH=enchant.getJSONObject("bedrock"); - JAVA_ENCH=enchant.getJSONObject("java"); + BedrockItemMap=bedrock; + JavaItemMap=java; + BedrockEnchantMap=enchant.getJSONObject("bedrock"); + JavaEnchantMap=enchant.getJSONObject("java"); } public int inventoryIndex(int index,boolean isToBedrock){ @@ -104,7 +107,7 @@ public CompoundTag nbtMapTranslator(String name,NbtMap nbtMap,boolean isFirst){ } public ItemStack convertToJE(ItemData itemData){ int id=1,data=0; - String item=(String)JAVA_NAME2ID.get((String) BEDROCK_ID2NAME.get(itemData.getId()+":"+itemData.getDamage())); + String item=(String)JavaItemMap.get((String) BedrockItemMap.get(itemData.getId()+":"+itemData.getDamage())); if(item!=null){ String[] splitData=item.split(":"); id=new Integer(splitData[0]); @@ -121,11 +124,11 @@ public ItemStack convertToJE(ItemData itemData){ return new ItemStack(id,itemData.getCount(), data,tag); } public short getJavaEnchant(short id){ - String result=BEDROCK_ENCH.getString(id+""); + String result=BedrockEnchantMap.getString(id+""); if(result==null){ return id; } - Short javaResult=JAVA_ENCH.getShort(result); + Short javaResult=JavaEnchantMap.getShort(result); if(javaResult==null){ return id; } diff --git a/src/main/java/me/liuli/ez4h/translators/converters/MetadataConverter.java b/src/main/java/me/liuli/ez4h/translators/converters/MetadataConverter.java index 9400dc4..21ca32c 100644 --- a/src/main/java/me/liuli/ez4h/translators/converters/MetadataConverter.java +++ b/src/main/java/me/liuli/ez4h/translators/converters/MetadataConverter.java @@ -6,7 +6,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityDataMap; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.cache.EntityInfo; import java.util.ArrayList; diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientChatPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientChatPacketTranslator.java index 3ad0617..76c9c2f 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientChatPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientChatPacketTranslator.java @@ -8,7 +8,7 @@ import com.nukkitx.protocol.bedrock.packet.CommandRequestPacket; import com.nukkitx.protocol.bedrock.packet.TextPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; import java.util.ArrayList; diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerActionPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerActionPacketTranslator.java index 9afec6d..8e9f4bd 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerActionPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerActionPacketTranslator.java @@ -13,7 +13,7 @@ import com.nukkitx.protocol.bedrock.data.inventory.TransactionType; import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket; import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientPlayerActionPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerChangeHeldItemPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerChangeHeldItemPacketTranslator.java index 9312d58..2be40ad 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerChangeHeldItemPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerChangeHeldItemPacketTranslator.java @@ -4,7 +4,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerChangeHeldItemPacket; import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.protocol.bedrock.packet.PlayerHotbarPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientPlayerChangeHeldItemPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerInteractEntityPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerInteractEntityPacketTranslator.java index 6c7e2ff..28e42d7 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerInteractEntityPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerInteractEntityPacketTranslator.java @@ -7,7 +7,7 @@ import com.nukkitx.protocol.bedrock.data.inventory.TransactionType; import com.nukkitx.protocol.bedrock.packet.InteractPacket; import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientPlayerInteractEntityPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPlaceBlockPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPlaceBlockPacketTranslator.java index 7ba1804..b27c26a 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPlaceBlockPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPlaceBlockPacketTranslator.java @@ -8,7 +8,7 @@ import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.data.inventory.TransactionType; import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientPlayerPlaceBlockPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPositionPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPositionPacketTranslator.java index b3d46b5..06683ea 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPositionPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPositionPacketTranslator.java @@ -5,7 +5,7 @@ import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientPlayerPositionPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPositionRotationPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPositionRotationPacketTranslator.java index 6615f7b..68d9e32 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPositionRotationPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerPositionRotationPacketTranslator.java @@ -7,7 +7,7 @@ import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket; import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; import java.util.HashMap; diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerRotationPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerRotationPacketTranslator.java index d5b371c..36aa77b 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerRotationPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerRotationPacketTranslator.java @@ -5,7 +5,7 @@ import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientPlayerRotationPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerStatePacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerStatePacketTranslator.java index cfb8fd6..e5c62ce 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerStatePacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerStatePacketTranslator.java @@ -5,7 +5,7 @@ import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientPlayerStatePacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerSwingArmPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerSwingArmPacketTranslator.java index 7dd9e8c..7eb6923 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerSwingArmPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerSwingArmPacketTranslator.java @@ -4,7 +4,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerSwingArmPacket; import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.protocol.bedrock.packet.AnimatePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientPlayerSwingArmPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerUseItemPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerUseItemPacketTranslator.java index 560544b..b97980c 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerUseItemPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientPlayerUseItemPacketTranslator.java @@ -7,7 +7,7 @@ import com.nukkitx.math.vector.Vector3i; import com.nukkitx.protocol.bedrock.data.inventory.TransactionType; import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientPlayerUseItemPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientRequestPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientRequestPacketTranslator.java index 2e33042..4ea7a2d 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientRequestPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientRequestPacketTranslator.java @@ -5,7 +5,7 @@ import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.math.vector.Vector3f; import com.nukkitx.protocol.bedrock.packet.RespawnPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientRequestPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/play/ClientSettingsPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/play/ClientSettingsPacketTranslator.java index 90777db..121e384 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/play/ClientSettingsPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/play/ClientSettingsPacketTranslator.java @@ -4,7 +4,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.ClientSettingsPacket; import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.protocol.bedrock.packet.RequestChunkRadiusPacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientSettingsPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/window/ClientCloseWindowPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/window/ClientCloseWindowPacketTranslator.java index 84c8dab..3486877 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/window/ClientCloseWindowPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/window/ClientCloseWindowPacketTranslator.java @@ -4,7 +4,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientCloseWindowPacket; import com.github.steveice10.packetlib.packet.Packet; import com.nukkitx.protocol.bedrock.packet.ContainerClosePacket; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; public class ClientCloseWindowPacketTranslator implements JavaTranslator { diff --git a/src/main/java/me/liuli/ez4h/translators/java/window/ClientWindowActionPacketTranslator.java b/src/main/java/me/liuli/ez4h/translators/java/window/ClientWindowActionPacketTranslator.java index 4856e4f..3ee3652 100644 --- a/src/main/java/me/liuli/ez4h/translators/java/window/ClientWindowActionPacketTranslator.java +++ b/src/main/java/me/liuli/ez4h/translators/java/window/ClientWindowActionPacketTranslator.java @@ -12,7 +12,7 @@ import com.nukkitx.protocol.bedrock.packet.InteractPacket; import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket; import me.liuli.ez4h.EZ4H; -import me.liuli.ez4h.minecraft.bedrock.Client; +import me.liuli.ez4h.minecraft.Client; import me.liuli.ez4h.translators.JavaTranslator; import me.liuli.ez4h.translators.converters.ItemConverter; import me.liuli.ez4h.translators.java.play.ClientPlayerActionPacketTranslator; diff --git a/src/main/java/me/liuli/ez4h/utils/FileUtils.java b/src/main/java/me/liuli/ez4h/utils/FileUtils.java index b46c536..4f5cdb5 100644 --- a/src/main/java/me/liuli/ez4h/utils/FileUtils.java +++ b/src/main/java/me/liuli/ez4h/utils/FileUtils.java @@ -1,6 +1,8 @@ package me.liuli.ez4h.utils; +import javax.net.ssl.HttpsURLConnection; import java.io.*; +import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.StandardCopyOption; import java.util.jar.JarEntry; @@ -18,6 +20,17 @@ public static String readIS(InputStream inputStream) throws Exception { inputStream.close(); return byteArrayOutputStream.toString("UTF-8"); } + public static byte[] readIS2Byte(InputStream inputStream) throws Exception { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + byte[] buffer = new byte[1024]; + int length; + while ((length = inputStream.read(buffer)) != -1) { + byteArrayOutputStream.write(buffer, 0, length); + } + byteArrayOutputStream.close(); + inputStream.close(); + return byteArrayOutputStream.toByteArray(); + } public static String readFile(String fileName) { File file = new File(fileName); Long filelength = file.length(); diff --git a/src/main/java/me/liuli/ez4h/utils/OtherUtils.java b/src/main/java/me/liuli/ez4h/utils/OtherUtils.java index 467b60d..1dcbf8e 100644 --- a/src/main/java/me/liuli/ez4h/utils/OtherUtils.java +++ b/src/main/java/me/liuli/ez4h/utils/OtherUtils.java @@ -1,5 +1,7 @@ package me.liuli.ez4h.utils; +import javax.net.ssl.HttpsURLConnection; +import java.net.URL; import java.util.Base64; public class OtherUtils { @@ -9,6 +11,9 @@ public static boolean isNull(Object object){ public static String base64Encode(String input) { return new String(Base64.getEncoder().encode(input.getBytes())); } + public static String base64Encode(byte[] input) { + return new String(Base64.getEncoder().encode(input)); + } public static String base64Decode(String input) { return new String(Base64.getDecoder().decode(input.getBytes())); } @@ -20,4 +25,33 @@ public static byte[] toByteArray(long value) { } return result; } + public static String httpGet(String url) throws Exception { + HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection(); + connection.setRequestMethod("GET"); + connection.connect(); + if(connection.getResponseCode()==204){ + return null; + } + return FileUtils.readIS(connection.getInputStream()); + } + public static byte[] httpGetByte(String url) throws Exception { + HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection(); + connection.setRequestMethod("GET"); + connection.connect(); + if(connection.getResponseCode()==204){ + return null; + } + return FileUtils.readIS2Byte(connection.getInputStream()); + } + public static String toHttps(String url){ + if((!url.startsWith("https"))&&url.startsWith("http")){ + return "https"+url.substring(4); + } + return url; + } + public static void setBaseHeaders(HttpsURLConnection connection){ + connection.setRequestProperty("Accept-encoding","gzip"); + connection.setRequestProperty("Accept-Language","en-US"); + connection.setRequestProperty("User-Agent","Mozilla/5.0 (XboxReplay; XboxLiveAuth/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"); + } }