diff options
Diffstat (limited to 'src/main/java/gregtech/common/misc')
8 files changed, 194 insertions, 91 deletions
diff --git a/src/main/java/gregtech/common/misc/GT_Command.java b/src/main/java/gregtech/common/misc/GT_Command.java index c2af60523d..66b77b2c87 100644 --- a/src/main/java/gregtech/common/misc/GT_Command.java +++ b/src/main/java/gregtech/common/misc/GT_Command.java @@ -101,14 +101,16 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner public List addTabCompletionOptions(ICommandSender sender, String[] ss) { List<String> l = new ArrayList<>(); String test = ss.length == 0 ? "" : ss[0].trim(); - if (ss.length == 0 || ss.length == 1 && (test.isEmpty() || Stream.of( - "toggle", - "chunks", - "pollution", - "global_energy_add", - "global_energy_set", - "global_energy_join", - "global_energy_display").anyMatch(s -> s.startsWith(test)))) { + if (ss.length == 0 || ss.length == 1 && (test.isEmpty() || Stream + .of( + "toggle", + "chunks", + "pollution", + "global_energy_add", + "global_energy_set", + "global_energy_join", + "global_energy_display") + .anyMatch(s -> s.startsWith(test)))) { Stream.of( "toggle", "chunks", @@ -116,7 +118,9 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner "global_energy_add", "global_energy_set", "global_energy_join", - "global_energy_display").filter(s -> test.isEmpty() || s.startsWith(test)).forEach(l::add); + "global_energy_display") + .filter(s -> test.isEmpty() || s.startsWith(test)) + .forEach(l::add); } else if (test.equals("toggle")) { String test1 = ss[1].trim(); Stream.of( @@ -133,7 +137,9 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner "debugStones", "debugChunkloaders", "debugMulti", - "debugWorldData").filter(s -> test1.isEmpty() || s.startsWith(test1)).forEach(l::add); + "debugWorldData") + .filter(s -> test1.isEmpty() || s.startsWith(test1)) + .forEach(l::add); } return l; } @@ -178,7 +184,8 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner int amount = (strings.length < 2) ? GT_Mod.gregtechproxy.mPollutionSmogLimit : Integer.parseInt(strings[1]); GT_Pollution.addPollution( - sender.getEntityWorld().getChunkFromBlockCoords(coordinates.posX, coordinates.posZ), + sender.getEntityWorld() + .getChunkFromBlockCoords(coordinates.posX, coordinates.posZ), amount); break; case "global_energy_add": { diff --git a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java b/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java index 9edee98725..6de4de3c71 100644 --- a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java +++ b/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java @@ -22,8 +22,8 @@ public class GT_DrillingLogicDelegate { public static final ItemStack MINING_PIPE_STACK = GT_ModHandler.getIC2Item("miningPipe", 0); public static final Block MINING_PIPE_BLOCK = GT_Utility.getBlockFromStack(MINING_PIPE_STACK); - public static final Block MINING_PIPE_TIP_BLOCK = GT_Utility - .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 0)); + public static final Block MINING_PIPE_TIP_BLOCK = GT_Utility.getBlockFromStack( + GT_ModHandler.getIC2Item("miningPipeTip", 0)); /** The owner machine pointer */ private final GT_IDrillingLogicDelegateOwner owner; @@ -74,7 +74,8 @@ public class GT_DrillingLogicDelegate { // Replace the tip onto pipe if (te.getBlockOffset(0, tipDepth, 0) == MINING_PIPE_TIP_BLOCK) { - te.getWorld().setBlock(xCoord, yCoord + tipDepth, zCoord, MINING_PIPE_BLOCK); + te.getWorld() + .setBlock(xCoord, yCoord + tipDepth, zCoord, MINING_PIPE_BLOCK); } // Get and decrease pipe from the machine boolean pipeTaken = owner.pullInputs(MINING_PIPE_STACK.getItem(), 1, false); @@ -91,7 +92,8 @@ public class GT_DrillingLogicDelegate { } // Descent the pipe tip - te.getWorld().setBlock(xCoord, yCoord + tipDepth - 1, zCoord, MINING_PIPE_TIP_BLOCK); + te.getWorld() + .setBlock(xCoord, yCoord + tipDepth - 1, zCoord, MINING_PIPE_TIP_BLOCK); tipDepth--; return true; } @@ -140,16 +142,19 @@ public class GT_DrillingLogicDelegate { int actualDrillY = yCoord + tipDepth; // Move the pipe tip position if (actualDrillY < yCoord - 1) { - owner.getBaseMetaTileEntity().getWorld().setBlock(xCoord, actualDrillY + 1, zCoord, MINING_PIPE_TIP_BLOCK); + owner.getBaseMetaTileEntity() + .getWorld() + .setBlock(xCoord, actualDrillY + 1, zCoord, MINING_PIPE_TIP_BLOCK); } // Remove the old pipe tip - aBaseMetaTileEntity.getWorld().setBlock( - xCoord, - actualDrillY, - zCoord, - Blocks.air, - 0, - /* send to client without neighbour updates */ 2); + aBaseMetaTileEntity.getWorld() + .setBlock( + xCoord, + actualDrillY, + zCoord, + Blocks.air, + 0, + /* send to client without neighbour updates */ 2); // Return the pipe back to the machine (inputs allowed for this case!) owner.pushOutputs(MINING_PIPE_STACK, 1, false, true); @@ -177,19 +182,21 @@ public class GT_DrillingLogicDelegate { } short metaData = 0; - TileEntity tTileEntity = owner.getBaseMetaTileEntity().getTileEntity(x, y, z); + TileEntity tTileEntity = owner.getBaseMetaTileEntity() + .getTileEntity(x, y, z); if (tTileEntity instanceof GT_TileEntity_Ores) { metaData = ((GT_TileEntity_Ores) tTileEntity).mMetaData; } ItemStack cobble = GT_Utility.getCobbleForOre(block, metaData); - te.getWorld().setBlock( - x, - y, - z, - Block.getBlockFromItem(cobble.getItem()), - cobble.getItemDamage(), /* cause updates(1) + send to client(2) */ - 3); + te.getWorld() + .setBlock( + x, + y, + z, + Block.getBlockFromItem(cobble.getItem()), + cobble.getItemDamage(), /* cause updates(1) + send to client(2) */ + 3); } /** @@ -231,18 +238,26 @@ public class GT_DrillingLogicDelegate { } public boolean canFakePlayerInteract(IGregTechTileEntity te, int xCoord, int yCoord, int zCoord) { - return GT_Utility - .setBlockByFakePlayer(getFakePlayer(te), xCoord, yCoord, zCoord, MINING_PIPE_TIP_BLOCK, 0, true); + return GT_Utility.setBlockByFakePlayer( + getFakePlayer(te), + xCoord, + yCoord, + zCoord, + MINING_PIPE_TIP_BLOCK, + 0, + true); } /** Get target block drops. We need to encapsulate everyting of mining in this class. */ private List<ItemStack> getBlockDrops(final Block oreBlock, int posX, int posY, int posZ) { return oreBlock.getDrops( - owner.getBaseMetaTileEntity().getWorld(), + owner.getBaseMetaTileEntity() + .getWorld(), posX, posY, posZ, - owner.getBaseMetaTileEntity().getMetaID(posX, posY, posZ), + owner.getBaseMetaTileEntity() + .getMetaID(posX, posY, posZ), owner.getMachineTier()); } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java index 81c7fac375..db7b811a1d 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java @@ -103,11 +103,12 @@ public class SpaceProjectManager { public static void putInTeam(UUID teamMember, UUID teamLeader) { if (teamMember.equals(teamLeader)) { spaceTeams.put(teamMember, teamLeader); - } else if (!spaceTeams.get(teamLeader).equals(teamLeader)) { - putInTeam(teamMember, spaceTeams.get(teamLeader)); - } else { - spaceTeams.put(teamMember, teamLeader); - } + } else if (!spaceTeams.get(teamLeader) + .equals(teamLeader)) { + putInTeam(teamMember, spaceTeams.get(teamLeader)); + } else { + spaceTeams.put(teamMember, teamLeader); + } SpaceProjectWorldSavedData.INSTANCE.markDirty(); } @@ -264,14 +265,20 @@ public class SpaceProjectManager { * Gets the UUID using the player's username */ public static UUID getPlayerUUIDFromName(String playerName) { - return MinecraftServer.getServer().func_152358_ax().func_152655_a(playerName).getId(); + return MinecraftServer.getServer() + .func_152358_ax() + .func_152655_a(playerName) + .getId(); } /** * Gets the player's name using their UUID */ public static String getPlayerNameFromUUID(UUID playerUUID) { - return MinecraftServer.getServer().func_152358_ax().func_152652_a(playerUUID).getName(); + return MinecraftServer.getServer() + .func_152358_ax() + .func_152652_a(playerUUID) + .getName(); } // #endregion diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java index 23a7b7bbb1..a70d1b5843 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java @@ -50,16 +50,34 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { public static SpaceProjectWorldSavedData INSTANCE; - private static final Gson GSON_SPACE_PROJECT = new GsonBuilder().serializeNulls().enableComplexMapKeySerialization() - .registerTypeAdapter(spaceTeamProjects.getClass(), new SpaceTeamProjectsMapAdapter()) - .registerTypeAdapter(Map.class, new SpaceTeamProjectsMapAdapter()) - .registerTypeAdapter(Pair.of((ISpaceBody) SolarSystem.Ariel, "").getClass(), new PairAdapter()) - .registerTypeAdapter(Pair.class, new PairAdapter()) - .registerTypeAdapter(ISpaceProject.class, new SpaceProjectAdapter()) - .registerTypeAdapter(ISP_Upgrade.class, new SP_UpgradeAdapter()) - .registerTypeHierarchyAdapter(ISpaceProject.class, new SpaceProjectAdapter()) - .registerTypeHierarchyAdapter(ISP_Upgrade.class, new SP_UpgradeAdapter()).create(); - private static final Gson GSON_TEAMS = new GsonBuilder().serializeNulls().create(); + private static final Gson GSON_SPACE_PROJECT = new GsonBuilder().serializeNulls() + .enableComplexMapKeySerialization() + .registerTypeAdapter( + spaceTeamProjects.getClass(), + new SpaceTeamProjectsMapAdapter()) + .registerTypeAdapter( + Map.class, + new SpaceTeamProjectsMapAdapter()) + .registerTypeAdapter( + Pair.of((ISpaceBody) SolarSystem.Ariel, "") + .getClass(), + new PairAdapter()) + .registerTypeAdapter(Pair.class, new PairAdapter()) + .registerTypeAdapter( + ISpaceProject.class, + new SpaceProjectAdapter()) + .registerTypeAdapter( + ISP_Upgrade.class, + new SP_UpgradeAdapter()) + .registerTypeHierarchyAdapter( + ISpaceProject.class, + new SpaceProjectAdapter()) + .registerTypeHierarchyAdapter( + ISP_Upgrade.class, + new SP_UpgradeAdapter()) + .create(); + private static final Gson GSON_TEAMS = new GsonBuilder().serializeNulls() + .create(); private static final String DATA_NAME = "GT_SpaceProjectData"; @@ -127,8 +145,14 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { } else { spaceTeams = new HashMap<>(); } - spaceTeamsFile = new File(aWorld.getSaveHandler().getWorldDirectory(), SPACE_TEAMS_JSON); - teamProjectsFile = new File(aWorld.getSaveHandler().getWorldDirectory(), SPACE_TEAM_PROJECTS_JSON); + spaceTeamsFile = new File( + aWorld.getSaveHandler() + .getWorldDirectory(), + SPACE_TEAMS_JSON); + teamProjectsFile = new File( + aWorld.getSaveHandler() + .getWorldDirectory(), + SPACE_TEAM_PROJECTS_JSON); MapStorage tStorage = aWorld.mapStorage; INSTANCE = (SpaceProjectWorldSavedData) tStorage.loadData(SpaceProjectWorldSavedData.class, DATA_NAME); if (INSTANCE == null) { @@ -151,7 +175,10 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { @Override public JsonElement serialize(Pair<ISpaceBody, String> src, Type typeOfSrc, JsonSerializationContext context) { JsonObject pair = new JsonObject(); - pair.addProperty(PAIR_LEFT, src.getLeft().getName()); + pair.addProperty( + PAIR_LEFT, + src.getLeft() + .getName()); pair.addProperty(PAIR_RIGHT, src.getRight()); return pair; } @@ -163,8 +190,11 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { if (json.isJsonObject()) { JsonObject obj = json.getAsJsonObject(); pair = Pair.of( - SpaceProjectManager.getLocation(obj.get(PAIR_LEFT).getAsString()), - obj.get(PAIR_RIGHT).getAsString()); + SpaceProjectManager.getLocation( + obj.get(PAIR_LEFT) + .getAsString()), + obj.get(PAIR_RIGHT) + .getAsString()); } return pair; } @@ -177,7 +207,10 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { JsonObject obj = new JsonObject(); obj.addProperty(PROJECT_NAME, src.getProjectName()); obj.addProperty(PROJECT_CURRENT_STAGE, src.getCurrentStage()); - obj.addProperty(PROJECT_LOCATION, src.getProjectLocation().getName()); + obj.addProperty( + PROJECT_LOCATION, + src.getProjectLocation() + .getName()); obj.add(PROJECT_CURRENT_UPGRADE, context.serialize(src.getUpgradeBeingBuilt())); obj.add(PROJECT_UPGRADES_BUILT, context.serialize(src.getAllBuiltUpgrades())); return obj; @@ -190,15 +223,21 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { return null; } JsonObject obj = json.getAsJsonObject(); - String projectName = obj.get(PROJECT_NAME).getAsString(); + String projectName = obj.get(PROJECT_NAME) + .getAsString(); ISpaceProject project = SpaceProjectManager.getProject(projectName); - int projectCurrentStage = obj.get(PROJECT_CURRENT_STAGE).getAsInt(); + int projectCurrentStage = obj.get(PROJECT_CURRENT_STAGE) + .getAsInt(); ISP_Upgrade[] projectUpgradesBuilt = new ISP_Upgrade[0]; - projectUpgradesBuilt = context - .deserialize(obj.get(PROJECT_UPGRADES_BUILT), projectUpgradesBuilt.getClass()); - ISP_Upgrade projectCurrentUpgrade = context - .deserialize(obj.get(PROJECT_CURRENT_UPGRADE), ISP_Upgrade.class); - ISpaceBody projectLocation = SpaceProjectManager.getLocation(obj.get(PROJECT_LOCATION).getAsString()); + projectUpgradesBuilt = context.deserialize( + obj.get(PROJECT_UPGRADES_BUILT), + projectUpgradesBuilt.getClass()); + ISP_Upgrade projectCurrentUpgrade = context.deserialize( + obj.get(PROJECT_CURRENT_UPGRADE), + ISP_Upgrade.class); + ISpaceBody projectLocation = SpaceProjectManager.getLocation( + obj.get(PROJECT_LOCATION) + .getAsString()); project.setBuiltUpgrade(projectUpgradesBuilt); project.setProjectLocation(projectLocation); project.setProjectCurrentStage(projectCurrentStage); @@ -213,7 +252,10 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { public JsonElement serialize(ISP_Upgrade src, Type typeOfSrc, JsonSerializationContext context) { JsonObject obj = new JsonObject(); obj.addProperty(UPGRADE_NAME, src.getUpgradeName()); - obj.addProperty(UPGRADE_PROJECT_PARENT, src.getParentProject().getProjectName()); + obj.addProperty( + UPGRADE_PROJECT_PARENT, + src.getParentProject() + .getProjectName()); obj.addProperty(UPGRADE_CURRENT_STAGE, src.getCurrentStage()); return obj; } @@ -225,14 +267,19 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { return null; } JsonObject obj = json.getAsJsonObject(); - String projectName = obj.get(UPGRADE_PROJECT_PARENT).getAsString(); + String projectName = obj.get(UPGRADE_PROJECT_PARENT) + .getAsString(); ISpaceProject project = SpaceProjectManager.getProject(projectName); - ISP_Upgrade upgrade = project.getUpgrade(obj.get(UPGRADE_NAME).getAsString()); + ISP_Upgrade upgrade = project.getUpgrade( + obj.get(UPGRADE_NAME) + .getAsString()); if (upgrade == null) { return null; } upgrade = upgrade.copy(); - upgrade.setUpgradeCurrentStage(obj.get(UPGRADE_CURRENT_STAGE).getAsInt()); + upgrade.setUpgradeCurrentStage( + obj.get(UPGRADE_CURRENT_STAGE) + .getAsInt()); return upgrade; } } @@ -249,7 +296,8 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { JsonObject teamMap = new JsonObject(); teamMap.add(MAP_UUID, context.serialize(firstEntry.getKey())); JsonArray teamProjectMap = new JsonArray(); - for (Entry<Pair<ISpaceBody, String>, ISpaceProject> secondEntry : firstEntry.getValue().entrySet()) { + for (Entry<Pair<ISpaceBody, String>, ISpaceProject> secondEntry : firstEntry.getValue() + .entrySet()) { JsonObject projectMap = new JsonObject(); projectMap.add(MAP_PAIR, context.serialize(secondEntry.getKey())); projectMap.add(MAP_PROJECT, context.serialize(secondEntry.getValue())); @@ -270,7 +318,8 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { JsonObject teamMap = teamMapElement.getAsJsonObject(); UUID uuid = context.deserialize(teamMap.get(MAP_UUID), UUID.class); Map<Pair<ISpaceBody, String>, ISpaceProject> projectMap = new HashMap<>(); - for (JsonElement teamProjectMapElement : teamMap.get(MAP_MAP).getAsJsonArray()) { + for (JsonElement teamProjectMapElement : teamMap.get(MAP_MAP) + .getAsJsonArray()) { JsonObject teamProjectMap = teamProjectMapElement.getAsJsonObject(); Pair<ISpaceBody, String> pair = context.deserialize(teamProjectMap.get(MAP_PAIR), Pair.class); ISpaceProject project = context.deserialize(teamProjectMap.get(MAP_PROJECT), ISpaceProject.class); 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; } } 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 8a54c40e70..6bd2561d68 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 @@ -152,20 +152,25 @@ public class SPM_Command extends CommandBase { break; } String finalFilter = filter; - return autoComplete.stream().filter(s -> finalFilter.isEmpty() || s.startsWith(finalFilter)) - .collect(Collectors.toList()); + return autoComplete.stream() + .filter(s -> finalFilter.isEmpty() || s.startsWith(finalFilter)) + .collect(Collectors.toList()); } private String[] getPlayers() { - return MinecraftServer.getServer().getAllUsernames(); + return MinecraftServer.getServer() + .getAllUsernames(); } private String[] getLocations() { - return SpaceProjectManager.getLocationNames().toArray(new String[0]); + return SpaceProjectManager.getLocationNames() + .toArray(new String[0]); } private String[] getProjects() { - return SpaceProjectManager.getProjectsMap().keySet().toArray(new String[0]); + return SpaceProjectManager.getProjectsMap() + .keySet() + .toArray(new String[0]); } private String[] getSubCommands() { @@ -204,7 +209,8 @@ public class SPM_Command extends CommandBase { UUID tID = SpaceProjectManager.getPlayerUUIDFromName(playerName); switch (argument) { case ALL: - for (String project : SpaceProjectManager.getProjectsMap().keySet()) { + for (String project : SpaceProjectManager.getProjectsMap() + .keySet()) { sender.addChatMessage(new ChatComponentText(project)); } break; diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java index ba673640c2..8ef301b6ba 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java @@ -19,8 +19,8 @@ import gregtech.common.misc.spaceprojects.SpaceProjectManager; */ public class SP_Command extends CommandBase { - private static Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections - .newSetFromMap(new WeakHashMap<Pair<EntityPlayerMP, EntityPlayerMP>, Boolean>()); + private static Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections.newSetFromMap( + new WeakHashMap<Pair<EntityPlayerMP, EntityPlayerMP>, Boolean>()); private static Set<EntityPlayerMP> confirm = Collections.newSetFromMap(new WeakHashMap<EntityPlayerMP, Boolean>()); private static final String INVITE = "invite"; |