diff --git a/plugins/finale-paper/build.gradle.kts b/plugins/finale-paper/build.gradle.kts
index 1ddff3e13..818862361 100644
--- a/plugins/finale-paper/build.gradle.kts
+++ b/plugins/finale-paper/build.gradle.kts
@@ -1,9 +1,7 @@
-import net.civmc.civgradle.common.util.civRepo
+import net.civmc.civgradle.CivGradleExtension
 
 plugins {
-    `java-library`
-    `maven-publish`
-    id("net.civmc.civgradle.plugin") version "1.0.0-SNAPSHOT"
+	id("net.civmc.civgradle") version "2.+" apply false
 }
 
 // Temporary hack:
@@ -12,44 +10,28 @@ gradle.buildFinished {
 	project.buildDir.deleteRecursively()
 }
 
-allprojects {
-	group = "net.civmc.finale"
-	version = "2.0.0-SNAPSHOT"
-	description = "Finale"
-}
-
 subprojects {
-	apply(plugin = "net.civmc.civgradle.plugin")
 	apply(plugin = "java-library")
 	apply(plugin = "maven-publish")
+	apply(plugin = "net.civmc.civgradle")
 
-	java {
-		toolchain {
-			languageVersion.set(JavaLanguageVersion.of(17))
-		}
+	configure<CivGradleExtension> {
+		pluginName = project.property("pluginName") as String
 	}
 
 	repositories {
 		mavenCentral()
-        civRepo("CivMC/CivModCore")
-        civRepo("CivMC/CombatTagPlus")
+		maven("https://repo.civmc.net/repository/maven-public")
         maven("https://repo.dmulloy2.net/content/groups/public/")
 	}
 
-	publishing {
-		repositories {
-			maven {
-				name = "GitHubPackages"
-				url = uri("https://maven.pkg.github.com/CivMC/Finale")
-				credentials {
-					username = System.getenv("GITHUB_ACTOR")
-					password = System.getenv("GITHUB_TOKEN")
-				}
-			}
-		}
-		publications {
-			register<MavenPublication>("gpr") {
-				from(components["java"])
+	repositories {
+		maven {
+			name = "GitHubPackages"
+			url = uri("https://maven.pkg.github.com/CivMC/Finale")
+			credentials {
+				username = System.getenv("GITHUB_ACTOR")
+				password = System.getenv("GITHUB_TOKEN")
 			}
 		}
 	}
diff --git a/plugins/finale-paper/gradle.properties b/plugins/finale-paper/gradle.properties
new file mode 100644
index 000000000..d379e4412
--- /dev/null
+++ b/plugins/finale-paper/gradle.properties
@@ -0,0 +1,7 @@
+# Gradle properties
+group = net.civmc.finale
+version = 2.0.1
+description = Finale
+
+# Custom Properties
+pluginName = Finale
diff --git a/plugins/finale-paper/paper/build.gradle.kts b/plugins/finale-paper/paper/build.gradle.kts
index df4111fcb..de221372d 100644
--- a/plugins/finale-paper/paper/build.gradle.kts
+++ b/plugins/finale-paper/paper/build.gradle.kts
@@ -1,13 +1,6 @@
 plugins {
-	`java-library`
-	id("net.civmc.civgradle.plugin")
-	id("io.papermc.paperweight.userdev") version "1.3.1"
-}
-
-civGradle {
-	paper {
-		pluginName = "Finale"
-	}
+	id("net.civmc.civgradle")
+	id("io.papermc.paperweight.userdev")
 }
 
 dependencies {
diff --git a/plugins/finale-paper/paper/src/main/java/com/github/maxopoly/finale/combat/AsyncPacketHandler.java b/plugins/finale-paper/paper/src/main/java/com/github/maxopoly/finale/combat/AsyncPacketHandler.java
index ac571b5f3..539144cff 100644
--- a/plugins/finale-paper/paper/src/main/java/com/github/maxopoly/finale/combat/AsyncPacketHandler.java
+++ b/plugins/finale-paper/paper/src/main/java/com/github/maxopoly/finale/combat/AsyncPacketHandler.java
@@ -25,15 +25,15 @@ import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.attribute.Attribute;
 import org.bukkit.block.Block;
 import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftBoat;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftLivingEntity;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftVehicle;
 import org.bukkit.entity.Damageable;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -82,8 +82,9 @@ public class AsyncPacketHandler extends PacketAdapter implements Listener {
 
 					if (target == null || target.isDead() || target.isInvulnerable() ||
 							!world.getUID().equals(target.getWorld().getUID()) || !(target instanceof LivingEntity)) {
-						if (entity instanceof CraftVehicle vehicle){
-							vehicle.getHandle().hurt(DamageSource.playerAttack(((CraftPlayer) attacker).getHandle()), (float) ((CraftPlayer) attacker).getHandle().getAttribute(Attributes.ATTACK_DAMAGE).getValue());
+						if (entity instanceof CraftVehicle || entity.getType() == EntityType.ITEM_FRAME){
+							CraftEntity craftEntity = (CraftEntity)entity;
+							craftEntity.getHandle().hurt(DamageSource.playerAttack(((CraftPlayer) attacker).getHandle()), (float) ((CraftPlayer) attacker).getHandle().getAttribute(Attributes.ATTACK_DAMAGE).getValue());
 						}
 						return;
 					}
diff --git a/plugins/finale-paper/settings.gradle.kts b/plugins/finale-paper/settings.gradle.kts
index 5ffc5d019..843c40f35 100644
--- a/plugins/finale-paper/settings.gradle.kts
+++ b/plugins/finale-paper/settings.gradle.kts
@@ -14,4 +14,7 @@ pluginManagement {
 	}
 }
 
+rootProject.name = "finale"
+
 include(":paper")
+project(":paper").name = rootProject.name + "-paper"