diff --git a/build.gradle b/build.gradle
index 3d1eab1460..6bdc57ab06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -272,7 +272,7 @@ project(':forge') {
         installer 'org.ow2.asm:asm-tree:6.2'
         installer 'cpw.mods:modlauncher:0.9.+'
         installer 'net.minecraftforge:accesstransformers:0.14.+:shadowed'
-        installer 'net.minecraftforge:eventbus:0.6.+:service'
+        installer 'net.minecraftforge:eventbus:0.7.+:service'
         installer 'net.minecraftforge:forgespi:0.6.+'
         installer 'net.minecraftforge:coremods:0.2.+'
         installer 'com.electronwill.night-config:core:3.4.2'
diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java
index 5715417a3a..8e23be35d1 100644
--- a/src/main/java/net/minecraftforge/common/MinecraftForge.java
+++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java
@@ -19,6 +19,7 @@
 
 package net.minecraftforge.common;
 
+import net.minecraftforge.eventbus.api.BusBuilder;
 import net.minecraftforge.eventbus.api.IEventBus;
 
 import net.minecraft.crash.CrashReport;
@@ -42,7 +43,7 @@ public class MinecraftForge
      * ORE_GEN_BUS for ore gen events
      * EVENT_BUS for everything else
      */
-    public static final IEventBus EVENT_BUS = IEventBus.create();
+    public static final IEventBus EVENT_BUS = BusBuilder.builder().build();
 
     static final ForgeInternalHandler INTERNAL_HANDLER = new ForgeInternalHandler();
     private static final Logger LOGGER = LogManager.getLogger();
diff --git a/src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java b/src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java
index fa0c797f83..b580d4355b 100644
--- a/src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java
+++ b/src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java
@@ -20,8 +20,6 @@
 package net.minecraftforge.fml;
 
 import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.lifecycle.ModLifecycleEvent;
-import net.minecraftforge.fml.javafmlmod.FMLModContainer;
 import net.minecraftforge.forgespi.language.ILifecycleEvent;
 
 import java.util.List;
diff --git a/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java b/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java
index 8bf6be4e30..750a0a891b 100644
--- a/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java
+++ b/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java
@@ -20,6 +20,7 @@
 package net.minecraftforge.fml.javafmlmod;
 
 import net.minecraftforge.eventbus.EventBusErrorMessage;
+import net.minecraftforge.eventbus.api.BusBuilder;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.IEventListener;
@@ -28,7 +29,6 @@ import net.minecraftforge.fml.LifecycleEventProvider;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.ModLoadingException;
 import net.minecraftforge.fml.ModLoadingStage;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 
@@ -61,7 +61,7 @@ public class FMLModContainer extends ModContainer
         triggerMap.put(ModLoadingStage.ENQUEUE_IMC, dummy().andThen(this::beforeEvent).andThen(this::initMod).andThen(this::fireEvent).andThen(this::afterEvent));
         triggerMap.put(ModLoadingStage.PROCESS_IMC, dummy().andThen(this::beforeEvent).andThen(this::fireEvent).andThen(this::afterEvent));
         triggerMap.put(ModLoadingStage.COMPLETE, dummy().andThen(this::beforeEvent).andThen(this::completeLoading).andThen(this::fireEvent).andThen(this::afterEvent));
-        this.eventBus = IEventBus.create(this::onEventFailed);
+        this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).build();
         this.configHandler = Optional.of(event -> this.eventBus.post(event));
         final FMLJavaModLoadingContext contextExtension = new FMLJavaModLoadingContext(this);
         this.contextExtension = () -> contextExtension;
diff --git a/src/main/java/net/minecraftforge/fml/network/NetworkInstance.java b/src/main/java/net/minecraftforge/fml/network/NetworkInstance.java
index 1635611ad3..30f9ddec4a 100644
--- a/src/main/java/net/minecraftforge/fml/network/NetworkInstance.java
+++ b/src/main/java/net/minecraftforge/fml/network/NetworkInstance.java
@@ -20,12 +20,11 @@
 package net.minecraftforge.fml.network;
 
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.eventbus.api.BusBuilder;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.IEventListener;
-import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -51,7 +50,7 @@ public class NetworkInstance
         this.networkProtocolVersion = networkProtocolVersion.get();
         this.clientAcceptedVersions = clientAcceptedVersions;
         this.serverAcceptedVersions = serverAcceptedVersions;
-        this.networkEventBus = IEventBus.create(this::handleError);
+        this.networkEventBus = BusBuilder.builder().setExceptionHandler(this::handleError).build();
     }
 
     private void handleError(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable)