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

7
src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java
View file

@ -7,7 +7,8 @@ import WayofTime.bloodmagic.command.sub.SubCommandOrb;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentString;
import java.util.*;
@ -55,7 +56,7 @@ public class CommandBloodMagic extends CommandBase
}
@Override
public void processCommand(ICommandSender commandSender, String[] args)
public void execute(MinecraftServer server, ICommandSender commandSender, String[] args)
{
if (args.length > 0 && subCommands.containsKey(args[0]))
{
@ -65,7 +66,7 @@ public class CommandBloodMagic extends CommandBase
subCommand.processSubCommand(commandSender, subArgs);
} else
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("commands.error.unknown")));
commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect("commands.error.unknown")));
}
}

3
src/main/java/WayofTime/bloodmagic/command/ISubCommand.java
View file

@ -2,6 +2,7 @@ package WayofTime.bloodmagic.command;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
public interface ISubCommand
{
@ -14,5 +15,5 @@ public interface ISubCommand
String getHelpText();
void processSubCommand(ICommandSender commandSender, String[] args);
void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args);
}

43
src/main/java/WayofTime/bloodmagic/command/SubCommandBase.java
View file

@ -3,12 +3,8 @@ package WayofTime.bloodmagic.command;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.PlayerNotFoundException;
import net.minecraft.command.PlayerSelector;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.TextComponentString;
import java.util.Locale;
@ -37,39 +33,14 @@ public abstract class SubCommandBase implements ISubCommand
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args)
public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args)
{
if (args.length == 0 && !getSubCommandName().equals("help"))
displayErrorString(commandSender, String.format(StatCollector.translateToLocal("commands.format.error"), capitalizeFirstLetter(getSubCommandName()), getArgUsage(commandSender)));
displayErrorString(commandSender, String.format(TextHelper.localizeEffect("commands.format.error"), capitalizeFirstLetter(getSubCommandName()), getArgUsage(commandSender)));
if (isBounded(0, 2, args.length) && args[0].equals("help"))
displayHelpString(commandSender, String.format(StatCollector.translateToLocal("commands.format.help"), capitalizeFirstLetter(getSubCommandName()), getHelpText()));
}
protected EntityPlayerMP getCommandSenderAsPlayer(ICommandSender commandSender) throws PlayerNotFoundException
{
if (commandSender instanceof EntityPlayerMP)
return (EntityPlayerMP) commandSender;
else
throw new PlayerNotFoundException(StatCollector.translateToLocal("commands.error.arg.player.missing"));
}
protected EntityPlayerMP getPlayer(ICommandSender commandSender, String playerName) throws PlayerNotFoundException
{
EntityPlayerMP entityplayermp = PlayerSelector.matchOnePlayer(commandSender, playerName);
if (entityplayermp != null)
return entityplayermp;
else
{
entityplayermp = MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(playerName);
if (entityplayermp == null)
throw new PlayerNotFoundException();
else
return entityplayermp;
}
displayHelpString(commandSender, String.format(TextHelper.localizeEffect("commands.format.help"), capitalizeFirstLetter(getSubCommandName()), getHelpText()));
}
protected String capitalizeFirstLetter(String toCapital)
@ -84,16 +55,16 @@ public abstract class SubCommandBase implements ISubCommand
protected void displayHelpString(ICommandSender commandSender, String display, Object... info)
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect(display, info)));
commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect(display, info)));
}
protected void displayErrorString(ICommandSender commandSender, String display, Object... info)
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect(display, info)));
commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect(display, info)));
}
protected void displaySuccessString(ICommandSender commandSender, String display, Object... info)
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect(display, info)));
commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect(display, info)));
}
}

21
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java
View file

@ -7,13 +7,14 @@ import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.command.SubCommandBase;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.base.Strings;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.PlayerNotFoundException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentTranslation;
public class SubCommandBind extends SubCommandBase
{
@ -36,19 +37,19 @@ public class SubCommandBind extends SubCommandBase
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args)
public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args)
{
super.processSubCommand(commandSender, args);
super.processSubCommand(server, commandSender, args);
if (commandSender.getEntityWorld().isRemote)
return;
try
{
EntityPlayer player = getCommandSenderAsPlayer(commandSender);
EntityPlayer player = CommandBase.getCommandSenderAsPlayer(commandSender);
String playerName = player.getName();
String uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
ItemStack held = player.getHeldItem();
ItemStack held = player.getHeldItemMainhand();
boolean bind = true;
if (held != null && held.getItem() instanceof IBindable)
@ -68,7 +69,7 @@ public class SubCommandBind extends SubCommandBase
} else
{
playerName = args[0];
uuid = PlayerHelper.getUUIDFromPlayer(getPlayer(commandSender, playerName)).toString();
uuid = PlayerHelper.getUUIDFromPlayer(CommandBase.getPlayer(server, commandSender, playerName)).toString();
}
}
@ -76,20 +77,20 @@ public class SubCommandBind extends SubCommandBase
{
BindableHelper.setItemOwnerName(held, playerName);
BindableHelper.setItemOwnerUUID(held, uuid);
commandSender.addChatMessage(new ChatComponentTranslation("commands.bind.success"));
commandSender.addChatMessage(new TextComponentTranslation("commands.bind.success"));
} else
{
if (!Strings.isNullOrEmpty(((IBindable) held.getItem()).getOwnerUUID(held)))
{
held.getTagCompound().removeTag(Constants.NBT.OWNER_UUID);
held.getTagCompound().removeTag(Constants.NBT.OWNER_NAME);
commandSender.addChatMessage(new ChatComponentTranslation("commands.bind.remove.success"));
commandSender.addChatMessage(new TextComponentTranslation("commands.bind.remove.success"));
}
}
}
} catch (PlayerNotFoundException e)
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("commands.error.404")));
commandSender.addChatMessage(new TextComponentTranslation(TextHelper.localizeEffect("commands.error.404")));
}
}

