diff --git a/api/build.gradle b/api/build.gradle index 71e44e8..2dbb9e2 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -1,2 +1,2 @@ -group = 'com.qualityplus' -project.version = '1.0.0' \ No newline at end of file +group = 'com.github.r3back' +version = rootProject.version \ No newline at end of file diff --git a/api/src/main/java/com/qualityplus/assistant/api/DependencyPlugin.java b/api/src/main/java/com/qualityplus/fastwrapper/api/DependencyPlugin.java similarity index 88% rename from api/src/main/java/com/qualityplus/assistant/api/DependencyPlugin.java rename to api/src/main/java/com/qualityplus/fastwrapper/api/DependencyPlugin.java index bcbc742..30a8156 100644 --- a/api/src/main/java/com/qualityplus/assistant/api/DependencyPlugin.java +++ b/api/src/main/java/com/qualityplus/fastwrapper/api/DependencyPlugin.java @@ -1,4 +1,4 @@ -package com.qualityplus.assistant.api; +package com.qualityplus.fastwrapper.api; import java.util.Optional; diff --git a/build.gradle b/build.gradle index 6ae0bfc..a74a198 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,22 @@ plugins { id 'com.github.johnrengelman.shadow' version '7.0.0' + id 'maven-publish' id 'checkstyle' } defaultTasks 'build' -group = 'com.qualityplus.core' -version = '1.0.0' +group = 'com.github.r3back' +version = '1.1.4' + +apply plugin: 'java' +apply plugin: 'maven-publish' +apply plugin: 'com.github.johnrengelman.shadow' subprojects { apply plugin: 'java' apply plugin: 'maven-publish' + apply plugin: 'com.github.johnrengelman.shadow' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -29,6 +35,9 @@ subprojects { maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } + maven { + url 'https://jitpack.io' + } } dependencies { @@ -40,6 +49,3 @@ subprojects { annotationProcessor("org.projectlombok:lombok:1.18.22") } } - - - diff --git a/build/tmp/jar/MANIFEST.MF b/build/tmp/jar/MANIFEST.MF new file mode 100644 index 0000000..59499bc --- /dev/null +++ b/build/tmp/jar/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/core/build.gradle b/core/build.gradle index 71e44e8..2707812 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,2 +1,14 @@ -group = 'com.qualityplus' -project.version = '1.0.0' \ No newline at end of file +plugins { + id 'com.github.johnrengelman.shadow' +} + +group = 'com.github.r3back' +version = rootProject.version + +shadowJar { + archiveFileName = project.name + "-SNAPSHOT.jar" +} + +artifacts { + archives shadowJar +} \ No newline at end of file diff --git a/core/region-wrapper-commons/build.gradle b/core/region-wrapper-commons/build.gradle index 0214e94..bf91c2f 100644 --- a/core/region-wrapper-commons/build.gradle +++ b/core/region-wrapper-commons/build.gradle @@ -1,5 +1,5 @@ -group = 'com.qualityplus' -project.version = '1.0.0' +group = 'com.github.r3back' +version = rootProject.version dependencies { compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT' diff --git a/core/region-wrapper-commons/src/main/java/com/qualityplus/assistant/api/addons/RegionAddon.java b/core/region-wrapper-commons/src/main/java/com/qualityplus/fastwrapper/api/addons/RegionAddon.java similarity index 93% rename from core/region-wrapper-commons/src/main/java/com/qualityplus/assistant/api/addons/RegionAddon.java rename to core/region-wrapper-commons/src/main/java/com/qualityplus/fastwrapper/api/addons/RegionAddon.java index 411048a..02b0a90 100644 --- a/core/region-wrapper-commons/src/main/java/com/qualityplus/assistant/api/addons/RegionAddon.java +++ b/core/region-wrapper-commons/src/main/java/com/qualityplus/fastwrapper/api/addons/RegionAddon.java @@ -1,6 +1,6 @@ -package com.qualityplus.assistant.api.addons; +package com.qualityplus.fastwrapper.api.addons; -import com.qualityplus.assistant.api.DependencyPlugin; +import com.qualityplus.fastwrapper.api.DependencyPlugin; import org.bukkit.Location; import java.util.List; diff --git a/core/region-wrapper-commons/src/main/java/com/qualityplus/assistant/base/addons/DefaultRegionsAddon.java b/core/region-wrapper-commons/src/main/java/com/qualityplus/fastwrapper/base/addons/DefaultRegionsAddon.java similarity index 80% rename from core/region-wrapper-commons/src/main/java/com/qualityplus/assistant/base/addons/DefaultRegionsAddon.java rename to core/region-wrapper-commons/src/main/java/com/qualityplus/fastwrapper/base/addons/DefaultRegionsAddon.java index 3d445e1..83a93f8 100644 --- a/core/region-wrapper-commons/src/main/java/com/qualityplus/assistant/base/addons/DefaultRegionsAddon.java +++ b/core/region-wrapper-commons/src/main/java/com/qualityplus/fastwrapper/base/addons/DefaultRegionsAddon.java @@ -1,6 +1,6 @@ -package com.qualityplus.assistant.base.addons; +package com.qualityplus.fastwrapper.base.addons; -import com.qualityplus.assistant.api.addons.RegionAddon; +import com.qualityplus.fastwrapper.api.addons.RegionAddon; import org.bukkit.Location; import java.util.Collections; diff --git a/core/region-wrapper-residence/build.gradle b/core/region-wrapper-residence/build.gradle index a92a814..d9d98ac 100644 --- a/core/region-wrapper-residence/build.gradle +++ b/core/region-wrapper-residence/build.gradle @@ -1,5 +1,5 @@ -group = 'com.qualityplus' -project.version = '1.0.0' +group = 'com.github.r3back' +version = rootProject.version def urlFile = { url, name -> File file = new File("$buildDir/download/${name}.jar") diff --git a/core/region-wrapper-residence/src/main/java/com/qualityplus/assistant/base/addons/regions/ResidenceAddon.java b/core/region-wrapper-residence/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/ResidenceAddon.java similarity index 89% rename from core/region-wrapper-residence/src/main/java/com/qualityplus/assistant/base/addons/regions/ResidenceAddon.java rename to core/region-wrapper-residence/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/ResidenceAddon.java index 568f2b7..d98fd3a 100644 --- a/core/region-wrapper-residence/src/main/java/com/qualityplus/assistant/base/addons/regions/ResidenceAddon.java +++ b/core/region-wrapper-residence/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/ResidenceAddon.java @@ -1,9 +1,9 @@ -package com.qualityplus.assistant.base.addons.regions; +package com.qualityplus.fastwrapper.base.addons.regions; import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.google.common.collect.ImmutableSet; -import com.qualityplus.assistant.api.addons.RegionAddon; +import com.qualityplus.fastwrapper.api.addons.RegionAddon; import org.bukkit.Location; import java.util.Optional; diff --git a/core/region-wrapper-ultra-regions/build.gradle b/core/region-wrapper-ultra-regions/build.gradle index e647122..d755f53 100644 --- a/core/region-wrapper-ultra-regions/build.gradle +++ b/core/region-wrapper-ultra-regions/build.gradle @@ -1,5 +1,5 @@ -group = 'com.qualityplus' -project.version = '1.0.0' +group = 'com.github.r3back' +version = rootProject.version dependencies { compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT' diff --git a/core/region-wrapper-ultra-regions/src/main/java/com/qualityplus/assistant/base/addons/regions/UltraRegionsAddon.java b/core/region-wrapper-ultra-regions/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/UltraRegionsAddon.java similarity index 87% rename from core/region-wrapper-ultra-regions/src/main/java/com/qualityplus/assistant/base/addons/regions/UltraRegionsAddon.java rename to core/region-wrapper-ultra-regions/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/UltraRegionsAddon.java index 60f8b01..2f52592 100644 --- a/core/region-wrapper-ultra-regions/src/main/java/com/qualityplus/assistant/base/addons/regions/UltraRegionsAddon.java +++ b/core/region-wrapper-ultra-regions/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/UltraRegionsAddon.java @@ -1,6 +1,6 @@ -package com.qualityplus.assistant.base.addons.regions; +package com.qualityplus.fastwrapper.base.addons.regions; -import com.qualityplus.assistant.api.addons.RegionAddon; +import com.qualityplus.fastwrapper.api.addons.RegionAddon; /*import me.TechsCode.UltraRegions.UltraRegions; import me.TechsCode.UltraRegions.selection.XYZ; import me.TechsCode.UltraRegions.storage.Region;*/ @@ -9,7 +9,6 @@ import java.util.HashSet; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; /** * Ultra Regions implementation diff --git a/core/region-wrapper-wg6/build.gradle b/core/region-wrapper-wg6/build.gradle index 9384451..dc93fc1 100644 --- a/core/region-wrapper-wg6/build.gradle +++ b/core/region-wrapper-wg6/build.gradle @@ -1,5 +1,5 @@ -group = 'com.qualityplus' -project.version = '1.0.0' +group = 'com.github.r3back' +version = rootProject.version repositories{ maven { diff --git a/core/region-wrapper-wg6/src/main/java/com/qualityplus/assistant/base/addons/regions/WG6Addon.java b/core/region-wrapper-wg6/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/WG6Addon.java similarity index 89% rename from core/region-wrapper-wg6/src/main/java/com/qualityplus/assistant/base/addons/regions/WG6Addon.java rename to core/region-wrapper-wg6/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/WG6Addon.java index 8cc0876..8fbace5 100644 --- a/core/region-wrapper-wg6/src/main/java/com/qualityplus/assistant/base/addons/regions/WG6Addon.java +++ b/core/region-wrapper-wg6/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/WG6Addon.java @@ -1,6 +1,6 @@ -package com.qualityplus.assistant.base.addons.regions; +package com.qualityplus.fastwrapper.base.addons.regions; -import com.qualityplus.assistant.api.addons.RegionAddon; +import com.qualityplus.fastwrapper.api.addons.RegionAddon; import com.sk89q.worldguard.bukkit.WGBukkit; import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.managers.RegionManager; diff --git a/core/region-wrapper-wg7/build.gradle b/core/region-wrapper-wg7/build.gradle index a562b47..0063a50 100644 --- a/core/region-wrapper-wg7/build.gradle +++ b/core/region-wrapper-wg7/build.gradle @@ -1,5 +1,5 @@ -group = 'com.qualityplus' -project.version = '1.0.0' +group = 'com.github.r3back' +version = rootProject.version repositories{ maven { diff --git a/core/region-wrapper-wg7/src/main/java/com/qualityplus/assistant/base/addons/regions/WG7Addon.java b/core/region-wrapper-wg7/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/WG7Addon.java similarity index 92% rename from core/region-wrapper-wg7/src/main/java/com/qualityplus/assistant/base/addons/regions/WG7Addon.java rename to core/region-wrapper-wg7/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/WG7Addon.java index 4aa1685..87c14b1 100644 --- a/core/region-wrapper-wg7/src/main/java/com/qualityplus/assistant/base/addons/regions/WG7Addon.java +++ b/core/region-wrapper-wg7/src/main/java/com/qualityplus/fastwrapper/base/addons/regions/WG7Addon.java @@ -1,6 +1,6 @@ -package com.qualityplus.assistant.base.addons.regions; +package com.qualityplus.fastwrapper.base.addons.regions; -import com.qualityplus.assistant.api.addons.RegionAddon; +import com.qualityplus.fastwrapper.api.addons.RegionAddon; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.world.World; import com.sk89q.worldguard.WorldGuard; diff --git a/plugin/build.gradle b/plugin/build.gradle new file mode 100644 index 0000000..ff0fb96 --- /dev/null +++ b/plugin/build.gradle @@ -0,0 +1,54 @@ +plugins { + id 'java' +} + +group 'com.github.r3back' +version rootProject.version + +repositories { + mavenCentral() +} + +dependencies { + project(':core').subprojects.forEach(project -> implementation project) + implementation project(':api') +} + +shadowJar { + archiveClassifier.set('') + + dependencies { + include(project(':api')) + include(project(':core:region-wrapper-commons')) + include(project(':core:region-wrapper-residence')) + include(project(':core:region-wrapper-ultra-regions')) + include(project(':core:region-wrapper-wg6')) + include(project(':core:region-wrapper-wg7')) + } +} + +artifacts { + archives shadowJar +} + +publishing { + repositories { + maven { + url "https://jitpack.io" + credentials { + username 'token' + password System.getenv('API_TOKEN') + } + } + } + + + publications { + register('shadow', MavenPublication) { + groupId project.group + artifactId rootProject.name + version project.version + artifact shadowJar + } + } +} \ No newline at end of file diff --git a/plugin/src/main/java/com/qualityplus/fastwrapper/FastWrapper.java b/plugin/src/main/java/com/qualityplus/fastwrapper/FastWrapper.java new file mode 100644 index 0000000..b05de74 --- /dev/null +++ b/plugin/src/main/java/com/qualityplus/fastwrapper/FastWrapper.java @@ -0,0 +1,14 @@ +package com.qualityplus.fastwrapper; + +import com.qualityplus.fastwrapper.api.addons.RegionAddon; + +/** + * Fast Region Plugin Wrapper Interface + */ +public interface FastWrapper { + /** + * + * @return {@link RegionAddon} + */ + public RegionAddon getRegionAddon(); +} diff --git a/settings.gradle b/settings.gradle index a8e92d5..b88985b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,10 @@ rootProject.name = 'fast-region-wrapper' include ('core', 'api', + 'plugin', 'core:region-wrapper-commons', 'core:region-wrapper-residence', 'core:region-wrapper-ultra-regions', 'core:region-wrapper-wg6', - 'core:region-wrapper-wg7') \ No newline at end of file + 'core:region-wrapper-wg7') +