diff options
Diffstat (limited to 'src/main/java/gregtech/common/items/behaviors')
5 files changed, 19 insertions, 28 deletions
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java index 93414ec8aa..7c03965cc0 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java @@ -122,7 +122,7 @@ public class Behaviour_Arrow extends Behaviour_None { -1, null, true, - new Object[] { aWorld, Double.valueOf(aX), Double.valueOf(aY), Double.valueOf(aZ) }); + new Object[] { aWorld, aX, aY, aZ }); rArrow.setArrowItem(aStack); return rArrow; } @@ -138,7 +138,7 @@ public class Behaviour_Arrow extends Behaviour_None { -1, null, true, - new Object[] { aWorld, aEntity, Float.valueOf(this.mSpeedMultiplier * aSpeed) }); + new Object[] { aWorld, aEntity, this.mSpeedMultiplier * aSpeed }); rArrow.setArrowItem(aStack); return rArrow; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java index 57e0750335..d0c589c09f 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java @@ -104,8 +104,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { + aWorld.provider.dimensionId + EnumChatFormatting.RESET + " -----"); - if (aTileEntity instanceof ICoverable) { - ICoverable tCoverable = (ICoverable) aTileEntity; + if (aTileEntity instanceof ICoverable tCoverable) { int tSide = tCoverable.getCoverItemAtSide((byte) aSide) != null ? aSide : tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ)) != null ? GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ) : -1; @@ -135,8 +134,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { } private void doPaste(TileEntity aTileEntity, int aSide, float hitX, float hitY, float hitZ, EntityPlayer aPlayer) { - if (aTileEntity instanceof ICoverable) { - ICoverable tCoverable = (ICoverable) aTileEntity; + if (aTileEntity instanceof ICoverable tCoverable) { if (mCoverType == 0 || mStoredData == null) { GT_Utility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First."); return; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java index 84b6513563..8b876a5b44 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java @@ -38,17 +38,14 @@ public class Behaviour_DataStick extends Behaviour_None { aList.add("Rocket Schematic Tier: " + sTier); } else if (sTier >= 100) { switch (sTier) { - case 100: { + case 100 -> { aList.add("Moonbuggy Schematic"); - break; } - case 101: { + case 101 -> { aList.add("Cargo-Rocket Schematic"); - break; } - case 102: { + case 102 -> { aList.add("Astro-Miner Schematic"); - break; } } } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java index 737caf9f5b..cf5b782200 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java @@ -55,11 +55,9 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None { } } } - if (aTileEntity instanceof IGregTechTileEntity) { - IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity; + if (aTileEntity instanceof IGregTechTileEntity tTileEntity) { IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity(); - if (mTileEntity instanceof GT_MetaTileEntity_BasicTank) { - GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity; + if (mTileEntity instanceof GT_MetaTileEntity_BasicTank machine) { if (machine.mFluid != null && machine.mFluid.amount > 0) machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000); GT_Utility.sendSoundToPlayers( diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java index 51723469d6..6bb687a5a8 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java @@ -33,24 +33,22 @@ public class Behaviour_Scoop extends Behaviour_None { } if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - Object tButterfly = ((IEntityButterfly) aEntity).getButterfly(); - ((IButterfly) tButterfly).getGenome() - .getPrimary() - .getRoot() - .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) - .registerCatch((IButterfly) tButterfly); + IButterfly tButterfly = ((IEntityButterfly) aEntity).getButterfly(); + tButterfly.getGenome() + .getPrimary() + .getRoot() + .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) + .registerCatch(tButterfly); aPlayer.worldObj.spawnEntityInWorld( new EntityItem( aPlayer.worldObj, aEntity.posX, aEntity.posY, aEntity.posZ, - ((IButterfly) tButterfly).getGenome() - .getPrimary() - .getRoot() - .getMemberStack( - ((IButterfly) tButterfly).copy(), - EnumFlutterType.BUTTERFLY.ordinal()))); + tButterfly.getGenome() + .getPrimary() + .getRoot() + .getMemberStack(tButterfly.copy(), EnumFlutterType.BUTTERFLY.ordinal()))); aEntity.setDead(); } return true; |