aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tools
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
committerRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
commit8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch)
tree0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/common/tools
parentd795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff)
downloadGT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/common/tools')
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool.java18
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Axe.java38
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java28
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java14
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java20
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java6
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java57
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java6
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java14
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java6
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java44
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java6
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_File.java20
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java59
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Hoe.java24
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java44
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Knife.java24
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Mortar.java12
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java34
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Plow.java50
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Plunger.java24
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java12
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Saw.java59
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Scoop.java16
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java40
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Screwdriver_LV.java8
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Sense.java48
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Shovel.java36
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java22
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java36
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Sword.java34
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Turbine.java16
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java62
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java14
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Wrench.java25
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java8
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java10
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java8
38 files changed, 476 insertions, 526 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java
index 178005c6c5..ac3fe66542 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool.java
@@ -130,19 +130,19 @@ public abstract class GT_Tool implements IToolStats {
@Override
public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) {
return GT_DamageSources.getCombatDamage(
- (aPlayer instanceof EntityPlayer) ? "player" : "mob",
- aPlayer,
- (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null);
+ (aPlayer instanceof EntityPlayer) ? "player" : "mob",
+ aPlayer,
+ (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null);
}
public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
- return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer).func_151519_b(
- aEntity);
+ return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer)
+ .func_151519_b(aEntity);
}
@Override
public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
- int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
+ int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
return 0;
}
@@ -173,19 +173,19 @@ public abstract class GT_Tool implements IToolStats {
@Override
public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
- EntityPlayer aPlayer) {
+ EntityPlayer aPlayer) {
return aOriginalDamage;
}
@Override
public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
- EntityPlayer aPlayer) {
+ EntityPlayer aPlayer) {
return aOriginalDamage;
}
@Override
public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj,
- int aX, int aY, int aZ) {
+ int aX, int aY, int aZ) {
return aDefault;
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
index bb5649a453..787803911b 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
@@ -94,19 +94,19 @@ public class GT_Tool_Axe extends GT_Tool {
@Override
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe")
- || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.wood);
+ || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.wood);
}
@Override
public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
- int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
+ int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
int rAmount = 0;
if ((GregTech_API.sTimber) && (!aPlayer.isSneaking())
- && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
+ && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
int tY = aY + 1;
for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {
if ((aPlayer.worldObj.getBlock(aX, tY, aZ) != aBlock)
- || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) {
+ || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) {
break;
}
rAmount++;
@@ -117,15 +117,15 @@ public class GT_Tool_Axe extends GT_Tool {
@Override
public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld,
- int aX, int aY, int aZ) {
+ int aX, int aY, int aZ) {
if (aBlock.isWood(aPlayer.worldObj, aX, aY, aZ)
- && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
+ && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
float rAmount = 1.0F;
float tIncrement = 1.0F;
if ((GregTech_API.sTimber) && !aPlayer.isSneaking()) {
int tY = aY + 1;
for (int tH = aPlayer.worldObj.getHeight(); (tY < tH)
- && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
+ && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
tIncrement += 0.1F;
rAmount += tIncrement;
}
@@ -133,8 +133,8 @@ public class GT_Tool_Axe extends GT_Tool {
return 2.0F * aDefault / rAmount;
}
return (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine)
- || (aBlock.getMaterial() == Material.plants)
- || (aBlock.getMaterial() == Material.gourd) ? aDefault / 4.0F : aDefault;
+ || (aBlock.getMaterial() == Material.plants)
+ || (aBlock.getMaterial() == Material.gourd) ? aDefault / 4.0F : aDefault;
}
@Override
@@ -145,16 +145,14 @@ public class GT_Tool_Axe extends GT_Tool {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead
- ? GT_MetaGenerated_Tool.getPrimaryMaterial(
- aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex]
- : GT_MetaGenerated_Tool.getSecondaryMaterial(
- aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];
+ ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex]
+ : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];
}
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
@@ -163,11 +161,11 @@ public class GT_Tool_Axe extends GT_Tool {
@Override
public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
return new ChatComponentText(
- EnumChatFormatting.RED + aEntity.getCommandSenderName()
- + EnumChatFormatting.WHITE
- + " has been chopped by "
- + EnumChatFormatting.GREEN
- + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " has been chopped by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
index 833f169e61..a8b83a0221 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
@@ -45,14 +45,14 @@ public class GT_Tool_BranchCutter extends GT_Tool {
@Override
public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
- int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
+ int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
if (aBlock.getMaterial() == Material.leaves) {
aEvent.dropChance = Math.min(
- 1.0F,
- Math.max(
- aEvent.dropChance,
- (aStack.getItem()
- .getHarvestLevel(aStack, "") + 1) * 0.2F));
+ 1.0F,
+ Math.max(
+ aEvent.dropChance,
+ (aStack.getItem()
+ .getHarvestLevel(aStack, "") + 1) * 0.2F));
if (aBlock == Blocks.leaves) {
aDrops.clear();
if (((aMetaData & 0x3) == 0) && (aPlayer.worldObj.rand.nextInt(9) <= aFortune * 2)) {
@@ -74,7 +74,7 @@ public class GT_Tool_BranchCutter extends GT_Tool {
@Override
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "grafter")
- || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.leaves);
+ || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.leaves);
}
@Override
@@ -85,17 +85,17 @@ public class GT_Tool_BranchCutter extends GT_Tool {
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
return new ChatComponentText(
- EnumChatFormatting.RED + aEntity.getCommandSenderName()
- + EnumChatFormatting.WHITE
- + " has been trimmed by "
- + EnumChatFormatting.GREEN
- + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " has been trimmed by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java
index a99dac9e57..bdfe66401a 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java
@@ -83,18 +83,18 @@ public class GT_Tool_ButcheryKnife extends GT_Tool {
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
return new ChatComponentText(
- EnumChatFormatting.GREEN + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE
- + " has butchered "
- + EnumChatFormatting.RED
- + aEntity.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ EnumChatFormatting.GREEN + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " has butchered "
+ + EnumChatFormatting.RED
+ + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
@Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java b/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java
index b12b8d37ea..4d7192ce93 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java
@@ -57,25 +57,25 @@ public class GT_Tool_BuzzSaw extends GT_Tool_Saw {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return !aIsToolHead
- ? GT_MetaGenerated_Tool.getPrimaryMaterial(
- aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadBuzzSaw.mTextureIndex]
- : Textures.ItemIcons.HANDLE_BUZZSAW;
+ ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+ aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadBuzzSaw.mTextureIndex]
+ : Textures.ItemIcons.HANDLE_BUZZSAW;
}
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
return new ChatComponentText(
- EnumChatFormatting.RED + aEntity.getCommandSenderName()
- + EnumChatFormatting.WHITE
- + " got buzzed by "
- + EnumChatFormatting.GREEN
- + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " got buzzed by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java
index 1895eff282..38c1d3acb8 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java
@@ -50,8 +50,8 @@ public class GT_Tool_Chainsaw_HV extends GT_Tool_Chainsaw_LV {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead
- ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
- aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
- : Textures.ItemIcons.POWER_UNIT_HV;
+ ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+ aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
+ : Textures.ItemIcons.POWER_UNIT_HV;
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
index 56f623f771..a99d54993a 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
@@ -107,34 +107,29 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
@Override
public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
- int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
+ int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
int rAmount = 0;
if ((aBlock.getMaterial() == Material.leaves) && ((aBlock instanceof IShearable))) {
aPlayer.worldObj.setBlock(aX, aY, aZ, aBlock, aMetaData, 0);
if (((IShearable) aBlock).isShearable(aStack, aPlayer.worldObj, aX, aY, aZ)) {
- ArrayList<ItemStack> tDrops = ((IShearable) aBlock).onSheared(
- aStack,
- aPlayer.worldObj,
- aX,
- aY,
- aZ,
- aFortune);
+ ArrayList<ItemStack> tDrops = ((IShearable) aBlock)
+ .onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune);
aDrops.clear();
}
aPlayer.worldObj.setBlock(aX, aY, aZ, Blocks.air, 0, 0);
} else if (((aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce))
- && (aDrops.isEmpty())) {
- aDrops.add(new ItemStack(aBlock, 1, aMetaData));
- aPlayer.worldObj.setBlockToAir(aX, aY, aZ);
- aEvent.dropChance = 1.0F;
- return 1;
- }
+ && (aDrops.isEmpty())) {
+ aDrops.add(new ItemStack(aBlock, 1, aMetaData));
+ aPlayer.worldObj.setBlockToAir(aX, aY, aZ);
+ aEvent.dropChance = 1.0F;
+ return 1;
+ }
if ((GregTech_API.sTimber) && (!aPlayer.isSneaking())
- && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
+ && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
int tY = aY + 1;
for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {
if ((aPlayer.worldObj.getBlock(aX, tY, aZ) != aBlock)
- || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) {
+ || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) {
break;
}
rAmount++;
@@ -145,15 +140,15 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
@Override
public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld,
- int aX, int aY, int aZ) {
+ int aX, int aY, int aZ) {
if (aBlock.isWood(aPlayer.worldObj, aX, aY, aZ)
- && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
+ && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
float rAmount = 1.0F;
float tIncrement = 1.0F;
if ((GregTech_API.sTimber) && !aPlayer.isSneaking()) {
int tY = aY + 1;
for (int tH = aPlayer.worldObj.getHeight(); (tY < tH)
- && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
+ && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
tIncrement += 0.1F;
rAmount += tIncrement;
}
@@ -161,32 +156,32 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
return 2.0F * aDefault / rAmount;
}
return (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine)
- || (aBlock.getMaterial() == Material.plants)
- || (aBlock.getMaterial() == Material.gourd) ? aDefault / 4.0F : aDefault;
+ || (aBlock.getMaterial() == Material.plants)
+ || (aBlock.getMaterial() == Material.gourd) ? aDefault / 4.0F : aDefault;
}
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead
- ? GT_MetaGenerated_Tool.getPrimaryMaterial(
- aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
- : Textures.ItemIcons.POWER_UNIT_LV;
+ ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+ aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
+ : Textures.ItemIcons.POWER_UNIT_LV;
}
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
return new ChatComponentText(
- EnumChatFormatting.RED + aEntity.getCommandSenderName()
- + EnumChatFormatting.WHITE
- + " was massacred by "
- + EnumChatFormatting.GREEN
- + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " was massacred by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java
index 863c26ac82..6c88895e48 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java
@@ -50,8 +50,8 @@ public class GT_Tool_Chainsaw_MV extends GT_Tool_Chainsaw_LV {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead
- ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
- aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
- : Textures.ItemIcons.POWER_UNIT_MV;
+ ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+ aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
+ : Textures.ItemIcons.POWER_UNIT_MV;
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
index b5cc684469..f9f82fd373 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
@@ -98,7 +98,7 @@ public class GT_Tool_Crowbar extends GT_Tool {
String tTool = aBlock.getHarvestTool(aMetaData);
if ((tTool == null) || (tTool.equals(""))) {
for (Iterator<IToolStats> i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values()
- .iterator(); i$.hasNext(); i$.next()) {
+ .iterator(); i$.hasNext(); i$.next()) {
if (((i$ instanceof GT_Tool_Crowbar)) && (!((IToolStats) i$).isMinableBlock(aBlock, aMetaData))) {
return false;
}
@@ -131,11 +131,11 @@ public class GT_Tool_Crowbar extends GT_Tool {
@Override
public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
return new ChatComponentText(
- EnumChatFormatting.RED + aEntity.getCommandSenderName()
- + EnumChatFormatting.WHITE
- + " was removed by "
- + EnumChatFormatting.GREEN
- + aPlayer.getCommandSenderName()
- + EnumChatFormatting.WHITE);
+ EnumChatFormatting.RED + aEntity.getCommandSenderName()
+ + EnumChatFormatting.WHITE
+ + " was removed by "
+ + EnumChatFormatting.GREEN
+ + aPlayer.getCommandSenderName()
+ + EnumChatFormatting.WHITE);
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
index 77ab501e46..fa62c99ea8 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
@@ -61,8 +61,8 @@ public class GT_Tool_Drill_HV extends GT_Tool_Drill_LV {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead
- ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
- aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex]
- : Textures.ItemIcons.POWER_UNIT_HV;
+ ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+ aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex]
+ : Textures.ItemIcons.POWER_UNIT_HV;
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
index 395c7753ff..911374dc15 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
@@ -92,17 +92,17 @@ public class GT_Tool_Drill_LV extends GT_Tool {
@Override
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "pickaxe", "shovel")
- || GT_ToolHarvestHelper.isAppropriateMaterial(
- aBlock,