From d1cedbb823ceb626118682d51c5079217f7222a2 Mon Sep 17 00:00:00 2001
From: Konicai <71294714+Konicai@users.noreply.github.com>
Date: Wed, 20 Apr 2022 12:36:10 -0400
Subject: [PATCH] Generate velocity-plugins.json and relocate fastutil (#2940)

---
 bootstrap/velocity/build.gradle.kts | 3 ++-
 build.gradle.kts                    | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bootstrap/velocity/build.gradle.kts b/bootstrap/velocity/build.gradle.kts
index f9fcafb2c..ab2f85b85 100644
--- a/bootstrap/velocity/build.gradle.kts
+++ b/bootstrap/velocity/build.gradle.kts
@@ -1,11 +1,12 @@
 val velocityVersion = "3.0.0"
 
 dependencies {
+    annotationProcessor("com.velocitypowered", "velocity-api", velocityVersion)
     api(projects.core)
 }
 
 platformRelocate("com.fasterxml.jackson")
-platformRelocate("it.unimi.fastutil")
+platformRelocate("it.unimi.dsi.fastutil")
 platformRelocate("net.kyori.adventure.text.serializer.gson.legacyimpl")
 
 exclude("com.google.*:*")
diff --git a/build.gradle.kts b/build.gradle.kts
index 6037f65d3..b10d7c357 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,6 +10,10 @@ allprojects {
     group = "org.geysermc"
     version = "2.1.0-SNAPSHOT"
     description = "Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers."
+
+    tasks.withType<JavaCompile> {
+        options.encoding = "UTF-8"
+    }
 }
 
 val platforms = setOf(