diff --git a/bukkit/.project b/bukkit/.project deleted file mode 100644 index 2d6f7110..00000000 --- a/bukkit/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - dynmap - Project dynmap created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/bukkit/.settings/org.eclipse.buildship.core.prefs b/bukkit/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index a7b84d92..00000000 --- a/bukkit/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir=.. -eclipse.preferences.version=1 diff --git a/settings.gradle b/settings.gradle index 0ac29699..891d375e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ rootProject.name = 'dynmap-common' -include ':dynmap' +include ':spigot' include ':bukkit-helper-113' include ':bukkit-helper' include ':dynmap-api' @@ -11,7 +11,7 @@ include ':forge-1.10.2' include ':forge-1.9.4' include ':forge-1.8.9' -project(':dynmap').projectDir = "$rootDir/bukkit" as File +project(':spigot').projectDir = "$rootDir/spigot" as File project(':bukkit-helper-113').projectDir = "$rootDir/bukkit-helper-113" as File project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File project(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File diff --git a/bukkit/.gitignore b/spigot/.gitignore similarity index 100% rename from bukkit/.gitignore rename to spigot/.gitignore diff --git a/bukkit/build.gradle b/spigot/build.gradle similarity index 100% rename from bukkit/build.gradle rename to spigot/build.gradle diff --git a/bukkit/src/main/assembly/package.xml b/spigot/src/main/assembly/package.xml similarity index 100% rename from bukkit/src/main/assembly/package.xml rename to spigot/src/main/assembly/package.xml diff --git a/bukkit/src/main/java/org/dynmap/bukkit/Armor.java b/spigot/src/main/java/org/dynmap/bukkit/Armor.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/Armor.java rename to spigot/src/main/java/org/dynmap/bukkit/Armor.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/DynmapPlugin.java rename to spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/Helper.java b/spigot/src/main/java/org/dynmap/bukkit/Helper.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/Helper.java rename to spigot/src/main/java/org/dynmap/bukkit/Helper.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java b/spigot/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java rename to spigot/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/permissions/GroupManagerPermissions.java b/spigot/src/main/java/org/dynmap/bukkit/permissions/GroupManagerPermissions.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/permissions/GroupManagerPermissions.java rename to spigot/src/main/java/org/dynmap/bukkit/permissions/GroupManagerPermissions.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java b/spigot/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java rename to spigot/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/permissions/OpPermissions.java b/spigot/src/main/java/org/dynmap/bukkit/permissions/OpPermissions.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/permissions/OpPermissions.java rename to spigot/src/main/java/org/dynmap/bukkit/permissions/OpPermissions.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java b/spigot/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java rename to spigot/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java b/spigot/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java rename to spigot/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/permissions/PermissionProvider.java b/spigot/src/main/java/org/dynmap/bukkit/permissions/PermissionProvider.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/permissions/PermissionProvider.java rename to spigot/src/main/java/org/dynmap/bukkit/permissions/PermissionProvider.java diff --git a/bukkit/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java b/spigot/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java similarity index 100% rename from bukkit/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java rename to spigot/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java diff --git a/bukkit/src/main/resources/configuration.txt b/spigot/src/main/resources/configuration.txt similarity index 100% rename from bukkit/src/main/resources/configuration.txt rename to spigot/src/main/resources/configuration.txt diff --git a/bukkit/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml similarity index 100% rename from bukkit/src/main/resources/plugin.yml rename to spigot/src/main/resources/plugin.yml diff --git a/bukkit/tools/Biomes.ods b/spigot/tools/Biomes.ods similarity index 100% rename from bukkit/tools/Biomes.ods rename to spigot/tools/Biomes.ods diff --git a/bukkit/tools/bukkit_formatting_profile.xml b/spigot/tools/bukkit_formatting_profile.xml similarity index 100% rename from bukkit/tools/bukkit_formatting_profile.xml rename to spigot/tools/bukkit_formatting_profile.xml