Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Pahimar 2015-02-07 12:59:21 -05:00
parent d77ee1bd02 08553d57a8
commit e9db1db54d
8 changed files with 407 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/pahimar/ee3/command/CommandEE.java
View file

@ -73,6 +73,10 @@ public class CommandEE extends CommandBase
modCommands.add(new CommandTemplateLearnItem());
modCommands.add(new CommandTemplateForgetEverything());
modCommands.add(new CommandTemplateForgetItem());
modCommands.add(new CommandSetItemLearnable());
modCommands.add(new CommandSetItemNotLearnable());
modCommands.add(new CommandSetItemRecoverable());
modCommands.add(new CommandSetItemNotRecoverable());
for (CommandBase commandBase : modCommands)
{

94
src/main/java/com/pahimar/ee3/command/CommandSetItemLearnable.java Normal file
View file

@ -0,0 +1,94 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.reference.Messages;
import com.pahimar.ee3.reference.Names;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.WrongUsageException;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.JsonToNBT;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import java.util.List;
public class CommandSetItemLearnable extends CommandBase
{
@Override
public String getCommandName()
{
return Names.Commands.SET_ITEM_LEARNABLE;
}
@Override
public int getRequiredPermissionLevel()
{
return 2;
}
@Override
public String getCommandUsage(ICommandSender commandSender)
{
return Messages.Commands.SET_ITEM_LEARNABLE_USAGE;
}
@Override
public void processCommand(ICommandSender commandSender, String[] args)
{
if (args.length < 2)
{
throw new WrongUsageException(Messages.Commands.SET_ITEM_LEARNABLE_USAGE);
}
else
{
Item item = getItemByText(commandSender, args[1]);
int metaData = 0;
if (args.length >= 3)
{
metaData = parseInt(commandSender, args[2]);
}
ItemStack itemStack = new ItemStack(item, 1, metaData);
if (args.length >= 4)
{
String stringNBTData = func_147178_a(commandSender, args, 3).getUnformattedText();
try
{
NBTBase nbtBase = JsonToNBT.func_150315_a(stringNBTData);
if (!(nbtBase instanceof NBTTagCompound))
{
func_152373_a(commandSender, this, Messages.Commands.INVALID_NBT_TAG_ERROR, new Object[]{"Not a valid tag"});
return;
}
itemStack.setTagCompound((NBTTagCompound) nbtBase);
}
catch (Exception exception)
{
func_152373_a(commandSender, this, Messages.Commands.INVALID_NBT_TAG_ERROR, new Object[]{exception.getMessage()});
return;
}
}
AbilityRegistryProxy.setAsLearnable(itemStack);
func_152373_a(commandSender, this, Messages.Commands.SET_ITEM_LEARNABLE_SUCCESS, new Object[]{commandSender.getCommandSenderName(), itemStack.func_151000_E()});
}
}
@Override
public List addTabCompletionOptions(ICommandSender commandSender, String[] args)
{
if (args.length == 2)
{
return getListOfStringsFromIterableMatchingLastWord(args, Item.itemRegistry.getKeys());
}
return null;
}
}

94
src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java Normal file
View file

@ -0,0 +1,94 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.reference.Messages;
import com.pahimar.ee3.reference.Names;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.WrongUsageException;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.JsonToNBT;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import java.util.List;
public class CommandSetItemNotLearnable extends CommandBase
{
@Override
public String getCommandName()
{
return Names.Commands.SET_ITEM_NOT_LEARNABLE;
}
@Override
public int getRequiredPermissionLevel()
{
return 2;
}
@Override
public String getCommandUsage(ICommandSender commandSender)
{
return Messages.Commands.SET_ITEM_NOT_LEARNABLE_USAGE;
}
@Override
public void processCommand(ICommandSender commandSender, String[] args)
{
if (args.length < 2)
{
throw new WrongUsageException(Messages.Commands.SET_ITEM_NOT_LEARNABLE_USAGE);
}
else
{
Item item = getItemByText(commandSender, args[1]);
int metaData = 0;
if (args.length >= 3)
{
metaData = parseInt(commandSender, args[2]);
}
ItemStack itemStack = new ItemStack(item, 1, metaData);
if (args.length >= 4)
{
String stringNBTData = func_147178_a(commandSender, args, 3).getUnformattedText();
try
{
NBTBase nbtBase = JsonToNBT.func_150315_a(stringNBTData);
if (!(nbtBase instanceof NBTTagCompound))
{
func_152373_a(commandSender, this, Messages.Commands.INVALID_NBT_TAG_ERROR, new Object[]{"Not a valid tag"});
return;
}
itemStack.setTagCompound((NBTTagCompound) nbtBase);
}
catch (Exception exception)
{
func_152373_a(commandSender, this, Messages.Commands.INVALID_NBT_TAG_ERROR, new Object[]{exception.getMessage()});
return;
}
}
AbilityRegistryProxy.setAsNotLearnable(itemStack);
func_152373_a(commandSender, this, Messages.Commands.SET_ITEM_NOT_LEARNABLE_SUCCESS, new Object[]{commandSender.getCommandSenderName(), itemStack.func_151000_E()});
}
}
@Override
public List addTabCompletionOptions(ICommandSender commandSender, String[] args)
{
if (args.length == 2)
{
return getListOfStringsFromIterableMatchingLastWord(args, Item.itemRegistry.getKeys());
}
return null;
}
}

94
src/main/java/com/pahimar/ee3/command/CommandSetItemNotRecoverable.java Normal file
View file

@ -0,0 +1,94 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.reference.Messages;
import com.pahimar.ee3.reference.Names;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.WrongUsageException;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.JsonToNBT;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import java.util.List;
public class CommandSetItemNotRecoverable extends CommandBase
{
@Override
public String getCommandName()
{
return Names.Commands.SET_ITEM_NOT_RECOVERABLE;
}
@Override
public int getRequiredPermissionLevel()
{
return 2;
}
@Override
public String getCommandUsage(ICommandSender commandSender)
{
return Messages.Commands.SET_ITEM_NOT_RECOVERABLE_USAGE;
}
@Override
public void processCommand(ICommandSender commandSender, String[] args)
{
if (args.length < 2)
{
throw new WrongUsageException(Messages.Commands.SET_ITEM_NOT_RECOVERABLE_USAGE);
}
else
{
Item item = getItemByText(commandSender, args[1]);
int metaData = 0;
if (args.length >= 3)
{
metaData = parseInt(commandSender, args[2]);
}
ItemStack itemStack = new ItemStack(item, 1, metaData);
if (args.length >= 4)
{
String stringNBTData = func_147178_a(commandSender, args, 3).getUnformattedText();
try
{
NBTBase nbtBase = JsonToNBT.func_150315_a(stringNBTData);
if (!(nbtBase instanceof NBTTagCompound))
{
func_152373_a(commandSender, this, Messages.Commands.INVALID_NBT_TAG_ERROR, new Object[]{"Not a valid tag"});
return;
}
itemStack.setTagCompound((NBTTagCompound) nbtBase);
}
catch (Exception exception)
{
func_152373_a(commandSender, this, Messages.Commands.INVALID_NBT_TAG_ERROR, new Object[]{exception.getMessage()});
return;
}
}
AbilityRegistryProxy.setAsRecoverable(itemStack);
func_152373_a(commandSender, this, Messages.Commands.SET_ITEM_NOT_RECOVERABLE_SUCCESS, new Object[]{commandSender.getCommandSenderName(), itemStack.func_151000_E()});
}
}
@Override
public List addTabCompletionOptions(ICommandSender commandSender, String[] args)
{
if (args.length == 2)
{
return getListOfStringsFromIterableMatchingLastWord(args, Item.itemRegistry.getKeys());
}
return null;
}
}

94
src/main/java/com/pahimar/ee3/command/CommandSetItemRecoverable.java Normal file
View file

@ -0,0 +1,94 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.reference.Messages;
import com.pahimar.ee3.reference.Names;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.WrongUsageException;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.JsonToNBT;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import java.util.List;
public class CommandSetItemRecoverable extends CommandBase
{
@Override
public String getCommandName()
{
return Names.Commands.SET_ITEM_RECOVERABLE;
}
@Override
public int getRequiredPermissionLevel()
{
return 2;
}
@Override
public String getCommandUsage(ICommandSender commandSender)
{
return Messages.Commands.SET_ITEM_RECOVERABLE_USAGE;
}
@Override
public void processCommand(ICommandSender commandSender, String[] args)
{
if (args.length < 2)
{
throw new WrongUsageException(Messages.Commands.SET_ITEM_RECOVERABLE_USAGE);
}
else
{
Item item = getItemByText(commandSender, args[1]);
int metaData = 0;
if (args.length >= 3)
{
metaData = parseInt(commandSender, args[2]);
}
ItemStack itemStack = new ItemStack(item, 1, metaData);
if (args.length >= 4)
{
String stringNBTData = func_147178_a(commandSender, args, 3).getUnformattedText();
try
{
NBTBase nbtBase = JsonToNBT.func_150315_a(stringNBTData);
if (!(nbtBase instanceof NBTTagCompound))
{
func_152373_a(commandSender, this, Messages.Commands.INVALID_NBT_TAG_ERROR, new Object[]{"Not a valid tag"});
return;
}
itemStack.setTagCompound((NBTTagCompound) nbtBase);
}
catch (Exception exception)
{
func_152373_a(commandSender, this, Messages.Commands.INVALID_NBT_TAG_ERROR, new Object[]{exception.getMessage()});
return;
}
}
AbilityRegistryProxy.setAsRecoverable(itemStack);
func_152373_a(commandSender, this, Messages.Commands.SET_ITEM_RECOVERABLE_SUCCESS, new Object[]{commandSender.getCommandSenderName(), itemStack.func_151000_E()});
}
}
@Override
public List addTabCompletionOptions(ICommandSender commandSender, String[] args)
{
if (args.length == 2)
{
return getListOfStringsFromIterableMatchingLastWord(args, Item.itemRegistry.getKeys());
}
return null;
}
}

11
src/main/java/com/pahimar/ee3/reference/Messages.java
View file

@ -49,6 +49,17 @@ public final class Messages
public static final String TEMPLATE_FORGET_ITEM_USAGE = COMMAND_PREFIX + Names.Commands.TEMPLATE_FORGET_ITEM + ".usage";
public static final String TEMPLATE_FORGET_ITEM_SUCCESS = COMMAND_PREFIX + Names.Commands.TEMPLATE_FORGET_ITEM + ".success";
public static final String SET_ITEM_LEARNABLE_USAGE = COMMAND_PREFIX + Names.Commands.SET_ITEM_LEARNABLE + ".usage";
public static final String SET_ITEM_LEARNABLE_SUCCESS = COMMAND_PREFIX + Names.Commands.SET_ITEM_LEARNABLE + ".success";
public static final String SET_ITEM_NOT_LEARNABLE_USAGE = COMMAND_PREFIX + Names.Commands.SET_ITEM_NOT_LEARNABLE + ".usage";
public static final String SET_ITEM_NOT_LEARNABLE_SUCCESS = COMMAND_PREFIX + Names.Commands.SET_ITEM_NOT_LEARNABLE + ".success";
public static final String SET_ITEM_RECOVERABLE_USAGE = COMMAND_PREFIX + Names.Commands.SET_ITEM_RECOVERABLE + ".usage";
public static final String SET_ITEM_RECOVERABLE_SUCCESS = COMMAND_PREFIX + Names.Commands.SET_ITEM_RECOVERABLE + ".success";
public static final String SET_ITEM_NOT_RECOVERABLE_USAGE = COMMAND_PREFIX + Names.Commands.SET_ITEM_NOT_RECOVERABLE + ".usage";
public static final String SET_ITEM_NOT_RECOVERABLE_SUCCESS = COMMAND_PREFIX + Names.Commands.SET_ITEM_NOT_RECOVERABLE + ".success";
}
public static final class Configuration

