Skip to content

Commit

Permalink
feat: more moa skins (#2545)
Browse files Browse the repository at this point in the history
  • Loading branch information
bconlon1 authored Feb 8, 2025
1 parent 400fe24 commit 59add24
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2025-01-23T16:38:43.2300676 Languages: en_us for mod: aether
cc72a95b175361efdf42486ceaead8a853449dd1 assets/aether/lang/en_us.json
// 1.21.1 2025-02-07T14:03:29.5916976 Languages: en_us for mod: aether
26ec925db17b677d512e36720a16d29480ff8b5a assets/aether/lang/en_us.json
4 changes: 4 additions & 0 deletions src/generated/resources/assets/aether/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@
"gui.aether.moa_skins.skin.black_moa": "Black Moa",
"gui.aether.moa_skins.skin.blue_moa": "Blue Moa",
"gui.aether.moa_skins.skin.boko_yellow": "Boko Yellow",
"gui.aether.moa_skins.skin.bronze_moa": "Bronze Moa",
"gui.aether.moa_skins.skin.brown_moa": "Brown Moa",
"gui.aether.moa_skins.skin.chicken_moa": "Chicken Moa",
"gui.aether.moa_skins.skin.cockatrice_moa": "Cockatrice",
Expand All @@ -569,6 +570,7 @@
"gui.aether.moa_skins.skin.gargoyle_moa": "Gargoyle Moa",
"gui.aether.moa_skins.skin.gharrix_red": "Gharrix Red",
"gui.aether.moa_skins.skin.gilded_gharrix": "Gilded Gharrix",
"gui.aether.moa_skins.skin.gold_moa": "Gold Moa",
"gui.aether.moa_skins.skin.green_moa": "Green Moa",
"gui.aether.moa_skins.skin.halcian_pink": "Halcian Pink",
"gui.aether.moa_skins.skin.medical_bot": "Medical Bot",
Expand All @@ -577,10 +579,12 @@
"gui.aether.moa_skins.skin.orange_moa": "Orange Moa",
"gui.aether.moa_skins.skin.peacock_moa": "Peacock Moa",
"gui.aether.moa_skins.skin.phoenix_moa": "Phoenix Moa",
"gui.aether.moa_skins.skin.pink_moa": "Pink Moa",
"gui.aether.moa_skins.skin.prehistoric_moa": "Prehistoric Moa",
"gui.aether.moa_skins.skin.purple_moa": "Purple Moa",
"gui.aether.moa_skins.skin.red_moa": "Red Moa",
"gui.aether.moa_skins.skin.sentry_moa": "Sentry Moa",
"gui.aether.moa_skins.skin.silver_moa": "Silver Moa",
"gui.aether.moa_skins.skin.skeleton_moa": "Skeleton Moa",
"gui.aether.moa_skins.skin.stratus": "Stratus",
"gui.aether.moa_skins.skin.tivalier_green": "Tivalier Green",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,10 @@ protected void addTranslations() {
this.addMoaSkinsText("skin.red_moa", "Red Moa");
this.addMoaSkinsText("skin.green_moa", "Green Moa");
this.addMoaSkinsText("skin.purple_moa", "Purple Moa");
this.addMoaSkinsText("skin.pink_moa", "Pink Moa");
this.addMoaSkinsText("skin.bronze_moa", "Bronze Moa");
this.addMoaSkinsText("skin.silver_moa", "Silver Moa");
this.addMoaSkinsText("skin.gold_moa", "Gold Moa");
this.addMoaSkinsText("skin.boko_yellow", "Boko Yellow");
this.addMoaSkinsText("skin.crookjaw_purple", "Crookjaw Purple");
this.addMoaSkinsText("skin.gharrix_red", "Gharrix Red");
Expand Down
32 changes: 32 additions & 0 deletions src/main/java/com/aetherteam/aether/perk/types/MoaSkins.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,38 @@ public static void registerMoaSkins(Level level) {
.saddleLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "textures/entity/mobs/moa/moa_saddle.png"))
.info(new MoaSkin.Info(User.Tier.HUMAN, false))
));
register("pink_moa", new MoaSkin("pink_moa", new MoaSkin.Properties()
.displayName(Component.translatable("gui.aether.moa_skins.skin.pink_moa"))
.userPredicate((user) -> PerkUtil.hasHumanMoaSkins().test(user))
.iconLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "skins/icons/pink_moa_icon"))
.skinLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "textures/entity/mobs/moa/skins/pink_moa/pink_moa.png"))
.saddleLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "textures/entity/mobs/moa/moa_saddle.png"))
.info(new MoaSkin.Info(User.Tier.HUMAN, false))
));
register("bronze_moa", new MoaSkin("bronze_moa", new MoaSkin.Properties()
.displayName(Component.translatable("gui.aether.moa_skins.skin.bronze_moa"))
.userPredicate((user) -> PerkUtil.hasHumanMoaSkins().test(user))
.iconLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "skins/icons/bronze_moa_icon"))
.skinLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "textures/entity/mobs/moa/skins/bronze_moa/bronze_moa.png"))
.saddleLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "textures/entity/mobs/moa/moa_saddle.png"))
.info(new MoaSkin.Info(User.Tier.HUMAN, false))
));
register("silver_moa", new MoaSkin("silver_moa", new MoaSkin.Properties()
.displayName(Component.translatable("gui.aether.moa_skins.skin.silver_moa"))
.userPredicate((user) -> PerkUtil.hasHumanMoaSkins().test(user))
.iconLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "skins/icons/silver_moa_icon"))
.skinLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "textures/entity/mobs/moa/skins/silver_moa/silver_moa.png"))
.saddleLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "textures/entity/mobs/moa/moa_saddle.png"))
.info(new MoaSkin.Info(User.Tier.HUMAN, false))
));
register("gold_moa", new MoaSkin("gold_moa", new MoaSkin.Properties()
.displayName(Component.translatable("gui.aether.moa_skins.skin.gold_moa"))
.userPredicate((user) -> PerkUtil.hasHumanMoaSkins().test(user))
.iconLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "skins/icons/gold_moa_icon"))
.skinLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "textures/entity/mobs/moa/skins/gold_moa/gold_moa.png"))
.saddleLocation(ResourceLocation.fromNamespaceAndPath(Aether.MODID, "textures/entity/mobs/moa/moa_saddle.png"))
.info(new MoaSkin.Info(User.Tier.HUMAN, false))
));
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))
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 59add24

Please sign in to comment.