keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Revert "Shut down all other mod handlers if the loading cycle errors. This prevents other mods from throwing errors and being blamed for initial cause. This is a temporary hack until cpw re-writes the mod event dispatcher."

Browse source 
This reverts commit 7592bbe8

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2020-07-28 19:17:29 -04:00
parent 7592bbe87e
commit 19a38f5cb9
No known key found for this signature in database
GPG key ID: 8EB3DF749553B1B7
3 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/net/minecraftforge/fml/ModContainer.java
View file

@ -104,7 +104,6 @@ public abstract class ModContainer
*/ */
public final void transitionState(LifecycleEventProvider.LifecycleEvent event, Consumer<List<ModLoadingException>> errorHandler) public final void transitionState(LifecycleEventProvider.LifecycleEvent event, Consumer<List<ModLoadingException>> errorHandler)
{ {
if (shutdown) return; //TODO: Remove
if (modLoadingStage == event.fromStage()) if (modLoadingStage == event.fromStage())
{ {
try try
@ -166,11 +165,4 @@ public abstract class ModContainer
* @param e Event to accept * @param e Event to accept
*/ */
protected void acceptEvent(Event e) {} protected void acceptEvent(Event e) {}
//TEMPORARY INTERNAL FUNCTION UNTIL net.minecraftforge.fml.ModList.dispatchParallelEvent is fixed.
@Deprecated protected boolean shutdown = false;
@Deprecated protected void shutdown()
{
this.shutdown = true;
}
} }

1
src/main/java/net/minecraftforge/fml/ModList.java
View file

@ -141,7 +141,6 @@ public class ModList
catch (InterruptedException | ExecutionException e) catch (InterruptedException | ExecutionException e)
{ {
LOGGER.error(LOADING, "Encountered an exception during parallel processing - sleeping 10 seconds to wait for jobs to finish", e); LOGGER.error(LOADING, "Encountered an exception during parallel processing - sleeping 10 seconds to wait for jobs to finish", e);
this.mods.forEach(ModContainer::shutdown); //Prevent all future events from being sent out.
errorHandler.accept(Collections.singletonList(new UncaughtModLoadingException(lifecycleEvent.fromStage(), e))); errorHandler.accept(Collections.singletonList(new UncaughtModLoadingException(lifecycleEvent.fromStage(), e)));
modLoadingThreadPool.awaitQuiescence(10, TimeUnit.SECONDS); modLoadingThreadPool.awaitQuiescence(10, TimeUnit.SECONDS);
if (!modLoadingThreadPool.isQuiescent()) { if (!modLoadingThreadPool.isQuiescent()) {

1
src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java
View file

@ -171,7 +171,6 @@ public class FMLModContainer extends ModContainer
@Override @Override
protected void acceptEvent(final Event e) protected void acceptEvent(final Event e)
{ {
if (this.shutdown) return;
this.eventBus.post(e); this.eventBus.post(e);
} }