From 459c4693290aa3dd820ea08348d7149a9714dad1 Mon Sep 17 00:00:00 2001 From: unurled Date: Tue, 6 Jun 2023 17:29:01 +0200 Subject: [PATCH] 0.6.0 patch errors --- build.gradle | 50 ++++++++++--------- .../raxen/utils/libs/HolographicDisplay.java | 32 ------------ .../me/unurled/raxen/utils/libs/LuckPerm.java | 25 ---------- 3 files changed, 26 insertions(+), 81 deletions(-) delete mode 100644 src/main/java/me/unurled/raxen/utils/libs/HolographicDisplay.java delete mode 100644 src/main/java/me/unurled/raxen/utils/libs/LuckPerm.java diff --git a/build.gradle b/build.gradle index 6f074e4..c46931c 100644 --- a/build.gradle +++ b/build.gradle @@ -58,36 +58,39 @@ repositories { dependencies { // lombok stuff - implementation 'org.projectlombok:lombok:1.18.24' - annotationProcessor 'org.projectlombok:lombok:1.18.24' - testCompileOnly 'org.projectlombok:lombok:1.18.24' + implementation 'org.projectlombok:lombok:1.18.26' + annotationProcessor 'org.projectlombok:lombok:1.18.26' + testCompileOnly 'org.projectlombok:lombok:1.18.26' + + implementation 'org.apache.httpcomponents:httpclient:4.5.13' + implementation 'org.apache.httpcomponents:httpmime:4.5.13' // mongo stuff - implementation 'org.mongodb:mongodb-driver-sync:4.7.2' - implementation 'org.mongodb:bson:4.7.2' - implementation 'org.mongodb:mongodb-driver-core:4.7.2' + implementation 'org.mongodb:mongodb-driver-sync:4.9.1' + implementation 'org.mongodb:bson:4.9.1' + implementation 'org.mongodb:mongodb-driver-core:4.9.1' + + implementation 'redis.clients:jedis:4.3.1' compileOnly 'io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT' implementation 'de.tr7zw:item-nbt-api-plugin:2.11.2' // compileOnly 'de.tr7zw:item-nbt-api:2.11.2' - compileOnly 'com.comphenix.protocol:ProtocolLib:4.8.0' - compileOnly 'net.luckperms:api:5.4' + compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0' compileOnly 'com.github.MilkBowl:VaultAPI:1.7.1' compileOnly 'net.essentialsx:EssentialsX:2.19.7' compileOnly 'com.sk89q.worldedit:worldedit-core:7.2.14' compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.14' - compileOnly 'me.clip:placeholderapi:2.11.2' + compileOnly 'me.clip:placeholderapi:2.11.3' compileOnly('net.citizensnpcs:citizens-main:2.0.31-SNAPSHOT') { exclude group: '*', module: '*' } compileOnly 'com.onarandombox.multiversecore:Multiverse-Core:4.3.1' - compileOnly 'me.filoghost.holographicdisplays:holographicdisplays-api:3.0.2-SNAPSHOT' -// compileOnly fileTree(dir: 'libs', include: '*.jar') + implementation 'com.github.decentsoftware-eu:decentholograms:2.8.1' paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.19.4-R0.1-SNAPSHOT") } group = 'me.unurled' -version = '0.5.8' +version = '0.6.0' description = 'Raxen' java { @@ -96,14 +99,6 @@ java { } } -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - tasks.withType(JavaCompile) { options.encoding = 'UTF-8' options.release = 17 @@ -123,13 +118,20 @@ shadowJar { dependencies { include dependency('de.tr7zw:item-nbt-api-plugin:2.11.2') include dependency('de.tr7zw:item-nbt-api:2.11.2') - include dependency('org.mongodb:mongodb-driver-sync:4.7.2') - include dependency('org.mongodb:bson:4.7.2') - include dependency('org.mongodb:mongodb-driver-core:4.7.2') + include dependency('org.mongodb:mongodb-driver-sync:4.9.1') + include dependency('org.mongodb:bson:4.9.1') + include dependency('org.mongodb:mongodb-driver-core:4.9.1') + include dependency('com.github.decentsoftware-eu:decentholograms:2.8.1') + include dependency('org.apache.httpcomponents:httpclient:4.5.13') + include dependency('org.apache.httpcomponents:httpmime:4.5.13') + include dependency('redis.clients:jedis:4.3.1') } relocate("de.tr7zw", "me.unurled.libs.de.tr7zw") relocate("com.mongodb", 'me.unurled.libs.com.mongodb') relocate("org.bson", 'me.unurled.libs.org.bson') + relocate('eu.decentsoftware', 'me.unurled.libs.eu.decentsoftware') + relocate('org.apache', 'me.unurled.libs.org.apache') + relocate('redis.clients', 'me.unurled.libs.redis.clients') processResources { expand version: project.version } @@ -139,7 +141,7 @@ shadowJar { sourceSets { main { resources { - srcDirs = ['src/main/resources', 'src/main/resources/schematics'] + srcDirs = ['src/main/resources'] } } } diff --git a/src/main/java/me/unurled/raxen/utils/libs/HolographicDisplay.java b/src/main/java/me/unurled/raxen/utils/libs/HolographicDisplay.java deleted file mode 100644 index cbc5940..0000000 --- a/src/main/java/me/unurled/raxen/utils/libs/HolographicDisplay.java +++ /dev/null @@ -1,32 +0,0 @@ -package me.unurled.raxen.utils.libs; - -import lombok.Getter; -import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.hologram.Hologram; -import me.unurled.raxen.Raxen; -import org.bukkit.Location; - -public class HolographicDisplay { - - private Raxen main; - @Getter - private HolographicDisplaysAPI api; - - public HolographicDisplay(Raxen main) { - this.main = main; - api = HolographicDisplaysAPI.get(main); - } - - /** - * template to use - * - * @param loc - * @param text - */ - public void createHologram(Location loc, String... text) { - Hologram hologram = api.createHologram(loc); - for (String s : text) { - hologram.getLines().appendText(s); - } - } -} diff --git a/src/main/java/me/unurled/raxen/utils/libs/LuckPerm.java b/src/main/java/me/unurled/raxen/utils/libs/LuckPerm.java deleted file mode 100644 index 92dd618..0000000 --- a/src/main/java/me/unurled/raxen/utils/libs/LuckPerm.java +++ /dev/null @@ -1,25 +0,0 @@ -package me.unurled.raxen.utils.libs; - -import lombok.Getter; -import me.unurled.raxen.Raxen; -import net.luckperms.api.LuckPerms; -import org.bukkit.Bukkit; -import org.bukkit.plugin.RegisteredServiceProvider; - -public class LuckPerm { - - private static RegisteredServiceProvider provider; - - @Getter - private static LuckPerms api; - - public LuckPerm(Raxen main) { - provider = Bukkit.getServicesManager().getRegistration(LuckPerms.class); - } - - public static void register() { - if (provider != null) { - api = provider.getProvider(); - } - } -}