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

Improvements to TypeColor

Browse Source
This commit is contained in:
Olof Larsson 2016-03-23 11:35:39 +01:00
parent 777ee542b5
commit 615a212847
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/com/massivecraft/massivecore/command/type/TypeColor.java
View File

@ -2,6 +2,7 @@ package com.massivecraft.massivecore.command.type;
import java.util.Collection; import java.util.Collection;
import org.bukkit.ChatColor;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -9,6 +10,7 @@ import org.bukkit.command.CommandSender;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.type.enumeration.TypeDyeColor; import com.massivecraft.massivecore.command.type.enumeration.TypeDyeColor;
import com.massivecraft.massivecore.command.type.primitive.TypeInteger; import com.massivecraft.massivecore.command.type.primitive.TypeInteger;
import com.massivecraft.massivecore.util.MUtil;
import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.util.Txt;
public class TypeColor extends TypeAbstract<Color> public class TypeColor extends TypeAbstract<Color>
@ -21,7 +23,29 @@ public class TypeColor extends TypeAbstract<Color>
public static TypeColor get() { return i; } public static TypeColor get() { return i; }
// -------------------------------------------- // // -------------------------------------------- //
// OVERRIDE // WRITE VISUAL
// -------------------------------------------- //
@Override
public String getVisualInner(Color value, CommandSender sender)
{
DyeColor dyeColor = DyeColor.getByColor(value);
if (dyeColor != null) return MUtil.getChatColor(dyeColor) + Txt.getNicedEnum(dyeColor);
return ChatColor.RED.toString() + value.getRed() + " " + ChatColor.GREEN.toString() + value.getGreen() + " " + ChatColor.BLUE.toString() + value.getBlue();
}
// -------------------------------------------- //
// WRITE ID
// -------------------------------------------- //
@Override
public String getIdInner(Color value)
{
return value.getRed() + " " + value.getGreen() + " " + value.getBlue();
}
// -------------------------------------------- //
// READ
// -------------------------------------------- // // -------------------------------------------- //
@Override @Override
@ -33,11 +57,11 @@ public class TypeColor extends TypeAbstract<Color>
ret = readInnerRgb(arg); ret = readInnerRgb(arg);
if (ret != null) return ret; if (ret != null) return ret;
// Try hex // Try Hex
ret = readInnerHex(arg); ret = readInnerHex(arg);
if (ret != null) return ret; if (ret != null) return ret;
// Try chat color // Try DyeColor
ret = readInnerDyeColor(arg); ret = readInnerDyeColor(arg);
if (ret != null) return ret; if (ret != null) return ret;
@ -49,14 +73,14 @@ public class TypeColor extends TypeAbstract<Color>
String[] rgb = Txt.PATTERN_WHITESPACE.split(arg); String[] rgb = Txt.PATTERN_WHITESPACE.split(arg);
if (rgb.length != 3) return null; if (rgb.length != 3) return null;
int red = getRgb(rgb[0]); int red = readInnerRgbNumber(rgb[0]);
int green = getRgb(rgb[1]); int green = readInnerRgbNumber(rgb[1]);
int blue = getRgb(rgb[2]); int blue = readInnerRgbNumber(rgb[2]);
return Color.fromRGB(red, green, blue); return Color.fromRGB(red, green, blue);
} }
private int getRgb(String arg) throws MassiveException private int readInnerRgbNumber(String arg) throws MassiveException
{ {
int ret = TypeInteger.get().read(arg); int ret = TypeInteger.get().read(arg);
if (ret > 255 || ret < 0) throw new MassiveException().addMsg("<b>RGB number must be between 0 and 255."); if (ret > 255 || ret < 0) throw new MassiveException().addMsg("<b>RGB number must be between 0 and 255.");
@ -109,6 +133,10 @@ public class TypeColor extends TypeAbstract<Color>
} }
} }
// -------------------------------------------- //
// TAB LIST
// -------------------------------------------- //
@Override @Override
public Collection<String> getTabList(CommandSender sender, String arg) public Collection<String> getTabList(CommandSender sender, String arg)
{ {