Request

.gitignore

@@ -7,6 +7,7 @@ build
 eclipse
 libs
 run
+.idea
 
 # file
 !gradlew.bat

CHANGE_LOG.md

@@ -1,3 +1,5 @@
 # Change Log
 
-* Fixed slow game startup
+* Added Custom Item Rarity Color
+* Added Remove Superboom Notification
+* Toast now can display under 5 seconds

build.gradle

@@ -20,7 +20,6 @@ plugins {
 }
 
 def mcVersion = project.mc_version
-def username = project.username
 
 apply plugin: "net.minecraftforge.gradle.forge"
 apply plugin: "org.spongepowered.mixin"
@@ -37,7 +36,7 @@ minecraft {
     mappings = "${mcp_mapping}"
     makeObfSourceJar = false
     clientJvmArgs += "-Dmixin.debug.export=true -Dmixin.debug.verbose=true"
-    clientRunArgs += "--username ${username} --uuid ${uuid} --mixin mixins.skyblockcatia.json --tweakClass org.spongepowered.asm.launch.MixinTweaker"
+    clientRunArgs += "--mixin mixins.skyblockcatia.json --tweakClass org.spongepowered.asm.launch.MixinTweaker"
 
     if (project.hasProperty("sha1")) {
         replace "@FINGERPRINT@", project.sha1
@@ -67,6 +66,7 @@ repositories {
 sourceSets {
     main {
         ext.refMap = "mixins.skyblockcatia.refmap.json"
+        output.resourcesDir = java.outputDir
     }
 }
 
@@ -76,7 +76,7 @@ jar {
     }
     manifest {
         attributes("FMLAT": "skyblockcatia_at.cfg",
-                   "FMLCorePluginContainsFMLMod": "true",
+                   "FMLCorePluginContainsFMLMod": "false",
                    "TweakClass": "org.spongepowered.asm.launch.MixinTweaker",
                    "MixinConfigs": "mixins.skyblockcatia.json",
                    "ForceLoadAsMod": "true"

src/main/java/com/stevekung/skyblockcatia/config/SkyBlockcatiaConfig.java

@@ -18,6 +18,15 @@ public class SkyBlockcatiaConfig
 
     // Main Settings
     public static String hypixelApiKey;
+    public static String commonRarityColor;
+    public static String uncommonRarityColor;
+    public static String rareRarityColor;
+    public static String epicRarityColor;
+    public static String legendaryRarityColor;
+    public static String mythicRarityColor;
+    public static String supremeRarityColor;
+    public static String specialRarityColor;
+    public static String verySpecialRarityColor;
     public static boolean enableConfirmToDisconnect;
     public static boolean enableSkinRenderingFix;
     public static boolean disableHurtCameraEffect;
@@ -101,6 +110,43 @@ private static List<String> addMainSetting()
         SkyBlockcatiaConfig.disableErrorLog = prop.getBoolean();
         propOrder.add(prop.getName());
 
+        prop = SkyBlockcatiaConfig.getProperty(SkyBlockcatiaConfig.MAIN_SETTINGS, "Common Rarity Color", "255,255,255").setRequiresMcRestart(true);
+        SkyBlockcatiaConfig.commonRarityColor = prop.getString();
+        propOrder.add(prop.getName());
+
+        prop = SkyBlockcatiaConfig.getProperty(SkyBlockcatiaConfig.MAIN_SETTINGS, "Uncommon Rarity Color", "85,255,85").setRequiresMcRestart(true);
+        SkyBlockcatiaConfig.uncommonRarityColor = prop.getString();
+        propOrder.add(prop.getName());
+
+        prop = SkyBlockcatiaConfig.getProperty(SkyBlockcatiaConfig.MAIN_SETTINGS, "RareRarity Color", "85,85,255").setRequiresMcRestart(true);
+        SkyBlockcatiaConfig.rareRarityColor = prop.getString();
+        propOrder.add(prop.getName());
+
+        prop = SkyBlockcatiaConfig.getProperty(SkyBlockcatiaConfig.MAIN_SETTINGS, "Epic Rarity Color", "170,0,170").setRequiresMcRestart(true);
+        SkyBlockcatiaConfig.epicRarityColor = prop.getString();
+        propOrder.add(prop.getName());
+
+        prop = SkyBlockcatiaConfig.getProperty(SkyBlockcatiaConfig.MAIN_SETTINGS, "Legendary Rarity Color", "255,170,0").setRequiresMcRestart(true);
+        SkyBlockcatiaConfig.legendaryRarityColor = prop.getString();
+        propOrder.add(prop.getName());
+
+        prop = SkyBlockcatiaConfig.getProperty(SkyBlockcatiaConfig.MAIN_SETTINGS, "Mythic Rarity Color", "255,85,255").setRequiresMcRestart(true);
+        SkyBlockcatiaConfig.mythicRarityColor = prop.getString();
+        propOrder.add(prop.getName());
+
+        prop = SkyBlockcatiaConfig.getProperty(SkyBlockcatiaConfig.MAIN_SETTINGS, "Supreme Rarity Color", "170,0,0").setRequiresMcRestart(true);
+        SkyBlockcatiaConfig.supremeRarityColor = prop.getString();
+        propOrder.add(prop.getName());
+
+        prop = SkyBlockcatiaConfig.getProperty(SkyBlockcatiaConfig.MAIN_SETTINGS, "Special Rarity Color", "255,85,85").setRequiresMcRestart(true);
+        SkyBlockcatiaConfig.specialRarityColor = prop.getString();
+        propOrder.add(prop.getName());
+
+        prop = SkyBlockcatiaConfig.getProperty(SkyBlockcatiaConfig.MAIN_SETTINGS, "Very Special Rarity Color", "170,0,0").setRequiresMcRestart(true);
+        SkyBlockcatiaConfig.verySpecialRarityColor = prop.getString();
+        propOrder.add(prop.getName());
+
+
         return propOrder;
     }
 

src/main/java/com/stevekung/skyblockcatia/config/SkyBlockcatiaSettings.java

@@ -51,6 +51,7 @@ public class SkyBlockcatiaSettings
     public boolean showHitboxWhenDragonSpawned = false;
     public boolean sneakToOpenInventoryWhileFightDragon = false;
     public boolean leavePartyWhenLastEyePlaced = false;
+    public boolean disableSuperboomNotification = false;
     public boolean lobbyPlayerViewer = true;
     public boolean auctionBidConfirm = false;
     public boolean disableBlockParticles = false;
@@ -130,6 +131,7 @@ public void load()
             this.fixSkyblockEnchantTag = SkyBlockcatiaSettings.getBoolean(nbt, "FixSkyblockEnchantTag", this.fixSkyblockEnchantTag);
             this.disableNightVision = SkyBlockcatiaSettings.getBoolean(nbt, "DisableNightVision", this.disableNightVision);
             this.displayRealtimePing = SkyBlockcatiaSettings.getBoolean(nbt, "DisplayRealtimePing", this.displayRealtimePing);
+            this.disableSuperboomNotification = SkyBlockcatiaSettings.getBoolean(nbt, "disableSuperboomNotification", this.disableSuperboomNotification);
 
             LoggerIN.info("Loading extended config {}", SkyBlockcatiaSettings.file.getPath());
         }
@@ -186,6 +188,7 @@ public void save(String profileName)
             nbt.setBoolean("FixSkyblockEnchantTag", this.fixSkyblockEnchantTag);
             nbt.setBoolean("DisableNightVision", this.disableNightVision);
             nbt.setBoolean("DisplayRealtimePing", this.displayRealtimePing);
+            nbt.setBoolean("disableSuperboomNotification", this.disableSuperboomNotification);
             nbt.setInteger("SelectedHypixelMinigame", this.selectedHypixelMinigame);
             nbt.setInteger("HypixelMinigameScrollPos", this.hypixelMinigameScrollPos);
             nbt.setInteger("ItemRarityOpacity", this.itemRarityOpacity);
@@ -414,6 +417,10 @@ else if (options == SkyBlockcatiaSettings.Options.DISABLE_NIGHT_VISION)
         {
             this.disableNightVision = !this.disableNightVision;
         }
+        else if (options == Options.DISABLE_SUPERBOOM_NOTIFICATION)
+        {
+            this.disableSuperboomNotification = !this.disableSuperboomNotification;
+        }
         else if (options == SkyBlockcatiaSettings.Options.DISPLAY_REALTIME_PING)
         {
             this.displayRealtimePing = !this.displayRealtimePing;
@@ -545,6 +552,8 @@ public boolean getOptionOrdinalValue(SkyBlockcatiaSettings.Options options)
                 return this.disableNightVision;
             case DISPLAY_REALTIME_PING:
                 return this.displayRealtimePing;
+            case DISABLE_SUPERBOOM_NOTIFICATION:
+                return this.disableSuperboomNotification;
             default:
                 return false;
         }
@@ -592,14 +601,15 @@ public enum Options
         FIX_SKYBLOCK_ENCHANT_TAG(false, true),
         DISABLE_NIGHT_VISION(false, true),
         DISPLAY_REALTIME_PING(false, true),
+        DISABLE_SUPERBOOM_NOTIFICATION(false, true),
         ITEM_RARITY_OPACITY(true, false, 1.0F, 100.0F, 1.0F),
         AUCTION_BID_CONFIRM_VALUE(true, false, 100000.0F, 20000000.0F, 100000.0F),
-        VISIT_ISLAND_TOAST_TIME(true, false, 5.0F, 20.0F, 1.0F),
-        RARE_DROP_TOAST_TIME(true, false, 5.0F, 20.0F, 1.0F),
-        SPECIAL_DROP_TOAST_TIME(true, false, 5.0F, 20.0F, 1.0F),
-        FISH_CATCH_TOAST_TIME(true, false, 5.0F, 20.0F, 1.0F),
-        GIFT_TOAST_TIME(true, false, 5.0F, 20.0F, 1.0F),
-        PET_TOAST_TIME(true, false, 5.0F, 20.0F, 1.0F),
+        VISIT_ISLAND_TOAST_TIME(true, false, 2.0F, 20.0F, 1.0F),
+        RARE_DROP_TOAST_TIME(true, false, 2.0F, 20.0F, 1.0F),
+        SPECIAL_DROP_TOAST_TIME(true, false, 2.0F, 20.0F, 1.0F),
+        FISH_CATCH_TOAST_TIME(true, false, 2.0F, 20.0F, 1.0F),
+        GIFT_TOAST_TIME(true, false, 2.0F, 20.0F, 1.0F),
+        PET_TOAST_TIME(true, false, 2.0F, 20.0F, 1.0F),
         ;
 
         private final boolean isFloat;

src/main/java/com/stevekung/skyblockcatia/core/SkyBlockcatiaMod.java

@@ -45,7 +45,7 @@ public class SkyBlockcatiaMod
     public static final String MOD_ID = "skyblockcatia";
     private static final int MAJOR_VERSION = 1;
     private static final int MINOR_VERSION = 3;
-    private static final int BUILD_VERSION = 2;
+    private static final int BUILD_VERSION = 3;
     protected static final String GUI_FACTORY = "com.stevekung.skyblockcatia.config.ConfigGuiFactory";
     public static final String VERSION = SkyBlockcatiaMod.MAJOR_VERSION + "." + SkyBlockcatiaMod.MINOR_VERSION + "." + SkyBlockcatiaMod.BUILD_VERSION;
     protected static final String FORGE_VERSION = "required-after:Forge@[11.15.1.2318,);";

src/main/java/com/stevekung/skyblockcatia/event/handler/SkyBlockEventHandler.java

@@ -403,6 +403,11 @@ else if (petCareMatcher.matches())
                     this.mc.thePlayer.sendChatMessage("/p leave");
                 }
 
+                if (SkyBlockcatiaSettings.INSTANCE.disableSuperboomNotification && message.contains("Your Superboom TNT is ineffective"))
+                {
+                     cancelMessage = true;
+                }
+
                 if (SkyBlockEventHandler.isSkyBlock || SkyBlockcatiaMod.isDevelopment)
                 {
                     if (dragonDownMatcher.matches())

src/main/java/com/stevekung/skyblockcatia/gui/config/GuiSkyBlockSettings.java

@@ -18,7 +18,7 @@
 public class GuiSkyBlockSettings extends GuiScreen
 {
     private static final SkyBlockcatiaSettings.Options[] QOL_OPTIONS = { JUNGLE_AXE_COOLDOWN, GRAPPLING_HOOK_COOLDOWN, ZEALOT_RESPAWN_COOLDOWN, PLACED_SUMMONING_EYE_TRACKER, LEAVE_PARTY_WHEN_LAST_EYE_PLACED, LOBBY_PLAYER_VIEWER, AUCTION_BID_CONFIRM, AUCTION_BID_CONFIRM_VALUE, BAZAAR_ON_TOOLTIPS, SNEAK_TO_TRADE_OTHER_PLAYER_ISLAND, DISPLAY_ITEM_ABILITY_MAX_USED, SHORTCUT_BUTTON_IN_INVENTORY };
-    private static final SkyBlockcatiaSettings.Options[] RENDERING_OPTIONS = { SUPPORTERS_FANCY_COLOR, SHOW_ITEM_RARITY, ITEM_RARITY_OPACITY, MAKE_SPECIAL_ZEALOT_HELD_GOLD, SHOW_HITBOX_WHEN_DRAGON_SPAWNED, HITBOX_RENDER_MODE, GLOWING_DRAGON_ARMOR, DISABLE_BLOCK_PARTICLES, FIX_SKYBLOCK_ENCHANT_TAG, DISABLE_NIGHT_VISION, DISPLAY_REALTIME_PING };
+    private static final SkyBlockcatiaSettings.Options[] RENDERING_OPTIONS = { SUPPORTERS_FANCY_COLOR, SHOW_ITEM_RARITY, ITEM_RARITY_OPACITY, MAKE_SPECIAL_ZEALOT_HELD_GOLD, SHOW_HITBOX_WHEN_DRAGON_SPAWNED, HITBOX_RENDER_MODE, GLOWING_DRAGON_ARMOR, DISABLE_BLOCK_PARTICLES, FIX_SKYBLOCK_ENCHANT_TAG, DISABLE_NIGHT_VISION, DISPLAY_REALTIME_PING, DISABLE_SUPERBOOM_NOTIFICATION };
     private static final SkyBlockcatiaSettings.Options[] MISC_OPTIONS = { RIGHT_CLICK_ADD_PARTY, SNEAK_TO_OPEN_INVENTORY_WHILE_FIGHT_DRAGON, LOBBY_PLAYER_COUNT, SHOW_OBTAINED_DATE };
     private static final SkyBlockcatiaSettings.Options[] TOAST_OPTIONS = { VISIT_ISLAND_TOAST_MODE, VISIT_ISLAND_TOAST_TIME, RARE_DROP_TOAST_MODE, RARE_DROP_TOAST_TIME, SPECIAL_DROP_TOAST_TIME, FISH_CATCH_TOAST_MODE, FISH_CATCH_TOAST_TIME, GIFT_TOAST_MODE, GIFT_TOAST_TIME, PET_TOAST_MODE, PET_TOAST_TIME };
 

src/main/java/com/stevekung/skyblockcatia/mixin/player_api/entity/EntityPlayerSPMixin.java

@@ -11,7 +11,7 @@
 @Mixin(EntityPlayerSP.class)
 public class EntityPlayerSPMixin
 {
-    @Redirect(method = "localSetPlayerSPHealth(F)V", remap = false, at = @At(value = "FIELD", remap = false, target = "net/minecraft/client/entity/EntityPlayerSP.field_70737_aN:I"))
+    @Redirect(method = "setPlayerSPHealth", remap = false, at = @At(value = "FIELD", remap = false, target = "Lnet/minecraft/client/entity/EntityPlayerSP;hurtTime:I"))
     private void setNoHurtTime(EntityPlayerSP entity, int oldValue)
     {
         entity.hurtTime = SkyBlockEventHandler.isSkyBlock ? 0 : oldValue;

src/main/java/com/stevekung/skyblockcatia/mixin/render_player_api/renderer/entity/RenderPlayerMixin.java

@@ -15,17 +15,14 @@
 import net.minecraft.entity.player.EnumPlayerModelParts;
 
 @Mixin(RenderPlayer.class)
-public class RenderPlayerMixin
-{
+public class RenderPlayerMixin {
     @Inject(method = "<init>(Lnet/minecraft/client/renderer/entity/RenderManager;Z)V", at = @At("RETURN"))
-    private void init(RenderManager renderManager, boolean useSmallArms, CallbackInfo info)
-    {
+    private void init(RenderManager renderManager, boolean useSmallArms, CallbackInfo info) {
         ((RenderPlayer) (Object) this).addLayer(new LayerGlowingSteveKunG((RenderPlayer) (Object) this));
     }
 
-    @Redirect(method = "localSetModelVisibilities(Lnet/minecraft/client/entity/AbstractClientPlayer;)V", remap = false, at = @At(value = "INVOKE", remap = false, target = "net/minecraft/client/entity/AbstractClientPlayer.func_175148_a(Lnet/minecraft/entity/player/EnumPlayerModelParts;)Z"))
-    private boolean fixSecondLayer(AbstractClientPlayer clientPlayer, EnumPlayerModelParts part)
-    {
+    @Redirect(method = "setModelVisibilities", remap = false, at = @At(value = "INVOKE", remap = false, target = "Lnet/minecraft/client/entity/AbstractClientPlayer;isWearing(Lnet/minecraft/entity/player/EnumPlayerModelParts;)Z"))
+    private boolean fixSecondLayer(AbstractClientPlayer clientPlayer, EnumPlayerModelParts part) {
         return SkyBlockAPIViewerScreen.renderSecondLayer || clientPlayer.isWearing(part);
     }
 }

src/main/java/com/stevekung/skyblockcatia/utils/skyblock/SBRarity.java

@@ -3,21 +3,22 @@
 import java.util.Arrays;
 import java.util.Comparator;
 
+import com.stevekung.skyblockcatia.config.SkyBlockcatiaConfig;
 import com.stevekung.skyblockcatia.utils.ColorUtils;
 
 import net.minecraft.util.EnumChatFormatting;
 
 public enum SBRarity
 {
-    COMMON("COMMON", EnumChatFormatting.WHITE, ColorUtils.stringToRGB("255,255,255")),
-    UNCOMMON("UNCOMMON", EnumChatFormatting.GREEN, ColorUtils.stringToRGB("85,255,85")),
-    RARE("RARE", EnumChatFormatting.BLUE, ColorUtils.stringToRGB("85,85,255")),
-    EPIC("EPIC", EnumChatFormatting.DARK_PURPLE, ColorUtils.stringToRGB("170,0,170")),
-    LEGENDARY("LEGENDARY", EnumChatFormatting.GOLD, ColorUtils.stringToRGB("255,170,0")),
-    MYTHIC("MYTHIC", EnumChatFormatting.LIGHT_PURPLE, ColorUtils.stringToRGB("255,85,255")),
-    SUPREME("SUPREME", EnumChatFormatting.DARK_RED, ColorUtils.stringToRGB("170,0,0")),
-    SPECIAL("SPECIAL", EnumChatFormatting.RED, ColorUtils.stringToRGB("255,85,85")),
-    VERY_SPECIAL("VERY SPECIAL", EnumChatFormatting.RED, ColorUtils.stringToRGB("170,0,0"));
+    COMMON("COMMON", EnumChatFormatting.WHITE, ColorUtils.stringToRGB(SkyBlockcatiaConfig.commonRarityColor)),
+    UNCOMMON("UNCOMMON", EnumChatFormatting.GREEN, ColorUtils.stringToRGB(SkyBlockcatiaConfig.uncommonRarityColor)),
+    RARE("RARE", EnumChatFormatting.BLUE, ColorUtils.stringToRGB(SkyBlockcatiaConfig.rareRarityColor)),
+    EPIC("EPIC", EnumChatFormatting.DARK_PURPLE, ColorUtils.stringToRGB(SkyBlockcatiaConfig.epicRarityColor)),
+    LEGENDARY("LEGENDARY", EnumChatFormatting.GOLD, ColorUtils.stringToRGB(SkyBlockcatiaConfig.legendaryRarityColor)),
+    MYTHIC("MYTHIC", EnumChatFormatting.LIGHT_PURPLE, ColorUtils.stringToRGB(SkyBlockcatiaConfig.mythicRarityColor)),
+    SUPREME("SUPREME", EnumChatFormatting.DARK_RED, ColorUtils.stringToRGB(SkyBlockcatiaConfig.supremeRarityColor)),
+    SPECIAL("SPECIAL", EnumChatFormatting.RED, ColorUtils.stringToRGB(SkyBlockcatiaConfig.specialRarityColor)),
+    VERY_SPECIAL("VERY SPECIAL", EnumChatFormatting.RED, ColorUtils.stringToRGB(SkyBlockcatiaConfig.verySpecialRarityColor));
 
     private static final SBRarity[] VALUES = Arrays.stream(values()).sorted(Comparator.comparingInt(SBRarity::ordinal)).toArray(size -> new SBRarity[size]);
     private final String name;

src/main/java/debug/builder/PetsBuilder.java

@@ -89,6 +89,9 @@ public class PetsBuilder
         SKINS.add(new PetSkin("ENDERMAN_SLAYER", RenderUtils.decodeTextureURL("ewogICJ0aW1lc3RhbXAiIDogMTYyMTk4NDE5NTUwNCwKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGZmZjQxZTFhZmM1OTdiMTRmNzdiOGU0NGUyYTEzNGRhYmUxNjFhMTUyNmFkZTgwZTYyOTBmMmRmMzMxZGMxMSIKICAgIH0KICB9Cn0"), EnumChatFormatting.DARK_PURPLE, "Void Conqueror", "301afb75-07dd-37ce-94a1-7c5c40ab2512"));
         SKINS.add(new PetSkin("WOLF", RenderUtils.decodeTextureURL("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzhlNDE0ZTc2MmUxMDI0Yzc5OWU3MGI3YTUyN2MyMmZiOTU2NDhmMTQxZDY2MGIxMGM1MTJjYzEyNDMzNDIxOCJ9fX0K"), EnumChatFormatting.DARK_PURPLE, "Dark", "be4a9ed9-609c-32ea-b49b-44a7bd7ab0f2"));
         SKINS.add(new PetSkin("HOUND_BEAGLE", RenderUtils.decodeTextureURL("ewogICJ0aW1lc3RhbXAiIDogMTYyOTYxNjEwNjg1NSwKICAicHJvZmlsZUlkIiA6ICJiY2M1NjEwODdlMTk0YmYxYjYzNjY0MWU3YWVjZmE5MiIsCiAgInByb2ZpbGVOYW1lIiA6ICJKdWR1bWR1bSIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS84NzczNjRlMGNlMjdmMDIzOWI3NzU0NzA2YjkzMDIyZDBjZjk0NTg1NDAxNWQ2MDk2ZjljZjQzZDI0YTM4MjY5IiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0="), EnumChatFormatting.BLUE, "Beagle", "be6aae4e-4833-3527-9b9c-1934c394b758"));
+        SKINS.add(new PetSkin("SQUID_GLOW", RenderUtils.decodeTextureURL("ewogICJ0aW1lc3RhbXAiIDogMTYzMTE3Mjk1NTIyMSwKICAicHJvZmlsZUlkIiA6ICJiNjM2OWQ0MzMwNTU0NGIzOWE5OTBhODYyNWY5MmEwNSIsCiAgInByb2ZpbGVOYW1lIiA6ICJCb2JpbmhvXyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9mY2E5OTgyNTIwZWVlNDA2NmJhYjBhZTY5N2YzYjM2NTYwODRiNjYzOWJhODkxMTNiZDhlMjNhYjcyODg1NjNkIgogICAgfQogIH0KfQ"), EnumChatFormatting.LIGHT_PURPLE, "Glow", "8abdb7cd-e70c-3903-b14e-28c3d6d56e8b"));
+        SKINS.add(new PetSkin("TIGER_SABER_TOOTH", RenderUtils.decodeTextureURL("ewogICJ0aW1lc3RhbXAiIDogMTYzMDM3NTc0NzgwOCwKICAicHJvZmlsZUlkIiA6ICIzZjM4YmViZGYwMWQ0MjNkYWI4MjczZjUwNGFiNGEyNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJjazM0Nzk0MjM1NzUzNzMxIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2U5MmRiYTJmYmQ2OTlkNTQxYjJmYTBmYmNhZmY2NDBhZDhjMzExOTg3YWRlNTlhMTNiMmE2NWQwY2UzMTkzMTYiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ"), EnumChatFormatting.DARK_PURPLE, "Saber-Tooth", "7ceec9f6-db6f-3d28-987c-8a27542c7390"));
+        SKINS.add(new PetSkin("PARROT_GOLD_MACAW", RenderUtils.decodeTextureURL("ewogICJ0aW1lc3RhbXAiIDogMTYzMDM3NTk2NjQ0NywKICAicHJvZmlsZUlkIiA6ICJiZmIyOTcyMDI4ZTA0YTdhOTk0N2U2YTJkZDc5YzYxOSIsCiAgInByb2ZpbGVOYW1lIiA6ICJGaXJlYWxleCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS81ZGFkMzQ2NTBmOGQxYzZhZmJmZDk3OWIzOGQ3ZTE0MTJlNjM2MjE1YjhmODUyNDBlMDZkOTk4Mjc4ODc5YjhiIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0"), EnumChatFormatting.BLUE, "Gold Macaw", "02c2e5c0-67d3-3c2d-99fd-411a8a2b845e"));
 
         INDEXS.add(new RarityIndex("COMMON", 0));
         INDEXS.add(new RarityIndex("UNCOMMON", 6));