diff options
Diffstat (limited to 'src/main/java/gregtech/api/enchants')
3 files changed, 24 insertions, 23 deletions
diff --git a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java index a31b802219..52fd3b1134 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java @@ -1,9 +1,5 @@ package gregtech.api.enchants; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.Materials; -import gregtech.api.util.GT_Config; -import gregtech.api.util.GT_LanguageManager; import net.minecraft.enchantment.EnchantmentDamage; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -12,7 +8,13 @@ import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import gregtech.api.enums.ConfigCategories; +import gregtech.api.enums.Materials; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_LanguageManager; + public class Enchantment_EnderDamage extends EnchantmentDamage { + public static Enchantment_EnderDamage INSTANCE; public Enchantment_EnderDamage() { @@ -43,20 +45,15 @@ public class Enchantment_EnderDamage extends EnchantmentDamage { @Override public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) { - if ((aHurtEntity instanceof EntityEnderman - || aHurtEntity instanceof EntityDragon - || (aHurtEntity.getClass().getName().contains(".") - && aHurtEntity - .getClass() - .getName() - .substring(aHurtEntity.getClass().getName().lastIndexOf(".")) - .contains("Ender")))) { + if ((aHurtEntity instanceof EntityEnderman || aHurtEntity instanceof EntityDragon + || (aHurtEntity.getClass().getName().contains(".") && aHurtEntity.getClass().getName() + .substring(aHurtEntity.getClass().getName().lastIndexOf(".")).contains("Ender")))) { // Weakness causes Endermen to not be able to teleport with GT being installed. - aHurtEntity.addPotionEffect( - new PotionEffect(Potion.weakness.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); + aHurtEntity + .addPotionEffect(new PotionEffect(Potion.weakness.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); // They also get Poisoned. If you have this Enchant on an Arrow, you can kill the Ender Dragon easier. - aHurtEntity.addPotionEffect( - new PotionEffect(Potion.poison.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); + aHurtEntity + .addPotionEffect(new PotionEffect(Potion.poison.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); } } diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java b/src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java index 136b5c61a6..ecbe654698 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java @@ -1,14 +1,16 @@ package gregtech.api.enchants; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.util.GT_Config; -import gregtech.api.util.GT_LanguageManager; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import gregtech.api.enums.ConfigCategories; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_LanguageManager; + public class Enchantment_Hazmat extends Enchantment { + public static Enchantment_Hazmat INSTANCE; public Enchantment_Hazmat() { diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java index f6088caab3..34035c9457 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java @@ -1,16 +1,18 @@ package gregtech.api.enchants; +import net.minecraft.enchantment.EnchantmentDamage; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Materials; import gregtech.api.util.GT_Config; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Utility; -import net.minecraft.enchantment.EnchantmentDamage; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; public class Enchantment_Radioactivity extends EnchantmentDamage { + public static Enchantment_Radioactivity INSTANCE; public Enchantment_Radioactivity() { |