Code cleanup

This commit is contained in:
Unknown 2019-10-15 00:00:00 +02:00 committed by unknown
parent a91dac78c8
commit 8628eda807
4 changed files with 5 additions and 5 deletions

View file

@ -184,7 +184,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;

View file

@ -248,7 +248,8 @@ public class BlockForceField extends BlockAbstractForceField implements IDamageR
return null;
}
private ForceFieldSetup getForceFieldSetup(final IBlockAccess blockAccess, @Nonnull final BlockPos blockPos) {
@Nullable
private ForceFieldSetup getForceFieldSetup(@Nonnull final IBlockAccess blockAccess, @Nonnull final BlockPos blockPos) {
final TileEntity tileEntity = blockAccess.getTileEntity(blockPos);
if (tileEntity instanceof TileEntityForceField) {
return ((TileEntityForceField) tileEntity).getForceFieldSetup();
@ -374,7 +375,7 @@ public class BlockForceField extends BlockAbstractForceField implements IDamageR
public int getLightValue(@Nonnull final IBlockState blockState, final IBlockAccess blockAccess, @Nonnull final BlockPos blockPos) {
final TileEntity tileEntity = blockAccess.getTileEntity(blockPos);
if (tileEntity instanceof TileEntityForceField) {
return ((TileEntityForceField)tileEntity).cache_lightCamouflage;
return ((TileEntityForceField) tileEntity).cache_lightCamouflage;
}
return 0;

View file

@ -90,7 +90,7 @@ public class Dictionary {
+ "- Expandable: this block will be squished/ignored in case of collision.\n"
+ "- Mining: this block is mineable (default: all 'ore' blocks from the ore dictionary).\n"
+ "- SkipMining: this block is ignored from mining (default: bedrock).\n"
+ "- StopMining: this block will prevent mining through it (default: command/creative, bedrock, force fields).\n"
+ "- StopMining: this block will prevent mining through it (default: command/creative, force fields).\n"
+ "- PlaceEarliest: this block will be removed last and placed first (default: ship hull and projectors).\n"
+ "- PlaceEarlier: this block will be placed fairly soon (default: force field blocks).\n"
+ "- PlaceNormal: this block will be removed and placed with non-tile entities.\n"

View file

@ -101,7 +101,7 @@ public class WorldHandler {
public void onPlayerChangedDimension(final PlayerChangedDimensionEvent event) {
WarpDrive.logger.info(String.format("onPlayerChangedDimension %s %d -> %d (%.1f %.1f %.1f)",
event.player.getName(), event.fromDim, event.toDim,
event.player.posX, event.player.posY, event.player.posZ ));
event.player.posX, event.player.posY, event.player.posZ ));
WarpDrive.cloaks.onPlayerJoinWorld((EntityPlayerMP) event.player, ((EntityPlayerMP) event.player).world);
}