Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup (null checks & BeamFrequency)

Browse source
This commit is contained in:
Unknown 2020-05-01 04:32:32 +02:00
parent 5bcb64edcf
commit e8452e0dbf
6 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/cr0s/warpdrive/block/ItemBlockAbstractBase.java
View file

@ -55,9 +55,8 @@ public class ItemBlockAbstractBase extends ItemBlock implements IItemBase {
@Nonnull
@Override
public String getTranslationKey(final ItemStack itemStack) {
public String getTranslationKey(@Nonnull final ItemStack itemStack) {
if ( hasUniqueName
|| itemStack == null
|| !(block instanceof BlockAbstractContainer)
|| !((BlockAbstractContainer) block).hasSubBlocks ) {
return getTranslationKey();

5
src/main/java/cr0s/warpdrive/block/decoration/ItemBlockDecorative.java
View file

@ -15,10 +15,7 @@ public class ItemBlockDecorative extends ItemBlockAbstractBase {
@Nonnull
@Override
public String getTranslationKey(final ItemStack itemStack) {
if (itemStack == null) {
return getTranslationKey();
}
public String getTranslationKey(@Nonnull final ItemStack itemStack) {
return getTranslationKey() + EnumDecorativeType.byMetadata(itemStack.getItemDamage()).getName();
}
}

5
src/main/java/cr0s/warpdrive/block/forcefield/ItemBlockForceFieldProjector.java
View file

@ -30,10 +30,7 @@ public class ItemBlockForceFieldProjector extends ItemBlockAbstractBase {
@Nonnull
@Override
public String getTranslationKey(final ItemStack itemStack) {
if (itemStack == null) {
return getTranslationKey();
}
public String getTranslationKey(@Nonnull final ItemStack itemStack) {
return getTranslationKey() + (itemStack.getItemDamage() == 1 ? ".double" : ".single");
}
}

4
src/main/java/cr0s/warpdrive/block/hull/ItemBlockHull.java
View file

@ -33,8 +33,8 @@ public class ItemBlockHull extends ItemBlockAbstractBase {
@Nonnull
@Override
public String getTranslationKey(final ItemStack itemStack) {
if (itemStack == null || block instanceof BlockHullStairs) {
public String getTranslationKey(@Nonnull final ItemStack itemStack) {
if (block instanceof BlockHullStairs) {
return getTranslationKey();
}
return getTranslationKey() + EnumDyeColor.byMetadata( itemStack.getItemDamage() ).getTranslationKey();

2
src/main/java/cr0s/warpdrive/block/hull/ItemBlockHullSlab.java
View file

@ -29,7 +29,7 @@ public class ItemBlockHullSlab extends ItemBlockHull {
@Nonnull
@Override
public String getTranslationKey(final ItemStack itemstack) {
public String getTranslationKey(@Nonnull final ItemStack itemstack) {
return getTranslationKey();
}

2
src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporterCore.java
View file

@ -167,7 +167,7 @@ public class TileEntityTransporterCore extends TileEntityAbstractEnergyCoreOrCon
}
// frequency status
isConnected = beamFrequency > 0 && beamFrequency <= IBeamFrequency.BEAM_FREQUENCY_MAX;
isConnected = IBeamFrequency.isValid(beamFrequency);
// always cool down
if (tickCooldown > 0) {