diff --git a/build.gradle.kts b/build.gradle.kts
index bfab8e6..470aea5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,42 +1,39 @@
+val minecraft_version="1.18.1"
+val spigot_version="1.18.1-R0.1-SNAPSHOT"
+
 plugins {
 	`java-library`
-	id("io.papermc.paperweight.userdev") version "1.3.3"
+	id("io.github.rancraftplayz.remapper") version "1.0.0"
 }
 
 repositories {
-    mavenCentral()
-    maven("https://oss.sonatype.org/content/repositories/snapshots")
-    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+	mavenCentral()
+	maven("https://repo.spongepowered.org/maven")
+	maven("https://maven.elmakers.com/repository/")
+	mavenLocal()
 
-    // libs folder (TODO: transfer away from this!)
-    flatDir {
-        dirs = setOf(file("libs"))
-    }
+	// libs folder (TODO: transfer away from this!)
+	flatDir {
+		dirs = setOf(file("libs"))
+	}
 }
 
 dependencies {
 	implementation(":Factions")
 	implementation(":GriefPrevention")
 	implementation(":MassiveCore")
-    implementation(":PreciousStones")
-    implementation(":RedProtect")
-    implementation(":Residence")
-    implementation(":Towny")
-    implementation(":WorldEdit")
-    implementation(":WorldGuard")
-    paperDevBundle("1.18.1-R0.1-SNAPSHOT")
+	implementation(":PreciousStones")
+	implementation(":RedProtect")
+	implementation(":Residence")
+	implementation(":Towny")
+	implementation(":WorldEdit")
+	implementation(":WorldGuard")
+	compileOnly("org.spigotmc:spigot:${spigot_version}:remapped-mojang")
+	remapLib("org.spigotmc:spigot:${spigot_version}:remapped-mojang")
 }
 
-tasks {
-	assemble {
-		dependsOn(reobfJar)
-	}
-	
-	reobfJar {
-		outputJar.set(layout.buildDirectory.file("libs/Herobrine 2.jar"))
-	}
+spigot {
+	version = minecraft_version
 }
 
-java {
-	toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-}
\ No newline at end of file
+tasks.named("jar") { finalizedBy("remapJar") } 
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 746404d..3d0f275 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,17 +1 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/6.7/userguide/multi_project_builds.html
- */
-
-pluginManagement {
-	repositories {
-		gradlePluginPortal()
-		maven("https://papermc.io/repo/repository/maven-public/")
-	}
-}
-
 rootProject.name = "Herobrine 2"
\ No newline at end of file