From 0d6a9a0269be9538a9f86cbb70ea865e20bf5b70 Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Mon, 1 Mar 2021 11:20:33 -0600
Subject: [PATCH] Bump to Bevy main.

---
 Cargo.toml |  2 +-
 src/lib.rs | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e417c37..ea62677 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 alto = "3"
 anyhow = "1"
-bevy = "0.4"
+bevy = { git = "https://github.com/bevyengine/bevy" }
 claxon = "0.4"
 hound = "3"
 lewton = "0.10"
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index 354d056..8037c4f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -107,11 +107,10 @@ struct Buffers(HashMap<HandleId, Arc<alto::Buffer>>);
 fn buffer_creation(
     context: Res<Context>,
     mut buffers: ResMut<Buffers>,
-    mut event_reader: Local<EventReader<AssetEvent<Buffer>>>,
-    events: Res<Events<AssetEvent<Buffer>>>,
+    mut events: EventReader<AssetEvent<Buffer>>,
     assets: Res<Assets<Buffer>>,
 ) {
-    for event in event_reader.iter(&events) {
+    for event in events.iter() {
         match event {
             AssetEvent::Created { handle } => {
                 if let Some(buffer) = assets.get(handle) {
@@ -358,10 +357,10 @@ impl Plugin for OpenAlPlugin {
         let context = device.new_context(None).expect("Could not create context");
         app.add_asset::<Buffer>()
             .init_asset_loader::<BufferAssetLoader>()
-            .add_thread_local_resource(device)
-            .add_resource(context)
-            .add_resource(Buffers::default())
-            .add_resource(GlobalEffects::default())
+            .insert_non_send_resource(device)
+            .insert_resource(context)
+            .insert_resource(Buffers::default())
+            .insert_resource(GlobalEffects::default())
             .register_type::<Listener>()
             .add_system(buffer_creation.system())
             .add_system(source_update.system())