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/damagesources/GTDamageSources.java | 119 +++++++++++++++++++++ .../api/damagesources/GT_DamageSources.java | 119 --------------------- 2 files changed, 119 insertions(+), 119 deletions(-) create mode 100644 src/main/java/gregtech/api/damagesources/GTDamageSources.java delete mode 100644 src/main/java/gregtech/api/damagesources/GT_DamageSources.java (limited to 'src/main/java/gregtech/api/damagesources') diff --git a/src/main/java/gregtech/api/damagesources/GTDamageSources.java b/src/main/java/gregtech/api/damagesources/GTDamageSources.java new file mode 100644 index 0000000000..44b80a57c9 --- /dev/null +++ b/src/main/java/gregtech/api/damagesources/GTDamageSources.java @@ -0,0 +1,119 @@ +package gregtech.api.damagesources; + +import javax.annotation.Nullable; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSource; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; + +public class GTDamageSources { + + public static DamageSource getElectricDamage() { + return ic2.api.info.Info.DMG_ELECTRIC; + } + + public static DamageSource getRadioactiveDamage() { + return ic2.api.info.Info.DMG_RADIATION; + } + + public static DamageSource getNukeExplosionDamage() { + return ic2.api.info.Info.DMG_NUKE_EXPLOSION; + } + + public static DamageSource getExplodingDamage() { + return new DamageSourceExploding(); + } + + public static DamageSource getCombatDamage(String aType, EntityLivingBase aPlayer, IChatComponent aDeathMessage) { + return new DamageSourceCombat(aType, aPlayer, aDeathMessage); + } + + public static DamageSource getHeatDamage() { + return new DamageSourceHeat(); + } + + public static DamageSource getFrostDamage() { + return new DamageSourceFrost(); + } + + private static class DamageSourceCombat extends EntityDamageSource { + + private final IChatComponent mDeathMessage; + + public DamageSourceCombat(String aType, EntityLivingBase aPlayer, IChatComponent aDeathMessage) { + super(aType, aPlayer); + mDeathMessage = aDeathMessage; + } + + @Override + public IChatComponent func_151519_b(EntityLivingBase aTarget) { + return mDeathMessage == null ? super.func_151519_b(aTarget) : mDeathMessage; + } + } + + private static class DamageSourceFrost extends DamageSource { + + public DamageSourceFrost() { + super("frost"); + setDifficultyScaled(); + } + + @Override + public IChatComponent func_151519_b(EntityLivingBase aTarget) { + return new ChatComponentText( + EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " got frozen"); + } + } + + private static class DamageSourceHeat extends DamageSource { + + public DamageSourceHeat() { + super("steam"); + setFireDamage(); + setDifficultyScaled(); + } + + @Override + public IChatComponent func_151519_b(EntityLivingBase aTarget) { + return new ChatComponentText( + EnumChatFormatting.RED + aTarget.getCommandSenderName() + + EnumChatFormatting.WHITE + + " was boiled alive"); + } + } + + public static class DamageSourceHotItem extends DamageSourceHeat { + + @Nullable + private final ItemStack stack; + + public DamageSourceHotItem(@Nullable ItemStack cause) { + this.stack = cause; + } + + @Nullable + public ItemStack getDamagingStack() { + return stack; + } + } + + public static class DamageSourceExploding extends DamageSource { + + public DamageSourceExploding() { + super("exploded"); + setDamageAllowedInCreativeMode(); + setDamageBypassesArmor(); + setDamageIsAbsolute(); + } + + @Override + public IChatComponent func_151519_b(EntityLivingBase aTarget) { + return new ChatComponentText( + EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " exploded"); + } + } +} diff --git a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java b/src/main/java/gregtech/api/damagesources/GT_DamageSources.java deleted file mode 100644 index 65a2519001..0000000000 --- a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java +++ /dev/null @@ -1,119 +0,0 @@ -package gregtech.api.damagesources; - -import javax.annotation.Nullable; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSource; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; - -public class GT_DamageSources { - - public static DamageSource getElectricDamage() { - return ic2.api.info.Info.DMG_ELECTRIC; - } - - public static DamageSource getRadioactiveDamage() { - return ic2.api.info.Info.DMG_RADIATION; - } - - public static DamageSource getNukeExplosionDamage() { - return ic2.api.info.Info.DMG_NUKE_EXPLOSION; - } - - public static DamageSource getExplodingDamage() { - return new DamageSourceExploding(); - } - - public static DamageSource getCombatDamage(String aType, EntityLivingBase aPlayer, IChatComponent aDeathMessage) { - return new DamageSourceCombat(aType, aPlayer, aDeathMessage); - } - - public static DamageSource getHeatDamage() { - return new DamageSourceHeat(); - } - - public static DamageSource getFrostDamage() { - return new DamageSourceFrost(); - } - - private static class DamageSourceCombat extends EntityDamageSource { - - private final IChatComponent mDeathMessage; - - public DamageSourceCombat(String aType, EntityLivingBase aPlayer, IChatComponent aDeathMessage) { - super(aType, aPlayer); - mDeathMessage = aDeathMessage; - } - - @Override - public IChatComponent func_151519_b(EntityLivingBase aTarget) { - return mDeathMessage == null ? super.func_151519_b(aTarget) : mDeathMessage; - } - } - - private static class DamageSourceFrost extends DamageSource { - - public DamageSourceFrost() { - super("frost"); - setDifficultyScaled(); - } - - @Override - public IChatComponent func_151519_b(EntityLivingBase aTarget) { - return new ChatComponentText( - EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " got frozen"); - } - } - - private static class DamageSourceHeat extends DamageSource { - - public DamageSourceHeat() { - super("steam"); - setFireDamage(); - setDifficultyScaled(); - } - - @Override - public IChatComponent func_151519_b(EntityLivingBase aTarget) { - return new ChatComponentText( - EnumChatFormatting.RED + aTarget.getCommandSenderName() - + EnumChatFormatting.WHITE - + " was boiled alive"); - } - } - - public static class DamageSourceHotItem extends DamageSourceHeat { - - @Nullable - private final ItemStack stack; - - public DamageSourceHotItem(@Nullable ItemStack cause) { - this.stack = cause; - } - - @Nullable - public ItemStack getDamagingStack() { - return stack; - } - } - - public static class DamageSourceExploding extends DamageSource { - - public DamageSourceExploding() { - super("exploded"); - setDamageAllowedInCreativeMode(); - setDamageBypassesArmor(); - setDamageIsAbsolute(); - } - - @Override - public IChatComponent func_151519_b(EntityLivingBase aTarget) { - return new ChatComponentText( - EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " exploded"); - } - } -} -- cgit