lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial 1.9 commit

Browse source 
This DOES NOT BUILD. Do not even attempt.

Almost everything has been ported besides the block/item packages. Then it's a matter of testing what broke.
This commit is contained in:
Nick 2016-03-17 13:00:44 -07:00
parent f896383fe6
commit 6c729db70c
359 changed files with 1858 additions and 4447 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/main/java/WayofTime/bloodmagic/util/ChatUtil.java
View file

@ -1,26 +1,26 @@
package WayofTime.bloodmagic.util;
import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
import WayofTime.bloodmagic.util.helper.TextHelper;
import io.netty.buffer.ByteBuf;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiNewChat;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraftforge.fml.common.network.ByteBufUtils;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
import WayofTime.bloodmagic.util.helper.TextHelper;
public class ChatUtil
{
private static final int DELETION_ID = 2525277;
private static int lastAdded;
private static void sendNoSpamMessages(IChatComponent[] messages)
private static void sendNoSpamMessages(ITextComponent[] messages)
{
GuiNewChat chat = Minecraft.getMinecraft().ingameGUI.getChatGUI();
for (int i = DELETION_ID + messages.length - 1; i <= lastAdded; i++)
@ -35,25 +35,25 @@ public class ChatUtil
}
/**
* Returns a standard {@link ChatComponentText} for the given {@link String}
* Returns a standard {@link TextComponentString} for the given {@link String}
* .
*
* @param s
* The string to wrap.
*
* @return An {@link IChatComponent} containing the string.
* @return An {@link ITextComponent} containing the string.
*/
public static IChatComponent wrap(String s)
public static ITextComponent wrap(String s)
{
return new ChatComponentText(s);
return new TextComponentString(s);
}
/**
* @see #wrap(String)
*/
public static IChatComponent[] wrap(String... s)
public static ITextComponent[] wrap(String... s)
{
IChatComponent[] ret = new IChatComponent[s.length];
ITextComponent[] ret = new ITextComponent[s.length];
for (int i = 0; i < ret.length; i++)
{
ret[i] = wrap(s[i]);
@ -70,9 +70,9 @@ public class ChatUtil
* @param args
* The args to apply to the format
*/
public static IChatComponent wrapFormatted(String s, Object... args)
public static ITextComponent wrapFormatted(String s, Object... args)
{
return new ChatComponentTranslation(s, args);
return new TextComponentTranslation(s, args);
}
/**
@ -104,11 +104,11 @@ public class ChatUtil
* @param player
* The player to send the chat lines to.
* @param lines
* The {@link IChatComponent chat components} to send.yes
* The {@link ITextComponent chat components} to send.yes
*/
public static void sendChat(EntityPlayer player, IChatComponent... lines)
public static void sendChat(EntityPlayer player, ITextComponent... lines)
{
for (IChatComponent c : lines)
for (ITextComponent c : lines)
{
player.addChatComponentMessage(c);
}
@ -125,7 +125,7 @@ public class ChatUtil
}
/**
* Same as {@link #sendNoSpamClient(IChatComponent...)}, but wraps the
* Same as {@link #sendNoSpamClient(ITextComponent...)}, but wraps the
* Strings automatically.
*
* @param lines
@ -141,9 +141,9 @@ public class ChatUtil
/**
* Skips the packet sending, unsafe to call on servers.
*
* @see #sendNoSpam(EntityPlayerMP, IChatComponent...)
* @see #sendNoSpam(EntityPlayerMP, ITextComponent...)
*/
public static void sendNoSpamClient(IChatComponent... lines)
public static void sendNoSpamClient(ITextComponent... lines)
{
sendNoSpamMessages(lines);
}
@ -160,7 +160,7 @@ public class ChatUtil
/**
* @see #wrap(String)
* @see #sendNoSpam(EntityPlayer, IChatComponent...)
* @see #sendNoSpam(EntityPlayer, ITextComponent...)
*/
public static void sendNoSpam(EntityPlayer player, String... lines)
{
@ -171,9 +171,9 @@ public class ChatUtil
* First checks if the player is instanceof {@link EntityPlayerMP} before
* casting.
*
* @see #sendNoSpam(EntityPlayerMP, IChatComponent...)
* @see #sendNoSpam(EntityPlayerMP, ITextComponent...)
*/
public static void sendNoSpam(EntityPlayer player, IChatComponent... lines)
public static void sendNoSpam(EntityPlayer player, ITextComponent... lines)
{
if (player instanceof EntityPlayerMP)
{
@ -193,7 +193,7 @@ public class ChatUtil
/**
* @see #wrap(String)
* @see #sendNoSpam(EntityPlayerMP, IChatComponent...)
* @see #sendNoSpam(EntityPlayerMP, ITextComponent...)
*/
public static void sendNoSpam(EntityPlayerMP player, String... lines)
{
@ -211,7 +211,7 @@ public class ChatUtil
* @param lines
* The chat lines to send.
*/
public static void sendNoSpam(EntityPlayerMP player, IChatComponent... lines)
public static void sendNoSpam(EntityPlayerMP player, ITextComponent... lines)
{
if (lines.length > 0)
BloodMagicPacketHandler.INSTANCE.sendTo(new PacketNoSpamChat(lines), player);
@ -225,14 +225,14 @@ public class ChatUtil
public static class PacketNoSpamChat implements IMessage
{
private IChatComponent[] chatLines;
private ITextComponent[] chatLines;
public PacketNoSpamChat()
{
chatLines = new IChatComponent[0];
chatLines = new ITextComponent[0];
}
private PacketNoSpamChat(IChatComponent... lines)
private PacketNoSpamChat(ITextComponent... lines)
{
// this is guaranteed to be >1 length by accessing methods
this.chatLines = lines;
@ -242,19 +242,19 @@ public class ChatUtil
public void toBytes(ByteBuf buf)
{
buf.writeInt(chatLines.length);
for (IChatComponent c : chatLines)
for (ITextComponent c : chatLines)
{
ByteBufUtils.writeUTF8String(buf, IChatComponent.Serializer.componentToJson(c));
ByteBufUtils.writeUTF8String(buf, ITextComponent.Serializer.componentToJson(c));
}
}
@Override
public void fromBytes(ByteBuf buf)
{
chatLines = new IChatComponent[buf.readInt()];
chatLines = new ITextComponent[buf.readInt()];
for (int i = 0; i < chatLines.length; i++)
{
chatLines[i] = IChatComponent.Serializer.jsonToComponent(ByteBufUtils.readUTF8String(buf));
chatLines[i] = ITextComponent.Serializer.jsonToComponent(ByteBufUtils.readUTF8String(buf));
}
}