Prep for combining under gradle build

2024-06-24 13:44:42 +02:00 · 2018-08-11 21:54:48 -05:00 · 2018-08-11 21:54:48 -05:00 · 57bf7fb99d
commit 57bf7fb99d
parent d5160dcaf6
23 changed files with 7 additions and 1045 deletions
--- a/.gitignore
+++ b/.gitignore
@ -24,3 +24,5 @@
 # Mac filesystem dust
 /.DS_Store
 /dependency-reduced-pom.xml
+
+/.gradle
--- a/bukkit/.gitignore
+++ b/bukkit/.gitignore
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@ -170,7 +170,7 @@
 	<version>3.0-SNAPSHOT</version>
 	<parent>
 	   	<groupId>us.dynmap</groupId>
-   		<artifactId>dynmap-bukkit</artifactId>
+   		<artifactId>dynmap-common</artifactId>
   		<version>3.0-SNAPSHOT</version>
   		<relativePath>..</relativePath>    
 	</parent>
--- a/bukkit/src/main/assembly/package.xml
+++ b/bukkit/src/main/assembly/package.xml
--- a/bukkit/src/main/java/org/dynmap/bukkit/Armor.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/Armor.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/Helper.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/Helper.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/permissions/GroupManagerPermissions.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/permissions/GroupManagerPermissions.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/permissions/OpPermissions.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/permissions/OpPermissions.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/permissions/PermissionProvider.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/permissions/PermissionProvider.java
--- a/bukkit/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java
+++ b/bukkit/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java
--- a/bukkit/src/main/resources/configuration.txt
+++ b/bukkit/src/main/resources/configuration.txt
--- a/bukkit/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
--- a/bukkit/tools/Biomes.ods
+++ b/bukkit/tools/Biomes.ods
--- a/bukkit/tools/bukkit_formatting_profile.xml
+++ b/bukkit/tools/bukkit_formatting_profile.xml
--- a/helper/pom.xml
+++ b/helper/pom.xml
@ -2,7 +2,7 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>us.dynmap</groupId>
-    <artifactId>dynmap-bukkit</artifactId>
+    <artifactId>dynmap-common</artifactId>
    <version>3.0-SNAPSHOT</version>
    <relativePath>..</relativePath>
  </parent>
--- a/helper/src/main/java/org/dynmap/bukkit/helper/NewMapChunkCache.java
+++ b/helper/src/main/java/org/dynmap/bukkit/helper/NewMapChunkCache.java
--- a/helper113/pom.xml
+++ b/helper113/pom.xml
@ -2,7 +2,7 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <groupId>us.dynmap</groupId>
-    <artifactId>dynmap-bukkit</artifactId>
+    <artifactId>dynmap-common</artifactId>
    <version>3.0-SNAPSHOT</version>
    <relativePath>..</relativePath>
  </parent>
--- a/pom.xml
+++ b/pom.xml
@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>us.dynmap</groupId>
-	<artifactId>dynmap-bukkit</artifactId>
+	<artifactId>dynmap-common</artifactId>
 	<name>dynmap-bukkit</name>
 	<properties>
 		<timestamp>${maven.build.timestamp}</timestamp>
@ -17,7 +17,7 @@
 	</issueManagement>
 	<packaging>pom</packaging>
 	<modules>
-		<module>core</module>
+		<module>bukkit</module>
 		<module>helper113</module>
 		<module>helper</module>
 	</modules>