diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..79e2701
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.gradle
+.idea
+gradle
+run
+build
\ No newline at end of file
diff --git a/README.md b/README.md
index 834005c..264cf0e 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # SongPlayer
-A Fabric mod for Minecraft that plays noteblocks. The current version is for Minecraft 1.17.
+A Fabric mod for Minecraft that plays noteblocks. The current version is for Minecraft 1.18.x.
 
 # How to use
-The mod is in build/lib/song-player-1.1.0.jar. There will also be a releases section where you can grab my mod from.
+You can grab the jar from releases.
 
 This mod requires fabric api.
 
@@ -49,13 +49,8 @@ By default, the client uses /gms to go into survival mode. However, /gms does no
 Toggles whether a fake player will show up to represent your true position while playing a song. When playing a song, since it automatically enables freecam, your true position will be different from your apparent position. The fake player will show where you actually are. By default, this is disabled.
 
 # Mechanism
-SongPlayer places noteblocks with nbt and instrument data already in them, so the noteblocks do not need to be individually tuned. Ayunami2000 had previously done a proof-of-concept of this method.
+SongPlayer places noteblocks with nbt and instrument data already in them, so the noteblocks do not need to be individually tuned. Ayunami2000 has previously done a proof-of-concept of this method.
 
 My client will automatically detect what noteblocks are needed and place them automatically before each song is played, which makes playing songs quite easy. The only drawback is that you need to be able to switch between creative and survival mode, which my client will attempt to do automatically.
 
 When playing a song, freecam is enabled. You will be able to move around freely, but in reality you are only moving your camera while your player stays at the center of the noteblocks. This is because noteblocks can only be played if you're within reach distance of them, so you have to stand at the center of the noteblocks to play them, but it's still nice to be able to move around while your song is playing.
-
-# 1.17 Support
-I was pretty late to update my client to 1.17, so Ayunami2000 decided to do it for me, which is pretty neat. You can see their repo here: https://github.com/ayunami2000/SongPlayer-1.17. At the moment of writing this however, they don't seem to have updated the noteblock base id, which would make the client get the notes wrong, so I don't recommend using it.
-
-I've updated SongPlayer to 1.17 myself now so you can get it from here.
diff --git a/build.gradle b/build.gradle
index f807b77..2b7a845 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,9 @@
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
-	id 'maven-publish'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -40,14 +39,8 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// ensure that the encoding is set to UTF-8, no matter what the system default is
-	// this fixes some edge cases with special characters not displaying correctly
-	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-	// If Javadoc is generated, this must be specified in that task too.
-	it.options.encoding = "UTF-8"
-
-	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 16
+	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	it.options.release = 17
 }
 
 java {
@@ -62,26 +55,3 @@ jar {
 		rename { "${it}_${project.archivesBaseName}"}
 	}
 }
