Merge pull request #431 from VolmitSoftware/Development

Development
VolmitSoftware · May 24, 2023 · a081a84 · a081a84
2 parents 29aea0f + 94d2784
commit a081a84
Show file tree

Hide file tree

Showing 49 changed files with 2,283 additions and 2,539 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,14 +23,14 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '1.9.3-1.19.4'
+version '1.10.0-1.19.4'
 def nmsVersion = "1.19.4" //[NMS]
 def apiVersion = '1.19'
 def specialSourceVersion = '1.11.0' //[NMS]
 def spigotJarVersion = '1.19.4-R0.1-SNAPSHOT' //[NMS]
 def name = getRootProject().getName() // Defined in settings.gradle
 def main = 'com.volmit.adapt.Adapt'
-def manifoldVersion = '2023.1.0'
+def manifoldVersion = '2023.1.8'
 
 // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
 // ======================== WINDOWS =============================
@@ -71,15 +71,8 @@ repositories {
             includeGroup("org.spigotmc")
         }
     }
-//    maven {
-//        url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
-//        content {
-//            includeGroup 'org.bukkit'
-//            includeGroup 'org.spigotmc'
-//        }
-//    }
-    maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
     mavenCentral()
+    maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
     maven { url 'https://jitpack.io' }
     maven { url 'https://ci.ender.zone/plugin/repository/everything/' }
     maven { url "https://arcanearts.jfrog.io/artifactory/archives" }
@@ -106,18 +99,13 @@ shadowJar {
     append("plugin.yml")
     relocate 'manifold', 'com.volmit.adapt.util.manifold'
     relocate 'art.arcane', 'com.volmit.adapt.util.arcane'
-    relocate 'io.papermc.lib', 'com.volmit.adapt.util.paper'
-    relocate 'net.kyori', 'com.volmit.adapt.util.kyori'
-    relocate 'ChumBukkit.extensions', 'com.volmit.adapt.util.extensions'
-    relocate 'IrisBukkit.extensions', 'com.volmit.adapt.util.extensions'
     relocate 'Fukkit.extensions', 'com.volmit.adapt.util.extensions'
     relocate 'Amulet.extensions', 'com.volmit.adapt.util.extensions'
     dependencies {
-        include(dependency('io.papermc:paperlib'))
-        include(dependency('net.kyori:'))
         include(dependency('systems.manifold:'))
         include(dependency('xyz.xenondevs:'))
         include(dependency('art.arcane:'))
+        include(dependency('io.github.mqzn:'))
     }
 }
 
@@ -137,14 +125,13 @@ dependencies {
     implementation 'art.arcane:Amulet:22.7.18'
     implementation 'art.arcane:Fukkit:22.7.5'
     implementation 'art.arcane:Curse:22.11.8'
+    implementation "io.papermc:paperlib:1.0.7"
     annotationProcessor 'systems.manifold:manifold-ext:' + manifoldVersion
     testAnnotationProcessor 'systems.manifold:manifold-ext:' + manifoldVersion
     implementation 'systems.manifold:manifold-rt:' + manifoldVersion
-    implementation "io.papermc:paperlib:1.0.7"
 
     //Random Api's
     implementation 'com.github.DeadSilenceIV:AdvancedChestsAPI:2.9-BETA'
-    implementation 'com.elmakers.mine.bukkit:EffectLib:9.4'
     implementation 'com.sk89q.worldguard:worldguard-bukkit:7.0.7'
     implementation "com.github.FrancoBM12:API-MagicCosmetics:1.9.85"
     implementation 'me.clip:placeholderapi:2.11.2'
@@ -153,18 +140,19 @@ dependencies {
     implementation 'com.massivecraft:Factions:1.6.9.5-U0.6.21'
     implementation "com.github.angeschossen:ChestProtectAPI:3.6.0"
     implementation "com.github.TechFortress:GriefPrevention:16.18.1"
-    compileOnly fileTree(dir: 'libs', include: ['*.jar'])
-
-    // Shaded
-    implementation 'net.kyori:adventure-text-minimessage:4.12.0'
-    implementation 'net.kyori:adventure-platform-bukkit:4.1.2'
-    implementation 'net.kyori:adventure-api:4.12.0'
     implementation 'xyz.xenondevs:particle:1.8.1'
 
     // Dynamically Loaded
-    implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
-    implementation 'com.google.code.gson:gson:2.10'
+    compileOnly 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
+    compileOnly 'org.apache.commons:commons-lang3:3.12.0'
+    compileOnly 'com.google.code.gson:gson:2.10'
+    compileOnly 'com.elmakers.mine.bukkit:EffectLib:9.4'
+    compileOnly 'net.kyori:adventure-text-minimessage:4.13.1'
+    compileOnly 'net.kyori:adventure-platform-bukkit:4.3.0'
+    compileOnly 'net.kyori:adventure-api:4.13.1'
+    compileOnly 'io.github.mqzn:mCommands-spigot:1.0.9'
+    compileOnly 'io.github.mqzn:mCommands-common:1.0.9'
+    compileOnly fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 if (JavaVersion.current().toString() != "17") {