From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../api/enchants/EnchantmentEnderDamage.java | 72 ++++++++++++++++++++++ .../gregtech/api/enchants/EnchantmentHazmat.java | 56 +++++++++++++++++ .../api/enchants/EnchantmentRadioactivity.java | 68 ++++++++++++++++++++ .../api/enchants/Enchantment_EnderDamage.java | 72 ---------------------- .../gregtech/api/enchants/Enchantment_Hazmat.java | 56 ----------------- .../api/enchants/Enchantment_Radioactivity.java | 68 -------------------- 6 files changed, 196 insertions(+), 196 deletions(-) create mode 100644 src/main/java/gregtech/api/enchants/EnchantmentEnderDamage.java create mode 100644 src/main/java/gregtech/api/enchants/EnchantmentHazmat.java create mode 100644 src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java delete mode 100644 src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java delete mode 100644 src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java delete mode 100644 src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java (limited to 'src/main/java/gregtech/api/enchants') diff --git a/src/main/java/gregtech/api/enchants/EnchantmentEnderDamage.java b/src/main/java/gregtech/api/enchants/EnchantmentEnderDamage.java new file mode 100644 index 0000000000..6c26a54976 --- /dev/null +++ b/src/main/java/gregtech/api/enchants/EnchantmentEnderDamage.java @@ -0,0 +1,72 @@ +package gregtech.api.enchants; + +import net.minecraft.enchantment.EnchantmentDamage; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.boss.EntityDragon; +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.GTConfig; +import gregtech.api.util.GTLanguageManager; + +public class EnchantmentEnderDamage extends EnchantmentDamage { + + public static EnchantmentEnderDamage INSTANCE; + + public EnchantmentEnderDamage() { + super(GTConfig.addIDConfig(ConfigCategories.IDs.enchantments, "Disjunction", 15), 2, -1); + GTLanguageManager.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) { + return 5 + (aLevel - 1) * 8; + } + + @Override + public int getMaxEnchantability(int aLevel) { + return this.getMinEnchantability(aLevel) + 20; + } + + @Override + public int getMaxLevel() { + return 5; + } + + @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")))) { + // 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() { + return "enchantment.damage.endermen"; + } +} diff --git a/src/main/java/gregtech/api/enchants/EnchantmentHazmat.java b/src/main/java/gregtech/api/enchants/EnchantmentHazmat.java new file mode 100644 index 0000000000..bbac780b71 --- /dev/null +++ b/src/main/java/gregtech/api/enchants/EnchantmentHazmat.java @@ -0,0 +1,56 @@ +package gregtech.api.enchants; + +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.GTConfig; +import gregtech.api.util.GTLanguageManager; + +public class EnchantmentHazmat extends Enchantment { + + public static EnchantmentHazmat INSTANCE; + + public EnchantmentHazmat() { + super(GTConfig.addIDConfig(ConfigCategories.IDs.enchantments, "Hazmat", 13), 0, EnumEnchantmentType.armor); + GTLanguageManager.addStringLocalization(getName(), "Hazmat"); + INSTANCE = this; + } + + @Override + public int getMinEnchantability(int aLevel) { + return 50; + } + + @Override + public int getMaxEnchantability(int aLevel) { + return 100; + } + + @Override + public int getMaxLevel() { + return 1; + } + + @Override + public boolean canApply(ItemStack aStack) { + return aStack != null && (aStack.getItem() instanceof ItemArmor); + } + + @Override + public boolean canApplyAtEnchantingTable(ItemStack itemStack) { + return false; + } + + @Override + public boolean isAllowedOnBooks() { + return false; + } + + @Override + public String getName() { + return "enchantment.protection.hazmat"; + } +} diff --git a/src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java b/src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java new file mode 100644 index 0000000000..77e6f52702 --- /dev/null +++ b/src/main/java/gregtech/api/enchants/EnchantmentRadioactivity.java @@ -0,0 +1,68 @@ +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.GTConfig; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; + +public class EnchantmentRadioactivity extends EnchantmentDamage { + + public static EnchantmentRadioactivity INSTANCE; + + public EnchantmentRadioactivity() { + super(GTConfig.addIDConfig(ConfigCategories.IDs.enchantments, "Radioactivity", 14), 0, -1); + GTLanguageManager.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) { + return Integer.MAX_VALUE; + } + + @Override + public int getMaxEnchantability(int aLevel) { + return 0; + } + + @Override + public int getMaxLevel() { + return 5; + } + + @Override + public boolean canApply(ItemStack itemStack) { + return false; + } + + @Override + public boolean isAllowedOnBooks() { + return false; + } + + @Override + public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) { + GTUtility.applyRadioactivity(aHurtEntity, aLevel, 1); + } + + @Override + public String getName() { + return "enchantment.damage.radioactivity"; + } +} diff --git a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java deleted file mode 100644 index 07c13b3509..0000000000 --- a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java +++ /dev/null @@ -1,72 +0,0 @@ -package gregtech.api.enchants; - -import net.minecraft.enchantment.EnchantmentDamage; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.boss.EntityDragon; -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() { - 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) { - return 5 + (aLevel - 1) * 8; - } - - @Override - public int getMaxEnchantability(int aLevel) { - return this.getMinEnchantability(aLevel) + 20; - } - - @Override - public int getMaxLevel() { - return 5; - } - - @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")))) { - // 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() { - return "enchantment.damage.endermen"; - } -} diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java b/src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java deleted file mode 100644 index ecbe654698..0000000000 --- a/src/main/java/gregtech/api/enchants/Enchantment_Hazmat.java +++ /dev/null @@ -1,56 +0,0 @@ -package gregtech.api.enchants; - -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() { - super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Hazmat", 13), 0, EnumEnchantmentType.armor); - GT_LanguageManager.addStringLocalization(getName(), "Hazmat"); - INSTANCE = this; - } - - @Override - public int getMinEnchantability(int aLevel) { - return 50; - } - - @Override - public int getMaxEnchantability(int aLevel) { - return 100; - } - - @Override - public int getMaxLevel() { - return 1; - } - - @Override - public boolean canApply(ItemStack aStack) { - return aStack != null && (aStack.getItem() instanceof ItemArmor); - } - - @Override - public boolean canApplyAtEnchantingTable(ItemStack itemStack) { - return false; - } - - @Override - public boolean isAllowedOnBooks() { - return false; - } - - @Override - public String getName() { - return "enchantment.protection.hazmat"; - } -} diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java deleted file mode 100644 index e68e55cd6a..0000000000 --- a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java +++ /dev/null @@ -1,68 +0,0 @@ -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; - -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; - } - - @Override - public int getMinEnchantability(int aLevel) { - return Integer.MAX_VALUE; - } - - @Override - public int getMaxEnchantability(int aLevel) { - return 0; - } - - @Override - public int getMaxLevel() { - return 5; - } - - @Override - public boolean canApply(ItemStack itemStack) { - return false; - } - - @Override - public boolean isAllowedOnBooks() { - return false; - } - - @Override - public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) { - GT_Utility.applyRadioactivity(aHurtEntity, aLevel, 1); - } - - @Override - public String getName() { - return "enchantment.damage.radioactivity"; - } -} -- cgit