[ci skip] spotlessApply with the new settings

This commit is contained in:
Jason Mitchell committed 2023-01-28 18:04:28 -08:00
1 parent 83698cb73c
commit 84c2239244
561 files changed
+8872 -9300

No files matched your search

@@ -1,10 +1,8 @@
package tconstruct.library.tools;
import cofh.api.energy.IEnergyContainerItem;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.Event.Result;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
@@ -27,18 +25,23 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.event.entity.player.UseHoeEvent;
import tconstruct.TConstruct;
import tconstruct.library.ActiveToolMod;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.util.PiercingEntityDamage;
import cofh.api.energy.IEnergyContainerItem;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.Event.Result;
public class AbilityHelper {
public static Random random = new Random();
public static boolean necroticUHS;
/* Normal interactions */
public static boolean onBlockChanged(
ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player, Random random) {
public static boolean onBlockChanged(ItemStack stack, World world, Block block, int x, int y, int z,
EntityLivingBase player, Random random) {
if (!stack.hasTagCompound()) return false;
int reinforced = 0;
@@ -58,8 +61,8 @@ public class AbilityHelper {
return onLeftClickEntity(stack, player, entity, tool, 0);
}
public static boolean onLeftClickEntity(
ItemStack stack, EntityLivingBase player, Entity entity, ToolCore tool, int baseDamage) {
public static boolean onLeftClickEntity(ItemStack stack, EntityLivingBase player, Entity entity, ToolCore tool,
int baseDamage) {
if (entity != null && player != null && entity.canAttackWithItem() && stack.hasTagCompound()) {
if (!entity.hitByEntity(player)) // can't attack this entity
{
@@ -83,8 +86,7 @@ public class AbilityHelper {
}
if (damage > 0 || enchantDamage > 0) {
boolean criticalHit = player.fallDistance > 0.0F
&& !player.onGround
boolean criticalHit = player.fallDistance > 0.0F && !player.onGround
&& !player.isOnLadder()
&& !player.isInWater()
&& !player.isPotionActive(Potion.blindness)
@@ -116,14 +118,12 @@ public class AbilityHelper {
int armorValue = Math.min(20, ((EntityLivingBase) entity).getTotalArmorValue());
damage = (int) (damage / (1 - (0.04 * armorValue)));
if (player instanceof EntityPlayer)
causedDamage =
entity.attackEntityFrom(causePlayerPiercingDamage((EntityPlayer) player), damage);
if (player instanceof EntityPlayer) causedDamage = entity
.attackEntityFrom(causePlayerPiercingDamage((EntityPlayer) player), damage);
else causedDamage = entity.attackEntityFrom(causePiercingDamage(player), damage);
} else {
if (player instanceof EntityPlayer)
causedDamage = entity.attackEntityFrom(
DamageSource.causePlayerDamage((EntityPlayer) player), damage);
if (player instanceof EntityPlayer) causedDamage = entity
.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) player), damage);
else causedDamage = entity.attackEntityFrom(DamageSource.causeMobDamage(player), damage);
}
@@ -132,10 +132,8 @@ public class AbilityHelper {
// damageTool(stack, 1, player, false);
tool.onEntityDamaged(player.worldObj, player, entity);
if (!necroticUHS
|| (entity instanceof IMob
&& entity instanceof EntityLivingBase
&& ((EntityLivingBase) entity).getHealth() <= 0)) {
if (!necroticUHS || (entity instanceof IMob && entity instanceof EntityLivingBase
&& ((EntityLivingBase) entity).getHealth() <= 0)) {
if (isAlive) {
int drain = toolTags.getInteger("Necrotic") * 2;
if (drain > 0) player.heal(random.nextInt(drain + 1));
@@ -198,15 +196,22 @@ public class AbilityHelper {
return false;
}
public static int calcDamage(
Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, int baseDamage) {
public static int calcDamage(Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags,
int baseDamage) {
EntityLivingBase living = user instanceof EntityLivingBase ? (EntityLivingBase) user : null;
int damage = toolTags.getInteger("Attack") + baseDamage;
int earlyModDamage = 0;
for (ActiveToolMod mod : TConstructRegistry.activeModifiers) {
earlyModDamage = mod.baseAttackDamage(
earlyModDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity);
earlyModDamage,
damage,
tool,
stack.getTagCompound(),
toolTags,
stack,
living,
entity);
}
damage += earlyModDamage;
@@ -232,16 +237,16 @@ public class AbilityHelper {
int modDamage = 0;
for (ActiveToolMod mod : TConstructRegistry.activeModifiers) {
modDamage =
mod.attackDamage(modDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity);
modDamage = mod
.attackDamage(modDamage, damage, tool, stack.getTagCompound(), toolTags, stack, living, entity);
}
damage += modDamage;
return damage;
}
public static float calcKnockback(
Entity user, Entity entity, ItemStack stack, ToolCore tool, NBTTagCompound toolTags, int baseDamage) {
public static float calcKnockback(Entity user, Entity entity, ItemStack stack, ToolCore tool,
NBTTagCompound toolTags, int baseDamage) {
if (user == null) return 0;
float knockback = 0;
@@ -308,17 +313,15 @@ public class AbilityHelper {
List<EntityWolf> var6 = player.worldObj.getEntitiesWithinAABB(
EntityWolf.class,
AxisAlignedBB.getBoundingBox(
player.posX,
player.posY,
player.posZ,
player.posX + 1.0D,
player.posY + 1.0D,
player.posZ + 1.0D)
.expand(16.0D, 4.0D, 16.0D));
player.posX,
player.posY,
player.posZ,
player.posX + 1.0D,
player.posY + 1.0D,
player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D));
for (EntityWolf var5 : var6) {
if (var5.isTamed()
&& var5.getEntityToAttack() == null
if (var5.isTamed() && var5.getEntityToAttack() == null
&& player.getDisplayName().equals(var5.func_152113_b())
&& (!par2 || !var5.isSitting())) {
var5.setSitting(false);
@@ -340,8 +343,8 @@ public class AbilityHelper {
damageTool(stack, -dam, tags, entity, ignoreCharge);
}
public static void damageTool(
ItemStack stack, int dam, NBTTagCompound tags, EntityLivingBase entity, boolean ignoreCharge) {
public static void damageTool(ItemStack stack, int dam, NBTTagCompound tags, EntityLivingBase entity,
boolean ignoreCharge) {
if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode || tags == null)
return;
@@ -383,7 +386,7 @@ public class AbilityHelper {
int toolDamage = (damage * 100 / maxDamage) + 1;
int stackDamage = stack.getItemDamage();
// if (toolDamage != stackDamage) {
// // stack.setItemDamage((damage * 100 / maxDamage) + 1);
// // stack.setItemDamage((damage * 100 / maxDamage) + 1);
// }
}
}
@@ -480,8 +483,9 @@ public class AbilityHelper {
tags.setInteger("Energy", max - missing);
}
private static final boolean equalityOverrideLoaded =
Loader.isModLoaded("CoFHCore"); // Mods should be loaded far enough before this is ever initialized
private static final boolean equalityOverrideLoaded = Loader.isModLoaded("CoFHCore"); // Mods should be loaded far
// enough before this is ever
// initialized
public static void breakTool(ItemStack stack, NBTTagCompound tags, Entity entity) {
tags.getCompoundTag("InfiTool").setBoolean("Broken", true);
@@ -508,8 +512,8 @@ public class AbilityHelper {
living.motionZ *= boost;
}
public static boolean hoeGround(
ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, Random random) {
public static boolean hoeGround(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
Random random) {
if (!player.canPlayerEdit(x, y, z, side, stack)) {
return false;
} else {
@@ -525,8 +529,7 @@ public class AbilityHelper {
Block block = world.getBlock(x, y, z);
if (side != 0
&& world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z)
if (side != 0 && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z)
&& (block == Blocks.grass || block == Blocks.dirt)) {
Block block1 = Blocks.farmland;
world.playSoundEffect(
@@ -550,8 +553,12 @@ public class AbilityHelper {
public static void spawnItemAtEntity(Entity entity, ItemStack stack, int delay) {
if (!entity.worldObj.isRemote) {
EntityItem entityitem =
new EntityItem(entity.worldObj, entity.posX + 0.5D, entity.posY + 0.5D, entity.posZ + 0.5D, stack);
EntityItem entityitem = new EntityItem(
entity.worldObj,
entity.posX + 0.5D,
entity.posY + 0.5D,
entity.posZ + 0.5D,
stack);
entityitem.delayBeforeCanPickup = delay;
entity.worldObj.spawnEntityInWorld(entityitem);
}
@@ -560,13 +567,18 @@ public class AbilityHelper {
public static void spawnItemAtPlayer(EntityPlayer player, ItemStack stack) {
if (!player.worldObj.isRemote) {
// try to put it into the players inventory
if (player instanceof FakePlayer
|| !player.inventory.addItemStackToInventory(
stack)) // note that the addItemStackToInventory is not called for fake players
if (player instanceof FakePlayer || !player.inventory.addItemStackToInventory(stack)) // note that the
// addItemStackToInventory
// is not called for
// fake players
{
// drop the rest as an entity
EntityItem entityitem = new EntityItem(
player.worldObj, player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, stack);
player.worldObj,
player.posX + 0.5D,
player.posY + 0.5D,
player.posZ + 0.5D,
stack);
player.worldObj.spawnEntityInWorld(entityitem);
if (!(player instanceof FakePlayer)) entityitem.onCollideWithPlayer(player);
}
@@ -624,8 +636,8 @@ public class AbilityHelper {
return addItemStackToWorld(world, f, f1, f2, itemstack, false);
}
public static EntityItem addItemStackToWorld(
World world, float f, float f1, float f2, ItemStack itemstack, boolean flag) {
public static EntityItem addItemStackToWorld(World world, float f, float f1, float f2, ItemStack itemstack,
boolean flag) {
EntityItem entityitem;
if (flag) {
entityitem = new EntityItem(world, f, f1, f2, itemstack);