Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2025-02-15 01:31:22 +01:00
Code Issues Projects Releases Wiki Activity

Fix weird Lists import from internal jcommander package

Browse Source
This commit is contained in:
Henry Le Grys 2021-02-18 23:30:14 +00:00
parent 5d5a462387
commit 660fb40c44
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
creator-tools/src/main/java/com/skcraft/launcher/creator/controller/task/ProblemChecker.java
View File

@ -6,7 +6,7 @@
package com.skcraft.launcher.creator.controller.task;
import com.beust.jcommander.internal.Lists;
import com.google.common.collect.Lists;
import com.skcraft.concurrency.ProgressObservable;
import com.skcraft.launcher.builder.BuilderOptions;
import com.skcraft.launcher.creator.model.creator.Pack;

2
creator-tools/src/main/java/com/skcraft/launcher/creator/server/PackagesHandler.java
View File

@ -6,8 +6,8 @@
package com.skcraft.launcher.creator.server;
import com.beust.jcommander.internal.Lists;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.skcraft.launcher.model.modpack.Manifest;
import com.skcraft.launcher.model.modpack.ManifestInfo;
import com.skcraft.launcher.model.modpack.PackageList;

2
launcher-builder/src/main/java/com/skcraft/launcher/builder/BuilderUtils.java
View File

@ -6,7 +6,7 @@
package com.skcraft.launcher.builder;
import com.beust.jcommander.internal.Lists;
import com.google.common.collect.Lists;
import com.google.common.io.CharStreams;
import org.apache.commons.compress.compressors.CompressorStreamFactory;

2
launcher/src/main/java/com/skcraft/launcher/auth/AccountList.java
View File

@ -1,8 +1,8 @@
package com.skcraft.launcher.auth;
import com.beust.jcommander.internal.Lists;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.google.common.collect.Lists;
import com.skcraft.launcher.dialog.component.ListListenerReducer;
import com.skcraft.launcher.persistence.Scrambled;
import lombok.Getter;

2
launcher/src/main/java/com/skcraft/launcher/auth/microsoft/model/McProfileResponse.java
View File

@ -1,8 +1,8 @@
package com.skcraft.launcher.auth.microsoft.model;
import com.beust.jcommander.internal.Lists;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.Lists;
import lombok.Data;
import java.util.List;

2
launcher/src/main/java/com/skcraft/launcher/dialog/component/ListListenerReducer.java
View File

@ -1,6 +1,6 @@
package com.skcraft.launcher.dialog.component;
import com.beust.jcommander.internal.Lists;
import com.google.common.collect.Lists;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;

2
launcher/src/main/java/com/skcraft/launcher/model/minecraft/mapper/ArgumentValueDeserializer.java
View File

@ -1,6 +1,5 @@
package com.skcraft.launcher.model.minecraft.mapper;
import com.beust.jcommander.internal.Lists;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
@ -8,6 +7,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.exc.InvalidFormatException;
import com.fasterxml.jackson.databind.type.TypeFactory;
import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.Arrays;