diff options
Diffstat (limited to 'src/main/java/gregtech/common/misc/spaceprojects')
5 files changed, 29 insertions, 10 deletions
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java index 4370e5f919..4b0be2051a 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java @@ -2,7 +2,20 @@ package gregtech.common.misc.spaceprojects; import static gregtech.common.misc.spaceprojects.SpaceProjectManager.spaceTeamProjects; import static gregtech.common.misc.spaceprojects.SpaceProjectManager.spaceTeams; -import static gregtech.common.misc.spaceprojects.enums.JsonVariables.*; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.MAP_MAP; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.MAP_PAIR; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.MAP_PROJECT; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.MAP_UUID; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.PAIR_LEFT; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.PAIR_RIGHT; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.PROJECT_CURRENT_STAGE; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.PROJECT_CURRENT_UPGRADE; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.PROJECT_LOCATION; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.PROJECT_NAME; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.PROJECT_UPGRADES_BUILT; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.UPGRADE_CURRENT_STAGE; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.UPGRADE_NAME; +import static gregtech.common.misc.spaceprojects.enums.JsonVariables.UPGRADE_PROJECT_PARENT; import java.io.File; import java.io.FileReader; 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 9fc3bd955b..835a57f277 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 @@ -334,7 +334,7 @@ public class SP_Upgrade implements ISP_Upgrade { @Override public SP_Upgrade copy() { - SP_Upgrade copy = new SP_Upgrade().setUpgradeName(name) + return new SP_Upgrade().setUpgradeName(name) .setUpgradeUnlocalizedName(unlocalizedName) .setUpgradeBuildTime(buildTime) .setUpgradeFluidsCost(fluidsCost) @@ -342,7 +342,6 @@ public class SP_Upgrade implements ISP_Upgrade { .setUpgradeRequirements(requirements) .setUpgradeTotalStages(totalStages) .setUpgradeVoltage(voltage); - return copy; } @Override diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java index 6009f77d0c..896c7e1052 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java @@ -145,7 +145,7 @@ public class SPM_Command extends CommandBase { switch (arguments.length) { case 1 -> autoComplete.addAll(Arrays.asList(getSubCommands())); case 2 -> { - filter = arguments.length == 1 ? "" : arguments[1].trim(); + filter = arguments[1].trim(); if (arguments[0].equals(LIST)) { autoComplete.addAll(Arrays.asList(getListArguments())); } else if (arguments[0].equals(COPY) || arguments[0].equals(RESET)) { @@ -155,7 +155,7 @@ public class SPM_Command extends CommandBase { } } case 3 -> { - filter = arguments.length == 2 ? "" : arguments[2].trim(); + filter = arguments[2].trim(); if (arguments[1].equals(ALL)) {} else if (arguments[0].equals(LIST)) { autoComplete.addAll(Arrays.asList(getPlayers())); } else { @@ -163,7 +163,7 @@ public class SPM_Command extends CommandBase { } } case 4 -> { - filter = arguments.length == 3 ? "" : arguments[3].trim(); + filter = arguments[3].trim(); if (arguments[0].equals(UNLOCK_UPGRADE)) { ISpaceProject project = SpaceProjectManager.getProject(arguments[2]); if (project != null) { diff --git a/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java b/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java index 5d94add40d..70dee3269d 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java @@ -1,8 +1,15 @@ package gregtech.common.misc.spaceprojects.enums; import static gregtech.api.enums.Mods.GregTech; -import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.*; -import static gregtech.common.misc.spaceprojects.enums.StarType.*; +import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.AsteroidBelt; +import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.DwarfPlanet; +import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.GasGiant; +import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.IceGiant; +import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.NaturalSatellite; +import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.Planet; +import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.Star; +import static gregtech.common.misc.spaceprojects.enums.StarType.GClass; +import static gregtech.common.misc.spaceprojects.enums.StarType.NotAStar; import com.gtnewhorizons.modularui.api.drawable.UITexture; diff --git a/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java b/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java index 369c7c8c7a..51ae03ff30 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java @@ -76,7 +76,7 @@ public interface ISpaceProject { Map<String, ISP_Upgrade> getUpgradesBuiltMap(); /** - * @return + * @return all built upgrades */ Collection<ISP_Upgrade> getAllBuiltUpgrades(); @@ -374,7 +374,7 @@ public interface ISpaceProject { /** * Sets the current stage of the upgrade * - * @param stage + * @param stage the stage to set */ void setUpgradeCurrentStage(int stage); |