4
src/main/java/com/pahimar/ee3/reference/Names.java
View file

@ -132,5 +132,9 @@ public class Names
public static final String TEMPLATE_LEARN_ITEM = "template-learn-item";
public static final String TEMPLATE_FORGET_EVERYTHING = "template-forget-everything";
public static final String TEMPLATE_FORGET_ITEM = "template-forget-item";
public static final String SET_ITEM_LEARNABLE = "set-item-learnable";
public static final String SET_ITEM_NOT_LEARNABLE = "set-item-not-learnable";
public static final String SET_ITEM_RECOVERABLE = "set-item-recoverable";
public static final String SET_ITEM_NOT_RECOVERABLE = "set-item-not-recoverable";
}
}

16
src/main/resources/assets/ee3/lang/en_US.lang
View file

@ -122,14 +122,22 @@ commands.ee3.player-forget-everything.usage=/ee3 player-forget-everything <playe
commands.ee3.player-forget-everything.success=%s made %s forget how to transmute everything
commands.ee3.player-forget-item.usage=/ee3 player-forget-item <playername> <item> <data> [dataTag]
commands.ee3.player-forget-item.success=%s made %s forget how to transmute %s
commands.ee3.template-learn-everything.usage=/ee3 template-learn-everything <playername>
commands.ee3.template-learn-everything.usage=/ee3 template-learn-everything
commands.ee3.template-learn-everything.success=%s taught the knowledge template how to transmute everything
commands.ee3.template-learn-item.usage=/ee3 template-learn-item <playername> <item> <data> [dataTag]
commands.ee3.template-learn-item.usage=/ee3 template-learn-item <item> <data> [dataTag]
commands.ee3.template-learn-item.success=%s taught the knowledge template how to transmute %s
commands.ee3.template-forget-everything.usage=/ee3 template-forget-everything <playername>
commands.ee3.template-forget-everything.usage=/ee3 template-forget-everything
commands.ee3.template-forget-everything.success=%s made the knowledge template forget how to transmute everything
commands.ee3.template-forget-item.usage=/ee3 template-forget-item <playername> <item> <data> [dataTag]
commands.ee3.template-forget-item.usage=/ee3 template-forget-item <item> <data> [dataTag]
commands.ee3.template-forget-item.success=%s made the knowledge template forget how to transmute %s
commands.ee3.set-item-learnable.usage=/ee3 set-item-learnable <item> <data> [dataTag]
commands.ee3.set-item-learnable.success=%s set %s as learnable for transmutations
commands.ee3.set-item-not-learnable.usage=/ee3 set-item-not-learnable <item> <data> [dataTag]
commands.ee3.set-item-not-learnable.success=%s set %s as not learnable for transmutations
commands.ee3.set-item-recoverable.usage=/ee3 set-item-recoverable <item> <data> [dataTag]
commands.ee3.set-item-recoverable.success=%s set %s as being able to have its energy value recovered
commands.ee3.set-item-not-recoverable.usage=/ee3 set-item-not-recoverable <item> <data> [dataTag]
commands.ee3.set-item-not-recoverable.success=%s set %s as not being able to have its energy value recovered
# Tooltips
tooltip.ee3:upgradesPrefix=Upgrades (Alchemical) Chests