fix ClientPermissions and ChatFilter

Mumfrey
1 parent e068f370
Showing 8 changed files with 160 additions and 7 deletions
debug/obfuscation.properties
java/client/com/mumfrey/liteloader/client/PacketEventsClient.java
java/client/com/mumfrey/liteloader/client/util/PrivateFieldsClient.java
java/common/com/mumfrey/liteloader/core/PacketEvents.java
java/common/com/mumfrey/liteloader/core/runtime/Obf.java
java/common/com/mumfrey/liteloader/permissions/PermissionsManagerClient.java
java/common/com/mumfrey/liteloader/util/ChatUtilities.java
java/common/net/eq2online/permissions/ReplicatedPermissionsContainer.java
@@ -20,6 +20,7 @@ field_147713_ae=shaderIndex
 field_175083_ad=useShader
 field_149528_b=view
 field_70163_u=posY
+field_148919_a=chatComponent
 func_148833_a=processPacket
 func_71411_J=runGameLoop
 func_71407_l=runTick
@@ -20,6 +20,7 @@ import com.mumfrey.liteloader.ChatListener;
 import com.mumfrey.liteloader.JoinGameListener;
 import com.mumfrey.liteloader.PostLoginListener;
 import com.mumfrey.liteloader.PreJoinGameListener;
+import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
 import com.mumfrey.liteloader.common.transformers.PacketEventInfo;
 import com.mumfrey.liteloader.core.ClientPluginChannels;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
@@ -32,6 +33,7 @@ import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.core.runtime.Packets;
 import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.transformers.event.EventInfo;
+import com.mumfrey.liteloader.util.ChatUtilities;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
@@ -205,7 +207,8 @@ public class PacketEventsClient extends PacketEvents
 		if (packet.func_148915_c() == null)
 			return;
-		IChatComponent chat = packet.func_148915_c();
+		IChatComponent originalChat = packet.func_148915_c();
+		IChatComponent chat = originalChat;
 		String message = chat.getFormattedText();
 		// Chat filters get a stab at the chat first, if any filter returns false the chat is discarded
@@ -232,6 +235,19 @@ public class PacketEventsClient extends PacketEvents
 			}
 		}
+		if (chat != originalChat)
+		{
+			try
+			{
+				chat = ChatUtilities.convertLegacyCodes(chat);
+				PrivateFieldsClient.chatMessage.set(packet, chat);
+			}
+			catch (Exception ex)
+			{
+				ex.printStackTrace();
+			}
+		}
+		
 		// Chat listeners get the chat if no filter removed it
 		this.chatListeners.all().onChat(chat, message);
 	}
@@ -10,7 +10,9 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.client.resources.SimpleReloadableResourceManager;
 import net.minecraft.network.NetworkManager;
+import net.minecraft.network.play.server.S02PacketChat;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ObjectIntIdentityMap;
 import net.minecraft.util.RegistryNamespaced;
 import net.minecraft.util.RegistrySimple;
@@ -35,6 +37,7 @@ public class PrivateFieldsClient&lt;P, T&gt; extends PrivateFields&lt;P, T&gt;
 	public static final PrivateFieldsClient<TileEntityRendererDispatcher, Map>          specialRendererMap = new PrivateFieldsClient<TileEntityRendererDispatcher, Map>       (TileEntityRendererDispatcher.class, Obf.mapSpecialRenderers);
 	public static final PrivateFieldsClient<TileEntity, Map>                      tileEntityNameToClassMap = new PrivateFieldsClient<TileEntity, Map>                         (TileEntity.class,                   Obf.tileEntityNameToClassMap);
 	public static final PrivateFieldsClient<TileEntity, Map>                      tileEntityClassToNameMap = new PrivateFieldsClient<TileEntity, Map>                         (TileEntity.class,                   Obf.tileEntityClassToNameMap);
+	public static final PrivateFieldsClient<S02PacketChat, IChatComponent>                     chatMessage = new PrivateFieldsClient<S02PacketChat, IChatComponent>           (S02PacketChat.class,                Obf.chatComponent);
 	public static final PrivateFieldsClient<SimpleReloadableResourceManager, List<IResourceManagerReloadListener>> reloadListeners =
 			new PrivateFieldsClient<SimpleReloadableResourceManager, List<IResourceManagerReloadListener>>(SimpleReloadableResourceManager.class, Obf.reloadListeners);
@@ -280,9 +280,5 @@ public abstract class PacketEvents implements InterfaceProvider
 		{
 			LiteLoaderEventBroker.broker.onPlayerSettingsReceived(((NetHandlerPlayServer)netHandler).playerEntity, packet);
 		}
-		else
-		{
-			System.err.println("ACTUALLY: handler is " + netHandler);
-		}
 	}
 }
@@ -104,6 +104,7 @@ public class Obf
 	public static final Obf                    useShader = new Obf("field_175083_ad",                                            "ad"  );
 	public static final Obf                 viewDistance = new Obf("field_149528_b",                                             "b"   );
 	public static final Obf                   entityPosY = new Obf("field_70163_u",                                              "t"   );
