Skip to content

Commit e2c8473

Browse files
committed
[F] Fix build issues and checkstyle after merge
1 parent 7337df8 commit e2c8473

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

src/main/java/org/hydev/mcpm/client/arguments/CommandsFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private CommandsFactory() { }
2626
*/
2727
public static List<CommandParser> baseParsers() {
2828
var echoController = new EchoController();
29-
var exportPluginsController = new ExportPluginsController(new ExportInteractor(new LocalPluginTracker(null, null))); // idk man
29+
var exportPluginsController = new ExportPluginsController(new ExportInteractor(new LocalPluginTracker()));
3030

3131
/*
3232
* Add general parsers to this list!

src/main/java/org/hydev/mcpm/client/database/LocalPluginTracker.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.apache.commons.lang3.tuple.Pair;
77
import org.hydev.mcpm.client.database.boundary.SearchPackagesBoundary;
88
import org.hydev.mcpm.client.database.inputs.SearchPackagesInput;
9+
import org.hydev.mcpm.client.database.inputs.SearchPackagesType;
910
import org.hydev.mcpm.client.database.results.SearchPackagesResult;
1011
import org.hydev.mcpm.client.models.PluginModel;
1112
import org.hydev.mcpm.client.models.PluginVersion;
@@ -402,7 +403,7 @@ public Boolean compareVersion(String name, SearchPackagesBoundary searchPackages
402403
PluginYml currPlugin = readMeta(pluginYmlPath);
403404
String localVersion = currPlugin.version();
404405

405-
SearchPackagesInput searchPackagesInput = new SearchPackagesInput(SearchPackagesInput.Type.BY_NAME, name,
406+
SearchPackagesInput searchPackagesInput = new SearchPackagesInput(SearchPackagesType.BY_NAME, name,
406407
false);
407408
SearchPackagesResult searchPackagesResult = searchPackagesBoundary.search(searchPackagesInput);
408409

src/main/java/org/hydev/mcpm/client/database/PluginTracker.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package org.hydev.mcpm.client.database;
22

3-
import org.hydev.mcpm.client.models.PluginVersion;
4-
import org.hydev.mcpm.client.models.PluginYml;
5-
import org.hydev.mcpm.utils.HashUtils;
6-
import org.hydev.mcpm.utils.PluginJarFile;
73
import org.hydev.mcpm.client.database.boundary.SearchPackagesBoundary;
8-
import org.hydev.mcpm.client.database.fetcher.DatabaseFetcher;
9-
import org.hydev.mcpm.client.database.fetcher.LocalDatabaseFetcher;
104
import org.hydev.mcpm.client.models.PluginModel;
5+
import org.hydev.mcpm.client.models.PluginYml;
116

127
import java.io.File;
138
import java.util.List;
14-
import java.util.ArrayList;
15-
import java.io.*;
169

17-
interface PluginTracker {
10+
/**
11+
* Plugin tracker interface
12+
*
13+
* @author Kevin (https://github.com/kchprog)
14+
* @since 2022-09-27
15+
*/
16+
public interface PluginTracker {
1817
void addEntry(String name, boolean status);
1918

2019
void removeEntry(String name);

src/main/java/org/hydev/mcpm/client/database/export/ExportInteractor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ public ExportPluginsResult export(ExportPluginsInput input) {
3333
}
3434

3535
PrintStream ps = new PrintStream(input.out());
36-
plugins.forEach(p -> {
37-
ps.printf("%s %s\n", p.name(), p.version());
38-
});
36+
plugins.forEach(p -> ps.printf("%s %s\n", p.name(), p.version()));
3937
return new ExportPluginsResult(ExportPluginsResult.State.SUCCESS);
4038
}
4139
}

src/main/java/org/hydev/mcpm/client/installer/InstallInteractor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void installPlugin(InstallInput input) throws InstallException
7272
// 4. Add it to the plugin tracker
7373
new File("plugins").mkdirs();
7474
input.pluginDownloader().download(id, pluginVersion.id(), "plugins/" + name + ".jar");
75-
input.pluginTracker().addManuallyInstalled(name);
75+
input.pluginTracker().addEntry(name, true);
7676

7777
// 5. Install the dependencies
7878
if (pluginVersion.meta().depend() != null) {
@@ -85,6 +85,7 @@ public void installPlugin(InstallInput input) throws InstallException
8585
input.pluginDownloader(),
8686
input.pluginTracker());
8787
installPlugin(dependencyInput);
88+
input.pluginTracker().removeManuallyInstalled(name);
8889
}
8990
}
9091
}

src/main/java/org/hydev/mcpm/client/installer/input/InstallInput.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.hydev.mcpm.client.installer.input;
22

3-
import org.hydev.mcpm.client.database.LocalPluginTracker;
43
import org.hydev.mcpm.client.database.PluginTracker;
54
import org.hydev.mcpm.client.database.boundary.SearchPackagesBoundary;
65
import org.hydev.mcpm.client.database.inputs.SearchPackagesType;

0 commit comments

Comments
 (0)