radmanplays
/
EaglerForge
mirror of https://github.com/eaglerforge/EaglerForge-old.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
EaglerForge/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java

416 lines
11 KiB
Java
Raw Blame History

# Eagler Context Redacted Diff
# Copyright (c) 2024 lax1dude. All rights reserved.
# Version: 1.0
# Author: lax1dude
> DELETE 2 @ 2 : 8
> DELETE 4 @ 4 : 6
> INSERT 1 : 22 @ 1
+
+ import net.eaglerforge.api.BaseData;
+ import net.eaglerforge.api.ModAPI;
+ import net.eaglerforge.api.ModData;
+ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+
+ import com.google.common.collect.Maps;
+
+ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
+ import net.lax1dude.eaglercraft.v1_8.profile.ServerSkinCache;
+ import net.lax1dude.eaglercraft.v1_8.profile.SkinPackets;
+ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
+ import net.lax1dude.eaglercraft.v1_8.sp.lan.LANClientNetworkManager;
+ import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkManager;
+ import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
> DELETE 14 @ 14 : 16
> DELETE 9 @ 9 : 10
> DELETE 5 @ 5 : 8
> DELETE 47 @ 47 : 48
> DELETE 2 @ 2 : 3
> INSERT 36 : 37 @ 36
+ import net.minecraft.network.play.server.S20PacketEntityProperties.Snapshot;
> INSERT 2 : 3 @ 2
+ import net.minecraft.network.play.server.S22PacketMultiBlockChange.BlockUpdateData;
> INSERT 22 : 23 @ 22
+ import net.minecraft.network.play.server.S38PacketPlayerListItem.AddPlayerData;
> DELETE 18 @ 18 : 19
> DELETE 32 @ 32 : 34
> CHANGE 1 : 2 @ 1 : 2
~ public class NetHandlerPlayClient extends ModData implements INetHandlerPlayClient {
> CHANGE 1 : 2 @ 1 : 2
~ private final EaglercraftNetworkManager netManager;
> CHANGE 5 : 6 @ 5 : 6
~ private final Map<EaglercraftUUID, NetworkPlayerInfo> playerInfoMap = Maps.newHashMap();
> CHANGE 2 : 5 @ 2 : 3
~ private boolean isIntegratedServer = false;
~ private final EaglercraftRandom avRandomizer = new EaglercraftRandom();
~ private final ServerSkinCache skinCache;
> CHANGE 1 : 2 @ 1 : 2
~ public NetHandlerPlayClient(Minecraft mcIn, GuiScreen parGuiScreen, EaglercraftNetworkManager parNetworkManager,
> INSERT 5 : 8 @ 5
+ this.skinCache = new ServerSkinCache(parNetworkManager, mcIn.getTextureManager());
+ this.isIntegratedServer = (parNetworkManager instanceof ClientIntegratedServerNetworkManager)
+ || (parNetworkManager instanceof LANClientNetworkManager);
> INSERT 4 : 5 @ 4
+ this.skinCache.destroy();
> INSERT 2 : 6 @ 2
+ public ServerSkinCache getSkinCache() {
+ return this.skinCache;
+ }
+
> DELETE 1 @ 1 : 2
> DELETE 19 @ 19 : 20
> DELETE 105 @ 105 : 106
> DELETE 12 @ 12 : 13
> DELETE 21 @ 21 : 22
> DELETE 6 @ 6 : 7
> DELETE 8 @ 8 : 9
> DELETE 8 @ 8 : 9
> DELETE 31 @ 31 : 32
> DELETE 22 @ 22 : 23
> DELETE 8 @ 8 : 9
> DELETE 17 @ 17 : 18
> DELETE 8 @ 8 : 10
> DELETE 7 @ 7 : 8
> CHANGE 47 : 50 @ 47 : 51
~ BlockUpdateData[] dat = packetIn.getChangedBlocks();
~ for (int i = 0; i < dat.length; ++i) {
~ BlockUpdateData s22packetmultiblockchange$blockupdatedata = dat[i];
> DELETE 7 @ 7 : 8
> DELETE 22 @ 22 : 23
> CHANGE 8 : 11 @ 8 : 9
~ if (this.gameController.theWorld != null) {
~ this.gameController.loadWorld((WorldClient) null);
~ }
> CHANGE 1 : 3 @ 1 : 9
~ this.gameController.shutdownIntegratedServer(
~ new GuiDisconnected(this.guiScreenServer, "disconnect.lost", ichatcomponent));
> CHANGE 1 : 2 @ 1 : 2
~ this.gameController.shutdownIntegratedServer(
> DELETE 2 @ 2 : 3
> DELETE 7 @ 7 : 8
> CHANGE 23 : 37 @ 23 : 24
~ ModData eventData = new ModData();
~ eventData.set("preventDefault", false);
~ eventData.set("type", packetIn.type);
~ eventData.set("chat", packetIn.chatComponent.getFormattedText());
~ BaseData newEvent = ModAPI.callEvent("packetchat", eventData);
~ if (newEvent.has("preventDefault") && newEvent.getBoolean("preventDefault") == true) {
~ return;
~ }
~ packetIn.type = newEvent.has("type") ? newEvent.getByte("type") : packetIn.type;
~ if (newEvent.has("chat")
~ && (newEvent.getString("chat").length() != packetIn.chatComponent.getFormattedText().length())) {
~ packetIn.chatComponent = new ChatComponentText(newEvent.getString("chat"));
~ }
~
> DELETE 9 @ 9 : 10
> DELETE 20 @ 20 : 21
> DELETE 4 @ 4 : 5
> DELETE 35 @ 35 : 36
> DELETE 5 @ 5 : 6
> DELETE 5 @ 5 : 6
> DELETE 39 @ 39 : 40
> DELETE 12 @ 12 : 13
> DELETE 6 @ 6 : 7
> DELETE 5 @ 5 : 6
> DELETE 17 @ 17 : 18
> DELETE 9 @ 9 : 10
> DELETE 27 @ 27 : 28
> DELETE 27 @ 27 : 28
> DELETE 16 @ 16 : 17
> DELETE 10 @ 10 : 11
> DELETE 11 @ 11 : 12
> DELETE 22 @ 22 : 23
> DELETE 16 @ 16 : 17
> DELETE 8 @ 8 : 9
> DELETE 8 @ 8 : 9
> DELETE 4 @ 4 : 5
> DELETE 5 @ 5 : 6
> DELETE 5 @ 5 : 7
> DELETE 18 @ 18 : 19
> CHANGE 21 : 24 @ 21 : 40
~
~ // minecraft demo screen
~
> DELETE 18 @ 18 : 19
> DELETE 6 @ 6 : 7
> DELETE 11 @ 11 : 12
> DELETE 9 @ 9 : 10
> DELETE 25 @ 25 : 26
> DELETE 10 @ 10 : 26
> INSERT 1 : 3 @ 1
+ // used by twitch stream
+
> DELETE 3 @ 3 : 4
> CHANGE 5 : 6 @ 5 : 6
~
> DELETE 8 @ 8 : 9
> DELETE 4 @ 4 : 5
> DELETE 36 @ 36 : 37
> CHANGE 8 : 11 @ 8 : 11
~ List<AddPlayerData> lst = packetIn.func_179767_a();
~ for (int i = 0, l = lst.size(); i < l; ++i) {
~ S38PacketPlayerListItem.AddPlayerData s38packetplayerlistitem$addplayerdata = lst.get(i);
> CHANGE 1 : 4 @ 1 : 2
~ EaglercraftUUID uuid = s38packetplayerlistitem$addplayerdata.getProfile().getId();
~ this.playerInfoMap.remove(uuid);
~ this.skinCache.evictSkin(uuid);
> DELETE 34 @ 34 : 35
> DELETE 10 @ 10 : 11
> DELETE 9 @ 9 : 10
> CHANGE 7 : 30 @ 7 : 31
~ if (!EaglerFolderResourcePack.isSupported() || s.startsWith("level://")) {
~ this.netManager
~ .sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
~ return;
~ }
~ if (this.gameController.getCurrentServerData() != null && this.gameController.getCurrentServerData()
~ .getResourceMode() == ServerData.ServerResourceMode.ENABLED) {
~ NetHandlerPlayClient.this.netManager
~ .sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.ACCEPTED));
~ NetHandlerPlayClient.this.gameController.getResourcePackRepository().downloadResourcePack(s, s1,
~ success -> {
~ if (success) {
~ NetHandlerPlayClient.this.netManager.sendPacket(new C19PacketResourcePackStatus(s1,
~ C19PacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
~ } else {
~ NetHandlerPlayClient.this.netManager.sendPacket(new C19PacketResourcePackStatus(s1,
~ C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
~ }
~ });
~ } else if (this.gameController.getCurrentServerData() != null && this.gameController.getCurrentServerData()
~ .getResourceMode() != ServerData.ServerResourceMode.PROMPT) {
~ this.netManager
~ .sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
> CHANGE 1 : 9 @ 1 : 11
~ NetHandlerPlayClient.this.gameController.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() {
~ public void confirmClicked(boolean flag, int var2) {
~ NetHandlerPlayClient.this.gameController = Minecraft.getMinecraft();
~ if (flag) {
~ if (NetHandlerPlayClient.this.gameController.getCurrentServerData() != null) {
~ NetHandlerPlayClient.this.gameController.getCurrentServerData()
~ .setResourceMode(ServerData.ServerResourceMode.ENABLED);
~ }
> CHANGE 1 : 11 @ 1 : 20
~ NetHandlerPlayClient.this.netManager.sendPacket(
~ new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.ACCEPTED));
~ NetHandlerPlayClient.this.gameController.getResourcePackRepository().downloadResourcePack(s, s1,
~ success -> {
~ if (success) {
~ NetHandlerPlayClient.this.netManager.sendPacket(new C19PacketResourcePackStatus(
~ s1, C19PacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
~ } else {
~ NetHandlerPlayClient.this.netManager.sendPacket(new C19PacketResourcePackStatus(
~ s1, C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
> INSERT 1 : 7 @ 1
+ });
+ } else {
+ if (NetHandlerPlayClient.this.gameController.getCurrentServerData() != null) {
+ NetHandlerPlayClient.this.gameController.getCurrentServerData()
+ .setResourceMode(ServerData.ServerResourceMode.DISABLED);
+ }
> CHANGE 1 : 3 @ 1 : 34
~ NetHandlerPlayClient.this.netManager.sendPacket(
~ new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
> DELETE 1 @ 1 : 3
> INSERT 1 : 6 @ 1
+ ServerList.func_147414_b(NetHandlerPlayClient.this.gameController.getCurrentServerData());
+ NetHandlerPlayClient.this.gameController.displayGuiScreen((GuiScreen) null);
+ }
+ }, I18n.format("multiplayer.texturePrompt.line1", new Object[0]),
+ I18n.format("multiplayer.texturePrompt.line2", new Object[0]), 0));
> DELETE 4 @ 4 : 5
> DELETE 8 @ 8 : 9
> DELETE 2 @ 2 : 3
> DELETE 11 @ 11 : 13
> INSERT 9 : 28 @ 9
+ } else if ("EAG|Skins-1.8".equals(packetIn.getChannelName())) {
+ try {
+ SkinPackets.readPluginMessage(packetIn.getBufferData(), skinCache);
+ } catch (IOException e) {
+ logger.error("Couldn't read EAG|Skins-1.8 packet!");
+ logger.error(e);
+ }
+ } else if ("EAG|UpdateCert-1.8".equals(packetIn.getChannelName())) {
+ if (EagRuntime.getConfiguration().allowUpdateSvc()) {
+ try {
+ PacketBuffer pb = packetIn.getBufferData();
+ byte[] c = new byte[pb.readableBytes()];
+ pb.readBytes(c);
+ UpdateService.addCertificateToSet(c);
+ } catch (Throwable e) {
+ logger.error("Couldn't process EAG|UpdateCert-1.8 packet!");
+ logger.error(e);
+ }
+ }
> DELETE 5 @ 5 : 6
> DELETE 19 @ 19 : 20
> DELETE 16 @ 16 : 17
> DELETE 11 @ 11 : 12
> DELETE 39 @ 39 : 40
> DELETE 35 @ 35 : 36
> CHANGE 8 : 11 @ 8 : 9
~ List<Snapshot> lst = packetIn.func_149441_d();
~ for (int i = 0, l = lst.size(); i < l; ++i) {
~ S20PacketEntityProperties.Snapshot s20packetentityproperties$snapshot = lst.get(i);
> CHANGE 20 : 21 @ 20 : 21
~ public EaglercraftNetworkManager getNetworkManager() {
> CHANGE 7 : 8 @ 7 : 8
~ public NetworkPlayerInfo getPlayerInfo(EaglercraftUUID parUUID) {
> INSERT 16 : 20 @ 16
+
+ public boolean isClientInEaglerSingleplayerOrLAN() {
+ return isIntegratedServer;
+ }
> EOF
Reference in New Issue View Git Blame Copy Permalink