From f05928e26cff59b4ea6f1c593fd8065fbb0d4484 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Mon, 13 May 2019 11:24:02 +0200 Subject: [PATCH] Improved Helpers 2 --- .gitignore | 1 + .../anvil/infinity/abilities/AbilitySnap.java | 3 +- .../anvil/infinity/compat/HELoadedProxy.java | 4 +- .../infinity/compat/HENotLoadedProxy.java | 4 +- .../java/anvil/infinity/compat/HEProxy.java | 2 +- .../anvil/infinity/effects/EffectSnap.java | 2 - .../anvil/infinity/helpers/GauntelHelper.java | 44 +++++++++++++++++-- .../anvil/infinity/helpers/SoundHelper.java | 2 +- .../anvil/infinity/registry/Abilities.java | 3 +- 9 files changed, 51 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index c934d58..e508044 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ out run *.iml .idea +.gradle classes \ No newline at end of file diff --git a/src/main/java/anvil/infinity/abilities/AbilitySnap.java b/src/main/java/anvil/infinity/abilities/AbilitySnap.java index b64f39e..8562e2c 100644 --- a/src/main/java/anvil/infinity/abilities/AbilitySnap.java +++ b/src/main/java/anvil/infinity/abilities/AbilitySnap.java @@ -1,6 +1,7 @@ package anvil.infinity.abilities; import anvil.infinity.compat.CompatHandler; +import anvil.infinity.helpers.GauntelHelper; import anvil.infinity.registry.Effects; import lucraft.mods.lucraftcore.infinity.ModuleInfinity; import lucraft.mods.lucraftcore.superpowers.abilities.AbilityAction; @@ -36,7 +37,7 @@ public class AbilitySnap extends AbilityAction { @Override public boolean action() { - if (CompatHandler.HeroesExpension.hasFullGauntlet(entity)) { + if (GauntelHelper.hasFullGauntlet(entity)) { World w = entity.getEntityWorld(); List entities = w.loadedEntityList; boolean kill = false; diff --git a/src/main/java/anvil/infinity/compat/HELoadedProxy.java b/src/main/java/anvil/infinity/compat/HELoadedProxy.java index a7ae860..631ab90 100644 --- a/src/main/java/anvil/infinity/compat/HELoadedProxy.java +++ b/src/main/java/anvil/infinity/compat/HELoadedProxy.java @@ -14,7 +14,7 @@ public class HELoadedProxy implements HEProxy { } @Override - public boolean hasFullGauntlet(EntityLivingBase entity) { - return Ability.hasAbility(entity, AbilityPortal.class) && Ability.hasAbility(entity, AbilityHasPowerStone.class) && Ability.hasAbility(entity, AbilityHasRealityStone.class) && Ability.hasAbility(entity, AbilityHasSoulStone.class) && Ability.hasAbility(entity, AbilityHasTimeStone.class) && Ability.hasAbility(entity, AbilityHasMindStone.class); + public boolean hasSpaceStone(EntityLivingBase entity) { + return Ability.hasAbility(entity, AbilityPortal.class); } } diff --git a/src/main/java/anvil/infinity/compat/HENotLoadedProxy.java b/src/main/java/anvil/infinity/compat/HENotLoadedProxy.java index 8ce3573..fb60d15 100644 --- a/src/main/java/anvil/infinity/compat/HENotLoadedProxy.java +++ b/src/main/java/anvil/infinity/compat/HENotLoadedProxy.java @@ -12,7 +12,7 @@ public class HENotLoadedProxy implements HEProxy { } @Override - public boolean hasFullGauntlet(EntityLivingBase entity) { - return Ability.hasAbility(entity, AbilityHasPowerStone.class) && Ability.hasAbility(entity, AbilityHasRealityStone.class) && Ability.hasAbility(entity, AbilityHasSoulStone.class) && Ability.hasAbility(entity, AbilityHasTimeStone.class) && Ability.hasAbility(entity, AbilityHasMindStone.class); + public boolean hasSpaceStone(EntityLivingBase entity) { + return true; } } diff --git a/src/main/java/anvil/infinity/compat/HEProxy.java b/src/main/java/anvil/infinity/compat/HEProxy.java index 12f7e5b..cc75045 100644 --- a/src/main/java/anvil/infinity/compat/HEProxy.java +++ b/src/main/java/anvil/infinity/compat/HEProxy.java @@ -7,6 +7,6 @@ public interface HEProxy { Ability getAbilityGrabEntity(EntityLivingBase entity); - boolean hasFullGauntlet(EntityLivingBase entity); + boolean hasSpaceStone(EntityLivingBase entity); } diff --git a/src/main/java/anvil/infinity/effects/EffectSnap.java b/src/main/java/anvil/infinity/effects/EffectSnap.java index d98f1cd..c71b07f 100644 --- a/src/main/java/anvil/infinity/effects/EffectSnap.java +++ b/src/main/java/anvil/infinity/effects/EffectSnap.java @@ -1,12 +1,10 @@ package anvil.infinity.effects; import anvil.infinity.Infinity; -import anvil.infinity.SoundHelper; import anvil.infinity.helpers.SnapMessageHelper; import anvil.infinity.registry.Effects; import anvil.infinity.registry.Sounds; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraftforge.event.entity.living.LivingEvent; diff --git a/src/main/java/anvil/infinity/helpers/GauntelHelper.java b/src/main/java/anvil/infinity/helpers/GauntelHelper.java index 4f625d5..fb91868 100644 --- a/src/main/java/anvil/infinity/helpers/GauntelHelper.java +++ b/src/main/java/anvil/infinity/helpers/GauntelHelper.java @@ -1,4 +1,40 @@ -package anvil.infinity.helpers; - -public class GauntelHelper { -} +package anvil.infinity.helpers; + +import anvil.infinity.abilities.*; +import anvil.infinity.compat.CompatHandler; +import lucraft.mods.lucraftcore.superpowers.abilities.Ability; +import net.minecraft.entity.EntityLivingBase; + +public class GauntelHelper { + + public static boolean hasPowerStone(EntityLivingBase entity) { + return Ability.hasAbility(entity, AbilityHasPowerStone.class); + } + + public static boolean hasSpaceStone(EntityLivingBase entity) { + return CompatHandler.HeroesExpension.hasSpaceStone(entity); + } + + public static boolean hasRealityStone(EntityLivingBase entity) { + return Ability.hasAbility(entity, AbilityHasRealityStone.class); + } + + public static boolean hasSoulStone(EntityLivingBase entity) { + return Ability.hasAbility(entity, AbilityHasSoulStone.class); + } + + public static boolean hasTimeStone(EntityLivingBase entity) { + return Ability.hasAbility(entity, AbilityHasTimeStone.class); + } + + public static boolean hasMindStone(EntityLivingBase entity) { + return Ability.hasAbility(entity, AbilityHasMindStone.class); + } + + public static boolean hasFullGauntlet(EntityLivingBase entity) { + return hasPowerStone(entity) && hasSpaceStone(entity) && hasRealityStone(entity) && hasSoulStone(entity) && hasTimeStone(entity) && hasMindStone(entity); + } + + + +} diff --git a/src/main/java/anvil/infinity/helpers/SoundHelper.java b/src/main/java/anvil/infinity/helpers/SoundHelper.java index 6130855..c2d412b 100644 --- a/src/main/java/anvil/infinity/helpers/SoundHelper.java +++ b/src/main/java/anvil/infinity/helpers/SoundHelper.java @@ -1,4 +1,4 @@ -package anvil.infinity; +package anvil.infinity.helpers; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.SoundEvent; diff --git a/src/main/java/anvil/infinity/registry/Abilities.java b/src/main/java/anvil/infinity/registry/Abilities.java index 05b26a4..a549855 100644 --- a/src/main/java/anvil/infinity/registry/Abilities.java +++ b/src/main/java/anvil/infinity/registry/Abilities.java @@ -1,6 +1,7 @@ -package anvil.infinity.abilities; +package anvil.infinity.registry; import anvil.infinity.Infinity; +import anvil.infinity.abilities.*; import lucraft.mods.lucraftcore.superpowers.abilities.AbilityEntry; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent;