Update to 1.20.6

Author: UnknownSilicon

build.gradle

@@ -1,16 +1,24 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
-	id 'org.jetbrains.kotlin.jvm' version '1.7.0'
-	id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
+	id 'org.jetbrains.kotlin.jvm' version '2.0.0'
+	id 'io.github.goooler.shadow' version '8.1.7' apply false
 }
 
 allprojects {
 	apply plugin: 'org.jetbrains.kotlin.jvm'
 
 	archivesBaseName = 'VoteParty'
 	group 'me.clip'
-	version '2.34-DEV-Parallel'
+	version '2.35-DEV-Parallel'
+
+	java {
+		toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+	}
+
+	kotlin {
+		jvmToolchain(21)
+	}
 
 	repositories {
 		mavenCentral()
@@ -27,25 +35,24 @@ allprojects {
 		implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 
 		// spigot
-		compileOnly "org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT"
+		compileOnly "org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT"
 	}
 
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
+	sourceCompatibility = 21
+	targetCompatibility = 21
+
 
 	compileJava {
-		options.compilerArgs += ["-parameters"]
-		options.fork = true
-		options.forkOptions.executable = 'javac'
+
+		options.release.set(21)
 	}
 
 	compileKotlin {
-		kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
-		kotlinOptions.javaParameters = true
+
 	}
 }
 
-apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'io.github.goooler.shadow'
 
 shadowJar {
 	minimize()
@@ -63,10 +70,10 @@ shadowJar {
 dependencies {
 
 	// config
-	implementation "ch.jalu:configme:1.3.0"
+	implementation "ch.jalu:configme:1.4.1"
 
 	// placeholderapi
-	compileOnly "me.clip:placeholderapi:2.11.1"
+	compileOnly "me.clip:placeholderapi:2.11.6"
 
 	// NuVotifier hook
 	compileOnly files("libs/nuvotifier-2.7.3.jar")
@@ -75,16 +82,16 @@ dependencies {
 	implementation "co.aikar:acf-paper:0.5.1-SNAPSHOT"
 
 	// Support for materials across all versions
-	implementation 'com.github.cryptomorin:XSeries:9.0.0'
+	implementation 'com.github.cryptomorin:XSeries:10.0.0'
 
 	// json stuff
 	implementation 'net.kyori:adventure-platform-bukkit:4.1.1'
 	implementation 'net.kyori:adventure-api:4.11.0'
 	implementation 'net.kyori:adventure-text-minimessage:4.11.0'
+	implementation project(':version')
 
-	implementation project(":version")
-	implementation project(":version_old")
 	implementation project(":version_new")
+	implementation project(":version_old")
 }
 
 processResources {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,5 +1,3 @@
 rootProject.name = "VP"
-include 'version'
-include 'version_old'
-include 'version_new'
+include 'version', 'version_new', 'version_old'
 

src/main/kotlin/me/clip/voteparty/conf/mapper/SingleValueToCollectionMapper.kt

@@ -12,7 +12,8 @@ import java.util.Collections
  */
 class SingleValueToCollectionMapper : MapperImpl()
 {
-	override fun createCollection(context: MappingContext, value: Any): Collection<*>?
+
+	override fun createCollection(context: MappingContext, value: Any?): Collection<*>?
 	{
 		if (value !is Iterable<*>)
 		{

version/build.gradle

@@ -1,3 +1,6 @@
-group 'me.clip'
-version '2.0'
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '2.0.0'
+}
 
+group 'me.clip'
+version '2.35-DEV-Parallel'

version_new/build.gradle

@@ -1,6 +1,6 @@
+dependencies {
+	implementation project(':version')
+}
 group 'me.clip'
-version '2.0'
+version '2.35-DEV-Parallel'
 
-dependencies {
-	implementation project(":version")
-}

version_new/src/main/kotlin/me/clip/voteparty/version/VersionHookNew.kt

@@ -72,25 +72,24 @@ class VersionHookNew : VersionHook
 		private val OPTION = DustOptions(Color.RED, 0.8F)
 
 		private val SPELLS = setOf(
-			Particle.SPELL_MOB,
-			Particle.SPELL_MOB_AMBIENT
+			Particle.EFFECT,
+			Particle.ENTITY_EFFECT
 		                          )
 
 		private val SINGLE = setOf(
-			Particle.WATER_BUBBLE,
-			Particle.WATER_WAKE,
+			Particle.BUBBLE,
+			Particle.FISHING,
 			Particle.CRIT,
-			Particle.CRIT_MAGIC,
-			Particle.SMOKE_NORMAL,
-			Particle.SMOKE_LARGE,
+			Particle.SMOKE,
+			Particle.LARGE_SMOKE,
 			Particle.PORTAL,
-			Particle.ENCHANTMENT_TABLE,
+			Particle.ENCHANT,
 			Particle.FLAME,
 			Particle.CLOUD,
 			Particle.DRAGON_BREATH,
 			Particle.END_ROD,
 			Particle.DAMAGE_INDICATOR,
-			Particle.TOTEM,
+			Particle.TOTEM_OF_UNDYING,
 			Particle.SPIT,
 			Particle.SQUID_INK,
 			Particle.BUBBLE_POP,

version_old/build.gradle

@@ -1,5 +1,5 @@
 group 'me.clip'
-version '2.0'
+version '2.35-DEV-Parallel'
 
 
 repositories {
@@ -8,11 +8,15 @@ repositories {
 	}
 }
 
+configurations.configureEach {
+	resolutionStrategy  {
+		force "org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT"
+	}
+}
+
 dependencies {
-	implementation project(":version")
 	implementation "org.inventivetalent:particleapi:+"
 
-	compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT") {
-		force = true
-	}
+	compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
+	implementation project(':version')
 }