From 983a29bb3a8cef0907d54d93198faf31e9b1ee8a Mon Sep 17 00:00:00 2001 From: SamB440 Date: Sun, 2 Aug 2020 17:22:59 +0100 Subject: [PATCH] Update to Languagy 2.0.2. Fix anvilgui import. --- api/build.gradle | 2 +- build.gradle | 2 ++ legacy/build.gradle | 17 ++++++++++++----- modern/build.gradle | 10 +++++++--- rpgregions/build.gradle | 7 +++++-- .../net/islandearth/rpgregions/RPGRegions.java | 15 +++++++++++---- .../rpgregions/api/RPGRegionsAPI.java | 2 +- .../islandearth/rpgregions/gui/EditorGUI.java | 2 +- .../rpgregions/translation/Translations.java | 2 +- rpgregions/src/main/resources/plugin.yml | 3 +-- 10 files changed, 42 insertions(+), 20 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index 8fe20cc..57bd8e8 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -31,7 +31,7 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compileOnly 'org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT' // spigot + compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT' // spigot compileOnly 'com.github.MilkBowl:VaultAPI:1.7' // vault implementation 'io.papermc:paperlib:1.0.4' // paperlib - async teleport on Paper } diff --git a/build.gradle b/build.gradle index c994939..fd7e9ca 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 repositories { + mavenLocal() mavenCentral() maven { name = 'papermc-repo' @@ -53,6 +54,7 @@ dependencies { } shadowJar { + relocate 'net.islandearth.languagy', 'net.islandearth.rpgregions.languagy' relocate 'co.aikar.commands', 'net.islandearth.rpgregions.libs.acf' relocate 'co.aikar.idb', 'net.islandearth.rpgregions.libs.idb' relocate 'com.github.stefvanschie.inventoryframework', 'net.islandearth.rpgregions.inventoryframework' diff --git a/legacy/build.gradle b/legacy/build.gradle index fa20f4a..d99ea7a 100644 --- a/legacy/build.gradle +++ b/legacy/build.gradle @@ -9,6 +9,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 repositories { + mavenLocal() mavenCentral() maven { name = 'papermc-repo' @@ -30,7 +31,7 @@ repositories { // worldguard maven { url "https://maven.enginehub.org/repo/" } - // languagy, repo only accessible on request + // languagy maven { url = 'https://campfire.islandearth.net/maven/' } @@ -38,10 +39,16 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compileOnly 'com.sk89q.worldguard:worldguard-legacy:6.2' // worldguard legacy - compileOnly 'com.sk89q.worldedit:worldedit-core:6.1.4-SNAPSHOT' // worldedit - compileOnly 'net.islandearth:languagy:2.0.0-SNAPSHOT' // languagy - compileOnly 'org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT' // spigot + compileOnly ('com.sk89q.worldguard:worldguard-legacy:6.2') { + exclude group: 'com.destroystokyo.paper' + exclude group: 'org.spigotmc' + } + compileOnly ('com.sk89q.worldedit:worldedit-core:6.1.4-SNAPSHOT') { + exclude group: 'com.destroystokyo.paper' + exclude group: 'org.spigotmc' + } + implementation 'net.islandearth:languagy-api:2.0.2-SNAPSHOT' // languagy + compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT' // spigot compileOnly project(':rpgregions') compileOnly project(':api') } diff --git a/modern/build.gradle b/modern/build.gradle index 78bbf4d..4b52735 100644 --- a/modern/build.gradle +++ b/modern/build.gradle @@ -8,6 +8,7 @@ version = pluginVersion sourceCompatibility = 1.8 repositories { + mavenLocal() mavenCentral() maven { name = 'papermc-repo' @@ -37,9 +38,12 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.4-SNAPSHOT' // worldguard - compileOnly 'org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT' // spigot - compileOnly 'net.islandearth:languagy:2.0.0-SNAPSHOT' // languagy + implementation 'net.islandearth:languagy-api:2.0.2-SNAPSHOT' // languagy + compileOnly ('com.sk89q.worldguard:worldguard-bukkit:7.0.4-SNAPSHOT') { + exclude group: 'com.destroystokyo.paper' + exclude group: 'org.spigotmc' + } + compileOnly 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT' // spigot compileOnly 'net.zrips:residence:4.9.0.6' // residence compileOnly 'me.ryanhamshire:griefprevention:16.13.0' // griefprevention compileOnly project(':api') diff --git a/rpgregions/build.gradle b/rpgregions/build.gradle index 9171f54..06d4b1d 100644 --- a/rpgregions/build.gradle +++ b/rpgregions/build.gradle @@ -59,6 +59,7 @@ dependencies { testImplementation 'com.github.seeseemelk:MockBukkit-v1.15:0.3.0-SNAPSHOT' testImplementation 'org.reflections:reflections:0.9.12' + implementation 'net.islandearth:languagy-api:2.0.2-SNAPSHOT' // languagy implementation 'co.aikar:acf-paper:0.5.0-SNAPSHOT' // commands implementation 'co.aikar:idb-core:1.0.0-SNAPSHOT' // database implementation 'com.zaxxer:HikariCP:2.4.1' // database @@ -70,15 +71,17 @@ dependencies { compileOnly ('com.sk89q.worldguard:worldguard-bukkit:7.0.4-SNAPSHOT') { exclude group: 'com.destroystokyo.paper' + exclude group: 'org.spigotmc' } compileOnly ('com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT') { exclude group: 'org.bukkit' + exclude group: 'org.spigotmc' } - compileOnly 'org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT' // spigot + compileOnly 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT' // spigot compileOnly 'me.clip:placeholderapi:2.10.4' // PAPI - compileOnly 'net.islandearth:languagy:2.0.0-SNAPSHOT' // languagy compileOnly 'com.github.shynixn.headdatabase:hdb-api:1.0' // head database compileOnly 'com.djrapitops:Plan-api:5.1-R0.4' // plan + compileOnly 'org.jetbrains:annotations:19.0.0' compileOnly project(':api') } diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java b/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java index 0dfcba9..af7fcf4 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java @@ -6,10 +6,10 @@ import co.aikar.idb.DB; import com.google.common.collect.ImmutableList; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.islandearth.languagy.language.Language; -import net.islandearth.languagy.language.LanguagyImplementation; -import net.islandearth.languagy.language.LanguagyPluginHook; -import net.islandearth.languagy.language.Translator; +import net.islandearth.languagy.api.language.Language; +import net.islandearth.languagy.api.language.LanguagyImplementation; +import net.islandearth.languagy.api.language.LanguagyPluginHook; +import net.islandearth.languagy.api.language.Translator; import net.islandearth.rpgregions.api.RPGRegionsAPI; import net.islandearth.rpgregions.commands.RPGRegionsCommand; import net.islandearth.rpgregions.effects.RegionEffect; @@ -62,6 +62,7 @@ public final class RPGRegions extends JavaPlugin implements RPGRegionsAPI, Langu this.managers = new RPGRegionsManagers(this); this.registerListeners(); this.registerCommands(); + this.hook(this); this.registerMetrics(); } @@ -112,6 +113,7 @@ public final class RPGRegions extends JavaPlugin implements RPGRegionsAPI, Langu header += "Found a bug? Create an issue at https://gitlab.com/SamB440/rpgregions-2/issues" + eol; header += "Need help? Join our discord at https://discord.gg/fh62mxU" + eol; config.options().header(header); + config.addDefault("settings.dev.debug", false); config.addDefault("settings.integration.name", getIntegration()); config.addDefault("settings.storage.mode", "file"); config.addDefault("settings.sql.host", "localhost"); @@ -260,4 +262,9 @@ public final class RPGRegions extends JavaPlugin implements RPGRegionsAPI, Langu metrics.addCustomChart(new Metrics.SimplePie("storage_mode", () -> getConfig().getString("settings.storage.mode"))); } + + @Override + public boolean debug() { + return this.getConfig().getBoolean("settings.dev.debug"); + } } diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/api/RPGRegionsAPI.java b/rpgregions/src/main/java/net/islandearth/rpgregions/api/RPGRegionsAPI.java index 4cf9cd4..0e7fc84 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/api/RPGRegionsAPI.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/api/RPGRegionsAPI.java @@ -1,6 +1,6 @@ package net.islandearth.rpgregions.api; -import net.islandearth.languagy.language.Translator; +import net.islandearth.languagy.api.language.Translator; import net.islandearth.rpgregions.managers.RPGRegionsManagers; public interface RPGRegionsAPI { diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/gui/EditorGUI.java b/rpgregions/src/main/java/net/islandearth/rpgregions/gui/EditorGUI.java index f79627f..ad35258 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/gui/EditorGUI.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/gui/EditorGUI.java @@ -3,11 +3,11 @@ package net.islandearth.rpgregions.gui; import com.github.stefvanschie.inventoryframework.Gui; import com.github.stefvanschie.inventoryframework.GuiItem; import com.github.stefvanschie.inventoryframework.pane.StaticPane; -import net.islandearth.languagy.anvilgui.AnvilGUI; import net.islandearth.rpgregions.RPGRegions; import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion; import net.islandearth.rpgregions.utils.ItemStackBuilder; import net.islandearth.rpgregions.utils.XMaterial; +import net.wesjd.anvilgui.AnvilGUI; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java b/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java index 6069fa5..349975f 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java @@ -1,7 +1,7 @@ package net.islandearth.rpgregions.translation; import me.clip.placeholderapi.PlaceholderAPI; -import net.islandearth.languagy.language.Language; +import net.islandearth.languagy.api.language.Language; import net.islandearth.rpgregions.RPGRegions; import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; diff --git a/rpgregions/src/main/resources/plugin.yml b/rpgregions/src/main/resources/plugin.yml index b73bb1a..880a68e 100644 --- a/rpgregions/src/main/resources/plugin.yml +++ b/rpgregions/src/main/resources/plugin.yml @@ -2,8 +2,7 @@ name: RPGRegions version: @version@ main: net.islandearth.rpgregions.RPGRegions api-version: '1.13' -depend: [Languagy] -softdepend: [WorldGuard, PlaceholderAPI, HeadDatabase, Residence, Plan, GriefPrevention, Vault] +softdepend: [Languagy, WorldGuard, PlaceholderAPI, HeadDatabase, Residence, Plan, GriefPrevention, Vault] authors: [SamB440] description: Discoverable regions website: https://fortitude.islandearth.net