aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tools
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-01 18:11:43 +0200
committerGitHub <noreply@github.com>2023-04-01 18:11:43 +0200
commit5f50e4a36ec000657b0a1664784acf00275293c6 (patch)
tree5ef81441032735438c9fd9c620224ca58e46e537 /src/main/java/gregtech/common/tools
parent6b77557e0e87cf5afd9ebd3985323ff1249e615c (diff)
downloadGT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.gz
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.bz2
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.zip
update spotless formatting (#1827)
Diffstat (limited to 'src/main/java/gregtech/common/tools')
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool.java4
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Axe.java8
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java8
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java9
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java4
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java32
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java16
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Plow.java23
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Saw.java9
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java3
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Sense.java23
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java3
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Wrench.java8
13 files changed, 104 insertions, 46 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java
index 15bbaf976d..178005c6c5 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool.java
@@ -136,8 +136,8 @@ public abstract class GT_Tool implements IToolStats {
}
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
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 94c4681aa3..bb5649a453 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
@@ -145,10 +145,10 @@ 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
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 a4ea2f701d..833f169e61 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
@@ -47,8 +47,12 @@ public class GT_Tool_BranchCutter extends GT_Tool {
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) {
if (aBlock.getMaterial() == Material.leaves) {
- aEvent.dropChance = Math
- .min(1.0F, Math.max(aEvent.dropChance, (aStack.getItem().getHarvestLevel(aStack, "") + 1) * 0.2F));
+ aEvent.dropChance = Math.min(
+ 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)) {
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 5ed7647859..56f623f771 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
@@ -112,8 +112,13 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
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);
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 a774ab7856..3a9bb289ad 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
@@ -97,8 +97,8 @@ public class GT_Tool_Crowbar extends GT_Tool {
}
String tTool = aBlock.getHarvestTool(aMetaData);
if ((tTool == null) || (tTool.equals(""))) {
- for (Iterator i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values().iterator(); i$.hasNext(); i$
- .next()) {
+ for (Iterator i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values()
+ .iterator(); i$.hasNext(); i$.next()) {
if (((i$ instanceof GT_Tool_Crowbar)) && (!((IToolStats) i$).isMinableBlock(aBlock, aMetaData))) {
return false;
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java
index c8ebcf14f2..ac1ea88cc9 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java
@@ -28,13 +28,15 @@ import gregtech.common.items.behaviors.Behaviour_Prospecting;
public class GT_Tool_HardHammer extends GT_Tool {
- public static final List<String> mEffectiveList = Arrays
- .asList(EntityIronGolem.class.getName(), "EntityTowerGuardian");
+ public static final List<String> mEffectiveList = Arrays.asList(
+ EntityIronGolem.class.getName(),
+ "EntityTowerGuardian");
@Override
public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
EntityPlayer aPlayer) {
- String tName = aEntity.getClass().getName();
+ String tName = aEntity.getClass()
+ .getName();
tName = tName.substring(tName.lastIndexOf('.') + 1);
return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
}
@@ -122,8 +124,12 @@ public class GT_Tool_HardHammer extends GT_Tool {
@Override
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hammer", "pickaxe")
- || GT_ToolHarvestHelper
- .isAppropriateMaterial(aBlock, Material.rock, Material.glass, Material.ice, Material.packedIce)
+ || GT_ToolHarvestHelper.isAppropriateMaterial(
+ aBlock,
+ Material.rock,
+ Material.glass,
+ Material.ice,
+ Material.packedIce)
|| GT_Recipe.GT_Recipe_Map.sHammerRecipes.containsInput(new ItemStack(aBlock, 1, aMetaData));
}
@@ -131,12 +137,20 @@ public class GT_Tool_HardHammer extends GT_Tool {
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 rConversions = 0;
- GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes
- .findRecipe(null, true, MAX_IC2, null, new ItemStack(aBlock, 1, aMetaData));
+ GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(
+ null,
+ true,
+ MAX_IC2,
+ null,
+ new ItemStack(aBlock, 1, aMetaData));
if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
for (ItemStack tDrop : aDrops) {
- tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes
- .findRecipe(null, true, MAX_IC2, null, GT_Utility.copyAmount(1L, tDrop));
+ tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(
+ null,
+ true,
+ MAX_IC2,
+ null,
+ GT_Utility.copyAmount(1L, tDrop));
if (tRecipe != null) {
ItemStack tHammeringOutput = tRecipe.getOutput(0);
if (tHammeringOutput != null) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java
index aad96098fa..51b4abe4af 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java
@@ -77,12 +77,20 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV {
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 rConversions = 0;
- GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes
- .findRecipe(null, true, 2147483647L, null, new ItemStack(aBlock, 1, aMetaData));
+ GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(
+ null,
+ true,
+ 2147483647L,
+ null,
+ new ItemStack(aBlock, 1, aMetaData));
if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {
for (ItemStack tDrop : aDrops) {
- tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes
- .findRecipe(null, true, 2147483647L, null, GT_Utility.copyAmount(1L, new Object[] { tDrop }));
+ tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(
+ null,
+ true,
+ 2147483647L,
+ null,
+ GT_Utility.copyAmount(1L, new Object[] { tDrop }));
if (tRecipe != null) {
ItemStack tHammeringOutput = tRecipe.getOutput(0);
if (tHammeringOutput != null) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
index 97b7092e36..1ffb26df59 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
@@ -49,13 +49,22 @@ public class GT_Tool_Plow extends GT_Tool {
for (int i = -1; i < 2; i++) {
for (int j = -1; j < 2; j++) {
for (int k = -1; k < 2; k++) {
- if (((i != 0) || (j != 0) || (k != 0))
- && (aStack.getItem().getDigSpeed(
- aStack,
- aPlayer.worldObj.getBlock(aX + i, aY + j, aZ + k),
- aPlayer.worldObj.getBlockMetadata(aX + i, aY + j, aZ + k)) > 0.0F)
- && (((EntityPlayerMP) aPlayer).theItemInWorldManager
- .tryHarvestBlock(aX + i, aY + j, aZ + k))) {
+ if (((i != 0) || (j != 0) || (k != 0)) && (aStack.getItem()
+ .getDigSpeed(
+ aStack,
+ aPlayer.worldObj.getBlock(
+ aX + i,
+ aY + j,
+ aZ + k),
+ aPlayer.worldObj.getBlockMetadata(
+ aX + i,
+ aY + j,
+ aZ + k))
+ > 0.0F)
+ && (((EntityPlayerMP) aPlayer).theItemInWorldManager.tryHarvestBlock(
+ aX + i,
+ aY + j,
+ aZ + k))) {
rConversions++;
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java b/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
index 8fa1494a7e..124127c28c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
@@ -83,8 +83,13 @@ public class GT_Tool_Saw extends GT_Tool {
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();
aDrops.addAll(tDrops);
aEvent.dropChance = 1.0F;
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java b/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java
index 42542bb75d..f300abf5aa 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java
@@ -35,7 +35,8 @@ public class GT_Tool_Screwdriver extends GT_Tool {
@Override
public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
EntityPlayer aPlayer) {
- String tName = aEntity.getClass().getName();
+ String tName = aEntity.getClass()
+ .getName();
tName = tName.substring(tName.lastIndexOf('.') + 1);
return mEffectiveList.contains(tName) ? aOriginalDamage * 2.0F : aOriginalDamage;
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
index dd6cae9aaf..081f167bf1 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
@@ -47,13 +47,22 @@ public class GT_Tool_Sense extends GT_Tool {
for (int i = -2; i < 3; i++) {
for (int j = -2; j < 3; j++) {
for (int k = -2; k < 3; k++) {
- if (((i != 0) || (j != 0) || (k != 0))
- && (aStack.getItem().getDigSpeed(
- aStack,
- aPlayer.worldObj.getBlock(aX + i, aY + j, aZ + k),
- aPlayer.worldObj.getBlockMetadata(aX + i, aY + j, aZ + k)) > 0.0F)
- && (((EntityPlayerMP) aPlayer).theItemInWorldManager
- .tryHarvestBlock(aX + i, aY + j, aZ + k))) {
+ if (((i != 0) || (j != 0) || (k != 0)) && (aStack.getItem()
+ .getDigSpeed(
+ aStack,
+ aPlayer.worldObj.getBlock(
+ aX + i,
+ aY + j,
+ aZ + k),
+ aPlayer.worldObj.getBlockMetadata(
+ aX + i,
+ aY + j,
+ aZ + k))
+ > 0.0F)
+ && (((EntityPlayerMP) aPlayer).theItemInWorldManager.tryHarvestBlock(
+ aX + i,
+ aY + j,
+ aZ + k))) {
rConversions++;
}
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java b/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java
index d9ffb86059..98a3820106 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java
@@ -35,7 +35,8 @@ public class GT_Tool_Soldering_Iron extends GT_Tool {
@Override
public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
EntityPlayer aPlayer) {
- String tName = aEntity.getClass().getName();
+ String tName = aEntity.getClass()
+ .getName();
tName = tName.substring(tName.lastIndexOf('.') + 1);
return mEffectiveList.contains(tName) ? aOriginalDamage * 2.0F : aOriginalDamage;
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java b/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
index 955765287f..71e35372ce 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
@@ -24,13 +24,15 @@ import gregtech.common.items.behaviors.Behaviour_Wrench;
public class GT_Tool_Wrench extends GT_Tool {
- public static final List<String> mEffectiveList = Arrays
- .asList(EntityIronGolem.class.getName(), "EntityTowerGuardian");
+ public static final List<String> mEffectiveList = Arrays.asList(
+ EntityIronGolem.class.getName(),
+ "EntityTowerGuardian");
@Override
public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
EntityPlayer aPlayer) {
- String tName = aEntity.getClass().getName();
+ String tName = aEntity.getClass()
+ .getName();
tName = tName.substring(tName.lastIndexOf('.') + 1);
return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
}