Try and handle removal of mods a bit better. Currently no way to allow a world which has missing

blocks to load - but i have the code in place to allow it i think.
This commit is contained in:
Christian committed 2014-02-08 12:18:34 -05:00
1 parent 064b66af3d
commit c890206268
14 files changed
+204 -70

No files matched your search

@@ -79,9 +79,12 @@ import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.ModMetadata;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.WrongMinecraftVersionException;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent.Action;
import cpw.mods.fml.common.eventhandler.EventBus;
import cpw.mods.fml.common.network.FMLNetworkEvent;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.GameRegistryException;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.common.toposort.ModSortingException;
import cpw.mods.fml.relauncher.Side;
@@ -588,13 +591,21 @@ public class FMLClientHandler implements IFMLSidedHandler
}
else
{
launchIntegratedServerCallback(dirName, saveName);
}
}
public void launchIntegratedServerCallback(String dirName, String saveName)
{
client.func_71371_a(dirName, saveName, (WorldSettings)null);
try
{
client.func_71371_a(dirName, saveName, (WorldSettings)null);
}
catch (GameRegistryException gre)
{
showGuiScreen(new GuiModItemsMissing(gre.getItems(), gre.getMessage()));
}
}
public void showInGameModOptions(GuiIngameMenu guiIngameMenu)
@@ -742,6 +753,7 @@ public class FMLClientHandler implements IFMLSidedHandler
}
private CountDownLatch playClientBlock;
public void setPlayClient(NetHandlerPlayClient netHandlerPlayClient)
{
playClientBlock.countDown();
@@ -776,4 +788,17 @@ public class FMLClientHandler implements IFMLSidedHandler
bus.post(new FMLNetworkEvent.CustomPacketRegistrationEvent<NetHandlerPlayServer>(manager, channelSet, channel, side, NetHandlerPlayServer.class));
}
}
public void setDefaultMissingAction(FMLMissingMappingsEvent.Action action)
{
this.defaultMissingAction = action;
}
private Action defaultMissingAction = FMLMissingMappingsEvent.Action.FAIL;
@Override
public Action getDefaultMissingAction()
{
return defaultMissingAction;
}
}