+	public static final Obf                chatComponent = new Obf("field_148919_a",                                             "a"   );
 	// Methods
 	// -----------------------------------------------------------------------------------------
@@ -239,7 +239,7 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 				{
 					byte[] data = query.getBytes();
 					PacketBuffer buffer = new PacketBuffer(Unpooled.buffer());
-					buffer.writeByteArray(data);
+					buffer.writeBytes(data);
 					ClientPluginChannels.sendMessage(ReplicatedPermissionsContainer.CHANNEL, buffer, ChannelPolicy.DISPATCH_ALWAYS);
 				}
 			}
+package com.mumfrey.liteloader.util;
+
+import java.util.List;
+
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+
+/**
+ * Utility functions for chat
+ *
+ * @author Adam Mummery-Smith
+ */
+public abstract class ChatUtilities
+{
+	private static String formattingCodeLookup;
+	
+	static
+	{
+		StringBuilder formattingCodes = new StringBuilder();
+		
+		for (EnumChatFormatting chatFormat : EnumChatFormatting.values())
+		{
+			formattingCodes.append(chatFormat.toString().charAt(1));
+		}
+		
+		ChatUtilities.formattingCodeLookup = formattingCodes.toString();
+	}
+	
+	private ChatUtilities() {}
+	
+	/**
+	 * Get a chat style from a legacy formatting code
+	 * 
+	 * @param code Code
+	 * @return
+	 */
+	public static ChatStyle getChatStyleFromCode(char code)
+	{
+		int pos = ChatUtilities.formattingCodeLookup.indexOf(code);
+		if (pos < 0) return null;
+		EnumChatFormatting format = EnumChatFormatting.values()[pos];
+		
+		ChatStyle style = new ChatStyle();
+		if (format.isColor())
+		{
+			style.setColor(format);
+		}
+		else if (format.isFancyStyling())
+		{
+			switch (format)
+			{
+				case BOLD: style.setBold(true); break;
+				case ITALIC: style.setItalic(true); break;
+				case STRIKETHROUGH: style.setStrikethrough(true); break;
+				case UNDERLINE: style.setUnderlined(true); break;
+				case OBFUSCATED: style.setObfuscated(true); break;
+			}
+		}
+		
+		return style;
+	}
+
+	/**
+	 * Convert a component containing text formatted with legacy codes to a native ChatComponent structure
+	 */
+	public static IChatComponent convertLegacyCodes(IChatComponent chat)
+	{
+		return ChatUtilities.covertCodesInPlace(chat);
+	}
+
+	private static List<IChatComponent> covertCodesInPlace(List<IChatComponent> siblings)
+	{
+		for (int index = 0; index < siblings.size(); index++)
+		{
+			siblings.set(index, ChatUtilities.covertCodesInPlace(siblings.get(index)));
+		}
+		
+		return siblings;
+	}
+
+	@SuppressWarnings("unchecked")
+	private static IChatComponent covertCodesInPlace(IChatComponent component)
+	{
+		IChatComponent newComponent = null;
+		if (component instanceof ChatComponentText)
+		{
+			ChatComponentText textComponent = (ChatComponentText)component;
+			ChatStyle style = textComponent.getChatStyle();
+			String text = textComponent.getChatComponentText_TextValue();
+			
+			int pos = text.indexOf('\247');
+			while (pos > -1 && text != null)
+			{
+				if (pos < text.length() - 1)
+				{
+					IChatComponent head = new ChatComponentText(pos > 0 ? text.substring(0, pos) : "").setChatStyle(style);
+					style = ChatUtilities.getChatStyleFromCode(text.charAt(pos + 1));
+					text = text.substring(pos + 2);
+					newComponent = (newComponent == null) ? head : newComponent.appendSibling(head);
+					pos = text.indexOf('\247');
+				}
+				else
+				{
+					text = null;
+				}
+			}
+
+			if (text != null)
+			{
+				IChatComponent tail = new ChatComponentText(text).setChatStyle(style);
+				newComponent = (newComponent == null) ? tail : newComponent.appendSibling(tail);
+			}
+		}
+		
+		if (newComponent == null)
+		{
+			ChatUtilities.covertCodesInPlace(component.getSiblings());
+			return component;
+		}
+
+		for (IChatComponent oldSibling : ChatUtilities.covertCodesInPlace(component.getSiblings()))
+		{
+			newComponent.appendSibling(oldSibling);
+		}
+
+		return newComponent;
+	}
+}
@@ -98,7 +98,13 @@ public class ReplicatedPermissionsContainer implements Serializable
 	{
 		try
 		{
-			ObjectInputStream inputStream = new ObjectInputStream(new ByteArrayInputStream(data.readByteArray()));
+			int readableBytes = data.readableBytes();
+			if (readableBytes == 0) return null;
+			
+			byte[] payload = new byte[readableBytes];
+			data.readBytes(payload);
+			
+			ObjectInputStream inputStream = new ObjectInputStream(new ByteArrayInputStream(payload));
 			ReplicatedPermissionsContainer object = (ReplicatedPermissionsContainer)inputStream.readObject();
 			return object;
 		}