Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TypeItemStack now uses held item. Bugfix for Txt.getItemName

Browse Source
This commit is contained in:
Olof Larsson 2016-03-16 15:28:21 +01:00
parent 21211b404f
commit 2704b0bd49
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/massivecraft/massivecore/command/type/TypeItemStack.java
View File

@ -1,13 +1,14 @@
package com.massivecraft.massivecore.command.type;
import java.util.Collection;
import java.util.Collections;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.mson.Mson;
import com.massivecraft.massivecore.util.InventoryUtil;
import com.massivecraft.massivecore.util.Txt;
public class TypeItemStack extends TypeAbstract<ItemStack>
@ -32,29 +33,32 @@ public class TypeItemStack extends TypeAbstract<ItemStack>
@Override
public String getNameInner(ItemStack value)
{
// TODO: Implement
return null;
}
@Override
public String getIdInner(ItemStack value)
{
// TODO: Implement
return null;
}
@Override
public ItemStack read(String arg, CommandSender sender) throws MassiveException
{
// TODO: Implement
throw new MassiveException().addMsg("<b>Not implemented!");
}
@Override
public Collection<String> getTabList(CommandSender sender, String arg)
{
// TODO: Implement
return Collections.emptyList();
return null;
}
@SuppressWarnings("deprecation")
@Override
public ItemStack read(String arg, CommandSender sender) throws MassiveException
{
if ( ! (sender instanceof Player)) throw new MassiveException().addMsg("<b>You must be a player to hold an item in your hand.");
Player player = (Player)sender;
ItemStack ret = player.getItemInHand();
if (InventoryUtil.isNothing(ret)) throw new MassiveException().addMsg("<b>You must hold an item in your hand.");
ret = new ItemStack(ret);
return ret;
}
}

2
src/com/massivecraft/massivecore/util/Txt.java
View File

@ -433,7 +433,7 @@ public class Txt
{
if (InventoryUtil.isNothing(itemStack)) return Txt.parse("<silver><em>Nothing");
ChatColor color = (itemStack.getEnchantments().size() > 0) ? ChatColor.AQUA : ChatColor.RESET;
ChatColor color = (itemStack.getEnchantments().size() > 0) ? ChatColor.AQUA : ChatColor.WHITE;
if (itemStack.hasItemMeta())
{