Things. they work. Obviously still WAY more to do.

This commit is contained in:
cpw authored and LexManos committed 2018-09-05 11:53:54 -07:00
1 parent 1b1ee6f0b8
commit baa9dfe55a
95 files changed
+852 -786

No files matched your search

@@ -27,7 +27,7 @@ import net.minecraft.client.resources.IResourcePack;
import net.minecraft.client.resources.data.MetadataSerializer;
import net.minecraftforge.fml.SidedProvider;
import net.minecraftforge.fml.VersionChecker;
import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.fml.ModLoader;
import org.lwjgl.input.Mouse;
import java.io.IOException;
@@ -46,7 +46,7 @@ public class ClientModLoader
{
SidedProvider.setClient(()->minecraft);
SplashProgress.start();
FMLLoader.getModLoader().loadMods();
ModLoader.get().loadMods();
minecraft.refreshResources();
}
@@ -21,7 +21,8 @@ package net.minecraftforge.fml.client;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.fml.loading.ModList;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.language.ExtensionPoint;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import java.util.Optional;
@@ -31,6 +32,7 @@ public class ConfigGuiHandler
{
public static Optional<BiFunction<Minecraft, GuiScreen, GuiScreen>> getGuiFactoryFor(ModInfo selectedMod)
{
return ModList.get().getModContainerById(selectedMod.getModId()).map(mc->mc.getCustomExtension("customGuiFactory"));
return ModList.get().getModContainerById(selectedMod.getModId()).
flatMap(mc -> mc.getCustomExtension(ExtensionPoint.GUIFACTORY));
}
}
@@ -24,7 +24,7 @@ import java.util.Set;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.fml.client.config.GuiConfig;
import net.minecraftforge.fml.language.ModContainer;
import net.minecraftforge.fml.ModContainer;
public class DefaultGuiFactory implements IModGuiFactory
{
@@ -101,7 +101,7 @@ import net.minecraftforge.fml.common.LoaderException;
import net.minecraftforge.fml.common.MetadataCollection;
import net.minecraftforge.fml.common.MissingModsException;
import net.minecraftforge.fml.common.MultipleModsErrored;
import net.minecraftforge.fml.language.ModContainer;
import net.minecraftforge.fml.ModContainer;
import net.minecraftforge.fml.common.ModMetadata;
import net.minecraftforge.fml.common.StartupQuery;
import net.minecraftforge.fml.common.WrongMinecraftVersionException;
@@ -32,7 +32,7 @@ import javax.imageio.ImageIO;
import net.minecraft.client.resources.FileResourcePack;
import net.minecraftforge.fml.common.FMLContainerHolder;
import net.minecraftforge.fml.language.ModContainer;
import net.minecraftforge.fml.ModContainer;
public class FMLFileResourcePack extends FileResourcePack implements FMLContainerHolder {
@@ -32,7 +32,7 @@ import javax.imageio.ImageIO;
import net.minecraft.client.resources.FolderResourcePack;
import net.minecraftforge.fml.common.FMLContainerHolder;
import net.minecraftforge.fml.language.ModContainer;
import net.minecraftforge.fml.ModContainer;
public class FMLFolderResourcePack extends FolderResourcePack implements FMLContainerHolder {
@@ -20,7 +20,7 @@
package net.minecraftforge.fml.client;
import net.minecraftforge.fml.common.DuplicateModsFoundException;
import net.minecraftforge.fml.language.ModContainer;
import net.minecraftforge.fml.ModContainer;
import java.io.File;
import java.util.Map.Entry;
@@ -20,7 +20,7 @@
package net.minecraftforge.fml.client;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.fml.language.ModContainer;
import net.minecraftforge.fml.ModContainer;
import net.minecraftforge.fml.common.toposort.ModSortingException;
import net.minecraftforge.fml.common.toposort.ModSortingException.SortingExceptionData;
@@ -33,7 +33,7 @@ import net.minecraft.client.resources.IResourcePack;
import net.minecraft.client.resources.SimpleReloadableResourceManager;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.FMLContainerHolder;
import net.minecraftforge.fml.language.ModContainer;
import net.minecraftforge.fml.ModContainer;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -37,7 +37,7 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.language.ModContainer;
import net.minecraftforge.fml.ModContainer;
import org.lwjgl.input.Keyboard;
@@ -52,16 +52,16 @@ import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.VersionChecker;
import net.minecraftforge.fml.client.ConfigGuiHandler;
import net.minecraftforge.fml.client.ResourcePackLoader;
import net.minecraftforge.fml.language.ModContainer;
import net.minecraftforge.fml.ModContainer;
import net.minecraftforge.fml.common.versioning.ComparableVersion;
import static net.minecraft.util.StringUtils.stripControlCodes;
import net.minecraftforge.fml.language.IModInfo;
import net.minecraftforge.fml.loading.ModList;
import net.minecraftforge.fml.loading.StringUtils;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import org.apache.commons.lang3.tuple.Pair;