Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Commit

Permalink
fix fatal bug
Browse files Browse the repository at this point in the history
  • Loading branch information
liulihaocai committed Jan 22, 2021
1 parent 1d26122 commit d924efd
Show file tree
Hide file tree
Showing 86 changed files with 182 additions and 109 deletions.
2 changes: 1 addition & 1 deletion src/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Main-Class: me.liuli.ez4h.InitLibs
Main-Class: me.liuli.ez4h.Initialization

9 changes: 5 additions & 4 deletions src/main/java/me/liuli/ez4h/EZ4H.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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<Class<? extends BedrockTranslator>> subTypes = reflections.getSubTypesOf(BedrockTranslator.class);
for (Class<? extends BedrockTranslator> translatorClass : subTypes) {
try {
Expand All @@ -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<Class<? extends JavaTranslator>> subTypes = reflections.getSubTypesOf(JavaTranslator.class);
for (Class<? extends JavaTranslator> translatorClass : subTypes) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/liuli/ez4h/managers/CommandManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/liuli/ez4h/managers/CommonManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/me/liuli/ez4h/managers/ConfigManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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");
}
}
31 changes: 29 additions & 2 deletions src/main/java/me/liuli/ez4h/managers/LoginManager.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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()+".");
}
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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){
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/liuli/ez4h/minecraft/auth/Xbox.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
13 changes: 5 additions & 8 deletions src/main/java/me/liuli/ez4h/minecraft/auth/XboxLogin.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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:'"));
Expand All @@ -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"));

Expand All @@ -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){
Expand All @@ -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)){
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading

0 comments on commit d924efd

Please sign in to comment.