diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/EntityDestroyEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/EntityDestroyEvent.kt
index ff156558e..90ecd4c95 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/EntityDestroyEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/EntityDestroyEvent.kt
@@ -16,6 +16,7 @@ import de.bixilon.minosoft.data.entities.entities.Entity
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class EntityDestroyEvent(
     connection: PlayConnection,
     val entity: Entity,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/EntitySpawnEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/EntitySpawnEvent.kt
index 5cfe77e9c..a67d7b68d 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/EntitySpawnEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/EntitySpawnEvent.kt
@@ -18,6 +18,7 @@ import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.play.entity.EntityPlayerS2CP
 import de.bixilon.minosoft.protocol.packets.s2c.play.entity.spawn.*
 
+@Deprecated("Observables")
 class EntitySpawnEvent(
     connection: PlayConnection,
     val entity: Entity,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/GameEventChangeEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/GameEventChangeEvent.kt
index 93ffb5382..3f492c22a 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/GameEventChangeEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/GameEventChangeEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEv
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.play.GameEventS2CP
 
+@Deprecated("Observables")
 class GameEventChangeEvent(
     connection: PlayConnection,
     val event: ResourceLocation?,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/InternalMessageReceiveEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/InternalMessageReceiveEvent.kt
index 9658c7b76..fd242295d 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/InternalMessageReceiveEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/InternalMessageReceiveEvent.kt
@@ -16,6 +16,7 @@ import de.bixilon.minosoft.data.chat.message.InternalChatMessage
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("message receive event: InternalMessage")
 class InternalMessageReceiveEvent(
     connection: PlayConnection,
     val message: InternalChatMessage,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/TabListEntryChangeEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/TabListEntryChangeEvent.kt
index ea55294bd..2a828afa2 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/TabListEntryChangeEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/TabListEntryChangeEvent.kt
@@ -18,6 +18,7 @@ import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.play.tab.TabListS2CP
 import java.util.*
 
+@Deprecated("Observables")
 class TabListEntryChangeEvent(
     connection: PlayConnection,
     val items: Map<UUID, AdditionalDataUpdate?>,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarAddEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarAddEvent.kt
index a98b079ae..216df634f 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarAddEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarAddEvent.kt
@@ -16,6 +16,7 @@ import de.bixilon.minosoft.data.bossbar.Bossbar
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import java.util.*
 
+@Deprecated("Observables")
 class BossbarAddEvent(
     connection: PlayConnection,
     uuid: UUID,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarEvent.kt
index 2a6bc7db4..a0b9137e9 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarEvent.kt
@@ -18,6 +18,7 @@ import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEv
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import java.util.*
 
+@Deprecated("Observables")
 abstract class BossbarEvent(
     connection: PlayConnection,
     val uuid: UUID,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarFlagsSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarFlagsSetEvent.kt
index 56048f7e4..ecd26aaf5 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarFlagsSetEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarFlagsSetEvent.kt
@@ -16,6 +16,7 @@ import de.bixilon.minosoft.data.bossbar.Bossbar
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import java.util.*
 
+@Deprecated("Observables")
 class BossbarFlagsSetEvent(
     connection: PlayConnection,
     uuid: UUID,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarRemoveEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarRemoveEvent.kt
index 02842b8fb..d9bbaf342 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarRemoveEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarRemoveEvent.kt
@@ -16,6 +16,7 @@ import de.bixilon.minosoft.data.bossbar.Bossbar
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import java.util.*
 
+@Deprecated("Observables")
 class BossbarRemoveEvent(
     connection: PlayConnection,
     uuid: UUID,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarStyleSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarStyleSetEvent.kt
index 6a71e1810..f97833afc 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarStyleSetEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarStyleSetEvent.kt
@@ -16,6 +16,7 @@ import de.bixilon.minosoft.data.bossbar.Bossbar
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import java.util.*
 
+@Deprecated("Observables")
 class BossbarStyleSetEvent(
     connection: PlayConnection,
     uuid: UUID,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarTitleSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarTitleSetEvent.kt
index 8dffc63b2..bf84832c6 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarTitleSetEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarTitleSetEvent.kt
@@ -16,6 +16,7 @@ import de.bixilon.minosoft.data.bossbar.Bossbar
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import java.util.*
 
+@Deprecated("Observables")
 class BossbarTitleSetEvent(
     connection: PlayConnection,
     uuid: UUID,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarValueSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarValueSetEvent.kt
index 97108fece..2c465991a 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarValueSetEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/bossbar/BossbarValueSetEvent.kt
@@ -16,6 +16,7 @@ import de.bixilon.minosoft.data.bossbar.Bossbar
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import java.util.*
 
+@Deprecated("Observables")
 class BossbarValueSetEvent(
     connection: PlayConnection,
     uuid: UUID,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ObjectivePositionSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ObjectivePositionSetEvent.kt
index 0180439a1..b65cd0530 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ObjectivePositionSetEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ObjectivePositionSetEvent.kt
@@ -18,6 +18,7 @@ import de.bixilon.minosoft.data.scoreboard.ScoreboardPositions
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class ObjectivePositionSetEvent(
     connection: PlayConnection,
     val position: ScoreboardPositions,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreTeamChangeEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreTeamChangeEvent.kt
index 59a03ed67..fdff135ba 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreTeamChangeEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreTeamChangeEvent.kt
@@ -19,6 +19,7 @@ import de.bixilon.minosoft.data.scoreboard.Team
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class ScoreTeamChangeEvent(
     connection: PlayConnection,
     val objective: ScoreboardObjective,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardObjectiveCreateEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardObjectiveCreateEvent.kt
index 9d44b9acb..e9d472aa8 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardObjectiveCreateEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardObjectiveCreateEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.ScoreboardObjective
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class ScoreboardObjectiveCreateEvent(
     connection: PlayConnection,
     val objective: ScoreboardObjective,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardObjectiveUpdateEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardObjectiveUpdateEvent.kt
index d429b1d51..128dfc94f 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardObjectiveUpdateEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardObjectiveUpdateEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.ScoreboardObjective
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class ScoreboardObjectiveUpdateEvent(
     connection: PlayConnection,
     val objective: ScoreboardObjective,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardScorePutEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardScorePutEvent.kt
index 3d063cd7c..dbfeab935 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardScorePutEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardScorePutEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.ScoreboardScore
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class ScoreboardScorePutEvent(
     connection: PlayConnection,
     val score: ScoreboardScore,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardScoreRemoveEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardScoreRemoveEvent.kt
index 5eec94203..4782f2d91 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardScoreRemoveEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardScoreRemoveEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.ScoreboardScore
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class ScoreboardScoreRemoveEvent(
     connection: PlayConnection,
     val score: ScoreboardScore,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardTeamMemberEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardTeamMemberEvent.kt
index 409f81145..a123ce776 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardTeamMemberEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardTeamMemberEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.Team
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 abstract class ScoreboardTeamMemberEvent(
     connection: PlayConnection,
     val team: Team,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardTeamRemoveEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardTeamRemoveEvent.kt
index cf5f6fd5d..f36cf2e7e 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardTeamRemoveEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/ScoreboardTeamRemoveEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.Team
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class ScoreboardTeamRemoveEvent(
     connection: PlayConnection,
     val team: Team,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamCreateEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamCreateEvent.kt
index 8cb1af991..6f0f11b56 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamCreateEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamCreateEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.Team
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class TeamCreateEvent(
     connection: PlayConnection,
     val team: Team,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamMemberAddEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamMemberAddEvent.kt
index 72a02ec4a..56fc0ffe2 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamMemberAddEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamMemberAddEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.Team
 import de.bixilon.minosoft.modding.event.events.scoreboard.ScoreboardTeamMemberEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class TeamMemberAddEvent(
     connection: PlayConnection,
     team: Team,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamMemberRemoveEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamMemberRemoveEvent.kt
index eb4a68801..16f377f6e 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamMemberRemoveEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamMemberRemoveEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.Team
 import de.bixilon.minosoft.modding.event.events.scoreboard.ScoreboardTeamMemberEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class TeamMemberRemoveEvent(
     connection: PlayConnection,
     team: Team,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamUpdateEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamUpdateEvent.kt
index 142f7b452..2713dd6fc 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamUpdateEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/scoreboard/team/TeamUpdateEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.scoreboard.Team
 import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEvent
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 
+@Deprecated("Observables")
 class TeamUpdateEvent(
     connection: PlayConnection,
     val team: Team,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleSetEvent.kt
index b60c0465c..5b660d1c3 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleSetEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleSetEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEv
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.play.title.TitleTextS2CP
 
+@Deprecated("Observables")
 class TitleSetEvent(
     connection: PlayConnection,
     val title: ChatComponent,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleSubtitleSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleSubtitleSetEvent.kt
index 637675697..3aed6620a 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleSubtitleSetEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleSubtitleSetEvent.kt
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEv
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.play.title.SubtitleS2CP
 
+@Deprecated("Observables")
 class TitleSubtitleSetEvent(
     connection: PlayConnection,
     val subtitle: ChatComponent,
diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleTimesSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleTimesSetEvent.kt
index f302b2fbe..6198e7a9a 100644
--- a/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleTimesSetEvent.kt
+++ b/src/main/java/de/bixilon/minosoft/modding/event/events/title/TitleTimesSetEvent.kt
@@ -16,6 +16,7 @@ import de.bixilon.minosoft.modding.event.events.connection.play.PlayConnectionEv
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.play.title.TitleTimesS2CP
 
+@Deprecated("Observables")
 class TitleTimesSetEvent(
     connection: PlayConnection,
     val fadeInTime: Int,