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

Code cleanup

Browse source
This commit is contained in:
Unknown 2019-08-17 15:21:28 +02:00 committed by unknown
parent 371e049b8d
commit 878a885246
11 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/cr0s/warpdrive/WarpDrive.java
View file

@ -904,6 +904,7 @@ public class WarpDrive {
return block; return block;
} }
assert !blocks.contains(block);
blocks.add(block); blocks.add(block);
if (itemBlock != null) { if (itemBlock != null) {

10
src/main/java/cr0s/warpdrive/block/collection/TileEntityLaserTreeFarm.java
View file

@ -559,7 +559,9 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
harvestBlock(blockPosValuable, blockStateValuable); harvestBlock(blockPosValuable, blockStateValuable);
tickCurrentTask = isLog ? WarpDriveConfig.TREE_FARM_HARVEST_LOG_DELAY_TICKS : enableSilktouch ? WarpDriveConfig.TREE_FARM_SILKTOUCH_LEAF_DELAY_TICKS : WarpDriveConfig.TREE_FARM_BREAK_LEAF_DELAY_TICKS; tickCurrentTask = isLog ? WarpDriveConfig.TREE_FARM_HARVEST_LOG_DELAY_TICKS
: enableSilktouch ? WarpDriveConfig.TREE_FARM_SILKTOUCH_LEAF_DELAY_TICKS
: WarpDriveConfig.TREE_FARM_BREAK_LEAF_DELAY_TICKS;
return EnumTaskResult.CONTINUE; return EnumTaskResult.CONTINUE;
} }
@ -1038,7 +1040,7 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
if (!(tileEntity instanceof TileEntityLaserTreeFarm)) { if (!(tileEntity instanceof TileEntityLaserTreeFarm)) {
if (WarpDriveConfig.LOGGING_COLLECTION) { if (WarpDriveConfig.LOGGING_COLLECTION) {
WarpDrive.logger.error(String.format("%s Scanning aborted", WarpDrive.logger.error(String.format("%s Scanning aborted",
this)); this ));
} }
} else { } else {
@ -1054,7 +1056,7 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
if (WarpDriveConfig.LOGGING_COLLECTION) { if (WarpDriveConfig.LOGGING_COLLECTION) {
WarpDrive.logger.debug(String.format("%s Calculation started for %s", WarpDrive.logger.debug(String.format("%s Calculation started for %s",
this, stringTileEntity)); this, stringTileEntity ));
} }
blockPosSoils = calculate_getSoilPositions(blockAccess, axisAlignedBBSoil); blockPosSoils = calculate_getSoilPositions(blockAccess, axisAlignedBBSoil);
@ -1063,7 +1065,7 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
if (WarpDriveConfig.LOGGING_COLLECTION) { if (WarpDriveConfig.LOGGING_COLLECTION) {
WarpDrive.logger.debug(String.format("%s Calculation done: %s soil positions, %s valuables positions", WarpDrive.logger.debug(String.format("%s Calculation done: %s soil positions, %s valuables positions",
this, blockPosSoils.size(), blockStatePosValuables.size())); this, blockPosSoils.size(), blockStatePosValuables.size() ));
} }
} }
} catch (final Exception exception) { } catch (final Exception exception) {

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

@ -335,9 +335,10 @@ public class TileEntityTransporterCore extends TileEntityAbstractEnergyCoreOrCon
if (worldRemote == null) { if (worldRemote == null) {
WarpDrive.logger.error(String.format("Unable to initialize dimension %d for %s", WarpDrive.logger.error(String.format("Unable to initialize dimension %d for %s",
globalPositionRemote.dimensionId, globalPositionRemote.dimensionId,
this)); this ));
isJammed = true; isJammed = true;
reasonJammed = String.format("Unable to initialize dimension %d", globalPositionRemote.dimensionId); reasonJammed = String.format("Unable to initialize dimension %d",
globalPositionRemote.dimensionId);
return; return;
} }
@ -812,7 +813,7 @@ public class TileEntityTransporterCore extends TileEntityAbstractEnergyCoreOrCon
if (worldRemote == null) { if (worldRemote == null) {
WarpDrive.logger.error(String.format("Unable to initialize dimension %d for %s", WarpDrive.logger.error(String.format("Unable to initialize dimension %d for %s",
celestialObjectRemote.dimensionId, celestialObjectRemote.dimensionId,
this)); this ));
isJammed = true; isJammed = true;
reasonJammed = String.format("Unable to initialize dimension %d", reasonJammed = String.format("Unable to initialize dimension %d",
celestialObjectRemote.dimensionId); celestialObjectRemote.dimensionId);

5
src/main/java/cr0s/warpdrive/data/JumpBlock.java
View file

@ -136,6 +136,7 @@ public class JumpBlock {
return worldSource.getTileEntity(new BlockPos(x, y, z)); return worldSource.getTileEntity(new BlockPos(x, y, z));
} }
@Nullable
private NBTTagCompound getBlockNBT(@Nonnull final World worldSource) { private NBTTagCompound getBlockNBT(@Nonnull final World worldSource) {
if (weakTileEntity == null) { if (weakTileEntity == null) {
return blockNBT == null ? null : blockNBT.copy(); return blockNBT == null ? null : blockNBT.copy();
@ -502,7 +503,7 @@ public class JumpBlock {
} }
} }
public void writeToNBT(final World worldSource, final NBTTagCompound tagCompound) { public void writeToNBT(final World worldSource, @Nonnull final NBTTagCompound tagCompound) {
tagCompound.setString("block", Block.REGISTRY.getNameForObject(block).toString()); tagCompound.setString("block", Block.REGISTRY.getNameForObject(block).toString());
tagCompound.setByte("blockMeta", (byte) blockMeta); tagCompound.setByte("blockMeta", (byte) blockMeta);
final NBTTagCompound nbtTileEntity = getBlockNBT(worldSource); final NBTTagCompound nbtTileEntity = getBlockNBT(worldSource);
@ -540,7 +541,7 @@ public class JumpBlock {
tagCompound.removeTag("label"); tagCompound.removeTag("label");
} }
// WarpDrive UUID // WarpDrive machine signature UUID
if (tagCompound.hasKey(ICoreSignature.UUID_MOST_TAG)) { if (tagCompound.hasKey(ICoreSignature.UUID_MOST_TAG)) {
tagCompound.removeTag(ICoreSignature.UUID_MOST_TAG); tagCompound.removeTag(ICoreSignature.UUID_MOST_TAG);
tagCompound.removeTag(ICoreSignature.UUID_LEAST_TAG); tagCompound.removeTag(ICoreSignature.UUID_LEAST_TAG);

2
src/main/resources/assets/warpdrive/lang/de_de.lang
View file

@ -930,7 +930,7 @@ warpdrive.ship.guide.max_chunkloading=Close the game, update config/forgeChunkLo
warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting. warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting.
warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace! warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace!
warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d). warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d).
warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or configuration. warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or misconfiguration.
warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again. warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again.
warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d).
warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d).

2
src/main/resources/assets/warpdrive/lang/en_us.lang
View file

@ -930,7 +930,7 @@ warpdrive.ship.guide.max_chunkloading=Close the game, update config/forgeChunkLo
warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting. warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting.
warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace! warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace!
warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d). warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d).
warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or configuration. warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or misconfiguration.
warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again. warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again.
warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d).
warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d).