14
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandHelp.java
View file

@ -6,8 +6,8 @@ import WayofTime.bloodmagic.command.SubCommandBase;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.StatCollector;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentString;
public class SubCommandHelp extends SubCommandBase
{
@ -20,24 +20,24 @@ public class SubCommandHelp extends SubCommandBase
@Override
public String getArgUsage(ICommandSender commandSender)
{
return StatCollector.translateToLocal("commands.help.usage");
return TextHelper.localize("commands.help.usage");
}
@Override
public String getHelpText()
{
return StatCollector.translateToLocal("commands.help.help");
return TextHelper.localizeEffect("commands.help.help");
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args)
public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args)
{
super.processSubCommand(commandSender, args);
super.processSubCommand(server, commandSender, args);
if (args.length > 0)
return;
for (ISubCommand subCommand : ((CommandBloodMagic) getParentCommand()).getSubCommands().values())
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("commands.format.help", capitalizeFirstLetter(subCommand.getSubCommandName()), subCommand.getArgUsage(commandSender))));
commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect("commands.format.help", capitalizeFirstLetter(subCommand.getSubCommandName()), subCommand.getArgUsage(commandSender))));
}
}

20
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java
View file

@ -2,16 +2,16 @@ package WayofTime.bloodmagic.command.sub;
import WayofTime.bloodmagic.api.network.SoulNetwork;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.command.SubCommandBase;
import WayofTime.bloodmagic.util.Utils;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.PlayerNotFoundException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.StatCollector;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentString;
import java.util.Locale;
@ -26,19 +26,19 @@ public class SubCommandNetwork extends SubCommandBase
@Override
public String getArgUsage(ICommandSender commandSender)
{
return StatCollector.translateToLocal("commands.network.usage");
return TextHelper.localizeEffect("commands.network.usage");
}
@Override
public String getHelpText()
{
return StatCollector.translateToLocal("commands.network.help");
return TextHelper.localizeEffect("commands.network.help");
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args)
public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args)
{
super.processSubCommand(commandSender, args);
super.processSubCommand(server, commandSender, args);
if (args.length > 0)
{
@ -49,12 +49,12 @@ public class SubCommandNetwork extends SubCommandBase
try
{
String givenName = commandSender.getName();
EntityPlayer player = getPlayer(commandSender, givenName);
EntityPlayer player = CommandBase.getCommandSenderAsPlayer(commandSender);
if (args.length > 1)
{
givenName = args[1];
player = getPlayer(commandSender, givenName);
player = CommandBase.getPlayer(server, commandSender, givenName);
}
SoulNetwork network = NetworkHelper.getSoulNetwork(player);
@ -151,7 +151,7 @@ public class SubCommandNetwork extends SubCommandBase
}
if (args.length > 1)
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("message.divinationsigil.currentessence", network.getCurrentEssence())));
commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect("message.divinationsigil.currentessence", network.getCurrentEssence())));
break;
}

17
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java
View file

@ -6,12 +6,13 @@ import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.command.SubCommandBase;
import WayofTime.bloodmagic.util.Utils;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.PlayerNotFoundException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.StatCollector;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentString;
import java.util.Locale;
@ -26,19 +27,19 @@ public class SubCommandOrb extends SubCommandBase
@Override
public String getArgUsage(ICommandSender commandSender)
{
return StatCollector.translateToLocal("commands.orb.usage");
return TextHelper.localizeEffect("commands.orb.usage");
}
@Override
public String getHelpText()
{
return StatCollector.translateToLocal("commands.orb.help");
return TextHelper.localizeEffect("commands.orb.help");
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args)
public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args)
{
super.processSubCommand(commandSender, args);
super.processSubCommand(server, commandSender, args);
if (args.length > 0)
{
@ -53,7 +54,7 @@ public class SubCommandOrb extends SubCommandBase
if (args.length > 1)
givenName = args[1];
EntityPlayer player = getPlayer(commandSender, givenName);
EntityPlayer player = CommandBase.getPlayer(server, commandSender, givenName);
String uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
SoulNetwork network = NetworkHelper.getSoulNetwork(uuid);
@ -98,7 +99,7 @@ public class SubCommandOrb extends SubCommandBase
}
if (args.length > 1)
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("message.orb.currenttier", network.getOrbTier())));
commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect("message.orb.currenttier", network.getOrbTier())));
break;
}