diff --git a/src/main/java/com/aetherteam/aether/perk/types/MoaSkins.java b/src/main/java/com/aetherteam/aether/perk/types/MoaSkins.java index b70fbe681..9f3cff4c3 100644 --- a/src/main/java/com/aetherteam/aether/perk/types/MoaSkins.java +++ b/src/main/java/com/aetherteam/aether/perk/types/MoaSkins.java @@ -25,7 +25,7 @@ public static void registerMoaSkins() { register(name, new MoaSkin(name, new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin." + name)) .userPredicate((user) -> PerkUtil.hasLifetimeAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/" + name + "_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/" + name + "_icon.png")) .skinLocation(moaType.getMoaTexture()) .saddleLocation(moaType.getSaddleTexture()) .info(new MoaSkin.Info(User.Tier.ASCENTAN, true)) @@ -34,7 +34,7 @@ public static void registerMoaSkins() { register("classic_moa", new MoaSkin("classic_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.classic_moa")) .userPredicate((user) -> PerkUtil.hasLifetimeAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/classic_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/classic_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/classic_moa.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/moa_saddle.png")) .info(new MoaSkin.Info(User.Tier.ASCENTAN, true)) @@ -42,7 +42,7 @@ public static void registerMoaSkins() { register("boko_yellow", new MoaSkin("boko_yellow", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.boko_yellow")) .userPredicate((user) -> PerkUtil.hasLifetimeAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/boko_yellow_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/boko_yellow_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/boko_yellow/boko_yellow.png")) .hatLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/boko_yellow/boko_yellow_hat.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/boko_yellow/boko_yellow_saddle.png")) @@ -61,7 +61,7 @@ public static void registerMoaSkins() { register("gharrix_red", new MoaSkin("gharrix_red", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.gharrix_red")) .userPredicate((user) -> PerkUtil.hasLifetimeAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/gharrix_red_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/gharrix_red_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/gharrix_red/gharrix_red.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/gharrix_red/gharrix_red_saddle.png")) .info(new MoaSkin.Info(User.Tier.ASCENTAN, true)) @@ -69,7 +69,7 @@ public static void registerMoaSkins() { register("halcian_pink", new MoaSkin("halcian_pink", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.halcian_pink")) .userPredicate((user) -> PerkUtil.hasLifetimeAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/halcian_pink_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/halcian_pink_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/halcian_pink/halcian_pink.png")) .hatLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/halcian_pink/halcian_pink_hat.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/halcian_pink/halcian_pink_saddle.png")) @@ -78,7 +78,7 @@ public static void registerMoaSkins() { register("tivalier_green", new MoaSkin("tivalier_green", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.tivalier_green")) .userPredicate((user) -> PerkUtil.hasLifetimeAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/tivalier_green_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/tivalier_green_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/tivalier_green/tivalier_green.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/tivalier_green/tivalier_green_saddle.png")) .info(new MoaSkin.Info(User.Tier.ASCENTAN, true)) @@ -86,7 +86,7 @@ public static void registerMoaSkins() { register("gilded_gharrix", new MoaSkin("gilded_gharrix", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.gilded_gharrix")) .userPredicate((user) -> PerkUtil.hasAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/gilded_gharrix_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/gilded_gharrix_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/gilded_gharrix/gilded_gharrix.png")) .hatLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/gilded_gharrix/gilded_gharrix_hat.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/gilded_gharrix/gilded_gharrix_saddle.png")) @@ -95,7 +95,7 @@ public static void registerMoaSkins() { register("gargoyle_moa", new MoaSkin("gargoyle_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.gargoyle_moa")) .userPredicate((user) -> PerkUtil.hasAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/gargoyle_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/gargoyle_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/gargoyle_moa/gargoyle_moa.png")) .hatLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/gargoyle_moa/gargoyle_moa_hat.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/gargoyle_moa/gargoyle_moa_saddle.png")) @@ -104,7 +104,7 @@ public static void registerMoaSkins() { register("construction_bot", new MoaSkin("construction_bot", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.construction_bot")) .userPredicate((user) -> PerkUtil.hasAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/construction_bot_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/construction_bot_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/construction_bot/construction_bot.png")) .hatLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/construction_bot/construction_bot_hat.png")) .emissiveLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/construction_bot/construction_bot_emissive.png")) @@ -114,7 +114,7 @@ public static void registerMoaSkins() { register("mossy_statue_moa", new MoaSkin("mossy_statue_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.mossy_statue_moa")) .userPredicate((user) -> PerkUtil.hasAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/mossy_statue_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/mossy_statue_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/mossy_statue_moa/mossy_statue_moa.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/mossy_statue_moa/mossy_statue_moa_saddle.png")) .info(new MoaSkin.Info(User.Tier.ASCENTAN, false)) @@ -122,7 +122,7 @@ public static void registerMoaSkins() { register("chicken_moa", new MoaSkin("chicken_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.chicken_moa")) .userPredicate((user) -> PerkUtil.hasAscentanMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/chicken_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/chicken_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/chicken_moa/chicken_moa.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/chicken_moa/chicken_moa_saddle.png")) .info(new MoaSkin.Info(User.Tier.ASCENTAN, false)) @@ -130,7 +130,7 @@ public static void registerMoaSkins() { register("arctic_moa", new MoaSkin("arctic_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.arctic_moa")) .userPredicate((user) -> PerkUtil.hasLifetimeValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/arctic_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/arctic_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/arctic_moa/arctic_moa.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/arctic_moa/arctic_moa_saddle.png")) .info(new MoaSkin.Info(User.Tier.VALKYRIE, true)) @@ -138,7 +138,7 @@ public static void registerMoaSkins() { register("cockatrice_moa", new MoaSkin("cockatrice_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.cockatrice_moa")) .userPredicate((user) -> PerkUtil.hasLifetimeValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/cockatrice_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/cockatrice_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/cockatrice_moa/cockatrice_moa.png")) .emissiveLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/cockatrice_moa/cockatrice_moa_emissive.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/cockatrice_moa/cockatrice_moa_saddle.png")) @@ -147,7 +147,7 @@ public static void registerMoaSkins() { register("phoenix_moa", new MoaSkin("phoenix_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.phoenix_moa")) .userPredicate((user) -> PerkUtil.hasLifetimeValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/phoenix_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/phoenix_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/phoenix_moa/phoenix_moa.png")) .emissiveLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/phoenix_moa/phoenix_moa_emissive.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/phoenix_moa/phoenix_moa_saddle.png")) @@ -156,7 +156,7 @@ public static void registerMoaSkins() { register("sentry_moa", new MoaSkin("sentry_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.sentry_moa")) .userPredicate((user) -> PerkUtil.hasLifetimeValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/sentry_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/sentry_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/sentry_moa/sentry_moa.png")) .emissiveLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/sentry_moa/sentry_moa_emissive.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/sentry_moa/sentry_moa_saddle.png")) @@ -165,7 +165,7 @@ public static void registerMoaSkins() { register("valkyrie_moa", new MoaSkin("valkyrie_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.valkyrie_moa")) .userPredicate((user) -> PerkUtil.hasLifetimeValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/valkyrie_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/valkyrie_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/valkyrie_moa/valkyrie_moa.png")) .hatLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/valkyrie_moa/valkyrie_moa_hat.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/valkyrie_moa/valkyrie_moa_saddle.png")) @@ -174,7 +174,7 @@ public static void registerMoaSkins() { register("battle_sentry_moa", new MoaSkin("battle_sentry_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.battle_sentry_moa")) .userPredicate((user) -> PerkUtil.hasValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/battle_sentry_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/battle_sentry_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/battle_sentry_moa/battle_sentry_moa.png")) .emissiveLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/battle_sentry_moa/battle_sentry_moa_emissive.png")) .hatLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/battle_sentry_moa/battle_sentry_moa_hat.png")) @@ -186,7 +186,7 @@ public static void registerMoaSkins() { register("frozen_phoenix", new MoaSkin("frozen_phoenix", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.frozen_phoenix")) .userPredicate((user) -> PerkUtil.hasValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/frozen_phoenix_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/frozen_phoenix_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/frozen_phoenix/frozen_phoenix.png")) .emissiveLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/frozen_phoenix/frozen_phoenix_emissive.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/frozen_phoenix/frozen_phoenix_saddle.png")) @@ -195,7 +195,7 @@ public static void registerMoaSkins() { register("molten_moa", new MoaSkin("molten_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.molten_moa")) .userPredicate((user) -> PerkUtil.hasValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/molten_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/molten_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/molten_moa/molten_moa.png")) .emissiveLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/molten_moa/molten_moa_emissive.png")) .hatLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/molten_moa/molten_moa_hat.png")) @@ -205,7 +205,7 @@ public static void registerMoaSkins() { register("undead_moa", new MoaSkin("undead_moa", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.undead_moa")) .userPredicate((user) -> PerkUtil.hasValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/undead_moa_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/undead_moa_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/undead_moa/undead_moa.png")) .emissiveLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/undead_moa/undead_moa_emissive.png")) .hatLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/undead_moa/undead_moa_hat.png")) @@ -215,7 +215,7 @@ public static void registerMoaSkins() { register("stratus", new MoaSkin("stratus", new MoaSkin.Properties() .displayName(Component.translatable("gui.aether.moa_skins.skin.stratus")) .userPredicate((user) -> PerkUtil.hasValkyrieMoaSkins().test(user)) - .iconLocation(new ResourceLocation(Aether.MODID, "skins/icons/stratus_icon")) + .iconLocation(new ResourceLocation(Aether.MODID, "textures/gui/perks/skins/icons/stratus_icon.png")) .skinLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/stratus/stratus.png")) .saddleLocation(new ResourceLocation(Aether.MODID, "textures/entity/mobs/moa/skins/stratus/stratus_saddle.png")) .info(new MoaSkin.Info(User.Tier.VALKYRIE, false))