2
src/main/resources/assets/warpdrive/lang/fr_fr.lang
View file

@ -930,7 +930,7 @@ warpdrive.ship.guide.max_chunkloading=Close the game, update config/forgeChunkLo
warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting. warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting.
warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace! warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace!
warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d). warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d).
warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or configuration. warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or misconfiguration.
warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again. warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again.
warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d).
warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d).

2
src/main/resources/assets/warpdrive/lang/nl_nl.lang
View file

@ -929,7 +929,7 @@ warpdrive.ship.guide.max_chunkloading=Close the game, update config/forgeChunkLo
warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting. warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting.
warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace! warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace!
warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d). warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d).
warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or configuration. warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or misconfiguration.
warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again. warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again.
warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d).
warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d).

2
src/main/resources/assets/warpdrive/lang/ru_ru.lang
View file

@ -930,7 +930,7 @@ warpdrive.ship.guide.max_chunkloading=Close the game, update config/forgeChunkLo
warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting. warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting.
warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace! warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace!
warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d). warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d).
warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or configuration. warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or misconfiguration.
warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again. warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again.
warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d).
warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d).

2
src/main/resources/assets/warpdrive/lang/zh_cn.lang
View file

@ -935,7 +935,7 @@ warpdrive.ship.guide.max_chunkloading=Close the game, update config/forgeChunkLo
warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting. warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting.
warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace! warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace!
warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d). warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d).
warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or configuration. warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or misconfiguration.
warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again. warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again.
warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d).
warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d).

2
src/main/resources/assets/warpdrive/lang/zh_tw.lang
View file

@ -929,7 +929,7 @@ warpdrive.ship.guide.max_chunkloading=Close the game, update config/forgeChunkLo
warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting. warpdrive.ship.guide.chunkloading_rejected_in_target_world=Chunkloading rejected in target world %s. Aborting.
warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace! warpdrive.ship.guide.no_celestial_object_in_hyperspace=No star system exists in %1$s (%2$d), there's nowhere to exit hyperspace!
warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d). warpdrive.ship.guide.no_star_system_in_range=Ship won't survive in deep space.\nClosest star system is ~%1$d m away (%2$d %3$d %4$d) to (%5$d %6$d %7$d).
warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or configuration. warpdrive.ship.guide.exception_loading_dimension=Unable to load dimension %1$d.\nCheck console for a missing mod or misconfiguration.
warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again. warpdrive.ship.guide.unable_to_reach_hyperspace_from_planet=Unable to engage Alcubierre drive on a planet.\nGet into orbit, then try again.
warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_hyperspace_no_parent=Current location has no hyperspace connection.\nThere's no parent defined for %1$s (%2$d).
warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d). warpdrive.ship.guide.unable_to_reach_space_no_parent=Current location as no space connection.\nThere's no parent defined for %1$s (%2$d).