diff --git a/common/build.gradle.kts b/common/build.gradle.kts index a2b67c1f..62914f44 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -4,7 +4,6 @@ plugins { id("java") id("com.github.johnrengelman.shadow") version "7.1.1" id("net.minecrell.plugin-yml.bukkit") version "0.5.1" - id("io.papermc.paperweight.userdev") version "1.3.8" } group = "io.github.fisher2911" @@ -37,9 +36,8 @@ dependencies { // implementation(project(":1.17")) // implementation(project(":1.18")) // implementation(project(":nms")) - paperDevBundle("1.19.2-R0.1-SNAPSHOT") compileOnly("com.mojang:authlib:1.5.25") - compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT") + compileOnly("org.spigotmc:spigot:1.16.5-R0.1-SNAPSHOT") compileOnly("org.jetbrains:annotations:23.0.0") compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT") compileOnly("me.clip:placeholderapi:2.11.1") @@ -67,7 +65,7 @@ tasks { compileJava { options.encoding = Charsets.UTF_8.name() - options.release.set(17) + options.release.set(16) } shadowJar { @@ -102,7 +100,7 @@ tasks { } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17 + toolchain.languageVersion.set(JavaLanguageVersion.of(16 )) } diff --git a/common/src/main/java/io/github/fisher2911/hmccosmetics/packet/versions/PacketManager_1_19_2.java b/common/src/main/java/io/github/fisher2911/hmccosmetics/packet/versions/PacketManager_1_19_2.java index 23550f1e..a62edd20 100644 --- a/common/src/main/java/io/github/fisher2911/hmccosmetics/packet/versions/PacketManager_1_19_2.java +++ b/common/src/main/java/io/github/fisher2911/hmccosmetics/packet/versions/PacketManager_1_19_2.java @@ -6,9 +6,9 @@ import com.comphenix.protocol.wrappers.*; import io.github.fisher2911.hmccosmetics.packet.wrappers.*; import io.github.fisher2911.hmccosmetics.user.Equipment; import io.github.fisher2911.hmccosmetics.util.PlayerUtils; -import it.unimi.dsi.fastutil.ints.IntArrayList; import org.bukkit.GameMode; import org.bukkit.Location; +import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.IntArrayList; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/settings.gradle.kts b/settings.gradle.kts index 95277444..7906fd5a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,3 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven("https://repo.papermc.io/repository/maven-public/") - } -} - rootProject.name = "HMCCosmetics" include( "common"