diff --git a/src/main/java/com/comandante/creeper/Items/ItemType.java b/src/main/java/com/comandante/creeper/Items/ItemType.java index 974f6dd9c32d05523deef35e206c35acba481a7f..0e863f5267072b97b091a420c679806fab5c897a 100755 --- a/src/main/java/com/comandante/creeper/Items/ItemType.java +++ b/src/main/java/com/comandante/creeper/Items/ItemType.java @@ -1150,7 +1150,7 @@ public enum ItemType { 80, Sets.<TimeTracker.TimeOfDay>newHashSet()), KEAKIAR_CAP(104, Arrays.asList("keakiar", "cap", "k", "c", "keakiar cap"), - Color.GREEN + "keakiar" + Color.RESET + " flowers" + Color.RESET, + Color.GREEN + "keakiar" + Color.RESET + " cap" + Color.RESET, "a " + Color.GREEN + "keakiar" + Color.RESET + " cap" + Color.RESET + " is here on the ground.", "a " + Color.GREEN + "keakiar" + Color.RESET + " cap" + Color.RESET, true, @@ -1545,7 +1545,7 @@ public enum ItemType { Rarity.LEGENDARY, 100000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), - RADSUIT_CHESTPLATE(140, Arrays.asList("chestplate", "a radsuit chestplate", "radsuit chestplate"), + RADSUIT_CHESTPLATE(140, Arrays.asList("chestplate", "a radsuit chestplate", "radsuit chestplate", "radsuit"), Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " chestplate" + Color.RESET, "a " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " chestplate" + Color.RESET + " is on the ground.", "a " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " chestplate" + Color.RESET, @@ -1556,7 +1556,7 @@ public enum ItemType { Rarity.LEGENDARY, 100000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), - RADSUIT_HELMET(141, Arrays.asList("helmet", "a radsuit helmet", "radsuit helmet"), + RADSUIT_HELMET(141, Arrays.asList("helmet", "a radsuit helmet", "radsuit helmet", "radsuit"), Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " helmet" + Color.RESET, "a " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " helmet" + Color.RESET + " is on the ground.", "a " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " helmet" + Color.RESET, @@ -1567,7 +1567,7 @@ public enum ItemType { Rarity.LEGENDARY, 100000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), - RADSUIT_BRACERS(142, Arrays.asList("bracers", "radsuit bracers", "radsuit bracers"), + RADSUIT_BRACERS(142, Arrays.asList("bracers", "radsuit bracers", "radsuit"), Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " bracers" + Color.RESET, "a pair of " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " bracers" + Color.RESET + " are on the ground.", "a pair of " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " bracers" + Color.RESET, @@ -1578,7 +1578,7 @@ public enum ItemType { Rarity.LEGENDARY, 100000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), - RADSUIT_LEGGINGS(143, Arrays.asList("helmet", "radsuit leggings", "radsuit leggings"), + RADSUIT_LEGGINGS(143, Arrays.asList("leggings", "radsuit leggings", "radsuit"), Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " leggings" + Color.RESET, "a pair of " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " leggings" + Color.RESET + " are on the ground.", "a pair of " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " leggings" + Color.RESET, @@ -1589,7 +1589,7 @@ public enum ItemType { Rarity.LEGENDARY, 100000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), - RADSUIT_BOOTS(144, Arrays.asList("helmet", "radsuit boots"), + RADSUIT_BOOTS(144, Arrays.asList("boots", "radsuit boots", "radsuit"), Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " boots" + Color.RESET, "a pair of " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " boots" + Color.RESET + " are on the ground.", "a pair of " + Color.BOLD_ON + Color.GREEN + "radsuit" + Color.RESET + Color.MAGENTA + " boots" + Color.RESET, @@ -1601,9 +1601,9 @@ public enum ItemType { 100000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), CRYSTALLINE_TABLET(145, Arrays.asList("crystalline tablet", "crystalline", "tablet", "c", "t"), - Color.CYAN + "crystalline" + Color.RESET + Color.YELLOW + " tablet " + Color.RESET, + Color.CYAN + "crystalline" + Color.RESET + Color.YELLOW + " tablet" + Color.RESET, "a " + Color.CYAN + "crystalline" + Color.RESET + Color.YELLOW + " tablet " + Color.RESET + "is on the ground.", - "a " + Color.CYAN + "golden" + Color.RESET + Color.YELLOW + " tablet " + Color.RESET, + "a " + Color.CYAN + "golden" + Color.RESET + Color.YELLOW + " tablet" + Color.RESET, false, 0, 60, @@ -1612,9 +1612,9 @@ public enum ItemType { 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), STRAND_OF_ALYXITE(146, Arrays.asList("strand of alyxite", "strand", "alyxite", "s", "a"), - Color.WHITE + "strand of" + Color.RESET + Color.BOLD_ON + Color.RED + " alyxite " + Color.RESET, + Color.WHITE + "strand of" + Color.RESET + Color.BOLD_ON + Color.RED + " alyxite" + Color.RESET, "a " + Color.WHITE + "strand of" + Color.RESET + Color.BOLD_ON + Color.RED + " alyxite " + Color.RESET + "is on the ground.", - "a " + Color.WHITE + "strand of" + Color.RESET + Color.BOLD_ON + Color.RED + " alyxite " + Color.RESET, + "a " + Color.WHITE + "strand of" + Color.RESET + Color.BOLD_ON + Color.RED + " alyxite" + Color.RESET, false, 0, 60, @@ -1623,9 +1623,9 @@ public enum ItemType { 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), GARMR_HIDE(147, Arrays.asList("garmr hide", "garmr", "hide", "g", "h"), - Color.WHITE + "garmr" + Color.RESET + Color.BOLD_ON + Color.RED + " hide " + Color.RESET, + Color.WHITE + "garmr" + Color.RESET + Color.BOLD_ON + Color.RED + " hide" + Color.RESET, "a " + Color.WHITE + "garmr" + Color.RESET + Color.BOLD_ON + Color.RED + " hide " + Color.RESET + "is on the ground.", - "a " + Color.WHITE + "garmr" + Color.RESET + Color.BOLD_ON + Color.RED + " hide " + Color.RESET, + "a " + Color.WHITE + "garmr" + Color.RESET + Color.BOLD_ON + Color.RED + " hide" + Color.RESET, false, 0, 60, @@ -1634,9 +1634,9 @@ public enum ItemType { 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), STROMAN_GRAVER(148, Arrays.asList("stroman graver", "stroman", "graver", "s", "g"), - Color.RED + Color.BOLD_ON + "stroman" + Color.RESET + Color.BOLD_ON + Color.GREEN + " graver " + Color.RESET, + Color.RED + Color.BOLD_ON + "stroman" + Color.RESET + Color.BOLD_ON + Color.GREEN + " graver" + Color.RESET, "a " + Color.RED + Color.BOLD_ON + "stroman" + Color.RESET + Color.BOLD_ON + Color.GREEN + " graver " + Color.RESET + "is on the ground.", - "a " + Color.RED + Color.BOLD_ON + "stroman" + Color.RESET + Color.BOLD_ON + Color.GREEN + " graver " + Color.RESET, + "a " + Color.RED + Color.BOLD_ON + "stroman" + Color.RESET + Color.BOLD_ON + Color.GREEN + " graver" + Color.RESET, false, 0, 60, @@ -1645,9 +1645,9 @@ public enum ItemType { 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), VOLCANIC_GYROSCOPE(149, Arrays.asList("volcanic gyroscope", "volcanic", "gyroscope", "v", "g"), - Color.BLACK + Color.BOLD_ON + "volcanic" + Color.RESET + Color.BOLD_ON + Color.CYAN + " gyroscope " + Color.RESET, + Color.BLACK + Color.BOLD_ON + "volcanic" + Color.RESET + Color.BOLD_ON + Color.CYAN + " gyroscope" + Color.RESET, "a " + Color.BLACK + Color.BOLD_ON + "volcanic" + Color.RESET + Color.BOLD_ON + Color.CYAN + " gyroscope " + Color.RESET + "is on the ground.", - "a " + Color.BLACK + Color.BOLD_ON + "volcanic" + Color.RESET + Color.BOLD_ON + Color.CYAN + " gyroscope " + Color.RESET, + "a " + Color.BLACK + Color.BOLD_ON + "volcanic" + Color.RESET + Color.BOLD_ON + Color.CYAN + " gyroscope" + Color.RESET, false, 0, 60, @@ -1656,9 +1656,9 @@ public enum ItemType { 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), BASALT_WAND(150, Arrays.asList("basalt wand", "basalt", "wand", "b", "w"), - Color.BLACK + Color.BOLD_ON + "basalt" + Color.RESET + Color.BOLD_ON + Color.RED + " wand " + Color.RESET, + Color.BLACK + Color.BOLD_ON + "basalt" + Color.RESET + Color.BOLD_ON + Color.RED + " wand" + Color.RESET, "a " + Color.BLACK + Color.BOLD_ON + "basalt" + Color.RESET + Color.BOLD_ON + Color.RED + " wand " + Color.RESET + "is on the ground.", - "a " + Color.BLACK + Color.BOLD_ON + "basalt" + Color.RESET + Color.BOLD_ON + Color.RED + " wand " + Color.RESET, + "a " + Color.BLACK + Color.BOLD_ON + "basalt" + Color.RESET + Color.BOLD_ON + Color.RED + " wand" + Color.RESET, false, 0, 60, @@ -1667,9 +1667,9 @@ public enum ItemType { 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), SPIRAL_MAGNET(151, Arrays.asList("spiral magnet", "spiral", "magnet", "s", "m"), - Color.GREEN + Color.BOLD_ON + "spiral" + Color.RESET + Color.BOLD_ON + Color.BLACK + " magnet " + Color.RESET, + Color.GREEN + Color.BOLD_ON + "spiral" + Color.RESET + Color.BOLD_ON + Color.BLACK + " magnet" + Color.RESET, "a " + Color.GREEN + Color.BOLD_ON + "spiral" + Color.RESET + Color.BOLD_ON + Color.BLACK + " magnet " + Color.RESET + "is on the ground.", - "a " + Color.GREEN + Color.BOLD_ON + "spiral" + Color.RESET + Color.BOLD_ON + Color.BLACK + " magnet " + Color.RESET, + "a " + Color.GREEN + Color.BOLD_ON + "spiral" + Color.RESET + Color.BOLD_ON + Color.BLACK + " magnet" + Color.RESET, false, 0, 60, @@ -1678,9 +1678,75 @@ public enum ItemType { 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), SANDSTONE_RUNE(152, Arrays.asList("sandstone rune", "sandstone", "rune", "s", "r"), - Color.YELLOW + Color.BOLD_ON + "sandstone" + Color.RESET + Color.BOLD_ON + Color.BLACK + " rune " + Color.RESET, + Color.YELLOW + Color.BOLD_ON + "sandstone" + Color.RESET + Color.BOLD_ON + Color.BLACK + " rune" + Color.RESET, "a " + Color.YELLOW + Color.BOLD_ON + "sandstone" + Color.RESET + Color.BOLD_ON + Color.BLACK + " rune " + Color.RESET + "is on the ground.", - "a " + Color.YELLOW + Color.BOLD_ON + "sandstone" + Color.RESET + Color.BOLD_ON + Color.BLACK + " rune " + Color.RESET, + "a " + Color.YELLOW + Color.BOLD_ON + "sandstone" + Color.RESET + Color.BOLD_ON + Color.BLACK + " rune" + Color.RESET, + false, + 0, + 60, + false, + Rarity.LEGENDARY, + 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), + + SERRATED_TALON(153, Arrays.asList("serrated talon", "serrated", "talon", "s", "t"), + Color.WHITE + Color.BOLD_ON + "serrated" + Color.RESET + Color.BOLD_ON + Color.RED + " talon" + Color.RESET, + "a " + Color.WHITE + Color.BOLD_ON + "serrated" + Color.RESET + Color.BOLD_ON + Color.RED + " talon " + Color.RESET + "is on the ground.", + "a " + Color.WHITE + Color.BOLD_ON + "serrated" + Color.RESET + Color.BOLD_ON + Color.RED + " talon" + Color.RESET, + false, + 0, + 60, + false, + Rarity.LEGENDARY, + 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), + + GOLDEN_AMULET(154, Arrays.asList("golden amulet", "golden", "amulet", "g", "a"), + Color.YELLOW + Color.BOLD_ON + "golden" + Color.RESET + Color.BOLD_ON + Color.MAGENTA + " amulet" + Color.RESET, + "a " + Color.YELLOW + Color.BOLD_ON + "golden" + Color.RESET + Color.BOLD_ON + Color.MAGENTA + " amulet " + Color.RESET + "is on the ground.", + "a " + Color.YELLOW + Color.BOLD_ON + "golden" + Color.RESET + Color.BOLD_ON + Color.MAGENTA + " amulet" + Color.RESET, + false, + 0, + 60, + false, + Rarity.LEGENDARY, + 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), + + RUBY_CROWN(155, Arrays.asList("ruby crown", "ruby", "crown", "r", "c"), + Color.RED + Color.BOLD_ON + "ruby" + Color.RESET + Color.BOLD_ON + Color.YELLOW + " crown" + Color.RESET, + "a " + Color.RED + Color.BOLD_ON + "ruby" + Color.RESET + Color.BOLD_ON + Color.YELLOW + " crown " + Color.RESET + "is on the ground.", + "a " + Color.RED + Color.BOLD_ON + "ruby" + Color.RESET + Color.BOLD_ON + Color.YELLOW + " crown" + Color.RESET, + false, + 0, + 60, + false, + Rarity.LEGENDARY, + 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), + + POTION_OF_CLARITY(156, Arrays.asList("potion of clarity", "potion", "clarity", "p", "c"), + Color.MAGENTA + Color.BOLD_ON + "potion" + Color.RESET + " of" + Color.BOLD_ON + Color.CYAN + " clarity" + Color.RESET, + "a " + Color.MAGENTA + Color.BOLD_ON + "potion" + Color.RESET + " of" + Color.BOLD_ON + Color.CYAN + " clarity " + Color.RESET + "is on the ground.", + "a " + Color.MAGENTA + Color.BOLD_ON + "potion" + Color.RESET + " of" + Color.BOLD_ON + Color.CYAN + " clarity" + Color.RESET, + false, + 0, + 60, + false, + Rarity.LEGENDARY, + 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), + + LENS_OF_TIME(157, Arrays.asList("lens of time", "lens", "time", "l", "t"), + Color.CYAN + Color.BOLD_ON + "lens" + Color.RESET + " of" + Color.BOLD_ON + Color.RED + " time" + Color.RESET, + "a " + Color.CYAN + Color.BOLD_ON + "lens" + Color.RESET + " of" + Color.BOLD_ON + Color.RED + " time " + Color.RESET + "is on the ground.", + "a " + Color.CYAN + Color.BOLD_ON + "lens" + Color.RESET + " of" + Color.BOLD_ON + Color.RED + " time" + Color.RESET, + false, + 0, + 60, + false, + Rarity.LEGENDARY, + 8000000, Sets.<TimeTracker.TimeOfDay>newHashSet()), + + SAUSAGE_STUFFER(158, Arrays.asList("sausage stuffer", "sausage", "stuffer", "s"), + Color.RED + Color.BOLD_ON + "sausage" + Color.RESET + Color.BOLD_ON + Color.RED + " stuffer" + Color.RESET, + "a " + Color.RED + Color.BOLD_ON + "sausage" + Color.RESET + Color.BOLD_ON + Color.RED + " stuffer " + Color.RESET + "is on the ground.", + "a " + Color.RED + Color.BOLD_ON + "sausage" + Color.RESET + Color.BOLD_ON + Color.RED + " stuffer" + Color.RESET, false, 0, 60,