From d2a0f651738814c2f8c4f5175073b6e085931a85 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 11 Aug 2018 23:27:52 -0500 Subject: [PATCH] Cleanup directory structure --- {helper => bukkit-helper-113}/.classpath | 0 {helper => bukkit-helper-113}/.gitignore | 0 {helper113 => bukkit-helper-113}/.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 {helper113 => bukkit-helper-113}/build.gradle | 4 ++-- .../bukkit/helper/v113/BukkitVersionHelperSpigot113.java | 0 .../org/dynmap/bukkit/helper/v113/MapChunkCache113.java | 0 {helper113 => bukkit-helper}/.classpath | 0 {helper113 => bukkit-helper}/.gitignore | 0 {helper => bukkit-helper}/.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 {helper => bukkit-helper}/build.gradle | 2 +- .../org/dynmap/bukkit/helper/AbstractMapChunkCache.java | 0 .../org/dynmap/bukkit/helper/BukkitVersionHelper.java | 0 .../org/dynmap/bukkit/helper/BukkitVersionHelperCB.java | 0 .../dynmap/bukkit/helper/BukkitVersionHelperGeneric.java | 0 .../bukkit/helper/BukkitVersionHelperGlowstone.java | 0 .../main/java/org/dynmap/bukkit/helper/BukkitWorld.java | 0 .../org/dynmap/bukkit/helper/MapChunkCacheClassic.java | 0 .../main/java/org/dynmap/bukkit/helper/SnapshotCache.java | 0 bukkit/build.gradle | 8 ++++---- settings.gradle | 8 ++++---- 26 files changed, 11 insertions(+), 11 deletions(-) rename {helper => bukkit-helper-113}/.classpath (100%) rename {helper => bukkit-helper-113}/.gitignore (100%) rename {helper113 => bukkit-helper-113}/.project (100%) rename {helper => bukkit-helper-113}/.settings/org.eclipse.core.resources.prefs (100%) rename {helper => bukkit-helper-113}/.settings/org.eclipse.jdt.core.prefs (100%) rename {helper => bukkit-helper-113}/.settings/org.eclipse.m2e.core.prefs (100%) rename {helper113 => bukkit-helper-113}/build.gradle (82%) rename {helper113 => bukkit-helper-113}/src/main/java/org/dynmap/bukkit/helper/v113/BukkitVersionHelperSpigot113.java (100%) rename {helper113 => bukkit-helper-113}/src/main/java/org/dynmap/bukkit/helper/v113/MapChunkCache113.java (100%) rename {helper113 => bukkit-helper}/.classpath (100%) rename {helper113 => bukkit-helper}/.gitignore (100%) rename {helper => bukkit-helper}/.project (100%) rename {helper113 => bukkit-helper}/.settings/org.eclipse.core.resources.prefs (100%) rename {helper113 => bukkit-helper}/.settings/org.eclipse.jdt.core.prefs (100%) rename {helper113 => bukkit-helper}/.settings/org.eclipse.m2e.core.prefs (100%) rename {helper => bukkit-helper}/build.gradle (91%) rename {helper => bukkit-helper}/src/main/java/org/dynmap/bukkit/helper/AbstractMapChunkCache.java (100%) rename {helper => bukkit-helper}/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java (100%) rename {helper => bukkit-helper}/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java (100%) rename {helper => bukkit-helper}/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java (100%) rename {helper => bukkit-helper}/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGlowstone.java (100%) rename {helper => bukkit-helper}/src/main/java/org/dynmap/bukkit/helper/BukkitWorld.java (100%) rename {helper => bukkit-helper}/src/main/java/org/dynmap/bukkit/helper/MapChunkCacheClassic.java (100%) rename {helper => bukkit-helper}/src/main/java/org/dynmap/bukkit/helper/SnapshotCache.java (100%) diff --git a/helper/.classpath b/bukkit-helper-113/.classpath similarity index 100% rename from helper/.classpath rename to bukkit-helper-113/.classpath diff --git a/helper/.gitignore b/bukkit-helper-113/.gitignore similarity index 100% rename from helper/.gitignore rename to bukkit-helper-113/.gitignore diff --git a/helper113/.project b/bukkit-helper-113/.project similarity index 100% rename from helper113/.project rename to bukkit-helper-113/.project diff --git a/helper/.settings/org.eclipse.core.resources.prefs b/bukkit-helper-113/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from helper/.settings/org.eclipse.core.resources.prefs rename to bukkit-helper-113/.settings/org.eclipse.core.resources.prefs diff --git a/helper/.settings/org.eclipse.jdt.core.prefs b/bukkit-helper-113/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from helper/.settings/org.eclipse.jdt.core.prefs rename to bukkit-helper-113/.settings/org.eclipse.jdt.core.prefs diff --git a/helper/.settings/org.eclipse.m2e.core.prefs b/bukkit-helper-113/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from helper/.settings/org.eclipse.m2e.core.prefs rename to bukkit-helper-113/.settings/org.eclipse.m2e.core.prefs diff --git a/helper113/build.gradle b/bukkit-helper-113/build.gradle similarity index 82% rename from helper113/build.gradle rename to bukkit-helper-113/build.gradle index b38cd37a..382344bf 100644 --- a/helper113/build.gradle +++ b/bukkit-helper-113/build.gradle @@ -1,8 +1,8 @@ -description = 'dynmap-helper-1.13' +description = 'bukkit-helper-1.13' dependencies { - compile project(':dynmap-helper') + compile project(':bukkit-helper') compile group: 'us.dynmap', name: 'dynmap-api', version: "${project.version}" compile group: 'us.dynmap', name: 'DynmapCore', version: "${project.version}" compile group: 'org.bukkit', name: 'bukkit', version:'1.13-R0.1-SNAPSHOT' diff --git a/helper113/src/main/java/org/dynmap/bukkit/helper/v113/BukkitVersionHelperSpigot113.java b/bukkit-helper-113/src/main/java/org/dynmap/bukkit/helper/v113/BukkitVersionHelperSpigot113.java similarity index 100% rename from helper113/src/main/java/org/dynmap/bukkit/helper/v113/BukkitVersionHelperSpigot113.java rename to bukkit-helper-113/src/main/java/org/dynmap/bukkit/helper/v113/BukkitVersionHelperSpigot113.java diff --git a/helper113/src/main/java/org/dynmap/bukkit/helper/v113/MapChunkCache113.java b/bukkit-helper-113/src/main/java/org/dynmap/bukkit/helper/v113/MapChunkCache113.java similarity index 100% rename from helper113/src/main/java/org/dynmap/bukkit/helper/v113/MapChunkCache113.java rename to bukkit-helper-113/src/main/java/org/dynmap/bukkit/helper/v113/MapChunkCache113.java diff --git a/helper113/.classpath b/bukkit-helper/.classpath similarity index 100% rename from helper113/.classpath rename to bukkit-helper/.classpath diff --git a/helper113/.gitignore b/bukkit-helper/.gitignore similarity index 100% rename from helper113/.gitignore rename to bukkit-helper/.gitignore diff --git a/helper/.project b/bukkit-helper/.project similarity index 100% rename from helper/.project rename to bukkit-helper/.project diff --git a/helper113/.settings/org.eclipse.core.resources.prefs b/bukkit-helper/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from helper113/.settings/org.eclipse.core.resources.prefs rename to bukkit-helper/.settings/org.eclipse.core.resources.prefs diff --git a/helper113/.settings/org.eclipse.jdt.core.prefs b/bukkit-helper/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from helper113/.settings/org.eclipse.jdt.core.prefs rename to bukkit-helper/.settings/org.eclipse.jdt.core.prefs diff --git a/helper113/.settings/org.eclipse.m2e.core.prefs b/bukkit-helper/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from helper113/.settings/org.eclipse.m2e.core.prefs rename to bukkit-helper/.settings/org.eclipse.m2e.core.prefs diff --git a/helper/build.gradle b/bukkit-helper/build.gradle similarity index 91% rename from helper/build.gradle rename to bukkit-helper/build.gradle index 50414e41..e3cf95ac 100644 --- a/helper/build.gradle +++ b/bukkit-helper/build.gradle @@ -1,5 +1,5 @@ -description = 'dynmap-helper' +description = 'bukkit-helper' dependencies { compile group: 'us.dynmap', name: 'dynmap-api', version: "${project.version}" diff --git a/helper/src/main/java/org/dynmap/bukkit/helper/AbstractMapChunkCache.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/AbstractMapChunkCache.java similarity index 100% rename from helper/src/main/java/org/dynmap/bukkit/helper/AbstractMapChunkCache.java rename to bukkit-helper/src/main/java/org/dynmap/bukkit/helper/AbstractMapChunkCache.java diff --git a/helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java similarity index 100% rename from helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java rename to bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java diff --git a/helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java similarity index 100% rename from helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java rename to bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java diff --git a/helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java similarity index 100% rename from helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java rename to bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java diff --git a/helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGlowstone.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGlowstone.java similarity index 100% rename from helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGlowstone.java rename to bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGlowstone.java diff --git a/helper/src/main/java/org/dynmap/bukkit/helper/BukkitWorld.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitWorld.java similarity index 100% rename from helper/src/main/java/org/dynmap/bukkit/helper/BukkitWorld.java rename to bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitWorld.java diff --git a/helper/src/main/java/org/dynmap/bukkit/helper/MapChunkCacheClassic.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/MapChunkCacheClassic.java similarity index 100% rename from helper/src/main/java/org/dynmap/bukkit/helper/MapChunkCacheClassic.java rename to bukkit-helper/src/main/java/org/dynmap/bukkit/helper/MapChunkCacheClassic.java diff --git a/helper/src/main/java/org/dynmap/bukkit/helper/SnapshotCache.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/SnapshotCache.java similarity index 100% rename from helper/src/main/java/org/dynmap/bukkit/helper/SnapshotCache.java rename to bukkit-helper/src/main/java/org/dynmap/bukkit/helper/SnapshotCache.java diff --git a/bukkit/build.gradle b/bukkit/build.gradle index fcd61d2c..728f99ba 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -13,8 +13,8 @@ dependencies { compile group: 'org.bstats', name: 'bstats-bukkit', version:'1.1' compile group: 'com.googlecode.json-simple', name: 'json-simple', version:'1.1.1' compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2' - compile project(':dynmap-helper') - implementation(project(':dynmap-helper-113')) { + compile project(':bukkit-helper') + implementation(project(':bukkit-helper-113')) { transitive = false } } @@ -40,8 +40,8 @@ shadowJar { include(dependency('org.bstats::')) include(dependency('us.dynmap:dynmap-api:')) include(dependency('us.dynmap:DynmapCore:')) - include(dependency(':dynmap-helper')) - include(dependency(':dynmap-helper-113')) + include(dependency(':bukkit-helper')) + include(dependency(':bukkit-helper-113')) } relocate('org.bstats', 'org.dynmap.bstats') destinationDir = file '../target' diff --git a/settings.gradle b/settings.gradle index 419276fb..7d81a915 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,8 @@ rootProject.name = 'dynmap-common' include ':dynmap' -include ':dynmap-helper-113' -include ':dynmap-helper' +include ':bukkit-helper-113' +include ':bukkit-helper' project(':dynmap').projectDir = "$rootDir/bukkit" as File -project(':dynmap-helper-113').projectDir = "$rootDir/helper113" as File -project(':dynmap-helper').projectDir = "$rootDir/helper" as File \ No newline at end of file +project(':bukkit-helper-113').projectDir = "$rootDir/bukkit-helper-113" as File +project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File \ No newline at end of file