From 81fe7f456c40bee5a5cc7433c5637447108fabe2 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Fri, 21 Jun 2019 23:41:25 +0200 Subject: [PATCH] Add stone ability colors --- src/main/java/anvil/infinity/items/ItemMindStone.java | 6 ++++++ src/main/java/anvil/infinity/items/ItemPowerStone.java | 6 ++++++ src/main/java/anvil/infinity/items/ItemRealityStone.java | 6 ++++++ src/main/java/anvil/infinity/items/ItemSoulStone.java | 6 ++++++ src/main/java/anvil/infinity/items/ItemTimeStone.java | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/src/main/java/anvil/infinity/items/ItemMindStone.java b/src/main/java/anvil/infinity/items/ItemMindStone.java index e40b80e..bfad052 100644 --- a/src/main/java/anvil/infinity/items/ItemMindStone.java +++ b/src/main/java/anvil/infinity/items/ItemMindStone.java @@ -8,6 +8,7 @@ import lucraft.mods.lucraftcore.infinity.ModuleInfinity; import lucraft.mods.lucraftcore.infinity.items.ItemInfinityStone; import lucraft.mods.lucraftcore.superpowers.abilities.Ability; import lucraft.mods.lucraftcore.superpowers.abilities.AbilityFlight; +import lucraft.mods.lucraftcore.util.abilitybar.EnumAbilityBarColor; import lucraft.mods.lucraftcore.util.helper.StringHelper; import net.minecraft.entity.EntityLivingBase; @@ -39,6 +40,11 @@ public class ItemMindStone extends ItemInfinityStone { if (CompatHandler.isHeroesExpansion && ConfigHandler.heAbilities) { abilities.put("telekinesis", CompatHandler.HeroesExpension.getAbilityGrabEntity(entity)); } + + for (Ability ability : abilities.values()) { + ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.YELLOW); + } + return super.addStoneAbilities(entity, abilities, context); } diff --git a/src/main/java/anvil/infinity/items/ItemPowerStone.java b/src/main/java/anvil/infinity/items/ItemPowerStone.java index d5c8744..dc7696b 100644 --- a/src/main/java/anvil/infinity/items/ItemPowerStone.java +++ b/src/main/java/anvil/infinity/items/ItemPowerStone.java @@ -8,6 +8,7 @@ import lucraft.mods.lucraftcore.infinity.ModuleInfinity; import lucraft.mods.lucraftcore.infinity.items.ItemInfinityStone; import lucraft.mods.lucraftcore.superpowers.abilities.*; import lucraft.mods.lucraftcore.superpowers.abilities.supplier.IAbilityProvider; +import lucraft.mods.lucraftcore.util.abilitybar.EnumAbilityBarColor; import lucraft.mods.lucraftcore.util.helper.StringHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -47,6 +48,11 @@ public class ItemPowerStone extends ItemInfinityStone implements IAbilityProvide abilities.put("power_rocket_burst", CompatHandler.StarTech.getAbilityPowerRocketBurst(entity).setMaxCooldown(100)); abilities.put("power_tendrils", CompatHandler.StarTech.getAbilityTendrils(entity)); } + + for (Ability ability : abilities.values()) { + ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE); + } + return super.addStoneAbilities(entity, abilities, context); } diff --git a/src/main/java/anvil/infinity/items/ItemRealityStone.java b/src/main/java/anvil/infinity/items/ItemRealityStone.java index 5af5e4a..24749cc 100644 --- a/src/main/java/anvil/infinity/items/ItemRealityStone.java +++ b/src/main/java/anvil/infinity/items/ItemRealityStone.java @@ -8,6 +8,7 @@ import lucraft.mods.lucraftcore.infinity.items.ItemInfinityStone; import lucraft.mods.lucraftcore.superpowers.abilities.Ability; import lucraft.mods.lucraftcore.superpowers.abilities.AbilityInvisibility; import lucraft.mods.lucraftcore.superpowers.abilities.AbilitySizeChange; +import lucraft.mods.lucraftcore.util.abilitybar.EnumAbilityBarColor; import lucraft.mods.lucraftcore.util.helper.StringHelper; import net.minecraft.entity.EntityLivingBase; @@ -42,6 +43,11 @@ public class ItemRealityStone extends ItemInfinityStone { abilities.put("change_block", CompatHandler.SpeedsterHeroes.getAbilityChangeBlock(entity)); abilities.put("turn_into_bubbles", CompatHandler.SpeedsterHeroes.getAbilityTurnIntoBubbles(entity)); } + + for (Ability ability : abilities.values()) { + ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.RED); + } + return super.addStoneAbilities(entity, abilities, context); } diff --git a/src/main/java/anvil/infinity/items/ItemSoulStone.java b/src/main/java/anvil/infinity/items/ItemSoulStone.java index 58b25ec..89f5d67 100644 --- a/src/main/java/anvil/infinity/items/ItemSoulStone.java +++ b/src/main/java/anvil/infinity/items/ItemSoulStone.java @@ -12,6 +12,7 @@ import lucraft.mods.lucraftcore.superpowers.abilities.Ability; import lucraft.mods.lucraftcore.superpowers.abilities.AbilityAttributeModifier; import lucraft.mods.lucraftcore.superpowers.abilities.AbilityHealing; import lucraft.mods.lucraftcore.superpowers.abilities.AbilityHealth; +import lucraft.mods.lucraftcore.util.abilitybar.EnumAbilityBarColor; import lucraft.mods.lucraftcore.util.helper.StringHelper; import net.minecraft.entity.EntityLivingBase; @@ -50,6 +51,11 @@ public class ItemSoulStone extends ItemInfinityStone { abilities.put("healing", new AbilityHealing(entity).setDataValue(AbilityHealing.FREQUENCY, 1)); abilities.put("kill", new AbilityKill(entity, killCond)); abilities.put("snap", new AbilitySnap(entity)); + + for (Ability ability : abilities.values()) { + ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.ORANGE); + } + return super.addStoneAbilities(entity, abilities, context); } diff --git a/src/main/java/anvil/infinity/items/ItemTimeStone.java b/src/main/java/anvil/infinity/items/ItemTimeStone.java index e4d73b2..7e1d48c 100644 --- a/src/main/java/anvil/infinity/items/ItemTimeStone.java +++ b/src/main/java/anvil/infinity/items/ItemTimeStone.java @@ -6,6 +6,7 @@ import lucraft.mods.lucraftcore.infinity.EnumInfinityStone; import lucraft.mods.lucraftcore.infinity.ModuleInfinity; import lucraft.mods.lucraftcore.infinity.items.ItemInfinityStone; import lucraft.mods.lucraftcore.superpowers.abilities.Ability; +import lucraft.mods.lucraftcore.util.abilitybar.EnumAbilityBarColor; import lucraft.mods.lucraftcore.util.helper.StringHelper; import net.minecraft.entity.EntityLivingBase; @@ -33,6 +34,11 @@ public class ItemTimeStone extends ItemInfinityStone { public Ability.AbilityMap addStoneAbilities(EntityLivingBase entity, Ability.AbilityMap abilities, Ability.EnumAbilityContext context) { abilities.put("fast_forward", new AbilityFastForward(entity)); abilities.put("stop_time", new AbilityStopTime(entity)); + + for (Ability ability : abilities.values()) { + ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.GREEN); + } + return super.addStoneAbilities(entity, abilities, context); }