From 791fe53c486c56f5b87692e785a2212e3a36dcb9 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Tue, 4 Oct 2022 14:32:08 -0500 Subject: [PATCH] NMS Test Signed-off-by: LoJoSho --- common/build.gradle.kts | 8 +++++--- .../packet/versions/PacketManager_1_19_2.java | 7 +------ settings.gradle.kts | 7 +++++++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 62914f44..a2b67c1f 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -4,6 +4,7 @@ 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" @@ -36,8 +37,9 @@ 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:1.16.5-R0.1-SNAPSHOT") + compileOnly("org.spigotmc:spigot-api: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") @@ -65,7 +67,7 @@ tasks { compileJava { options.encoding = Charsets.UTF_8.name() - options.release.set(16) + options.release.set(17) } shadowJar { @@ -100,7 +102,7 @@ tasks { } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(16 + toolchain.languageVersion.set(JavaLanguageVersion.of(17 )) } 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 0c586afd..23550f1e 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 @@ -2,18 +2,13 @@ package io.github.fisher2911.hmccosmetics.packet.versions; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; -import com.comphenix.protocol.utility.MinecraftReflection; import com.comphenix.protocol.wrappers.*; -import com.google.common.collect.Lists; import io.github.fisher2911.hmccosmetics.packet.wrappers.*; import io.github.fisher2911.hmccosmetics.user.Equipment; import io.github.fisher2911.hmccosmetics.util.PlayerUtils; -import net.minecraft.server.v1_16_R3.EnumItemSlot; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; +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 7906fd5a..95277444 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,10 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven("https://repo.papermc.io/repository/maven-public/") + } +} + rootProject.name = "HMCCosmetics" include( "common"