diff options
Diffstat (limited to 'src/main/java/gregtech/common/misc/spaceprojects/base')
| -rw-r--r-- | src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java | 24 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java | 19 |
2 files changed, 31 insertions, 12 deletions
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java index 18540c429a..a4b8d5aa5b 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java @@ -294,14 +294,21 @@ public class SP_Upgrade implements ISP_Upgrade { return true; } - if (requirements.getBodyType() != null && !requirements.getBodyType().equals(SpaceBodyType.NONE)) { - if (!requirements.getBodyType().equals(projectBelongingTo.getProjectLocation().getType())) { + if (requirements.getBodyType() != null && !requirements.getBodyType() + .equals(SpaceBodyType.NONE)) { + if (!requirements.getBodyType() + .equals( + projectBelongingTo.getProjectLocation() + .getType())) { return false; } } if (requirements.getStarType() != null) { - if (!requirements.getStarType().equals(projectBelongingTo.getProjectLocation().getStarType())) { + if (!requirements.getStarType() + .equals( + projectBelongingTo.getProjectLocation() + .getStarType())) { return false; } } @@ -327,9 +334,14 @@ public class SP_Upgrade implements ISP_Upgrade { @Override public SP_Upgrade copy() { - SP_Upgrade copy = new SP_Upgrade().setUpgradeName(name).setUpgradeUnlocalizedName(unlocalizedName) - .setUpgradeBuildTime(buildTime).setUpgradeFluidsCost(fluidsCost).setUpgradeItemsCost(itemsCost) - .setUpgradeRequirements(requirements).setUpgradeTotalStages(totalStages).setUpgradeVoltage(voltage); + SP_Upgrade copy = new SP_Upgrade().setUpgradeName(name) + .setUpgradeUnlocalizedName(unlocalizedName) + .setUpgradeBuildTime(buildTime) + .setUpgradeFluidsCost(fluidsCost) + .setUpgradeItemsCost(itemsCost) + .setUpgradeRequirements(requirements) + .setUpgradeTotalStages(totalStages) + .setUpgradeVoltage(voltage); return copy; } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java index 0095ece5b1..dfbcf96dc6 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java @@ -368,10 +368,15 @@ public class SpaceProject implements ISpaceProject { @Override public ISpaceProject copy() { - SpaceProject copy = new SpaceProject().setProjectName(name).setProjectUnlocalizedName(unlocalizedName) - .setProjectVoltage(voltage).setProjectBuildTime(buildTime).setProjectItemsCost(itemsCost) - .setProjectFluidsCost(fluidsCost).setProjectStages(totalStage).setProjectTexture(texture) - .setProjectRequirements(requirements); + SpaceProject copy = new SpaceProject().setProjectName(name) + .setProjectUnlocalizedName(unlocalizedName) + .setProjectVoltage(voltage) + .setProjectBuildTime(buildTime) + .setProjectItemsCost(itemsCost) + .setProjectFluidsCost(fluidsCost) + .setProjectStages(totalStage) + .setProjectTexture(texture) + .setProjectRequirements(requirements); if (upgradesAvailable != null) { ISP_Upgrade[] upgrades = new SP_Upgrade[upgradesAvailable.size()]; int index = 0; @@ -400,13 +405,15 @@ public class SpaceProject implements ISpaceProject { } if (requirements.getBodyType() != null && checkLocation) { - if (!requirements.getBodyType().equals(location.getType())) { + if (!requirements.getBodyType() + .equals(location.getType())) { return false; } } if (requirements.getStarType() != null && checkLocation) { - if (!requirements.getStarType().equals(location.getStarType())) { + if (!requirements.getStarType() + .equals(location.getStarType())) { return false; } } |