Slightly cleaner code
This commit is contained in:
@@ -117,6 +117,7 @@ public class Mods implements Loadable{
|
|||||||
|
|
||||||
var loaded = loadMod(dest, true, true);
|
var loaded = loadMod(dest, true, true);
|
||||||
mods.add(loaded);
|
mods.add(loaded);
|
||||||
|
newImports.add(loaded);
|
||||||
//invalidate ordered mods cache
|
//invalidate ordered mods cache
|
||||||
lastOrderedMods = null;
|
lastOrderedMods = null;
|
||||||
requiresReload = true;
|
requiresReload = true;
|
||||||
@@ -772,10 +773,14 @@ public class Mods implements Loadable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
cont.button("@ok", this::hide).size(300, 50);
|
cont.button("@ok", this::hide).size(300, 50);
|
||||||
|
closeOnBack();
|
||||||
}}.show();
|
}}.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reload(){
|
public void reload(){
|
||||||
|
newImports.each(this::updateDependencies);
|
||||||
|
newImports.remove(m -> m.missingDependencies.isEmpty() && m.softDependencies.isEmpty());
|
||||||
|
|
||||||
if(newImports.any()){
|
if(newImports.any()){
|
||||||
checkDependencies(newImports, true);
|
checkDependencies(newImports, true);
|
||||||
}else{
|
}else{
|
||||||
@@ -1010,14 +1015,6 @@ public class Mods implements Loadable{
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Checks if a newly imported mod's dependencies are already added. */
|
|
||||||
public void loadImportDependencies(LoadedMod mod){
|
|
||||||
updateDependencies(mod);
|
|
||||||
if(mod.missingDependencies.any() || mod.missingSoftDependencies.any()){
|
|
||||||
newImports.add(mod);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean resolve(String element, ModResolutionContext context){
|
private boolean resolve(String element, ModResolutionContext context){
|
||||||
context.visited.add(element);
|
context.visited.add(element);
|
||||||
for(final var dependency : context.dependencies.get(element)){
|
for(final var dependency : context.dependencies.get(element)){
|
||||||
|
|||||||
@@ -619,7 +619,6 @@ public class ModsDialog extends BaseDialog{
|
|||||||
|
|
||||||
var mod = mods.importMod(file);
|
var mod = mods.importMod(file);
|
||||||
mod.setRepo(repo);
|
mod.setRepo(repo);
|
||||||
mods.loadImportDependencies(mod);
|
|
||||||
file.delete();
|
file.delete();
|
||||||
Core.app.post(() -> {
|
Core.app.post(() -> {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user