diff options
| author | Raven Szewczyk <git@eigenraven.me> | 2023-04-10 17:49:16 +0100 |
|---|---|---|
| committer | Raven Szewczyk <git@eigenraven.me> | 2023-04-10 17:49:16 +0100 |
| commit | 8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch) | |
| tree | 0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/common/misc | |
| parent | d795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff) | |
| download | GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2 GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip | |
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/common/misc')
8 files changed, 269 insertions, 299 deletions
diff --git a/src/main/java/gregtech/common/misc/GT_Command.java b/src/main/java/gregtech/common/misc/GT_Command.java index 2b91cdebd9..11019e3723 100644 --- a/src/main/java/gregtech/common/misc/GT_Command.java +++ b/src/main/java/gregtech/common/misc/GT_Command.java @@ -34,8 +34,8 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner private void printHelp(ICommandSender sender) { sender.addChatMessage( - new ChatComponentText( - "Usage: gt <toggle|chunks|pollution|global_energy_add|global_energy_set|global_energy_join>")); + new ChatComponentText( + "Usage: gt <toggle|chunks|pollution|global_energy_add|global_energy_set|global_energy_join>")); sender.addChatMessage(new ChatComponentText("\"toggle D1\" - toggles general.Debug (D1)")); sender.addChatMessage(new ChatComponentText("\"toggle D2\" - toggles general.Debug2 (D2)")); sender.addChatMessage(new ChatComponentText("\"toggle debugCleanroom\" - toggles cleanroom debug log")); @@ -43,8 +43,7 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner sender.addChatMessage(new ChatComponentText("\"toggle debugBlockPump\" - Possible issues with pumps")); sender.addChatMessage(new ChatComponentText("\"toggle debugBlockMiner\" - Possible issues with miners")); sender.addChatMessage( - new ChatComponentText( - "\"toggle debugEntityCramming\" - How long it takes and how many entities it finds")); + new ChatComponentText("\"toggle debugEntityCramming\" - How long it takes and how many entities it finds")); sender.addChatMessage(new ChatComponentText("\"toggle debugWorldGen\" - toggles generic worldgen debug")); sender.addChatMessage(new ChatComponentText("\"toggle debugOrevein\" - toggles worldgen ore vein debug")); sender.addChatMessage(new ChatComponentText("\"toggle debugSmallOres\" - toggles worldgen small vein debug")); @@ -53,48 +52,44 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner sender.addChatMessage(new ChatComponentText("\"toggle debugMulti\" - toggles structurelib debug")); sender.addChatMessage(new ChatComponentText("\"chunks\" - print a list of the force loaded chunks")); sender.addChatMessage( - new ChatComponentText( - "\"pollution <amount>\" - adds the <amount> of the pollution to the current chunk, " - + "\n if <amount> isnt specified, will add" - + GT_Mod.gregtechproxy.mPollutionSmogLimit - + "gibbl.")); + new ChatComponentText( + "\"pollution <amount>\" - adds the <amount> of the pollution to the current chunk, " + + "\n if <amount> isnt specified, will add" + + GT_Mod.gregtechproxy.mPollutionSmogLimit + + "gibbl.")); sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + " --- Global wireless EU controls ---")); sender.addChatMessage(new ChatComponentText("Allows you to set the amount of EU in a users wireless network.")); sender.addChatMessage( - new ChatComponentText( - "Usage:" + EnumChatFormatting.RED - + " global_energy_set " - + EnumChatFormatting.BLUE - + "[Name] " - + EnumChatFormatting.LIGHT_PURPLE - + "[EU]")); + new ChatComponentText( + "Usage:" + EnumChatFormatting.RED + + " global_energy_set " + + EnumChatFormatting.BLUE + + "[Name] " + + EnumChatFormatting.LIGHT_PURPLE + + "[EU]")); sender.addChatMessage( - new ChatComponentText( - "Allows you to add EU to a users wireless network. Also accepts negative numbers.")); + new ChatComponentText("Allows you to add EU to a users wireless network. Also accepts negative numbers.")); sender.addChatMessage( - new ChatComponentText( - "Usage:" + EnumChatFormatting.RED - + " global_energy_add " - + EnumChatFormatting.BLUE - + "[Name] " - + EnumChatFormatting.LIGHT_PURPLE - + "[EU]")); + new ChatComponentText( + "Usage:" + EnumChatFormatting.RED + + " global_energy_add " + + EnumChatFormatting.BLUE + + "[Name] " + + EnumChatFormatting.LIGHT_PURPLE + + "[EU]")); sender.addChatMessage( - new ChatComponentText( - "Allows you to join two users together into one network. Can be undone by writing the users name twice.")); + new ChatComponentText( + "Allows you to join two users together into one network. Can be undone by writing the users name twice.")); sender.addChatMessage( - new ChatComponentText( - "Usage:" + EnumChatFormatting.RED - + " global_energy_join " - + EnumChatFormatting.BLUE - + "[User joining] [User to join]")); + new ChatComponentText( + "Usage:" + EnumChatFormatting.RED + + " global_energy_join " + + EnumChatFormatting.BLUE + + "[User joining] [User to join]")); sender.addChatMessage(new ChatComponentText("Shows the amount of EU in a users energy network.")); sender.addChatMessage( - new ChatComponentText( - "Usage:" + EnumChatFormatting.RED - + " global_energy_display " - + EnumChatFormatting.BLUE - + "[Name]")); + new ChatComponentText( + "Usage:" + EnumChatFormatting.RED + " global_energy_display " + EnumChatFormatting.BLUE + "[Name]")); } @Override @@ -102,16 +97,17 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner 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)))) { - Stream.of( + .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", "pollution", @@ -119,11 +115,12 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner "global_energy_set", "global_energy_join", "global_energy_display") - .filter(s -> test.isEmpty() || s.startsWith(test)) - .forEach(l::add); + .filter(s -> test.isEmpty() || s.startsWith(test)) + .forEach(l::add); } else if (test.equals("toggle")) { String test1 = ss[1].trim(); - Stream.of( + Stream + .of( "D1", "D2", "debugCleanroom", @@ -138,8 +135,8 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner "debugChunkloaders", "debugMulti", "debugWorldData") - .filter(s -> test1.isEmpty() || s.startsWith(test1)) - .forEach(l::add); + .filter(s -> test1.isEmpty() || s.startsWith(test1)) + .forEach(l::add); } return l; } @@ -159,7 +156,7 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner if ("debugMulti".equals(strings[1])) { StructureLib.DEBUG_MODE = !StructureLib.DEBUG_MODE; sender.addChatMessage( - new ChatComponentText(strings[1] + " = " + (StructureLib.DEBUG_MODE ? "true" : "false"))); + new ChatComponentText(strings[1] + " = " + (StructureLib.DEBUG_MODE ? "true" : "false"))); return; } try { @@ -182,11 +179,11 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner case "pollution" -> { ChunkCoordinates coordinates = sender.getPlayerCoordinates(); int amount = (strings.length < 2) ? GT_Mod.gregtechproxy.mPollutionSmogLimit - : Integer.parseInt(strings[1]); + : Integer.parseInt(strings[1]); GT_Pollution.addPollution( - sender.getEntityWorld() - .getChunkFromBlockCoords(coordinates.posX, coordinates.posZ), - amount); + sender.getEntityWorld() + .getChunkFromBlockCoords(coordinates.posX, coordinates.posZ), + amount); } case "global_energy_add" -> { String username = strings[1]; @@ -199,34 +196,34 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner if (uuid.equals("")) { sender.addChatMessage( - new ChatComponentText("User " + formatted_username + " has no global energy network.")); + new ChatComponentText("User " + formatted_username + " has no global energy network.")); break; } String EU_string_formatted = EnumChatFormatting.RED - + GT_Utility.formatNumbers(new BigInteger(EU_String)) - + EnumChatFormatting.RESET; + + GT_Utility.formatNumbers(new BigInteger(EU_String)) + + EnumChatFormatting.RESET; if (addEUToGlobalEnergyMap(uuid, new BigInteger(EU_String))) sender.addChatMessage( - new ChatComponentText( - "Successfully added " + EU_string_formatted - + "EU to the global energy network of " - + formatted_username - + ".")); + new ChatComponentText( + "Successfully added " + EU_string_formatted + + "EU to the global energy network of " + + formatted_username + + ".")); else sender.addChatMessage( - new ChatComponentText( - "Failed to add " + EU_string_formatted - + "EU to the global energy map of " - + formatted_username - + ". Insufficient energy in network. ")); + new ChatComponentText( + "Failed to add " + EU_string_formatted + + "EU to the global energy map of " + + formatted_username + + ". Insufficient energy in network. ")); sender.addChatMessage( - new ChatComponentText( - formatted_username + " currently has " - + EnumChatFormatting.RED - + GT_Utility.formatNumbers(new BigInteger(getUserEU(uuid).toString())) - + EnumChatFormatting.RESET - + "EU in their network.")); + new ChatComponentText( + formatted_username + " currently has " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(new BigInteger(getUserEU(uuid).toString())) + + EnumChatFormatting.RESET + + "EU in their network.")); } case "global_energy_set" -> { @@ -239,7 +236,7 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner if (uuid.equals("")) { sender.addChatMessage( - new ChatComponentText("User " + formatted_username + " has no global energy network.")); + new ChatComponentText("User " + formatted_username + " has no global energy network.")); break; } @@ -247,20 +244,20 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner if ((new BigInteger(EU_String_0).compareTo(BigInteger.ZERO)) < 0) { sender.addChatMessage( - new ChatComponentText("Cannot set a users energy network to a negative value.")); + new ChatComponentText("Cannot set a users energy network to a negative value.")); break; } setUserEU(uuid, new BigInteger(EU_String_0)); sender.addChatMessage( - new ChatComponentText( - "Successfully set " + formatted_username - + "'s global energy network to " - + EnumChatFormatting.RED - + GT_Utility.formatNumbers(new BigInteger(EU_String_0)) - + EnumChatFormatting.RESET - + "EU.")); + new ChatComponentText( + "Successfully set " + formatted_username + + "'s global energy network to " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(new BigInteger(EU_String_0)) + + EnumChatFormatting.RESET + + "EU.")); } case "global_energy_join" -> { @@ -279,51 +276,50 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner if (uuid_1.equals("") && uuid_0.equals("")) { if (username_0.equals(username_1)) { sender.addChatMessage( - new ChatComponentText( - "User " + formatted_username_0 + " has no global energy network.")); + new ChatComponentText("User " + formatted_username_0 + " has no global energy network.")); } else { sender.addChatMessage( - new ChatComponentText( - "User " + formatted_username_0 - + " and " - + formatted_username_1 - + " have no global energy networks.")); + new ChatComponentText( + "User " + formatted_username_0 + + " and " + + formatted_username_1 + + " have no global energy networks.")); } break; } if (uuid_0.equals("")) { sender.addChatMessage( - new ChatComponentText("User " + formatted_username_0 + " has no global energy network.")); + new ChatComponentText("User " + formatted_username_0 + " has no global energy network.")); break; } if (uuid_1.equals("")) { sender.addChatMessage( - new ChatComponentText("User " + formatted_username_1 + " has no global energy network.")); + new ChatComponentText("User " + formatted_username_1 + " has no global energy network.")); break; } if (uuid_0.equals(uuid_1)) { joinUserNetwork(uuid_0, uuid_1); sender.addChatMessage( - new ChatComponentText( - "User " + formatted_username_0 + " has rejoined their own global energy network.")); + new ChatComponentText( + "User " + formatted_username_0 + " has rejoined their own global energy network.")); break; } joinUserNetwork(uuid_0, uuid_1); sender.addChatMessage( - new ChatComponentText( - "Success! " + formatted_username_0 + " has joined " + formatted_username_1 + ".")); + new ChatComponentText( + "Success! " + formatted_username_0 + " has joined " + formatted_username_1 + ".")); sender.addChatMessage( - new ChatComponentText( - "To undo this simply join your own network again with /gt global_energy_join " - + formatted_username_0 - + " " - + formatted_username_0 - + ".")); + new ChatComponentText( + "To undo this simply join your own network again with /gt global_energy_join " + + formatted_username_0 + + " " + + formatted_username_0 + + ".")); } case "global_energy_display" -> { @@ -336,23 +332,23 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner if (uuid.equals("")) { sender.addChatMessage( - new ChatComponentText("User " + formatted_username + " has no global energy network.")); + new ChatComponentText("User " + formatted_username + " has no global energy network.")); break; } sender.addChatMessage( - new ChatComponentText( - "User " + formatted_username - + " has " - + EnumChatFormatting.RED - + GT_Utility.formatNumbers(getUserEU(uuid)) - + EnumChatFormatting.RESET - + "EU in their network.")); + new ChatComponentText( + "User " + formatted_username + + " has " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(getUserEU(uuid)) + + EnumChatFormatting.RESET + + "EU in their network.")); } default -> { - sender.addChatMessage( - new ChatComponentText(EnumChatFormatting.RED + "Invalid command/syntax detected.")); + sender + .addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Invalid command/syntax detected.")); printHelp(sender); } } diff --git a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java b/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java index 6de4de3c71..9cf7fd7cf8 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; @@ -75,7 +75,7 @@ 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); + .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); @@ -93,7 +93,7 @@ public class GT_DrillingLogicDelegate { // Descent the pipe tip te.getWorld() - .setBlock(xCoord, yCoord + tipDepth - 1, zCoord, MINING_PIPE_TIP_BLOCK); + .setBlock(xCoord, yCoord + tipDepth - 1, zCoord, MINING_PIPE_TIP_BLOCK); tipDepth--; return true; } @@ -143,18 +143,12 @@ public class GT_DrillingLogicDelegate { // Move the pipe tip position if (actualDrillY < yCoord - 1) { owner.getBaseMetaTileEntity() - .getWorld() - .setBlock(xCoord, actualDrillY + 1, zCoord, MINING_PIPE_TIP_BLOCK); + .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); + .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); @@ -183,20 +177,20 @@ public class GT_DrillingLogicDelegate { short metaData = 0; TileEntity tTileEntity = owner.getBaseMetaTileEntity() - .getTileEntity(x, y, z); + .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); + .setBlock( + x, + y, + z, + Block.getBlockFromItem(cobble.getItem()), + cobble.getItemDamage(), /* cause updates(1) + send to client(2) */ + 3); } /** @@ -238,27 +232,21 @@ 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(), - posX, - posY, - posZ, - owner.getBaseMetaTileEntity() - .getMetaID(posX, posY, posZ), - owner.getMachineTier()); + owner.getBaseMetaTileEntity() + .getWorld(), + posX, + posY, + posZ, + owner.getBaseMetaTileEntity() + .getMetaID(posX, posY, posZ), + owner.getMachineTier()); } /** Can the owner continue doing its work? If we await new pipes - it cannot. */ diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java index 1067673399..c34c486223 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java @@ -104,11 +104,11 @@ public class SpaceProjectManager { 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); - } + .equals(teamLeader)) { + putInTeam(teamMember, spaceTeams.get(teamLeader)); + } else { + spaceTeams.put(teamMember, teamLeader); + } SpaceProjectWorldSavedData.INSTANCE.markDirty(); } @@ -182,14 +182,14 @@ public class SpaceProjectManager { public static void addProject(ISpaceProject project) { spaceProjects.put(project.getProjectName(), project); GT_Recipe.GT_Recipe_Map.sFakeSpaceProjectRecipes.add( - new GT_Recipe.GT_Recipe_Map.GT_FakeSpaceProjectRecipe( - false, - project.getTotalItemsCost(), - project.getTotalFluidsCost(), - project.getProjectBuildTime(), - (int) project.getProjectVoltage(), - project.getTotalStages(), - project.getProjectName())); + new GT_Recipe.GT_Recipe_Map.GT_FakeSpaceProjectRecipe( + false, + project.getTotalItemsCost(), + project.getTotalFluidsCost(), + project.getProjectBuildTime(), + (int) project.getProjectVoltage(), + project.getTotalStages(), + project.getProjectName())); } /** @@ -266,9 +266,9 @@ public class SpaceProjectManager { */ public static UUID getPlayerUUIDFromName(String playerName) { return MinecraftServer.getServer() - .func_152358_ax() - .func_152655_a(playerName) - .getId(); + .func_152358_ax() + .func_152655_a(playerName) + .getId(); } /** @@ -276,9 +276,9 @@ public class SpaceProjectManager { */ public static String getPlayerNameFromUUID(UUID playerUUID) { return MinecraftServer.getServer() - .func_152358_ax() - .func_152652_a(playerUUID) - .getName(); + .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 a70d1b5843..5afa1b5ef1 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java @@ -51,33 +51,21 @@ 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(); + .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(); + .create(); private static final String DATA_NAME = "GT_SpaceProjectData"; @@ -146,13 +134,13 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { spaceTeams = new HashMap<>(); } spaceTeamsFile = new File( - aWorld.getSaveHandler() - .getWorldDirectory(), - SPACE_TEAMS_JSON); + aWorld.getSaveHandler() + .getWorldDirectory(), + SPACE_TEAMS_JSON); teamProjectsFile = new File( - aWorld.getSaveHandler() - .getWorldDirectory(), - SPACE_TEAM_PROJECTS_JSON); + aWorld.getSaveHandler() + .getWorldDirectory(), + SPACE_TEAM_PROJECTS_JSON); MapStorage tStorage = aWorld.mapStorage; INSTANCE = (SpaceProjectWorldSavedData) tStorage.loadData(SpaceProjectWorldSavedData.class, DATA_NAME); if (INSTANCE == null) { @@ -170,31 +158,31 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { } private static class PairAdapter - implements JsonSerializer<Pair<ISpaceBody, String>>, JsonDeserializer<Pair<ISpaceBody, String>> { + implements JsonSerializer<Pair<ISpaceBody, String>>, JsonDeserializer<Pair<ISpaceBody, String>> { @Override public JsonElement serialize(Pair<ISpaceBody, String> src, Type typeOfSrc, JsonSerializationContext context) { JsonObject pair = new JsonObject(); pair.addProperty( - PAIR_LEFT, - src.getLeft() - .getName()); + PAIR_LEFT, + src.getLeft() + .getName()); pair.addProperty(PAIR_RIGHT, src.getRight()); return pair; } @Override public Pair<ISpaceBody, String> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException { + throws JsonParseException { Pair<ISpaceBody, String> pair = null; 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; } @@ -208,9 +196,9 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { obj.addProperty(PROJECT_NAME, src.getProjectName()); obj.addProperty(PROJECT_CURRENT_STAGE, src.getCurrentStage()); obj.addProperty( - PROJECT_LOCATION, - src.getProjectLocation() - .getName()); + 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; @@ -218,26 +206,24 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { @Override public ISpaceProject deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException { + throws JsonParseException { if (!json.isJsonObject()) { return null; } JsonObject obj = json.getAsJsonObject(); String projectName = obj.get(PROJECT_NAME) - .getAsString(); + .getAsString(); ISpaceProject project = SpaceProjectManager.getProject(projectName); int projectCurrentStage = obj.get(PROJECT_CURRENT_STAGE) - .getAsInt(); + .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); + 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()); + obj.get(PROJECT_LOCATION) + .getAsString()); project.setBuiltUpgrade(projectUpgradesBuilt); project.setProjectLocation(projectLocation); project.setProjectCurrentStage(projectCurrentStage); @@ -253,51 +239,51 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { JsonObject obj = new JsonObject(); obj.addProperty(UPGRADE_NAME, src.getUpgradeName()); obj.addProperty( - UPGRADE_PROJECT_PARENT, - src.getParentProject() - .getProjectName()); + UPGRADE_PROJECT_PARENT, + src.getParentProject() + .getProjectName()); obj.addProperty(UPGRADE_CURRENT_STAGE, src.getCurrentStage()); return obj; } @Override public ISP_Upgrade deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException { + throws JsonParseException { if (!json.isJsonObject()) { return null; } JsonObject obj = json.getAsJsonObject(); String projectName = obj.get(UPGRADE_PROJECT_PARENT) - .getAsString(); + .getAsString(); ISpaceProject project = SpaceProjectManager.getProject(projectName); ISP_Upgrade upgrade = project.getUpgrade( - obj.get(UPGRADE_NAME) - .getAsString()); + obj.get(UPGRADE_NAME) + .getAsString()); if (upgrade == null) { return null; } upgrade = upgrade.copy(); upgrade.setUpgradeCurrentStage( - obj.get(UPGRADE_CURRENT_STAGE) - .getAsInt()); + obj.get(UPGRADE_CURRENT_STAGE) + .getAsInt()); return upgrade; } } private static class SpaceTeamProjectsMapAdapter - implements JsonSerializer<Map<UUID, Map<Pair<ISpaceBody, String>, ISpaceProject>>>, - JsonDeserializer<Map<UUID, Map<Pair<ISpaceBody, String>, ISpaceProject>>> { + implements JsonSerializer<Map<UUID, Map<Pair<ISpaceBody, String>, ISpaceProject>>>, + JsonDeserializer<Map<UUID, Map<Pair<ISpaceBody, String>, ISpaceProject>>> { @Override public JsonElement serialize(Map<UUID, Map<Pair<ISpaceBody, String>, ISpaceProject>> src, Type typeOfSrc, - JsonSerializationContext context) { + JsonSerializationContext context) { JsonArray map = new JsonArray(); for (Entry<UUID, Map<Pair<ISpaceBody, String>, ISpaceProject>> firstEntry : src.entrySet()) { 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()) { + .entrySet()) { JsonObject projectMap = new JsonObject(); projectMap.add(MAP_PAIR, context.serialize(secondEntry.getKey())); projectMap.add(MAP_PROJECT, context.serialize(secondEntry.getValue())); @@ -311,7 +297,7 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { @Override public Map<UUID, Map<Pair<ISpaceBody, String>, ISpaceProject>> deserialize(JsonElement json, Type typeOfT, - JsonDeserializationContext context) throws JsonParseException { + JsonDeserializationContext context) throws JsonParseException { JsonArray mapArray = json.getAsJsonArray(); Map<UUID, Map<Pair<ISpaceBody, String>, ISpaceProject>> map = new HashMap<>(); for (JsonElement teamMapElement : mapArray) { @@ -319,7 +305,7 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { 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()) { + .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 a4b8d5aa5b..9fc3bd955b 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 @@ -295,20 +295,20 @@ public class SP_Upgrade implements ISP_Upgrade { } if (requirements.getBodyType() != null && !requirements.getBodyType() - .equals(SpaceBodyType.NONE)) { + .equals(SpaceBodyType.NONE)) { if (!requirements.getBodyType() - .equals( - projectBelongingTo.getProjectLocation() - .getType())) { + .equals( + projectBelongingTo.getProjectLocation() + .getType())) { return false; } } if (requirements.getStarType() != null) { if (!requirements.getStarType() - .equals( - projectBelongingTo.getProjectLocation() - .getStarType())) { + .equals( + projectBelongingTo.getProjectLocation() + .getStarType())) { return false; } } @@ -335,13 +335,13 @@ 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); + .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 dfbcf96dc6..201b7c27a9 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java @@ -369,14 +369,14 @@ 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); + .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; @@ -406,14 +406,14 @@ public class SpaceProject implements ISpaceProject { if (requirements.getBodyType() != null && checkLocation) { if (!requirements.getBodyType() - .equals(location.getType())) { + .equals(location.getType())) { return false; } } if (requirements.getStarType() != null && checkLocation) { if (!requirements.getStarType() - .equals(location.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 f3c93c25b6..bb08ad47fb 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 @@ -56,7 +56,7 @@ public class SPM_Command extends CommandBase { case RESET: if (!sender.canCommandSenderUseCommand(4, getCommandName())) { sender.addChatMessage( - new ChatComponentText("You don't have the permissions to execute this command")); + new ChatComponentText("You don't have the permissions to execute this command")); return; } processReset(sender, arguments.length >= 2 ? arguments[1] : sender.getCommandSenderName()); @@ -64,41 +64,41 @@ public class SPM_Command extends CommandBase { case UNLOCK: if (!sender.canCommandSenderUseCommand(4, getCommandName())) { sender.addChatMessage( - new ChatComponentText("You don't have the permissions to execute this command")); + new ChatComponentText("You don't have the permissions to execute this command")); return; } if (arguments.length < 3) { sender.addChatMessage( - new ChatComponentText("Not enough arguments. Needs to mention a project and a location")); + new ChatComponentText("Not enough arguments. Needs to mention a project and a location")); return; } processUnlock( - sender, - arguments[1], - arguments[2], - arguments.length >= 4 ? arguments[3] : sender.getCommandSenderName()); + sender, + arguments[1], + arguments[2], + arguments.length >= 4 ? arguments[3] : sender.getCommandSenderName()); break; case LOCK: if (!sender.canCommandSenderUseCommand(4, getCommandName())) { sender.addChatMessage( - new ChatComponentText("You don't have the permissions to execute this command")); + new ChatComponentText("You don't have the permissions to execute this command")); return; } if (arguments.length < 3) { sender.addChatMessage( - new ChatComponentText("Not enough arguments. Needs to mention a project and a location")); + new ChatComponentText("Not enough arguments. Needs to mention a project and a location")); return; } processLock( - sender, - arguments[1], - arguments[2], - arguments.length >= 4 ? arguments[3] : sender.getCommandSenderName()); + sender, + arguments[1], + arguments[2], + arguments.length >= 4 ? arguments[3] : sender.getCommandSenderName()); case LIST: if (arguments.length < 2) { sender.addChatMessage( - new ChatComponentText( - "No Argument for list subCommand. Usage /spm list -all, -available or -unlocked")); + new ChatComponentText( + "No Argument for list subCommand. Usage /spm list -all, -available or -unlocked")); return; } processList(sender, arguments[1], arguments.length >= 3 ? arguments[2] : sender.getCommandSenderName()); @@ -106,7 +106,7 @@ public class SPM_Command extends CommandBase { case COPY: if (!sender.canCommandSenderUseCommand(4, getCommandName())) { sender.addChatMessage( - new ChatComponentText("You don't have the permissions to execute this command")); + new ChatComponentText("You don't have the permissions to execute this command")); return; } if (arguments.length < 3) { @@ -149,24 +149,24 @@ public class SPM_Command extends CommandBase { } String finalFilter = filter; return autoComplete.stream() - .filter(s -> finalFilter.isEmpty() || s.startsWith(finalFilter)) - .collect(Collectors.toList()); + .filter(s -> finalFilter.isEmpty() || s.startsWith(finalFilter)) + .collect(Collectors.toList()); } private String[] getPlayers() { return MinecraftServer.getServer() - .getAllUsernames(); + .getAllUsernames(); } private String[] getLocations() { return SpaceProjectManager.getLocationNames() - .toArray(new String[0]); + .toArray(new String[0]); } private String[] getProjects() { return SpaceProjectManager.getProjectsMap() - .keySet() - .toArray(new String[0]); + .keySet() + .toArray(new String[0]); } private String[] getSubCommands() { @@ -206,7 +206,7 @@ public class SPM_Command extends CommandBase { switch (argument) { case ALL -> { for (String project : SpaceProjectManager.getProjectsMap() - .keySet()) { + .keySet()) { sender.addChatMessage(new ChatComponentText(project)); } } 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 29ae7e9432..84c5626e69 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 @@ -70,11 +70,11 @@ public class SP_Command extends CommandBase { EntityPlayerMP teamMember = getPlayer(sender, playerInvited); invite.add(Pair.of(teamMember, teamLeader)); String message = EnumChatFormatting.GOLD + teamLeader.getCommandSenderName() - + EnumChatFormatting.RESET - + " has sent you an invite to join their team. Accept it with" - + EnumChatFormatting.GOLD - + " /sp accept " - + teamLeader.getCommandSenderName(); + + EnumChatFormatting.RESET + + " has sent you an invite to join their team. Accept it with" + + EnumChatFormatting.GOLD + + " /sp accept " + + teamLeader.getCommandSenderName(); GT_Utility.sendChatToPlayer(teamMember, message); } @@ -83,8 +83,8 @@ public class SP_Command extends CommandBase { EntityPlayerMP teamLeader = getPlayer(sender, playerInviter); if (invite.contains(Pair.of(teamMember, teamLeader))) { String message = EnumChatFormatting.GOLD + teamMember.getCommandSenderName() - + EnumChatFormatting.RESET - + " has accepted the invite."; + + EnumChatFormatting.RESET + + " has accepted the invite."; SpaceProjectManager.putInTeam(teamMember.getUniqueID(), teamLeader.getUniqueID()); GT_Utility.sendChatToPlayer(teamLeader, message); invite.remove(Pair.of(teamMember, teamLeader)); @@ -94,10 +94,10 @@ public class SP_Command extends CommandBase { private void processLeave(ICommandSender sender) { EntityPlayerMP player = getCommandSenderAsPlayer(sender); String message = "Are you sure you want to leave the team. You will lose all progress. Use " - + EnumChatFormatting.GOLD - + "/sp confirm" - + EnumChatFormatting.RESET - + " to confirm this. This does nothing if you are the team leader."; + + EnumChatFormatting.GOLD + + "/sp confirm" + + EnumChatFormatting.RESET + + " to confirm this. This does nothing if you are the team leader."; GT_Utility.sendChatToPlayer(player, message); confirm.add(player); } |
