diff options
| author | Shawn Buckley <shawntbuckley@gmail.com> | 2015-10-21 22:06:25 -0400 |
|---|---|---|
| committer | Shawn Buckley <shawntbuckley@gmail.com> | 2015-10-21 22:06:25 -0400 |
| commit | 9353aa711b1d750ff945acdfed2d3b956291b615 (patch) | |
| tree | d6ca62ab093dede52afef0d82ac29d32c56fb29b /src/main/java/gregtech/api/enchants | |
| parent | 445e6c3f25714ecf15c07dcd3462375d65b6dc92 (diff) | |
| download | GT5-Unofficial-9353aa711b1d750ff945acdfed2d3b956291b615.tar.gz GT5-Unofficial-9353aa711b1d750ff945acdfed2d3b956291b615.tar.bz2 GT5-Unofficial-9353aa711b1d750ff945acdfed2d3b956291b615.zip | |
Reformat code
Diffstat (limited to 'src/main/java/gregtech/api/enchants')
| -rw-r--r-- | src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java | 52 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java | 50 |
2 files changed, 51 insertions, 51 deletions
diff --git a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java index 69919fe396..ef371b9a37 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java @@ -13,46 +13,46 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; public class Enchantment_EnderDamage extends EnchantmentDamage { - public static Enchantment_EnderDamage INSTANCE; - - public Enchantment_EnderDamage() { - super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Disjunction", 15), 2, -1); - GT_LanguageManager.addStringLocalization(getName(), "Disjunction"); - Materials.Silver .setEnchantmentForTools(this, 2); - Materials.Mercury .setEnchantmentForTools(this, 3); - Materials.Electrum .setEnchantmentForTools(this, 3); - Materials.SterlingSilver .setEnchantmentForTools(this, 4); - Materials.AstralSilver .setEnchantmentForTools(this, 5); - INSTANCE = this; - } - + public static Enchantment_EnderDamage INSTANCE; + + public Enchantment_EnderDamage() { + super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Disjunction", 15), 2, -1); + GT_LanguageManager.addStringLocalization(getName(), "Disjunction"); + Materials.Silver.setEnchantmentForTools(this, 2); + Materials.Mercury.setEnchantmentForTools(this, 3); + Materials.Electrum.setEnchantmentForTools(this, 3); + Materials.SterlingSilver.setEnchantmentForTools(this, 4); + Materials.AstralSilver.setEnchantmentForTools(this, 5); + INSTANCE = this; + } + @Override - public int getMinEnchantability(int aLevel) { + public int getMinEnchantability(int aLevel) { return 5 + (aLevel - 1) * 8; } - + @Override - public int getMaxEnchantability(int aLevel) { + public int getMaxEnchantability(int aLevel) { return this.getMinEnchantability(aLevel) + 20; } - + @Override - public int getMaxLevel() { + public int getMaxLevel() { return 5; } - + @Override - public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) { + public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) { if ((aHurtEntity instanceof EntityEnderman || aHurtEntity instanceof EntityDragon || (aHurtEntity.getClass().getName().indexOf(".") >= 0 && 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))); - // 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))); + // 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))); + // 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))); } } - + @Override - public String getName() { + public String getName() { return "enchantment.damage.endermen"; } }
\ No newline at end of file diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java index f05d00d08d..bf4cd1347c 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java @@ -11,51 +11,51 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; public class Enchantment_Radioactivity extends EnchantmentDamage { - public static Enchantment_Radioactivity INSTANCE; - - public Enchantment_Radioactivity() { - super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Radioactivity", 14), 0, -1); - GT_LanguageManager.addStringLocalization(getName(), "Radioactivity"); - Materials.Plutonium .setEnchantmentForTools(this, 1).setEnchantmentForArmors(this, 1); - Materials.Uranium235 .setEnchantmentForTools(this, 2).setEnchantmentForArmors(this, 2); - Materials.Plutonium241 .setEnchantmentForTools(this, 3).setEnchantmentForArmors(this, 3); - Materials.NaquadahEnriched .setEnchantmentForTools(this, 4).setEnchantmentForArmors(this, 4); - Materials.Naquadria .setEnchantmentForTools(this, 5).setEnchantmentForArmors(this, 5); - INSTANCE = this; - } - + public static Enchantment_Radioactivity INSTANCE; + + public Enchantment_Radioactivity() { + super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Radioactivity", 14), 0, -1); + GT_LanguageManager.addStringLocalization(getName(), "Radioactivity"); + Materials.Plutonium.setEnchantmentForTools(this, 1).setEnchantmentForArmors(this, 1); + Materials.Uranium235.setEnchantmentForTools(this, 2).setEnchantmentForArmors(this, 2); + Materials.Plutonium241.setEnchantmentForTools(this, 3).setEnchantmentForArmors(this, 3); + Materials.NaquadahEnriched.setEnchantmentForTools(this, 4).setEnchantmentForArmors(this, 4); + Materials.Naquadria.setEnchantmentForTools(this, 5).setEnchantmentForArmors(this, 5); + INSTANCE = this; + } + @Override - public int getMinEnchantability(int aLevel) { + public int getMinEnchantability(int aLevel) { return Integer.MAX_VALUE; } - + @Override - public int getMaxEnchantability(int aLevel) { + public int getMaxEnchantability(int aLevel) { return 0; } - + @Override - public int getMaxLevel() { + public int getMaxLevel() { return 5; } - + @Override - public boolean canApply(ItemStack par1ItemStack) { + public boolean canApply(ItemStack par1ItemStack) { return false; } - + @Override public boolean isAllowedOnBooks() { return false; } - + @Override - public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) { + public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) { GT_Utility.applyRadioactivity(aHurtEntity, aLevel, 1); } - + @Override - public String getName() { + public String getName() { return "enchantment.damage.radioactivity"; } }
\ No newline at end of file |
