Moving some stuff around, network and server events.

This commit is contained in:
cpw authored and LexManos committed 2018-09-05 12:37:20 -07:00
1 parent 689ebd8036
commit 6e99f84e91
21 files changed
+190 -491

No files matched your search

@@ -19,7 +19,7 @@
package net.minecraftforge.fml.loading;
import com.electronwill.nightconfig.core.path.PathConfig;
import com.electronwill.nightconfig.core.file.FileConfig;
import net.minecraftforge.fml.language.IModInfo;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
@@ -31,12 +31,12 @@ import java.util.List;
public class DefaultModInfos
{
static {
PathConfig minecraftmod;
PathConfig forgemod;
FileConfig minecraftmod;
FileConfig forgemod;
try
{
minecraftmod = PathConfig.of(Paths.get(DefaultModInfos.class.getClassLoader().getResource("minecraftmod.toml").toURI()));
forgemod = PathConfig.of(Paths.get(DefaultModInfos.class.getClassLoader().getResource("forgemod.toml").toURI()));
minecraftmod = FileConfig.of(Paths.get(DefaultModInfos.class.getClassLoader().getResource("minecraftmod.toml").toURI()));
forgemod = FileConfig.of(Paths.get(DefaultModInfos.class.getClassLoader().getResource("forgemod.toml").toURI()));
minecraftmod.load();
forgemod.load();
}
@@ -26,12 +26,12 @@ import net.minecraftforge.api.distmarker.Dist;
import java.nio.file.Path;
import java.util.concurrent.Callable;
public class FMLLaunchProvider extends FMLCommonLaunchHandler implements ILaunchHandlerService
public class FMLClientLaunchProvider extends FMLCommonLaunchHandler implements ILaunchHandlerService
{
@Override
public String name()
{
return "fml";
return "fmlclient";
}
@Override
@@ -40,7 +40,7 @@ public class FMLDevClientLaunchProvider extends FMLCommonLaunchHandler implement
@Override
public String name()
{
return "devfmlclient";
return "fmldevclient";
}
private static final List<String> SKIPPACKAGES = Arrays.asList(
@@ -40,7 +40,7 @@ public class FMLDevServerLaunchProvider extends FMLCommonLaunchHandler implement
@Override
public String name()
{
return "devfmlserver";
return "fmldevserver";
}
private static final List<String> SKIPPACKAGES = Arrays.asList(
@@ -19,7 +19,7 @@
package net.minecraftforge.fml.loading.moddiscovery;
import com.electronwill.nightconfig.core.path.PathConfig;
import com.electronwill.nightconfig.core.file.FileConfig;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import net.minecraftforge.fml.language.IModFileInfo;
@@ -49,10 +49,10 @@ public class ModFileParser {
public static IModFileInfo loadModFile(final ModFile file, final Path modsjson)
{
final PathConfig pathConfig = PathConfig.builder(modsjson).build();
pathConfig.load();
pathConfig.close();
return new ModFileInfo(file, pathConfig);
final FileConfig fileConfig = FileConfig.builder(modsjson).build();
fileConfig.load();
fileConfig.close();
return new ModFileInfo(file, fileConfig);
}
protected static List<CoreModFile> getCoreMods(final ModFile modFile) {