Fix failing to load a world with missing mod blocks and items. There will be a way to force worlds to load

when stuff is missing, but for right now, it will fail as this is "world safe".
This commit is contained in:
Christian committed 2014-02-08 22:37:40 -05:00
1 parent c890206268
commit 995c204338
6 files changed
+142 -20

No files matched your search

@@ -21,7 +21,9 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
@@ -69,6 +71,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.DummyModContainer;
import cpw.mods.fml.common.DuplicateModsFoundException;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLContainer;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.IFMLSidedHandler;
import cpw.mods.fml.common.Loader;
@@ -78,6 +81,7 @@ import cpw.mods.fml.common.MissingModsException;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.ModMetadata;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.WorldAccessContainer;
import cpw.mods.fml.common.WrongMinecraftVersionException;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent.Action;
@@ -596,16 +600,35 @@ public class FMLClientHandler implements IFMLSidedHandler
}
}
private CountDownLatch gameReleaseLatch;
private Thread clientWaiter;
private GameRegistryException gre;
public void launchIntegratedServerCallback(String dirName, String saveName)
{
try
{
client.func_71371_a(dirName, saveName, (WorldSettings)null);
try
{
Thread.interrupted();
gameReleaseLatch = new CountDownLatch(1);
clientWaiter = Thread.currentThread();
client.func_71371_a(dirName, saveName, (WorldSettings)null);
System.out.printf("POKEE %b\n", Thread.currentThread().isInterrupted());
gameReleaseLatch.await();
}
catch (InterruptedException ie)
{
Thread.interrupted();
throw gre;
}
}
catch (GameRegistryException gre)
{
client.func_71403_a(null);
showGuiScreen(new GuiModItemsMissing(gre.getItems(), gre.getMessage()));
}
Thread.interrupted();
}
public void showInGameModOptions(GuiIngameMenu guiIngameMenu)
@@ -801,4 +824,52 @@ public class FMLClientHandler implements IFMLSidedHandler
{
return defaultMissingAction;
}
@Override
public void serverLoadedSuccessfully()
{
if (gameReleaseLatch!=null)
{
gameReleaseLatch.countDown();
}
}
@Override
public void failedServerLoading(RuntimeException ex, WorldAccessContainer wac)
{
if (wac instanceof FMLContainer && ex instanceof GameRegistryException)
{
try
{
gre = (GameRegistryException) ex;
Executors.newSingleThreadExecutor().submit(new Callable<Void>()
{
@Override
public Void call() throws Exception
{
System.err.println("POKE");
clientWaiter.interrupt();
Thread.sleep(50);
System.err.println("POKE");
clientWaiter.interrupt();
Thread.sleep(50);
System.err.println("POKE");
clientWaiter.interrupt();
return null;
}
});
}
catch (Throwable t)
{
FMLLog.log(Level.ERROR, t, "stuff");
}
}
}
public boolean handlingCrash(CrashReport report)
{
return report.func_71505_b() instanceof GameRegistryException;
}
}
@@ -266,6 +266,7 @@ public class FMLCommonHandler
public boolean handleServerStarting(MinecraftServer server)
{
sidedDelegate.serverLoadedSuccessfully();
return Loader.instance().serverStarting(server);
}
@@ -380,7 +381,15 @@ public class FMLCommonHandler
WorldAccessContainer wac = ((InjectedModContainer)mc).getWrappedWorldAccessContainer();
if (wac != null)
{
wac.readData(handler, worldInfo, additionalProperties, tagCompound.func_74775_l(mc.getModId()));
try
{
wac.readData(handler, worldInfo, additionalProperties, tagCompound.func_74775_l(mc.getModId()));
}
catch (RuntimeException ex)
{
sidedDelegate.failedServerLoading(ex, wac);
throw ex;
}
}
}
}
@@ -57,4 +57,8 @@ public interface IFMLSidedHandler
void fireNetRegistrationEvent(EventBus bus, NetworkManager manager, Set<String> channelSet, String channel, Side side);
FMLMissingMappingsEvent.Action getDefaultMissingAction();
void serverLoadedSuccessfully();
void failedServerLoading(RuntimeException ex, WorldAccessContainer wac);
}
@@ -23,6 +23,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.IFMLSidedHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.WorldAccessContainer;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.eventhandler.EventBus;
import cpw.mods.fml.common.network.FMLNetworkEvent;
@@ -185,4 +186,14 @@ public class FMLServerHandler implements IFMLSidedHandler
{
return FMLMissingMappingsEvent.Action.valueOf(System.getProperty("fml.missingBlockAction", "FAIL"));
}
@Override
public void serverLoadedSuccessfully()
{
}
@Override
public void failedServerLoading(RuntimeException ex, WorldAccessContainer wac)
{
}
}