-
-// configure the maven publication
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			// add all the jars that should be included when publishing to maven
-			artifact(remapJar) {
-				builtBy remapJar
-			}
-			artifact(sourcesJar) {
-				builtBy remapSourcesJar
-			}
-		}
-	}
-
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-	repositories {
-		// Add repositories to publish to here.
-		// Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
-	}
-}
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$1.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$1.class
deleted file mode 100644
index b1c0c9f..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$1.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$Command.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$Command.class
deleted file mode 100644
index ba7630b..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$Command.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$currentCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$currentCommand.class
deleted file mode 100644
index 77f96db..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$currentCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$gotoCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$gotoCommand.class
deleted file mode 100644
index 3e833a4..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$gotoCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$helpCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$helpCommand.class
deleted file mode 100644
index dc6f3d0..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$helpCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$loopCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$loopCommand.class
deleted file mode 100644
index 0806161..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$loopCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$playCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$playCommand.class
deleted file mode 100644
index 69f2e6a..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$playCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$playurlCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$playurlCommand.class
deleted file mode 100644
index fb4fd5a..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$playurlCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$setCreativeCommandCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$setCreativeCommandCommand.class
deleted file mode 100644
index 4b79d81..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$setCreativeCommandCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$setSurvivalCommandCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$setSurvivalCommandCommand.class
deleted file mode 100644
index d26c172..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$setSurvivalCommandCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$songsCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$songsCommand.class
deleted file mode 100644
index fb63079..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$songsCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$stopCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$stopCommand.class
deleted file mode 100644
index 8e1c5f1..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$stopCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$toggleFakePlayerCommand.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$toggleFakePlayerCommand.class
deleted file mode 100644
index 8d6f0c0..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor$toggleFakePlayerCommand.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor.class
deleted file mode 100644
index de7447f..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/CommandProcessor.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/FakePlayerEntity.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/FakePlayerEntity.class
deleted file mode 100644
index 4209fff..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/FakePlayerEntity.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/Freecam.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/Freecam.class
deleted file mode 100644
index fc21f49..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/Freecam.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/SongPlayer$Mode.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/SongPlayer$Mode.class
deleted file mode 100644
index ac40cb6..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/SongPlayer$Mode.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/SongPlayer.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/SongPlayer.class
deleted file mode 100644
index 2b8f31e..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/SongPlayer.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin.class
deleted file mode 100644
index 128d200..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/ClientPlayerEntityMixin.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/ClientPlayerEntityMixin.class
deleted file mode 100644
index 2873b78..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/ClientPlayerEntityMixin.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/KeyboardMixin.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/KeyboardMixin.class
deleted file mode 100644
index 834743a..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/KeyboardMixin.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/MinecraftClientMixin.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/MinecraftClientMixin.class
deleted file mode 100644
index c888648..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/mixin/MinecraftClientMixin.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/noteblocks/BuildingThread.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/noteblocks/BuildingThread.class
deleted file mode 100644
index 55ca151..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/noteblocks/BuildingThread.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/noteblocks/PlayingThread.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/noteblocks/PlayingThread.class
deleted file mode 100644
index 10108c6..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/noteblocks/PlayingThread.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/noteblocks/Stage.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/noteblocks/Stage.class
deleted file mode 100644
index 47dc9d1..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/noteblocks/Stage.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/DownloadingThread.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/DownloadingThread.class
deleted file mode 100644
index 5609d63..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/DownloadingThread.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/MidiConverter$1.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/MidiConverter$1.class
deleted file mode 100644
index f7f0029..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/MidiConverter$1.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/MidiConverter.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/MidiConverter.class
deleted file mode 100644
index aec6774..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/MidiConverter.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/NoteEvent.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/NoteEvent.class
deleted file mode 100644
index 31892d4..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/NoteEvent.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/Song$DefaultTrustManager.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/Song$DefaultTrustManager.class
deleted file mode 100644
index 737465d..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/Song$DefaultTrustManager.class and /dev/null differ
diff --git a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/Song.class b/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/Song.class
deleted file mode 100644
index 6173ec2..0000000
Binary files a/build/classes/java/main/com/github/hhhzzzsss/songplayer/song/Song.class and /dev/null differ
diff --git a/build/classes/java/main/song-player-refmap.json b/build/classes/java/main/song-player-refmap.json
deleted file mode 100644
index 329cbce..0000000
--- a/build/classes/java/main/song-player-refmap.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "mappings": {
-    "com/github/hhhzzzsss/songplayer/mixin/KeyboardMixin": {
-      "onKey(JIIII)V": "Lnet/minecraft/class_309;method_1466(JIIII)V"
-    },
-    "com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin": {
-      "sendPacket(Lnet/minecraft/network/Packet;)V": "Lnet/minecraft/class_634;method_2883(Lnet/minecraft/class_2596;)V",
-      "onBlockUpdate(Lnet/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket;)V": "Lnet/minecraft/class_634;method_11136(Lnet/minecraft/class_2626;)V",
-      "onGameJoin(Lnet/minecraft/network/packet/s2c/play/GameJoinS2CPacket;)V": "Lnet/minecraft/class_634;method_11120(Lnet/minecraft/class_2678;)V"
-    },
-    "com/github/hhhzzzsss/songplayer/mixin/ClientPlayerEntityMixin": {
-      "sendChatMessage(Ljava/lang/String;)V": "Lnet/minecraft/class_746;method_3142(Ljava/lang/String;)V"
-    },
-    "com/github/hhhzzzsss/songplayer/mixin/MinecraftClientMixin": {
-      "doItemUse()V": "Lnet/minecraft/class_310;method_1583()V"
-    }
-  },
-  "data": {
-    "named:intermediary": {
-      "com/github/hhhzzzsss/songplayer/mixin/KeyboardMixin": {
-        "onKey(JIIII)V": "Lnet/minecraft/class_309;method_1466(JIIII)V"
-      },
-      "com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin": {
-        "sendPacket(Lnet/minecraft/network/Packet;)V": "Lnet/minecraft/class_634;method_2883(Lnet/minecraft/class_2596;)V",
-        "onBlockUpdate(Lnet/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket;)V": "Lnet/minecraft/class_634;method_11136(Lnet/minecraft/class_2626;)V",
-        "onGameJoin(Lnet/minecraft/network/packet/s2c/play/GameJoinS2CPacket;)V": "Lnet/minecraft/class_634;method_11120(Lnet/minecraft/class_2678;)V"
-      },
-      "com/github/hhhzzzsss/songplayer/mixin/ClientPlayerEntityMixin": {
-        "sendChatMessage(Ljava/lang/String;)V": "Lnet/minecraft/class_746;method_3142(Ljava/lang/String;)V"
-      },
-      "com/github/hhhzzzsss/songplayer/mixin/MinecraftClientMixin": {
-        "doItemUse()V": "Lnet/minecraft/class_310;method_1583()V"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/build/libs/song-player-1.0.0-dev.jar b/build/libs/song-player-1.0.0-dev.jar
deleted file mode 100644
index c2c3fa8..0000000
Binary files a/build/libs/song-player-1.0.0-dev.jar and /dev/null differ
diff --git a/build/libs/song-player-1.0.0-sources-dev.jar b/build/libs/song-player-1.0.0-sources-dev.jar
deleted file mode 100644
index 016487f..0000000
Binary files a/build/libs/song-player-1.0.0-sources-dev.jar and /dev/null differ
diff --git a/build/libs/song-player-1.0.0-sources.jar b/build/libs/song-player-1.0.0-sources.jar
deleted file mode 100644
index 72bf674..0000000
Binary files a/build/libs/song-player-1.0.0-sources.jar and /dev/null differ
diff --git a/build/libs/song-player-1.0.0.jar b/build/libs/song-player-1.0.0.jar
deleted file mode 100644
index 93a763a..0000000
Binary files a/build/libs/song-player-1.0.0.jar and /dev/null differ
diff --git a/build/libs/song-player-1.1.0-dev.jar b/build/libs/song-player-1.1.0-dev.jar
deleted file mode 100644
index 4f0e000..0000000
Binary files a/build/libs/song-player-1.1.0-dev.jar and /dev/null differ
diff --git a/build/libs/song-player-1.1.0-sources-dev.jar b/build/libs/song-player-1.1.0-sources-dev.jar
deleted file mode 100644
index 14def29..0000000
Binary files a/build/libs/song-player-1.1.0-sources-dev.jar and /dev/null differ
diff --git a/build/libs/song-player-1.1.0-sources.jar b/build/libs/song-player-1.1.0-sources.jar
deleted file mode 100644
index cdb2ff3..0000000
Binary files a/build/libs/song-player-1.1.0-sources.jar and /dev/null differ
diff --git a/build/libs/song-player-1.1.0.jar b/build/libs/song-player-1.1.0.jar
deleted file mode 100644
index a615fd7..0000000
Binary files a/build/libs/song-player-1.1.0.jar and /dev/null differ
diff --git a/build/libs/song-player-1.1.1-dev.jar b/build/libs/song-player-1.1.1-dev.jar
deleted file mode 100644
index 5036fe4..0000000
Binary files a/build/libs/song-player-1.1.1-dev.jar and /dev/null differ
diff --git a/build/libs/song-player-1.1.1-sources-dev.jar b/build/libs/song-player-1.1.1-sources-dev.jar
deleted file mode 100644
index 736aa46..0000000
Binary files a/build/libs/song-player-1.1.1-sources-dev.jar and /dev/null differ
diff --git a/build/libs/song-player-1.1.1-sources.jar b/build/libs/song-player-1.1.1-sources.jar
deleted file mode 100644
index d9c3306..0000000
Binary files a/build/libs/song-player-1.1.1-sources.jar and /dev/null differ
diff --git a/build/libs/song-player-1.1.1.jar b/build/libs/song-player-1.1.1.jar
deleted file mode 100644
index 5ebff45..0000000
Binary files a/build/libs/song-player-1.1.1.jar and /dev/null differ
diff --git a/build/loom-cache/mixin-map-1.16.1-1.16.1+build.1-v2.tiny b/build/loom-cache/mixin-map-1.16.1-1.16.1+build.1-v2.tiny
deleted file mode 100644
index c76c431..0000000
--- a/build/loom-cache/mixin-map-1.16.1-1.16.1+build.1-v2.tiny
+++ /dev/null
@@ -1,2 +0,0 @@
-v1	named	intermediary
-FIELD	com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin	Lnet/minecraft/network/ClientConnection;	connection	field_3689
diff --git a/build/loom-cache/mixin-map-1.17-1.17+build.1-v2.0.tiny b/build/loom-cache/mixin-map-1.17-1.17+build.1-v2.0.tiny
deleted file mode 100644
index c76c431..0000000
--- a/build/loom-cache/mixin-map-1.17-1.17+build.1-v2.0.tiny
+++ /dev/null
@@ -1,2 +0,0 @@
-v1	named	intermediary
-FIELD	com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin	Lnet/minecraft/network/ClientConnection;	connection	field_3689
diff --git a/build/loom-cache/mixin-map-1.17-1.17+build.13-v2.0.tiny b/build/loom-cache/mixin-map-1.17-1.17+build.13-v2.0.tiny
deleted file mode 100644
index a45443c..0000000
--- a/build/loom-cache/mixin-map-1.17-1.17+build.13-v2.0.tiny
+++ /dev/null
@@ -1 +0,0 @@
-v1	named	intermediary
diff --git a/build/resources/main/assets/songplayer/icon.png b/build/resources/main/assets/songplayer/icon.png
deleted file mode 100644
index 047b91f..0000000
Binary files a/build/resources/main/assets/songplayer/icon.png and /dev/null differ
diff --git a/build/resources/main/fabric.mod.json b/build/resources/main/fabric.mod.json
deleted file mode 100644
index c38a036..0000000
--- a/build/resources/main/fabric.mod.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "songplayer",
-  "version": "1.1.1",
-
-  "name": "Song Player",
-  "description": "Builds and plays noteblocks",
-  "authors": [
-    "hhhzzzsss"
-  ],
-  "contact": {
-    "homepage": "https://fabricmc.net/",
-    "sources": "https://github.com/FabricMC/fabric-example-mod"
-  },
-
-  "license": "CC0-1.0",
-  "icon": "assets/songplayer/icon.png",
-
-  "environment": "*",
-  "entrypoints": {
-    "main": [
-      "com.github.hhhzzzsss.songplayer.SongPlayer"
-    ]
-  },
-  "mixins": [
-    "songplayer.mixins.json"
-  ],
-
-  "depends": {
-    "fabricloader": ">=0.7.4",
-    "fabric": "*",
-    "minecraft": "1.17.x"
-  },
-  "suggests": {
-    "flamingo": "*"
-  }
-}
diff --git a/build/resources/main/songplayer.mixins.json b/build/resources/main/songplayer.mixins.json
deleted file mode 100644
index c526386..0000000
--- a/build/resources/main/songplayer.mixins.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "com.github.hhhzzzsss.songplayer.mixin",
-  "compatibilityLevel": "JAVA_8",
-  "mixins": [
-  ],
-  "client": [
-    "ClientPlayerEntityMixin",
-    "ClientPlayNetworkHandlerMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
diff --git a/build/tmp/compileJava/source-classes-mapping.txt b/build/tmp/compileJava/source-classes-mapping.txt
deleted file mode 100644
index cca0e0d..0000000
--- a/build/tmp/compileJava/source-classes-mapping.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-com/github/hhhzzzsss/songplayer/mixin/ClientPlayerEntityMixin.java
- com.github.hhhzzzsss.songplayer.mixin.ClientPlayerEntityMixin
-com/github/hhhzzzsss/songplayer/SongPlayer.java
- com.github.hhhzzzsss.songplayer.SongPlayer
- com.github.hhhzzzsss.songplayer.SongPlayer$Mode
-com/github/hhhzzzsss/songplayer/mixin/KeyboardMixin.java
- com.github.hhhzzzsss.songplayer.mixin.KeyboardMixin
-com/github/hhhzzzsss/songplayer/mixin/MinecraftClientMixin.java
- com.github.hhhzzzsss.songplayer.mixin.MinecraftClientMixin
-com/github/hhhzzzsss/songplayer/noteblocks/Stage.java
- com.github.hhhzzzsss.songplayer.noteblocks.Stage
-com/github/hhhzzzsss/songplayer/song/MidiConverter.java
- com.github.hhhzzzsss.songplayer.song.MidiConverter
- com.github.hhhzzzsss.songplayer.song.MidiConverter$1
-com/github/hhhzzzsss/songplayer/song/NoteEvent.java
- com.github.hhhzzzsss.songplayer.song.NoteEvent
-com/github/hhhzzzsss/songplayer/noteblocks/BuildingThread.java
- com.github.hhhzzzsss.songplayer.noteblocks.BuildingThread
-com/github/hhhzzzsss/songplayer/FakePlayerEntity.java
- com.github.hhhzzzsss.songplayer.FakePlayerEntity
-com/github/hhhzzzsss/songplayer/Freecam.java
- com.github.hhhzzzsss.songplayer.Freecam
-com/github/hhhzzzsss/songplayer/song/Song.java
- com.github.hhhzzzsss.songplayer.song.Song
- com.github.hhhzzzsss.songplayer.song.Song$DefaultTrustManager
-com/github/hhhzzzsss/songplayer/CommandProcessor.java
- com.github.hhhzzzsss.songplayer.CommandProcessor
- com.github.hhhzzzsss.songplayer.CommandProcessor$Command
- com.github.hhhzzzsss.songplayer.CommandProcessor$currentCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$gotoCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$helpCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$loopCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$playCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$playurlCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$setCreativeCommandCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$setSurvivalCommandCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$songsCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$stopCommand
- com.github.hhhzzzsss.songplayer.CommandProcessor$toggleFakePlayerCommand
-com/github/hhhzzzsss/songplayer/noteblocks/PlayingThread.java
- com.github.hhhzzzsss.songplayer.noteblocks.PlayingThread
-com/github/hhhzzzsss/songplayer/mixin/ClientPlayNetworkHandlerMixin.java
- com.github.hhhzzzsss.songplayer.mixin.ClientPlayNetworkHandlerMixin
-com/github/hhhzzzsss/songplayer/song/DownloadingThread.java
- com.github.hhhzzzsss.songplayer.song.DownloadingThread
diff --git a/build/tmp/jar/MANIFEST.MF b/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index 58630c0..0000000
--- a/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/build/tmp/remapJar/MANIFEST.MF b/build/tmp/remapJar/MANIFEST.MF
deleted file mode 100644
index 58630c0..0000000
--- a/build/tmp/remapJar/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/build/tmp/sourcesJar/MANIFEST.MF b/build/tmp/sourcesJar/MANIFEST.MF
deleted file mode 100644
index 58630c0..0000000
--- a/build/tmp/sourcesJar/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/gradle.properties b/gradle.properties
index 76aabf6..19732b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17
-	yarn_mappings=1.17+build.1
-	loader_version=0.11.6
+	minecraft_version=1.18.2
+	yarn_mappings=1.18.2+build.2
+	loader_version=0.13.3
 
 # Mod Properties
-	mod_version = 1.1.1
+	mod_version = 1.2.0
 	maven_group = com.github.hhhzzzsss
 	archives_base_name = song-player
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.34.9+1.17
+	fabric_version=0.47.10+1.18.2
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..1b6c787
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index f838415..69a0db9 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -9,8 +9,7 @@
     "hhhzzzsss"
   ],
   "contact": {
-    "homepage": "https://fabricmc.net/",
-    "sources": "https://github.com/FabricMC/fabric-example-mod"
+    "sources": "https://github.com/hhhzzzsss/SongPlayer"
   },
 
   "license": "CC0-1.0",
@@ -27,9 +26,9 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.13.3",
     "fabric": "*",
-    "minecraft": "1.17.x"
+    "minecraft": "1.18.x"
   },
   "suggests": {
     "flamingo": "*"