lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #153

Browse Source
This commit is contained in:
huangyuhui
2017-06-24 15:52:28 +08:00
parent cfa7b4832a
commit 2f3c8285c8
8 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HMCLCore/src/main/java/org/jackhuang/hmcl/core/service/IMinecraftProvider.java
View File

@@ -33,11 +33,11 @@ import org.jackhuang.hmcl.api.game.IMinecraftLibrary;
* org.jackhuang.hmcl.core.version.MinecraftVersionManager
* @author huangyuhui
*/
public abstract class IMinecraftProvider {
public abstract class IMinecraftProvider<T extends IMinecraftService> {
protected IMinecraftService service;
protected T service;
public IMinecraftProvider(IMinecraftService service) {
public IMinecraftProvider(T service) {
this.service = service;
}

2
HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftClassicVersion.java
View File

@@ -48,7 +48,7 @@ public class MinecraftClassicVersion extends MinecraftVersion {
}
@Override
public MinecraftVersion resolve(IMinecraftProvider manager, Set<String> resolvedSoFar) {
public MinecraftVersion resolve(IMinecraftProvider<?> manager, Set<String> resolvedSoFar) {
return this;
}

4
HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersion.java
View File

@@ -122,11 +122,11 @@ public class MinecraftVersion implements Cloneable, Comparable<MinecraftVersion>
}
}
public MinecraftVersion resolve(IMinecraftProvider provider) throws GameException {
public MinecraftVersion resolve(IMinecraftProvider<?> provider) throws GameException {
return resolve(provider, new HashSet<>());
}
protected MinecraftVersion resolve(IMinecraftProvider provider, Set<String> resolvedSoFar) throws GameException {
protected MinecraftVersion resolve(IMinecraftProvider<?> provider, Set<String> resolvedSoFar) throws GameException {
if (inheritsFrom == null)
return this;
if (!resolvedSoFar.add(id))

4
HMCLCore/src/main/java/org/jackhuang/hmcl/core/version/MinecraftVersionManager.java
View File

@@ -50,7 +50,7 @@ import org.jackhuang.hmcl.util.ui.SwingUtils;
*
* @author huangyuhui
*/
public class MinecraftVersionManager extends IMinecraftProvider {
public class MinecraftVersionManager<T extends IMinecraftService> extends IMinecraftProvider<T> {
final Map<String, MinecraftVersion> versions = new TreeMap<>();
@@ -58,7 +58,7 @@ public class MinecraftVersionManager extends IMinecraftProvider {
*
* @param p
*/
public MinecraftVersionManager(IMinecraftService p) {
public MinecraftVersionManager(T p) {
super(p);
}