From ca02c8d76e1ec07e0d65da84c1b6de7d1b9a2ba9 Mon Sep 17 00:00:00 2001 From: bconlon Date: Fri, 3 Jul 2020 17:51:48 -0700 Subject: [PATCH] Implemented Valkyrie Cape. --- .../java/com/legacy/aether/AetherConfig.java | 8 +++++++- .../com/legacy/aether/items/ItemsAether.java | 3 ++- .../player/abilities/AbilityAccessories.java | 2 +- .../legacy/aether/registry/AetherRegistries.java | 1 + .../gen/components/ComponentSilverDungeon.java | 3 ++- .../aether_legacy/models/item/valkyrie_cape.json | 6 ++++++ .../textures/armor/accessory_valkyrie_cape.png | Bin 0 -> 3409 bytes .../textures/items/accessories/valkyrie_cape.png | Bin 0 -> 3109 bytes 8 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/aether_legacy/models/item/valkyrie_cape.json create mode 100644 src/main/resources/assets/aether_legacy/textures/armor/accessory_valkyrie_cape.png create mode 100644 src/main/resources/assets/aether_legacy/textures/items/accessories/valkyrie_cape.png diff --git a/src/main/java/com/legacy/aether/AetherConfig.java b/src/main/java/com/legacy/aether/AetherConfig.java index e8199a9..1713ec5 100644 --- a/src/main/java/com/legacy/aether/AetherConfig.java +++ b/src/main/java/com/legacy/aether/AetherConfig.java @@ -15,7 +15,7 @@ public class AetherConfig { private static boolean disable_trivia, old_mobs; - private static boolean skyrootBucketOnly; + private static boolean skyrootBucketOnly, valkyrie_cape; private static boolean floating_block_collision; @@ -41,6 +41,7 @@ public class AetherConfig { aether_biome_id = config.get("World Identification", "Aether Biome ID", 127).getInt(127); skyrootBucketOnly = config.get("Misc", "Activate portal with only Skyroot bucket", false).getBoolean(false); + valkyrie_cape = config.get("Misc", "Swaps the Golden Feather with the Valkyrie Cape in dungeon loot", false).getBoolean(false); travel_dimension = config.get("Misc", "Dimension below aether", 0).getInt(0); floating_block_collision = config.get("Misc", "Floating block collision", true).getBoolean(true); @@ -93,4 +94,9 @@ public class AetherConfig { return AetherConfig.skyrootBucketOnly; } + public static boolean valkyrieCapeEnabled() + { + return AetherConfig.valkyrie_cape; + } + } \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/items/ItemsAether.java b/src/main/java/com/legacy/aether/items/ItemsAether.java index 6ff9b44..e20a303 100644 --- a/src/main/java/com/legacy/aether/items/ItemsAether.java +++ b/src/main/java/com/legacy/aether/items/ItemsAether.java @@ -100,7 +100,7 @@ public class ItemsAether { public static Item iron_ring, golden_ring, zanite_ring, ice_ring, iron_pendant, golden_pendant, zanite_pendant, ice_pendant; - public static Item white_cape, red_cape, blue_cape, yellow_cape, swet_cape, invisibility_cape, agility_cape; + public static Item white_cape, red_cape, blue_cape, yellow_cape, swet_cape, invisibility_cape, agility_cape, valkyrie_cape; public static Item golden_feather, regeneration_stone, iron_bubble, life_shard; @@ -241,6 +241,7 @@ public class ItemsAether { swet_cape = register("swet_cape", new ItemAccessory(AccessoryType.CAPE).setTexture("swet_cape").setDungeonLoot().setTextureName(Aether.find("accessories/swet_cape"))); invisibility_cape = register("invisibility_cape", new ItemAccessory(AccessoryType.CAPE).setDungeonLoot().setTextureName(Aether.find("accessories/invisibility_cape"))); agility_cape = register("agility_cape", new ItemAccessory(AccessoryType.CAPE).setTexture("agility_cape").setDungeonLoot().setTextureName(Aether.find("accessories/agility_cape"))); + valkyrie_cape = register("valkyrie_cape", new ItemAccessory(AccessoryType.CAPE).setTexture("valkyrie_cape").setDungeonLoot().setTextureName(Aether.find("accessories/valkyrie_cape"))); golden_feather = register("golden_feather", new ItemAccessory(AccessoryType.MISC).setDungeonLoot().setTextureName(Aether.find("accessories/golden_feather"))); regeneration_stone = register("regeneration_stone", new ItemAccessory(AccessoryType.MISC).setDungeonLoot().setTextureName(Aether.find("accessories/regeneration_stone"))); diff --git a/src/main/java/com/legacy/aether/player/abilities/AbilityAccessories.java b/src/main/java/com/legacy/aether/player/abilities/AbilityAccessories.java index e8913d2..331f8f3 100644 --- a/src/main/java/com/legacy/aether/player/abilities/AbilityAccessories.java +++ b/src/main/java/com/legacy/aether/player/abilities/AbilityAccessories.java @@ -95,7 +95,7 @@ public class AbilityAccessories implements IAetherAbility { } } - if (this.player.getAccessoryInventory().wearingAccessory(new ItemStack(ItemsAether.golden_feather))) { + if (this.player.getAccessoryInventory().wearingAccessory(new ItemStack(ItemsAether.golden_feather)) || this.player.getAccessoryInventory().wearingAccessory(new ItemStack(ItemsAether.valkyrie_cape))) { if (!this.player.getEntity().onGround && this.player.getEntity().motionY < 0.0D && !this.player.getEntity().isInWater() && !this.player.getEntity().isSneaking()) { this.player.getEntity().motionY *= 0.59999999999999998D; } diff --git a/src/main/java/com/legacy/aether/registry/AetherRegistries.java b/src/main/java/com/legacy/aether/registry/AetherRegistries.java index 2e21c05..9af052b 100644 --- a/src/main/java/com/legacy/aether/registry/AetherRegistries.java +++ b/src/main/java/com/legacy/aether/registry/AetherRegistries.java @@ -51,6 +51,7 @@ public class AetherRegistries { AetherAPI.instance().register(new AetherAccessory(ItemsAether.swet_cape, AccessoryType.CAPE)); AetherAPI.instance().register(new AetherAccessory(ItemsAether.invisibility_cape, AccessoryType.CAPE)); AetherAPI.instance().register(new AetherAccessory(ItemsAether.agility_cape, AccessoryType.CAPE)); + AetherAPI.instance().register(new AetherAccessory(ItemsAether.valkyrie_cape, AccessoryType.CAPE)); AetherAPI.instance().register(new AetherAccessory(ItemsAether.golden_feather, AccessoryType.MISC)); AetherAPI.instance().register(new AetherAccessory(ItemsAether.regeneration_stone, AccessoryType.MISC)); diff --git a/src/main/java/com/legacy/aether/world/gen/components/ComponentSilverDungeon.java b/src/main/java/com/legacy/aether/world/gen/components/ComponentSilverDungeon.java index 430c369..f97ab69 100644 --- a/src/main/java/com/legacy/aether/world/gen/components/ComponentSilverDungeon.java +++ b/src/main/java/com/legacy/aether/world/gen/components/ComponentSilverDungeon.java @@ -2,6 +2,7 @@ package com.legacy.aether.world.gen.components; import java.util.Random; +import com.legacy.aether.AetherConfig; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -562,7 +563,7 @@ public class ComponentSilverDungeon extends AetherStructure { if (random.nextBoolean()) return new ItemStack(ItemsAether.valkyrie_chestplate); } - return new ItemStack(ItemsAether.golden_feather); + return AetherConfig.valkyrieCapeEnabled() ? new ItemStack(ItemsAether.valkyrie_cape) : new ItemStack(ItemsAether.golden_feather); } } \ No newline at end of file diff --git a/src/main/resources/assets/aether_legacy/models/item/valkyrie_cape.json b/src/main/resources/assets/aether_legacy/models/item/valkyrie_cape.json new file mode 100644 index 0000000..645ba38 --- /dev/null +++ b/src/main/resources/assets/aether_legacy/models/item/valkyrie_cape.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "aether_legacy:items/accessories/valkyrie_cape" + } +} diff --git a/src/main/resources/assets/aether_legacy/textures/armor/accessory_valkyrie_cape.png b/src/main/resources/assets/aether_legacy/textures/armor/accessory_valkyrie_cape.png new file mode 100644 index 0000000000000000000000000000000000000000..16fbdb81320bb610684b70941b8470cab39e9a92 GIT binary patch literal 3409 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 literal 0 HcmV?d00001