diff --git a/RPGRegions.iml b/RPGRegions.iml index e88e4a9..6e28103 100644 --- a/RPGRegions.iml +++ b/RPGRegions.iml @@ -1,5 +1,5 @@ - + diff --git a/api/build.gradle b/api/build.gradle index 3e4cef7..bd7b414 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -10,34 +10,45 @@ sourceCompatibility = 1.8 repositories { mavenCentral() + mavenLocal() + + maven { url 'https://jitpack.io' } + maven { - name = 'papermc-repo' - url = 'https://papermc.io/repo/repository/maven-public/' + name 'papermc-repo' + url 'https://papermc.io/repo/repository/maven-public/' } maven { - name = 'sonatype' - url = 'https://oss.sonatype.org/content/groups/public/' + name 'sonatype' + url 'https://oss.sonatype.org/content/groups/public/' } maven { - name = 'CodeMC' - url = 'https://repo.codemc.org/repository/maven-public' + name 'CodeMC' + url 'https://repo.codemc.org/repository/maven-public' } - maven { url = "https://repo.aikar.co/content/groups/aikar/" } + maven { url "https://repo.aikar.co/content/groups/aikar/" } - maven { url = "https://jitpack.io" } + // worldguard + maven { url "https://maven.enginehub.org/repo/" } // PAPI + maven { url 'http://repo.extendedclip.com/content/repositories/placeholderapi/' } + + // plan maven { - url = 'http://repo.extendedclip.com/content/repositories/placeholderapi/' + name 'bintray' + url 'https://dl.bintray.com/rsl1122/Plan-repository' } + maven { url 'https://hub.spigotmc.org/nexus/content/repositories/public/' } + // MythicMobs - maven { - url = 'https://mvn.lumine.io/repository/maven-public/' - } + maven { url 'https://mvn.lumine.io/repository/maven-public/' } + + maven { url 'https://repo.codemc.io/repository/maven-snapshots/' } flatDir { dir '../libraries' } } @@ -48,12 +59,14 @@ dependencies { testImplementation 'org.reflections:reflections:0.9.12' implementation 'com.gitlab.samb440:languagy:2.0.3-RELEASE' // languagy + implementation 'io.papermc:paperlib:1.0.4' // paperlib - async teleport on Paper + compileOnly 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT' // spigot compileOnly 'com.github.MilkBowl:VaultAPI:1.7' // vault compileOnly 'me.clip:placeholderapi:2.10.4' // PAPI compileOnly name: 'AlonsoLevels_v2.0-BETA' // alonsolevels compileOnly 'com.github.shynixn.headdatabase:hdb-api:1.0' // head database - compileOnly 'org.jetbrains:annotations:19.0.0' + compileOnly 'org.jetbrains:annotations:20.1.0' compileOnly ('com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT') { exclude group: 'com.google' exclude group: 'org.bukkit' @@ -64,5 +77,4 @@ dependencies { exclude group: 'org.spigotmc' } compileOnly 'io.lumine.xikage:MythicMobs:4.9.1' - implementation 'io.papermc:paperlib:1.0.4' // paperlib - async teleport on Paper } diff --git a/api/src/main/java/net/islandearth/rpgregions/utils/RegenUtils.java b/api/src/main/java/net/islandearth/rpgregions/utils/RegenUtils.java index 27328c2..7bf1458 100644 --- a/api/src/main/java/net/islandearth/rpgregions/utils/RegenUtils.java +++ b/api/src/main/java/net/islandearth/rpgregions/utils/RegenUtils.java @@ -102,6 +102,7 @@ public class RegenUtils { return false; } + // This is awful and needs changing private static void generateRandomEntities(ProtectedRegion region, ConfiguredRegion configuredRegion) { Regenerate regenerate = configuredRegion.getRegenerate(); if (regenerate == null) return; diff --git a/build.gradle b/build.gradle index 1b1e334..901e1c8 100644 --- a/build.gradle +++ b/build.gradle @@ -11,46 +11,55 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 repositories { - mavenLocal() mavenCentral() + mavenLocal() + + maven { url 'https://jitpack.io' } + maven { - name = 'papermc-repo' - url = 'https://papermc.io/repo/repository/maven-public/' + name 'papermc-repo' + url 'https://papermc.io/repo/repository/maven-public/' } maven { - name = 'sonatype' - url = 'https://oss.sonatype.org/content/groups/public/' + name 'sonatype' + url 'https://oss.sonatype.org/content/groups/public/' } maven { - name = 'CodeMC' - url = 'https://repo.codemc.org/repository/maven-public' + name 'CodeMC' + url 'https://repo.codemc.org/repository/maven-public' } - maven { url = "https://repo.aikar.co/content/groups/aikar/" } + maven { url "https://repo.aikar.co/content/groups/aikar/" } // worldguard maven { url "https://maven.enginehub.org/repo/" } // PAPI + maven { url 'http://repo.extendedclip.com/content/repositories/placeholderapi/' } + + // plan maven { - url = 'http://repo.extendedclip.com/content/repositories/placeholderapi/' + name 'bintray' + url 'https://dl.bintray.com/rsl1122/Plan-repository' } - maven { url 'https://jitpack.io' } + maven { url 'https://hub.spigotmc.org/nexus/content/repositories/public/' } // MythicMobs - maven { - url = 'https://mvn.lumine.io/repository/maven-public/' - } + maven { url 'https://mvn.lumine.io/repository/maven-public/' } + + maven { url 'https://repo.codemc.io/repository/maven-snapshots/' } + + flatDir { dir '../libraries' } } dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' compile project(':rpgregions') compile project(':modern') - compile project(':legacy') + // compile project(':legacy') - To be removed at a later date. compile project(':api') } @@ -61,7 +70,7 @@ shadowJar { relocate 'com.github.stefvanschie.inventoryframework', 'net.islandearth.rpgregions.libs.inventoryframework' relocate 'org.bstats', 'net.islandearth.rpgregions.libs.bstats' relocate 'io.papermc.lib', 'net.islandearth.rpgregions.libs.paperlib' - relocate 'net.wesjd', 'net.islandearth.rpgregions.libsanvilgui' + relocate 'net.wesjd', 'net.islandearth.rpgregions.libs.anvilgui' } build.dependsOn shadowJar diff --git a/gradle.properties b/gradle.properties index ce38828..a94dfc7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ pluginGroup=net.islandearth -pluginVersion=1.3.7 +pluginVersion=1.3.8 # Set to false if you don't have access to the UltraRegions API jar to make the plugin compilable. The purchased plugin has support for it. ultraRegionsSupport=true diff --git a/legacy/README.md b/legacy/README.md new file mode 100644 index 0000000..70e5f43 --- /dev/null +++ b/legacy/README.md @@ -0,0 +1,2 @@ +# Legacy +This only exists for historical reasons and will be removed at a future date. \ No newline at end of file diff --git a/legacy/build.gradle b/legacy/build.gradle index 67896cc..f94fc82 100644 --- a/legacy/build.gradle +++ b/legacy/build.gradle @@ -9,29 +9,48 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 repositories { - mavenLocal() mavenCentral() + mavenLocal() + + maven { url 'https://jitpack.io' } + maven { - name = 'papermc-repo' - url = 'https://papermc.io/repo/repository/maven-public/' + name 'papermc-repo' + url 'https://papermc.io/repo/repository/maven-public/' } maven { - name = 'sonatype' - url = 'https://oss.sonatype.org/content/groups/public/' + name 'sonatype' + url 'https://oss.sonatype.org/content/groups/public/' } maven { - name = 'CodeMC' - url = 'https://repo.codemc.org/repository/maven-public' + name 'CodeMC' + url 'https://repo.codemc.org/repository/maven-public' } - maven { url = "https://repo.aikar.co/content/groups/aikar/" } + maven { url "https://repo.aikar.co/content/groups/aikar/" } // worldguard maven { url "https://maven.enginehub.org/repo/" } - maven { url 'https://jitpack.io' } + // PAPI + maven { url 'http://repo.extendedclip.com/content/repositories/placeholderapi/' } + + // plan + maven { + name 'bintray' + url 'https://dl.bintray.com/rsl1122/Plan-repository' + } + + maven { url 'https://hub.spigotmc.org/nexus/content/repositories/public/' } + + // MythicMobs + maven { url 'https://mvn.lumine.io/repository/maven-public/' } + + maven { url 'https://repo.codemc.io/repository/maven-snapshots/' } + + flatDir { dir '../libraries' } } dependencies { diff --git a/modern/build.gradle b/modern/build.gradle index 6a806c4..bd8ac8c 100644 --- a/modern/build.gradle +++ b/modern/build.gradle @@ -8,29 +8,46 @@ version = pluginVersion sourceCompatibility = 1.8 repositories { - mavenLocal() mavenCentral() + mavenLocal() + + maven { url 'https://jitpack.io' } + maven { - name = 'papermc-repo' - url = 'https://papermc.io/repo/repository/maven-public/' + name 'papermc-repo' + url 'https://papermc.io/repo/repository/maven-public/' } maven { - name = 'sonatype' - url = 'https://oss.sonatype.org/content/groups/public/' + name 'sonatype' + url 'https://oss.sonatype.org/content/groups/public/' } maven { - name = 'CodeMC' - url = 'https://repo.codemc.org/repository/maven-public' + name 'CodeMC' + url 'https://repo.codemc.org/repository/maven-public' } - maven { url = "https://repo.aikar.co/content/groups/aikar/" } + maven { url "https://repo.aikar.co/content/groups/aikar/" } // worldguard maven { url "https://maven.enginehub.org/repo/" } - maven { url 'https://jitpack.io' } + // PAPI + maven { url 'http://repo.extendedclip.com/content/repositories/placeholderapi/' } + + // plan + maven { + name 'bintray' + url 'https://dl.bintray.com/rsl1122/Plan-repository' + } + + maven { url 'https://hub.spigotmc.org/nexus/content/repositories/public/' } + + // MythicMobs + maven { url 'https://mvn.lumine.io/repository/maven-public/' } + + maven { url 'https://repo.codemc.io/repository/maven-snapshots/' } flatDir { dir '../libraries' } } diff --git a/rpgregions/build.gradle b/rpgregions/build.gradle index 6490180..c3b01ce 100644 --- a/rpgregions/build.gradle +++ b/rpgregions/build.gradle @@ -15,42 +15,40 @@ repositories { maven { url 'https://jitpack.io' } maven { - name = 'papermc-repo' - url = 'https://papermc.io/repo/repository/maven-public/' + name 'papermc-repo' + url 'https://papermc.io/repo/repository/maven-public/' } maven { - name = 'sonatype' - url = 'https://oss.sonatype.org/content/groups/public/' + name 'sonatype' + url 'https://oss.sonatype.org/content/groups/public/' } maven { - name = 'CodeMC' - url = 'https://repo.codemc.org/repository/maven-public' + name 'CodeMC' + url 'https://repo.codemc.org/repository/maven-public' } - maven { url = "https://repo.aikar.co/content/groups/aikar/" } + maven { url "https://repo.aikar.co/content/groups/aikar/" } // worldguard maven { url "https://maven.enginehub.org/repo/" } // PAPI - maven { - url = 'http://repo.extendedclip.com/content/repositories/placeholderapi/' - } + maven { url 'http://repo.extendedclip.com/content/repositories/placeholderapi/' } // plan maven { - name = 'bintray' - url = 'https://dl.bintray.com/rsl1122/Plan-repository' + name 'bintray' + url 'https://dl.bintray.com/rsl1122/Plan-repository' } maven { url 'https://hub.spigotmc.org/nexus/content/repositories/public/' } // MythicMobs - maven { - url = 'https://mvn.lumine.io/repository/maven-public/' - } + maven { url 'https://mvn.lumine.io/repository/maven-public/' } + + maven { url 'https://repo.codemc.io/repository/maven-snapshots/' } flatDir { dir '../libraries' } } @@ -68,7 +66,7 @@ dependencies { implementation 'com.github.stefvanschie.inventoryframework:IF:0.9.5' // inventory framework implementation 'org.bstats:bstats-bukkit:1.7' // plugin stats implementation 'io.papermc:paperlib:1.0.4' // paperlib - async teleport on Paper - implementation 'com.github.WesJD.AnvilGUI:anvilgui:master-SNAPSHOT' // anvilgui + implementation 'net.wesjd:anvilgui:1.5.0-SNAPSHOT' // anvilgui compileOnly ('com.sk89q.worldguard:worldguard-bukkit:7.0.4-SNAPSHOT') { exclude group: 'com.destroystokyo.paper' @@ -87,7 +85,7 @@ dependencies { compileOnly 'com.github.shynixn.headdatabase:hdb-api:1.0' // head database compileOnly 'com.djrapitops:Plan-api:5.1-R0.4' // plan compileOnly 'io.lumine.xikage:MythicMobs:4.9.1' - compileOnly 'org.jetbrains:annotations:19.0.0' + compileOnly 'org.jetbrains:annotations:20.1.0' compileOnly project(':api') }